Skip to content

Commit

Permalink
Merge pull request #78 from merative/ab/update-storybook-and-webpack
Browse files Browse the repository at this point in the history
Update storybook, webpack, react and others
  • Loading branch information
folkforms authored Jun 28, 2024
2 parents 6a3e915 + 485d8ec commit 45b2442
Show file tree
Hide file tree
Showing 25 changed files with 6,127 additions and 11,707 deletions.
43 changes: 0 additions & 43 deletions .eslintrc

This file was deleted.

16 changes: 14 additions & 2 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ const custom = require("../webpack.config.js");

module.exports = {
stories: [
"../packages/**/*.stories.mdx",
"../packages/**/*.mdx",
"../packages/**/*.stories.@(js|jsx|ts|tsx)",
],
addons: ["@storybook/addon-links", "@storybook/addon-essentials"],
addons: [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-webpack5-compiler-babel",
],
webpackFinal: (config) => {
return {
...config,
Expand All @@ -18,4 +22,12 @@ module.exports = {
},
};
},
core: {
disableTelemetry: true,
},
framework: {
name: "@storybook/react-webpack5",
options: {},
},
docs: {},
};
1 change: 1 addition & 0 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ export const parameters = {
},
},
};
export const tags = ["autodocs"];
5 changes: 0 additions & 5 deletions config/jest-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
* Copyright Merative US L.P. 2020
*/

import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';

// Ensure any error output to console is flagged as a failing test
global.console.error = (error) => {
throw new Error(error);
};

Enzyme.configure({ adapter: new Adapter() });
1 change: 1 addition & 0 deletions config/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

module.exports = {
rootDir: '../',
testEnvironment: 'jsdom',
collectCoverageFrom: [
'<rootDir>/packages/**/src/**/*.js',
'!<rootDir>/packages/**/src/apollo-client-hooks/**/*.js',
Expand Down
62 changes: 62 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import globals from "globals";
import pluginJs from "@eslint/js";
import pluginReactConfig from "eslint-plugin-react/configs/recommended.js";
import importPlugin from 'eslint-plugin-import';

export default [
{
settings: {
react: {
version: "detect"
}
}
},
{
files: [
"**/*.{js,mjs,cjs,jsx}"
],
plugins: {
importPlugin,
},
rules: {
"importPlugin/no-unresolved": "error",
"importPlugin/prefer-default-export": "error"
}
},
{
languageOptions: {
parserOptions: {
ecmaFeatures: {
jsx: true
}
}
}
},
{
languageOptions: {
globals: globals.browser
}
},
{
files: [
"**/__tests__/*.{js,mjs,cjs,jsx}"
],
languageOptions: {
globals: globals.jest
}
},
{
files: [
".storybook/*",
"config/jest-setup.js",
"config/jest.config.js",
"packages/carbon-addons-devenv/src/apollo-client-hooks/core/ApolloClientConfig.js",
"packages/carbon-addons-devenv/src/react/core/settings.js"
],
languageOptions: {
globals: globals.node
}
},
pluginJs.configs.recommended,
pluginReactConfig,
];
Loading

0 comments on commit 45b2442

Please sign in to comment.