diff --git a/.changeset/angry-cows-heal.md b/.changeset/angry-cows-heal.md new file mode 100644 index 0000000000..415e4c537d --- /dev/null +++ b/.changeset/angry-cows-heal.md @@ -0,0 +1,7 @@ +--- +'@talend/react-cmf': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +fix import of scripts-config-jest diff --git a/.changeset/chilled-boats-provide.md b/.changeset/chilled-boats-provide.md new file mode 100644 index 0000000000..d7ba61287a --- /dev/null +++ b/.changeset/chilled-boats-provide.md @@ -0,0 +1,6 @@ +--- +'@talend/scripts-config-babel': minor +--- + +adapt code to be compatible with pnpm +add missing deps diff --git a/.changeset/cold-mirrors-beam.md b/.changeset/cold-mirrors-beam.md new file mode 100644 index 0000000000..7d06b32b6a --- /dev/null +++ b/.changeset/cold-mirrors-beam.md @@ -0,0 +1,8 @@ +--- +'@talend/storybook-docs': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +remove ref to design-system and icons(circular dep) +adapt code for pnpm diff --git a/.changeset/eight-dryers-work.md b/.changeset/eight-dryers-work.md new file mode 100644 index 0000000000..54fb6caaed --- /dev/null +++ b/.changeset/eight-dryers-work.md @@ -0,0 +1,7 @@ +--- +'@talend/scripts-config-react-webpack': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +adapt code for pnpm diff --git a/.changeset/fast-elephants-switch.md b/.changeset/fast-elephants-switch.md new file mode 100644 index 0000000000..00f7c45a36 --- /dev/null +++ b/.changeset/fast-elephants-switch.md @@ -0,0 +1,6 @@ +--- +'@talend/eslint-config': minor +--- + +remove link to scripts-utils (circular dep) +add missing deps diff --git a/.changeset/forty-chefs-explode.md b/.changeset/forty-chefs-explode.md new file mode 100644 index 0000000000..b7683a30ec --- /dev/null +++ b/.changeset/forty-chefs-explode.md @@ -0,0 +1,7 @@ +--- +'@talend/http': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +fix tsconfig diff --git a/.changeset/fuzzy-bulldogs-build.md b/.changeset/fuzzy-bulldogs-build.md new file mode 100644 index 0000000000..bc51805640 --- /dev/null +++ b/.changeset/fuzzy-bulldogs-build.md @@ -0,0 +1,7 @@ +--- +'@talend/react-containers': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +add a tsconfig.build.json to exclude test files diff --git a/.changeset/gorgeous-rings-compare.md b/.changeset/gorgeous-rings-compare.md new file mode 100644 index 0000000000..01496ee27c --- /dev/null +++ b/.changeset/gorgeous-rings-compare.md @@ -0,0 +1,6 @@ +--- +'@talend/react-sagas': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps diff --git a/.changeset/grumpy-bulldogs-chew.md b/.changeset/grumpy-bulldogs-chew.md new file mode 100644 index 0000000000..368b821b6a --- /dev/null +++ b/.changeset/grumpy-bulldogs-chew.md @@ -0,0 +1,6 @@ +--- +'@talend/react-cmf-cqrs': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps diff --git a/.changeset/lemon-moons-mix.md b/.changeset/lemon-moons-mix.md new file mode 100644 index 0000000000..f2a3781f18 --- /dev/null +++ b/.changeset/lemon-moons-mix.md @@ -0,0 +1,7 @@ +--- +'@talend/design-system': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +remove useless cypress config (toto.cypress.config.js) diff --git a/.changeset/little-bikes-run.md b/.changeset/little-bikes-run.md new file mode 100644 index 0000000000..48eb9b1ea1 --- /dev/null +++ b/.changeset/little-bikes-run.md @@ -0,0 +1,8 @@ +--- +'@talend/icons': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +prepare scripts for pnpm +adapt scripts following changes made in scripts-config-babel diff --git a/.changeset/lovely-parrots-type.md b/.changeset/lovely-parrots-type.md new file mode 100644 index 0000000000..2dbd1e043b --- /dev/null +++ b/.changeset/lovely-parrots-type.md @@ -0,0 +1,6 @@ +--- +'@talend/react-forms': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps diff --git a/.changeset/modern-phones-retire.md b/.changeset/modern-phones-retire.md new file mode 100644 index 0000000000..f2536c2203 --- /dev/null +++ b/.changeset/modern-phones-retire.md @@ -0,0 +1,7 @@ +--- +'@talend/design-docs': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +remove link to design system (circular dep) diff --git a/.changeset/orange-eyes-explain.md b/.changeset/orange-eyes-explain.md new file mode 100644 index 0000000000..3ac26f82a8 --- /dev/null +++ b/.changeset/orange-eyes-explain.md @@ -0,0 +1,8 @@ +--- +'@talend/scripts-utils': minor +--- + +fix test to use package existing in the package.json +remove link to scripts-core (circular dep) +add missing deps +adapt code for pnpm diff --git a/.changeset/sharp-swans-tickle.md b/.changeset/sharp-swans-tickle.md new file mode 100644 index 0000000000..64545153d8 --- /dev/null +++ b/.changeset/sharp-swans-tickle.md @@ -0,0 +1,6 @@ +--- +'@talend/react-storybook-cmf': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps diff --git a/.changeset/sharp-vans-sing.md b/.changeset/sharp-vans-sing.md new file mode 100644 index 0000000000..8b23479784 --- /dev/null +++ b/.changeset/sharp-vans-sing.md @@ -0,0 +1,6 @@ +--- +'@talend/scripts-core': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +update scripts following changes made in scripts-config-babel diff --git a/.changeset/smooth-doors-knock.md b/.changeset/smooth-doors-knock.md new file mode 100644 index 0000000000..d1839ccaaf --- /dev/null +++ b/.changeset/smooth-doors-knock.md @@ -0,0 +1,6 @@ +--- +'@talend/router-bridge': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps diff --git a/.changeset/sweet-rockets-camp.md b/.changeset/sweet-rockets-camp.md new file mode 100644 index 0000000000..154a2ee83a --- /dev/null +++ b/.changeset/sweet-rockets-camp.md @@ -0,0 +1,6 @@ +--- +'@talend/ui-playground': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps diff --git a/.changeset/ten-crabs-bake.md b/.changeset/ten-crabs-bake.md new file mode 100644 index 0000000000..29cbc5bdae --- /dev/null +++ b/.changeset/ten-crabs-bake.md @@ -0,0 +1,6 @@ +--- +'@talend/react-cmf-router': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps diff --git a/.changeset/tender-pans-perform.md b/.changeset/tender-pans-perform.md new file mode 100644 index 0000000000..cbe8eb6f25 --- /dev/null +++ b/.changeset/tender-pans-perform.md @@ -0,0 +1,8 @@ +--- +'@talend/react-dataviz': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +remove useless config of jest (use the common) +fix config issue in tsconfig.json diff --git a/.changeset/thirty-pillows-type.md b/.changeset/thirty-pillows-type.md new file mode 100644 index 0000000000..385d0b108f --- /dev/null +++ b/.changeset/thirty-pillows-type.md @@ -0,0 +1,6 @@ +--- +'@talend/react-cmf-webpack-plugin': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps diff --git a/.changeset/three-pigs-breathe.md b/.changeset/three-pigs-breathe.md new file mode 100644 index 0000000000..2fab847f32 --- /dev/null +++ b/.changeset/three-pigs-breathe.md @@ -0,0 +1,7 @@ +--- +'@talend/module-to-cdn': minor +--- +remove babel config: there is no build task on this package +remove link to scripts-core to run lint (circular dependency), +remove link to tools/eslint-config and add it's own eslint config (circular dependency: fork/module-to-cdn > tools/eslint-config > tools/scripts-config-cdn > fork/module-to-cdn) +add missing deps diff --git a/.changeset/tidy-laws-talk.md b/.changeset/tidy-laws-talk.md new file mode 100644 index 0000000000..333a1aae41 --- /dev/null +++ b/.changeset/tidy-laws-talk.md @@ -0,0 +1,7 @@ +--- +'@talend/ui-storybook-one': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +fix for pnpm (not possible to ref a package to itself) diff --git a/.changeset/tidy-lemons-kick.md b/.changeset/tidy-lemons-kick.md new file mode 100644 index 0000000000..3a4ff75dea --- /dev/null +++ b/.changeset/tidy-lemons-kick.md @@ -0,0 +1,8 @@ +--- +'@talend/react-stepper': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +add tsconfig.build.json to exclude test +fix prettier config diff --git a/.changeset/violet-comics-live.md b/.changeset/violet-comics-live.md new file mode 100644 index 0000000000..ec63490e2a --- /dev/null +++ b/.changeset/violet-comics-live.md @@ -0,0 +1,6 @@ +--- +'@talend/react-bootstrap': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps diff --git a/.changeset/wild-turkeys-applaud.md b/.changeset/wild-turkeys-applaud.md new file mode 100644 index 0000000000..efff282fb0 --- /dev/null +++ b/.changeset/wild-turkeys-applaud.md @@ -0,0 +1,7 @@ +--- +'@talend/react-components': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps +add a tsconfig.build.json to exclude test files diff --git a/.changeset/wise-pans-nail.md b/.changeset/wise-pans-nail.md new file mode 100644 index 0000000000..8cfb32ec42 --- /dev/null +++ b/.changeset/wise-pans-nail.md @@ -0,0 +1,6 @@ +--- +'@talend/react-faceted-search': minor +--- + +update babel config to use babel.config.js instead of .babelrc.json +add missing deps diff --git a/.vscode/settings.json b/.vscode/settings.json index 8efa996cbf..01d3453f8c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,6 @@ { + "prettier.prettierPath": "./node_modules/prettier/index.cjs", + "prettier.configPath": ".prettierrc.js", "eslint.workingDirectories": [ { "pattern": "packages/**" diff --git a/fork/module-to-cdn/.babelrc b/fork/module-to-cdn/.babelrc deleted file mode 100644 index f9b18b310b..0000000000 --- a/fork/module-to-cdn/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../node_modules/@talend/scripts-config-babel/.babelrc.json" -} diff --git a/fork/module-to-cdn/.eslintrc.json b/fork/module-to-cdn/.eslintrc.json index 8464e11418..892f6e0fe8 100644 --- a/fork/module-to-cdn/.eslintrc.json +++ b/fork/module-to-cdn/.eslintrc.json @@ -1,4 +1,16 @@ { "root": true, - "extends": "@talend" + "extends": ["eslint:recommended", "plugin:prettier/recommended", "plugin:import/recommended"], + "env": { + "es6": true, + "node": true, + "jasmine": true, + "jest": true + }, + "parser": "@babel/eslint-parser", + "parserOptions": { + "ecmaVersion": 6, + "sourceType": "module", + "requireConfigFile": false + } } diff --git a/fork/module-to-cdn/package.json b/fork/module-to-cdn/package.json index aedb349483..55d2dd1fd3 100644 --- a/fork/module-to-cdn/package.json +++ b/fork/module-to-cdn/package.json @@ -20,7 +20,7 @@ "scripts": { "test": "jest index.test.js", "test:cron": "jest modules.test.js", - "lint": "talend-scripts lint ./" + "lint": "eslint ./" }, "files": [ "index.js", @@ -38,6 +38,8 @@ "semver": "^7.5.4" }, "devDependencies": { + "@babel/eslint-parser": "^7.22.15", + "eslint": "^7.32.0", "jest": "^29.7.0" }, "publishConfig": { diff --git a/fork/react-bootstrap/.babelrc b/fork/react-bootstrap/.babelrc index 1d6655372a..abd323e11d 100644 --- a/fork/react-bootstrap/.babelrc +++ b/fork/react-bootstrap/.babelrc @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/fork/react-bootstrap/package.json b/fork/react-bootstrap/package.json index 8f2079bfed..92e64ecc34 100644 --- a/fork/react-bootstrap/package.json +++ b/fork/react-bootstrap/package.json @@ -41,7 +41,10 @@ "react-dom": ">=16.3.0" }, "devDependencies": { + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^12.1.5", diff --git a/package.json b/package.json index ad6c3226ba..9a79374f7b 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "husky": "^8.0.3", "i18next-scanner": "^4.4.0", "lint-staged": "^13.3.0", - "prettier": "^2.8.8" + "prettier": "^3.0.3" }, "scripts": { "postinstall": "talend-yarn-workspace run build:lib", diff --git a/packages/cmf-cqrs/.babelrc.json b/packages/cmf-cqrs/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/cmf-cqrs/.babelrc.json +++ b/packages/cmf-cqrs/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/cmf-cqrs/package.json b/packages/cmf-cqrs/package.json index d2db1f5de1..edea6e8e84 100644 --- a/packages/cmf-cqrs/package.json +++ b/packages/cmf-cqrs/package.json @@ -38,8 +38,13 @@ "redux-saga": "^1.2.3" }, "devDependencies": { + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", + "@talend/scripts-config-typescript": "^11.1.0", + "@testing-library/react": "^12.1.5", "@testing-library/react-hooks": "^8.0.1", "mock-socket": "^9.3.1", "prop-types": "^15.8.1", diff --git a/packages/cmf-router/.babelrc.json b/packages/cmf-router/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/cmf-router/.babelrc.json +++ b/packages/cmf-router/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/cmf-router/package.json b/packages/cmf-router/package.json index 171e940025..1a598d258c 100644 --- a/packages/cmf-router/package.json +++ b/packages/cmf-router/package.json @@ -34,7 +34,10 @@ }, "devDependencies": { "@redux-saga/testing-utils": "^1.1.5", + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/cmf/.babelrc.json b/packages/cmf/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/cmf/.babelrc.json +++ b/packages/cmf/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/cmf/jest.config.js b/packages/cmf/jest.config.js index 5d8b9d7b46..3ed4450157 100644 --- a/packages/cmf/jest.config.js +++ b/packages/cmf/jest.config.js @@ -1,4 +1,4 @@ -const defaults = require('../../node_modules/@talend/scripts-config-jest/jest.config.js'); +const defaults = require('@talend/scripts-config-jest/jest.config.js'); module.exports = { ...defaults, diff --git a/packages/cmf/package.json b/packages/cmf/package.json index 7e4ee698f4..fad7b17960 100644 --- a/packages/cmf/package.json +++ b/packages/cmf/package.json @@ -55,7 +55,11 @@ }, "devDependencies": { "@redux-saga/testing-utils": "^1.1.5", + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", + "@talend/scripts-config-jest": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", "@testing-library/react": "^12.1.5", "jest-in-case": "^1.0.2", diff --git a/packages/components/.babelrc.json b/packages/components/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/components/.babelrc.json +++ b/packages/components/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/components/package.json b/packages/components/package.json index bf0f4ab7be..31995f1cae 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -34,15 +34,18 @@ }, "dependencies": { "@popperjs/core": "^2.11.8", + "@talend/assets-api": "^1.2.2", "@talend/bootstrap-theme": "^8.2.1", "@talend/design-tokens": "^2.9.0", - "@talend/react-a11y": "^2.0.0", "@talend/icons": "^7.0.0", + "@talend/react-a11y": "^2.0.0", + "@talend/react-bootstrap": "^2.0.0", "@talend/utils": "^2.6.0", "ally.js": "^1.4.1", "classnames": "^2.3.2", "d3": "^7.8.5", "date-fns": "^1.30.1", + "dom-helpers": "^3.4.0", "focus-outline-manager": "^1.0.2", "immutable": "^3.8.2", "invariant": "^2.2.4", @@ -51,7 +54,6 @@ "memoize-one": "^6.0.0", "rc-slider": "^10.2.1", "react-autowhatever": "10.2.0", - "@talend/react-bootstrap": "^2.0.0", "react-debounce-input": "^3.3.0", "react-draggable": "^4.4.5", "react-grid-layout": "^1.4.1", @@ -65,24 +67,30 @@ "recharts": "^2.8.0", "simplebar": "^5.3.9", "simplebar-react": "^2.4.3", - "styled-components": "^5.3.11" + "styled-components": "^5.3.11", + "warning": "^3.0.0" }, "devDependencies": { "@storybook/addon-actions": "^7.4.1", "@talend/bootstrap-theme": "^8.2.1", "@talend/design-system": "^8.0.0", - "@talend/icons": "^7.0.0", + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/locales-design-system": "^7.15.1", "@talend/locales-tui-components": "^11.4.5", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.1.0", + "@talend/scripts-config-storybook-lib": "^5.1.0", + "@talend/scripts-config-typescript": "^11.1.0", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^12.1.5", "@testing-library/user-event": "^13.5.0", + "@testing-library/react-hooks": "^8.0.1", "@types/classnames": "^2.3.1", "@types/d3": "^7.4.0", "@types/date-fns": "^0.0.2", - "@types/enzyme": "^3.10.13", + "@types/jest": "^29.5.5", "@types/lodash": "^4.14.198", "@types/prop-types": "^15.7.5", "@types/react": "^18.2.8", diff --git a/packages/containers/.babelrc.json b/packages/containers/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/containers/.babelrc.json +++ b/packages/containers/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/containers/package.json b/packages/containers/package.json index 61717db945..a61e0639ca 100644 --- a/packages/containers/package.json +++ b/packages/containers/package.json @@ -33,6 +33,7 @@ "url": "https://github.com/Talend/ui.git" }, "dependencies": { + "@talend/design-system": "^8.0.0", "@talend/react-bootstrap": "^2.0.0", "@talend/react-cmf": "^8.0.0", "@talend/react-components": "^12.0.0", @@ -54,8 +55,14 @@ "@talend/icons": "^7.0.0", "@talend/locales-tui-containers": "^9.1.3", "@talend/react-storybook-cmf": "^8.0.0", + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", + "@talend/scripts-config-storybook-lib": "^5.1.0", "@talend/scripts-config-react-webpack": "^16.0.0", + "@testing-library/react": "^12.1.5", + "@testing-library/user-event": "^13.5.0", "i18next": "^23.5.1", "jest-in-case": "^1.0.2", "prop-types": "^15.8.1", diff --git a/packages/dataviz/.babelrc.json b/packages/dataviz/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/dataviz/.babelrc.json +++ b/packages/dataviz/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/dataviz/jest.config.js b/packages/dataviz/jest.config.js deleted file mode 100755 index e754d5eb25..0000000000 --- a/packages/dataviz/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -process.env.TZ = 'Europe/Paris'; - -const defaults = require('@talend/scripts-config-jest/jest.config.js'); - -module.exports = { - ...defaults, -}; diff --git a/packages/dataviz/package.json b/packages/dataviz/package.json index 1b038dd029..1da687650b 100644 --- a/packages/dataviz/package.json +++ b/packages/dataviz/package.json @@ -50,21 +50,30 @@ "@cypress/react": "^7.0.3", "@cypress/webpack-dev-server": "^3.6.1", "@talend/bootstrap-theme": "^8.2.1", + "@talend/design-system": "^8.0.0", + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/icons": "^7.0.0", "@talend/locales-tui-components": "^11.4.5", "@talend/locales-tui-dataviz": "^3.0.1", "@talend/react-components": "^12.0.0", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", + "@talend/scripts-config-storybook-lib": "^5.1.0", + "@talend/scripts-config-typescript": "^11.1.0", "@testing-library/react": "^12.1.5", + "@testing-library/cypress": "^9.0.0", + "@testing-library/user-event": "^13.5.0", "@types/classnames": "^2.3.1", "@types/d3": "^7.4.0", - "@types/enzyme": "^3.10.13", "@types/geojson": "^7946.0.10", "@types/lodash": "^4.14.198", + "@types/node": "^6.14.13", "@types/react": "^18.2.8", "@types/topojson-client": "^3.1.2", "@types/topojson-specification": "^1.0.3", + "cypress": "^12.17.4", "cross-env": "^7.0.3", "i18next": "^23.5.1", "react": "^18.2.0", diff --git a/packages/dataviz/tsconfig.json b/packages/dataviz/tsconfig.json index bf1c507d62..af0c1855d2 100755 --- a/packages/dataviz/tsconfig.json +++ b/packages/dataviz/tsconfig.json @@ -8,7 +8,7 @@ "rootDirs": ["cypress", "@testing-library/cypress", "src"], "target": "es5", - "lib": ["es5", "dom"], + "lib": ["es6", "dom", "ES2017"], "types": ["cypress", "node"] } } diff --git a/packages/design-docs/.babelrc.json b/packages/design-docs/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/design-docs/.babelrc.json +++ b/packages/design-docs/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/design-docs/.storybook/.babelrc b/packages/design-docs/.storybook/.babelrc index 1d6655372a..abd323e11d 100644 --- a/packages/design-docs/.storybook/.babelrc +++ b/packages/design-docs/.storybook/.babelrc @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/design-docs/.storybook/main.js b/packages/design-docs/.storybook/main.js index f63db26fc8..864e7de88d 100644 --- a/packages/design-docs/.storybook/main.js +++ b/packages/design-docs/.storybook/main.js @@ -1,6 +1,8 @@ import path from 'path'; +import { packageDirectorySync } from 'pkg-dir'; + const iconConfig = require('@talend/icons/.storybook/main.js'); -const rootPath = require.resolve('@talend/design-docs').replace('src/index.ts', ''); +const rootPath = packageDirectorySync(); const { getJSAndTSLoader, } = require('@talend/scripts-config-react-webpack/config/webpack.config.common'); @@ -11,19 +13,19 @@ const monoRepoFixSourceMap = ['./src', '../design-system/src']; const srcDirectories = monoRepoFixSourceMap.map(src => path.resolve(process.cwd(), src)); const STORIES = [ - `${rootPath}src/Welcome.mdx`, - `${rootPath}src/GettingStarted.mdx`, - `${rootPath}src/Principles.mdx`, - `${rootPath}src/Statuses.mdx`, - // `${rootPath}src/Catalog.mdx`, - `${rootPath}src/content/VoiceAndTone.@(js|tsx|mdx)`, - `${rootPath}src/content/Internationalization.@(js|tsx|mdx)`, - `${rootPath}src/content/Conventions.@(js|tsx|mdx)`, - `${rootPath}src/content/Capitalization.@(js|tsx|mdx)`, - `${rootPath}src/content/Wording.@(js|tsx|mdx)`, - `${rootPath}src/tokens/**/*.mdx`, - `${rootPath}../design-system/src/stories/**/*.@(stories.tsx|mdx)`, - // `${rootPath}src/components/**/*.@(stories.tsx|mdx)`, + `${rootPath}/src/Welcome.mdx`, + `${rootPath}/src/GettingStarted.mdx`, + `${rootPath}/src/Principles.mdx`, + `${rootPath}/src/Statuses.mdx`, + // `${rootPath}/src/Catalog.mdx`, + `${rootPath}/src/content/VoiceAndTone.@(js|tsx|mdx)`, + `${rootPath}/src/content/Internationalization.@(js|tsx|mdx)`, + `${rootPath}/src/content/Conventions.@(js|tsx|mdx)`, + `${rootPath}/src/content/Capitalization.@(js|tsx|mdx)`, + `${rootPath}/src/content/Wording.@(js|tsx|mdx)`, + `${rootPath}/src/tokens/**/*.mdx`, + `${rootPath}/../design-system/src/stories/**/*.@(stories.tsx|mdx)`, + // `${rootPath}/src/components/**/*.@(stories.tsx|mdx)`, ]; export default { diff --git a/packages/design-docs/package.json b/packages/design-docs/package.json index 1639d3c884..a5c0d39ba7 100644 --- a/packages/design-docs/package.json +++ b/packages/design-docs/package.json @@ -31,6 +31,7 @@ "classnames": "^2.3.1", "color-contrast-checker": "^2.1.0", "figma-js": "^1.16.0", + "pkg-dir": "^7.0.0", "react-hook-form": "^6.15.8", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -49,12 +50,17 @@ "@storybook/testing-library": "^0.2.0", "@storybook/testing-react": "^2.0.1", "@storybook/theming": "^7.4.1", + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/locales-design-system": "^7.15.1", "@talend/locales-tui-components": "^11.4.5", "@talend/locales-tui-containers": "^9.1.3", "@talend/locales-tui-faceted-search": "^11.3.0", "@talend/locales-tui-forms": "^10.2.4", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", + "@talend/scripts-config-storybook-lib": "^5.1.0", + "@talend/scripts-config-typescript": "^11.1.0", "@types/react": "^18.2.7", "i18next": "^23.5.1", "mdx-embed": "^1.1.2", diff --git a/packages/design-system/.babelrc b/packages/design-system/.babelrc index 02add25248..269d2ec2cf 100644 --- a/packages/design-system/.babelrc +++ b/packages/design-system/.babelrc @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/design-system/package.json b/packages/design-system/package.json index a6ae2d8d96..534a2848f5 100644 --- a/packages/design-system/package.json +++ b/packages/design-system/package.json @@ -46,7 +46,6 @@ "typeface-source-sans-pro": "^1.1.13" }, "devDependencies": { - "@babel/core": "^7.22.20", "@cypress/react": "^7.0.3", "@cypress/webpack-dev-server": "^3.6.1", "@jest/globals": "^29.7.0", @@ -64,10 +63,16 @@ "@storybook/theming": "^7.4.1", "@svgr/webpack": "^5.5.0", "@talend/bootstrap-theme": "^8.2.1", + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/icons": "^7.0.0", "@talend/locales-design-system": "^7.15.1", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", + "@talend/scripts-config-storybook-lib": "^5.1.0", + "@talend/scripts-config-typescript": "^11.1.0", + "@talend/storybook-docs": "^2.0.0", "@testing-library/cypress": "^9.0.0", "@types/classnames": "^2.3.1", "@types/jest-axe": "^3.5.6", @@ -97,6 +102,7 @@ "peerDependencies": { "@talend/icons": "^7.0.0", "@talend/locales-design-system": "^7.15.1", + "@testing-library/react": "^12.1.5", "i18next": "^23.5.1", "react": "^16.14.0 || ^17.0.0 || ^18.0.0", "react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0", diff --git a/packages/design-system/toto.cypress.config.js b/packages/design-system/toto.cypress.config.js deleted file mode 100644 index 779663b46a..0000000000 --- a/packages/design-system/toto.cypress.config.js +++ /dev/null @@ -1,79 +0,0 @@ -const path = require('path'); -const { defineConfig } = require('cypress'); -const getWebpackConfiguration = require('@talend/scripts-config-react-webpack'); - -const { - getCommonStyleLoaders, - getSassLoaders, - getJSAndTSLoader, - getSassData, - getAssetsRules, -} = require('@talend/scripts-config-react-webpack/config/webpack.config.common'); - -const sassData = {}; -const webpackConfig = { - mode: 'development', - entry: [path.join(__dirname, 'src', 'index.js')], - output: { - path: path.resolve(__dirname, 'dist'), - }, - devtool: false, - resolve: { - extensions: ['.js', '.ts', '.tsx'], - fallback: { - url: false, - }, - }, - module: { - rules: [ - { - test: /\.js$/, - include: /node_modules/, - use: ['source-map-loader'], - enforce: 'pre', - }, - { - test: /\.(js|ts|tsx)$/, - exclude: /node_modules/, - include: [path.resolve(process.cwd(), './src/')], - use: getJSAndTSLoader(process.env, true), - }, - { - test: /\.css$/, - exclude: /\.module\.css$/, - include: [path.resolve(process.cwd(), './src/')], - use: getCommonStyleLoaders(false, true), - }, - { - test: /\.module\.css$/, - include: [path.resolve(process.cwd(), './src/')], - use: getCommonStyleLoaders(true, true), - }, - { - test: /\.scss$/, - exclude: /\.module\.scss$/, - include: [path.resolve(process.cwd(), './src/')], - use: getSassLoaders(false, sassData, true), - }, - { - test: /\.module\.scss$/, - include: [path.resolve(process.cwd(), './src/')], - use: getSassLoaders(true, sassData, true), - }, - ...getAssetsRules(true), - ].filter(Boolean), - }, -}; - -module.exports = defineConfig({ - component: { - devServer: { - framework: 'react', - bundler: 'webpack', - // optionally pass in webpack config - webpackConfig, - // or a function - the result is merged with any - // webpack.config that is found - }, - }, -}); diff --git a/packages/design-system/tsconfig.json b/packages/design-system/tsconfig.json index cb96299808..4d21978a9d 100644 --- a/packages/design-system/tsconfig.json +++ b/packages/design-system/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "@talend/scripts-config-typescript/tsconfig.json", - "include": ["../../node_modules/cypress", "cypress/**/*", "src/**/*", "custom.d.ts"], + "include": ["node_modules/cypress", "cypress/**/*", "src/**/*", "custom.d.ts"], "files": [], "compilerOptions": { "baseUrl": ".", diff --git a/packages/faceted-search/.babelrc b/packages/faceted-search/.babelrc index 02add25248..269d2ec2cf 100644 --- a/packages/faceted-search/.babelrc +++ b/packages/faceted-search/.babelrc @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/faceted-search/package.json b/packages/faceted-search/package.json index fbd693f9f7..5019a10d3f 100644 --- a/packages/faceted-search/package.json +++ b/packages/faceted-search/package.json @@ -36,7 +36,7 @@ "@talend/daikon-tql-client": "^1.3.1", "@talend/utils": "^2.6.0", "@talend/react-bootstrap": "^2.0.0", - "@talend/design-tokens": "2.9.0", + "@talend/design-tokens": "^2.9.0", "classnames": "^2.3.2", "date-fns": "^1.30.1", "invariant": "^2.2.4", @@ -48,12 +48,19 @@ "@storybook/testing-library": "^0.2.0", "@talend/bootstrap-theme": "^8.2.1", "@talend/design-system": "^8.0.0", + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/icons": "^7.0.0", "@talend/locales-tui-components": "^11.4.5", "@talend/locales-tui-faceted-search": "^11.3.0", "@talend/react-components": "^12.0.0", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", + "@talend/scripts-config-jest": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", + "@talend/scripts-config-storybook-lib": "^5.1.0", + "@testing-library/react": "^12.1.5", + "@testing-library/user-event": "^13.5.0", "babel-plugin-angularjs-annotate": "^0.10.0", "cross-env": "^7.0.3", "i18next": "^23.5.1", diff --git a/packages/forms/.babelrc.json b/packages/forms/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/forms/.babelrc.json +++ b/packages/forms/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/forms/package.json b/packages/forms/package.json index 74b2a17738..028da542ad 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -36,10 +36,12 @@ }, "dependencies": { "@talend/assets-api": "^1.2.2", - "@talend/json-schema-form-core": "1.1.1", + "@talend/icons": "^7.0.0", + "@talend/json-schema-form-core": "^1.1.1", "@talend/react-components": "^12.0.0", "@talend/design-system": "^8.0.0", "@talend/design-tokens": "^2.9.0", + "@talend/react-bootstrap": "^2.0.0", "@talend/utils": "^2.6.0", "ace-builds": "1.10.1", "ajv": "^6.12.6", @@ -49,7 +51,6 @@ "lodash": "^4.17.21", "memoize-one": "^6.0.0", "react-autowhatever": "10.2.0", - "@talend/react-bootstrap": "^2.0.0", "react-ace": "10.1.0", "react-hook-form": "^6.15.8", "react-jsonschema-form": "0.51.0", @@ -59,14 +60,19 @@ "@storybook/addon-actions": "^7.4.1", "@storybook/addon-controls": "^7.4.1", "@talend/bootstrap-theme": "^8.2.1", - "@talend/icons": "^7.0.0", "@talend/locales-tui-forms": "^10.2.4", "@talend/react-components": "^12.0.0", + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", + "@talend/scripts-config-storybook-lib": "^5.1.0", + "@talend/scripts-config-typescript": "^11.1.0", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^12.1.5", "@testing-library/user-event": "^14.5.1", + "ally.js": "^1.4.1", "i18next": "^23.5.1", "i18next-scanner-typescript": "^1.1.1", "jest-in-case": "^1.0.2", @@ -75,6 +81,7 @@ "prop-types": "^15.8.1", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-virtualized": "^9.22.5", "react-i18next": "^13.3.0", "react-test-renderer": "^18.2.0" }, diff --git a/packages/http/.babelrc b/packages/http/.babelrc index 02add25248..269d2ec2cf 100644 --- a/packages/http/.babelrc +++ b/packages/http/.babelrc @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/http/package.json b/packages/http/package.json index c7e2accf1d..58432371a9 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -27,8 +27,14 @@ "lint": "talend-scripts lint" }, "devDependencies": { + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", + "@talend/scripts-config-typescript": "^11.1.0", + "@types/jest": "^29.5.5", + "@types/node-fetch": "^2.6.6", "fetch-mock": "^9.11.0", "node-fetch": "^2.7.0", "react-dom": "^18.2.0", diff --git a/packages/http/tsconfig.json b/packages/http/tsconfig.json index 23310ba411..845fe55cb5 100644 --- a/packages/http/tsconfig.json +++ b/packages/http/tsconfig.json @@ -5,6 +5,7 @@ "allowJs": false, "declaration": true, "target": "ES5", - "module": "CommonJs" + "module": "CommonJs", + "types": ["jest"] } } diff --git a/packages/icons/.babelrc.json b/packages/icons/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/icons/.babelrc.json +++ b/packages/icons/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/icons/package.json b/packages/icons/package.json index 811471f385..14be0ed982 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -40,22 +40,29 @@ "url": "https://github.com/Talend/ui.git" }, "devDependencies": { - "@babel/core": "^7.22.20", + "@babel/core": "^7.23.2", "@babel/preset-env": "^7.22.20", "@babel/preset-react": "^7.22.15", "@svgr/webpack": "^5.5.0", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", + "@talend/scripts-config-typescript": "^11.1.0", + "@talend/babel-plugin-assets-api": "^1.1.0", + "@talend/babel-plugin-import-from-index": "^1.5.1", + "@talend/scripts-config-storybook-lib": "^5.1.0", + "@talend/design-tokens": "^2.9.0", "babel-loader": "^9.1.3", "copy-webpack-plugin": "^10.2.4", "css-loader": "^4.3.0", "mini-css-extract-plugin": "^2.7.6", "mkdirp": "^1.0.4", - "prettier": "^2.8.3", + "prettier": "^3.0.3", "react": "^18.2.0", "react-use": "^17.4.0", "string-replace-loader": "^2.3.0", "style-loader": "^1.3.0", "svgo": "^1.3.2", + "url-loader": "^4.1.1", "webfonts-loader": "^8.0.1", "webpack": "^5.88.2", "webpack-cli": "^4.10.0" diff --git a/packages/icons/scripts/react.js b/packages/icons/scripts/react.js index d1b1ef871f..1d0b70d263 100755 --- a/packages/icons/scripts/react.js +++ b/packages/icons/scripts/react.js @@ -4,7 +4,7 @@ const path = require('path'); const mkdirp = require('mkdirp'); const babel = require('@babel/core'); -const defaultOptions = require('@talend/scripts-config-babel/.babelrc.json'); +const defaultOptions = require('@talend/scripts-config-babel/babel.config.js'); const src = require('../src'); const info = require('../src/info').info; const infoFromFigma = require('../src/info').infoFromFigma; diff --git a/packages/icons/scripts/typescript.js b/packages/icons/scripts/typescript.js index 9d0a8ce3d3..d4c6911d5a 100644 --- a/packages/icons/scripts/typescript.js +++ b/packages/icons/scripts/typescript.js @@ -23,9 +23,8 @@ fs.readdirSync(iconSrcFolder) }); }); -fs.writeFileSync( - path.join(srcFolder, 'typeUtils.ts'), - prettier.format( +prettier + .format( ` export declare type IconName = ${icons} @@ -56,5 +55,7 @@ export declare type Icon = { }; `, { singleQuote: true, parser: 'typescript' }, - ), -); + ) + .then(data => { + fs.writeFileSync(path.join(srcFolder, 'typeUtils.ts'), data); + }); diff --git a/packages/icons/webpack.config.js b/packages/icons/webpack.config.js index 79f91dd811..370970eeb2 100644 --- a/packages/icons/webpack.config.js +++ b/packages/icons/webpack.config.js @@ -27,14 +27,14 @@ module.exports = { { // The replacer is used to create relative local paths instead of paths relative // to publicPath, because it makes it processable by webpack. - loader: 'string-replace-loader', + loader: require.resolve('string-replace-loader'), options: { search: /url\(\\"\//g, // The CSS output by css-loader is stringified, so the quotes are escaped replace: 'url(\\"./', }, }, { - loader: 'css-loader', + loader: require.resolve('css-loader'), options: { url: false, }, @@ -44,7 +44,7 @@ module.exports = { }, { test: /\.(woff|eot|ttf|svg)$/, - loader: 'url-loader', + loader: require.resolve('url-loader'), }, ], }, diff --git a/packages/icons/webpack.umd.js b/packages/icons/webpack.umd.js index 7041f9b380..866ff086f7 100644 --- a/packages/icons/webpack.umd.js +++ b/packages/icons/webpack.umd.js @@ -19,7 +19,7 @@ module.exports = (env = {}) => ({ test: /\.(js|jsx)$/, exclude: /node_modules/, use: { - loader: 'babel-loader', + loader: require.resolve('babel-loader'), }, }, { diff --git a/packages/playground/.babelrc.json b/packages/playground/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/playground/.babelrc.json +++ b/packages/playground/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/playground/package.json b/packages/playground/package.json index a1da0182ab..3ab3338b54 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -23,7 +23,11 @@ "author": "Talend Frontend ", "license": "Apache-2.0", "devDependencies": { + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", + "@talend/scripts-config-stylelint": "^4.0.0", "compression": "^1.7.4", "cross-env": "^7.0.3", "express": "^4.18.2", @@ -32,6 +36,7 @@ "dependencies": { "@talend/bootstrap-theme": "^8.2.1", "@talend/react-bootstrap": "^2.0.0", + "@talend/assets-api": "^1.2.2", "@talend/icons": "^7.0.0", "@talend/react-cmf": "^8.0.0", "@talend/react-cmf-router": "^6.0.0", diff --git a/packages/router-bridge/.babelrc.json b/packages/router-bridge/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/router-bridge/.babelrc.json +++ b/packages/router-bridge/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/router-bridge/package.json b/packages/router-bridge/package.json index 9057989aa2..74b3a1af06 100644 --- a/packages/router-bridge/package.json +++ b/packages/router-bridge/package.json @@ -20,7 +20,11 @@ "license": "Apache-2.0", "homepage": "https://github.com/ui/tree/master/packages/router-bridge#readme", "devDependencies": { + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", + "@talend/scripts-config-jest": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", "connected-react-router": "^6.9.3", "history": "^5.3.0", diff --git a/packages/sagas/.babelrc.json b/packages/sagas/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/sagas/.babelrc.json +++ b/packages/sagas/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/sagas/package.json b/packages/sagas/package.json index 7161b84b01..6b0423625b 100644 --- a/packages/sagas/package.json +++ b/packages/sagas/package.json @@ -41,7 +41,10 @@ "react-dom": ">= 16.14.0" }, "devDependencies": { + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", "prop-types": "^15.8.1", "react": "^18.2.0", diff --git a/packages/stepper/.babelrc.json b/packages/stepper/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/stepper/.babelrc.json +++ b/packages/stepper/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/stepper/.prettierrc.js b/packages/stepper/.prettierrc.js index 1733a40fc0..bb072ab5aa 100644 --- a/packages/stepper/.prettierrc.js +++ b/packages/stepper/.prettierrc.js @@ -11,5 +11,5 @@ module.exports = { '.*scss', ], importOrderSeparation: true, - experimentalBabelParserPluginsList: ['jsx', 'typescript'], + importOrderParserPlugins: ['jsx', 'typescript'], }; diff --git a/packages/stepper/package.json b/packages/stepper/package.json index eefb7ea4b6..469c492b50 100644 --- a/packages/stepper/package.json +++ b/packages/stepper/package.json @@ -42,9 +42,15 @@ }, "devDependencies": { "@talend/icons": "^7.0.0", + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", + "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-prettier": "^12.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", + "@talend/scripts-config-storybook-lib": "^5.1.0", + "@talend/scripts-config-typescript": "^11.1.0", "@talend/scripts-core": "^16.0.0", + "@testing-library/react-hooks": "^8.0.1", "@trivago/prettier-plugin-sort-imports": "^3.4.0", "i18next": "^23.5.1", "immutable": "^3.8.2", diff --git a/packages/storybook-cmf/.babelrc b/packages/storybook-cmf/.babelrc index 1d6655372a..abd323e11d 100644 --- a/packages/storybook-cmf/.babelrc +++ b/packages/storybook-cmf/.babelrc @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/storybook-cmf/package.json b/packages/storybook-cmf/package.json index 80cd521cbc..1426cc592b 100644 --- a/packages/storybook-cmf/package.json +++ b/packages/storybook-cmf/package.json @@ -24,8 +24,11 @@ "main": "lib/index.js", "mainSrc": "src/index.js", "devDependencies": { + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/react-cmf": "^8.0.0", "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", "@testing-library/react": "^12.1.5", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/storybook-docs/.babelrc b/packages/storybook-docs/.babelrc index 02add25248..269d2ec2cf 100644 --- a/packages/storybook-docs/.babelrc +++ b/packages/storybook-docs/.babelrc @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/storybook-docs/package.json b/packages/storybook-docs/package.json index ce75e269eb..c49fc91358 100644 --- a/packages/storybook-docs/package.json +++ b/packages/storybook-docs/package.json @@ -27,16 +27,32 @@ "access": "public" }, "dependencies": { - "@talend/design-system": "^8.0.0", + "@algolia/autocomplete-js": "^1.9.4", + "@storybook/blocks": "^7.4.1", + "@storybook/react": "^7.4.1", "@talend/design-tokens": "^2.9.0", + "algoliasearch": "^4.17.2", "classnames": "^2.3.1", "figma-js": "^1.16.0", "react": "^18.2.0" }, "devDependencies": { - "@talend/scripts-core": "^16.0.0" - }, - "peerDependencies": { - "@talend/icons": "^7.0.0" + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", + "@talend/scripts-core": "^16.0.0", + "@talend/scripts-config-babel": "^13.0.0", + "@talend/scripts-config-storybook-lib": "^5.1.0", + "@talend/scripts-config-typescript": "^11.1.0", + "@types/node": "^6.14.13", + "@types/react": "^17.0.65", + "@types/react-dom": "^17.0.20", + "css-loader": "^4.3.0", + "mini-css-extract-plugin": "^2.7.6", + "postcss-loader": "^7.3.3", + "resolve-url-loader": "^5.0.0", + "sass": "^1.68.0", + "sass-loader": "^13.3.2", + "webpack": "^5.88.2", + "webpack-cli": "^4.10.0" } } diff --git a/packages/storybook-docs/src/components/Statuses/Statuses.tsx b/packages/storybook-docs/src/components/Statuses/Statuses.tsx index 6c28c799cd..46a8a43015 100644 --- a/packages/storybook-docs/src/components/Statuses/Statuses.tsx +++ b/packages/storybook-docs/src/components/Statuses/Statuses.tsx @@ -1,5 +1,4 @@ import { Unstyled } from '@storybook/blocks'; -import { StackHorizontal, StackItem } from '@talend/design-system'; import { Status } from './Status'; import { Statuses, StatusType } from './Statuses.types'; diff --git a/packages/storybook-docs/src/components/Use.tsx b/packages/storybook-docs/src/components/Use.tsx index 3f07d230a2..c91b27d31a 100644 --- a/packages/storybook-docs/src/components/Use.tsx +++ b/packages/storybook-docs/src/components/Use.tsx @@ -1,41 +1,35 @@ import type { HTMLAttributes, ReactElement, PropsWithChildren } from 'react'; -// eslint-disable-next-line @talend/import-depth -import { IconNameWithSize } from '@talend/icons/dist/typeUtils'; import classnames from 'classnames'; -import { SizedIcon } from '@talend/design-system'; import { Grid } from './Grid'; import styles from './Use.module.scss'; type BlockTypes = { title: string; - icon: IconNameWithSize<'M'>; children: ReactElement | ReactElement[] | HTMLCollection; } & HTMLAttributes; -const Block = ({ title, icon, children, className, ...rest }: BlockTypes) => { +const Block = ({ title, children, className, ...rest }: BlockTypes) => { return (
- - {title} - + {title} {children}
); }; -const Do = ({ children, ...rest }: Omit) => { +const Do = ({ children, ...rest }: Omit) => { return ( - + {children} ); }; -const Dont = ({ children, ...rest }: Omit) => { +const Dont = ({ children, ...rest }: Omit) => { return ( - + {children} ); diff --git a/packages/storybook-docs/tsconfig.json b/packages/storybook-docs/tsconfig.json index eed52922a6..d4f8ecc5f9 100644 --- a/packages/storybook-docs/tsconfig.json +++ b/packages/storybook-docs/tsconfig.json @@ -1,8 +1,8 @@ - { +{ "extends": "@talend/scripts-config-typescript/tsconfig.json", "include": ["src/**/*", "custom.d.ts"], "files": [], "compilerOptions": { - "declaration": true, + "declaration": true } } diff --git a/packages/storybook-docs/webpack.custom.js b/packages/storybook-docs/webpack.custom.js index 73c46a8a9b..06526b8dca 100644 --- a/packages/storybook-docs/webpack.custom.js +++ b/packages/storybook-docs/webpack.custom.js @@ -20,9 +20,12 @@ module.exports = { exclude: /node_modules/, use: [ { loader: MiniCssExtractPlugin.loader, options: { esModule: false } }, - { loader: 'css-loader', options: { sourceMap: true } }, { - loader: 'postcss-loader', + loader: require.resolve('css-loader'), + options: { sourceMap: true }, + }, + { + loader: require.resolve('postcss-loader'), options: { postcssOptions: { plugins: ['autoprefixer'], @@ -30,9 +33,12 @@ module.exports = { }, }, }, - { loader: 'resolve-url-loader', options: { sourceMap: true } }, { - loader: 'sass-loader', + loader: require.resolve('resolve-url-loader'), + options: { sourceMap: true }, + }, + { + loader: require.resolve('sass-loader'), options: { sourceMap: true }, }, ], diff --git a/packages/storybook-one/.babelrc.json b/packages/storybook-one/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/storybook-one/.babelrc.json +++ b/packages/storybook-one/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/storybook-one/.storybook/.babelrc.json b/packages/storybook-one/.storybook/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/packages/storybook-one/.storybook/.babelrc.json +++ b/packages/storybook-one/.storybook/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/packages/storybook-one/.storybook/main.js b/packages/storybook-one/.storybook/main.js index 8a7b7e09d9..b1bcc023b8 100644 --- a/packages/storybook-one/.storybook/main.js +++ b/packages/storybook-one/.storybook/main.js @@ -1,6 +1,8 @@ import path from 'path'; +import { packageDirectorySync } from 'pkg-dir'; + const iconConfig = require('@talend/icons/.storybook/main.js'); -const rootPath = require.resolve('@talend/ui-storybook-one').replace('src/index.ts', ''); +const rootPath = packageDirectorySync(); const { getJSAndTSLoader, } = require('@talend/scripts-config-react-webpack/config/webpack.config.common'); @@ -8,24 +10,24 @@ const { const STORIES = [ { titlePrefix: 'Design System', - directory: `${rootPath}../design-system/src`, + directory: `${rootPath}/../design-system/src`, }, - `${rootPath}../components/**/*.stories.@(js|tsx)`, - `${rootPath}../forms/**/*.stories.@(js|tsx)`, - `${rootPath}../dataviz/src/**/*.stories.@(js|tsx)`, - `${rootPath}../icons/stories/**/*.stories.@(js|tsx)`, - `${rootPath}../faceted-search/stories/**/*.stories.@(js|tsx)`, + `${rootPath}/../components/**/*.stories.@(js|tsx)`, + `${rootPath}/../forms/**/*.stories.@(js|tsx)`, + `${rootPath}/../dataviz/src/**/*.stories.@(js|tsx)`, + `${rootPath}/../icons/stories/**/*.stories.@(js|tsx)`, + `${rootPath}/../faceted-search/stories/**/*.stories.@(js|tsx)`, ]; const monoRepoFixSourceMap = [ - '../components/src', - '../dataviz/src', '../design-system/src', - '../faceted-search/stories', - '../faceted-search/src', + '../components/src', '../forms/src', '../forms/stories', + '../dataviz/src', '../icons/stories', + '../faceted-search/stories', + '../faceted-search/src', ]; const srcDirectories = monoRepoFixSourceMap.map(src => path.resolve(process.cwd(), src)); diff --git a/packages/storybook-one/package.json b/packages/storybook-one/package.json index 2011681b23..a46f5ded4f 100644 --- a/packages/storybook-one/package.json +++ b/packages/storybook-one/package.json @@ -22,9 +22,13 @@ "dependencies": { "@talend/design-system": "^8.0.0", "@talend/design-tokens": "^2.7.3", + "@talend/react-faceted-search": "^12.0.0", + "@talend/storybook-docs": "^2.0.0", "@talend/icons": "^7.0.0", "@talend/react-components": "^12.0.0", + "@talend/react-forms": "^11.0.0", "@talend/react-dataviz": "^4.0.0", + "pkg-dir": "^7.0.0", "react-hook-form": "^6.15.8" }, "devDependencies": { @@ -43,11 +47,16 @@ "@storybook/testing-library": "^0.2.0", "@storybook/testing-react": "^2.0.1", "@storybook/theming": "^7.4.1", + "@talend/eslint-config": "^12.1.1", + "@talend/eslint-plugin": "^1.0.1", "@talend/locales-design-system": "^7.15.1", "@talend/locales-tui-components": "^11.4.5", "@talend/locales-tui-containers": "^9.1.3", "@talend/locales-tui-faceted-search": "^11.3.0", "@talend/locales-tui-forms": "^10.2.4", + "@talend/scripts-config-babel": "^13.0.0", + "@talend/scripts-config-storybook-lib": "^5.1.0", + "@talend/scripts-config-typescript": "^11.1.0", "@talend/scripts-core": "^16.0.0", "@types/react": "^18.2.0", "i18next": "^23.5.1", diff --git a/tools/cmf-webpack-plugin/.babelrc.json b/tools/cmf-webpack-plugin/.babelrc.json index 1d6655372a..abd323e11d 100644 --- a/tools/cmf-webpack-plugin/.babelrc.json +++ b/tools/cmf-webpack-plugin/.babelrc.json @@ -1,3 +1,3 @@ { - "extends": "@talend/scripts-config-babel/.babelrc.json" + "extends": "@talend/scripts-config-babel/babel.config.js" } diff --git a/tools/cmf-webpack-plugin/package.json b/tools/cmf-webpack-plugin/package.json index ec4008fa0e..a0e082f995 100644 --- a/tools/cmf-webpack-plugin/package.json +++ b/tools/cmf-webpack-plugin/package.json @@ -4,7 +4,7 @@ "main": "src/index.js", "mainSrc": "src/index.js", "scripts": { - "lint": "talend-scripts lint", + "lint": "eslint ./", "test": "echo nothing to test yet in @talend/react-cmf-webpack-plugin" }, "repository": { @@ -26,9 +26,15 @@ "homepage": "https://github.com/Talend/ui/blob/master/packages/cmf/README.md", "dependencies": { "@talend/scripts-cmf": "^1.1.0", - "lodash": "^4.17.21" + "lodash": "^4.17.21", + "webpack-sources": "^3.2.3" + }, + "devDependencies": { + "@babel/eslint-parser": "^7.22.15", + "@talend/eslint-config": "^12.1.1", + "@talend/scripts-config-babel": "^13.0.0", + "eslint": "^7.32.0" }, - "devDependencies": {}, "publishConfig": { "access": "public" }, diff --git a/tools/scripts-config-babel/babel-resolver.js b/tools/scripts-config-babel/babel-resolver.js index 5b81218fc3..48aac5c187 100644 --- a/tools/scripts-config-babel/babel-resolver.js +++ b/tools/scripts-config-babel/babel-resolver.js @@ -3,7 +3,7 @@ const fs = require('fs'); function checkBabelJsonExtension(babelConfigJsonPath) { const babelrc = JSON.parse(fs.readFileSync(babelConfigJsonPath, 'utf8')); - const babelrcExtends = '@talend/scripts-config-babel/.babelrc.json'; + const babelrcExtends = '@talend/scripts-config-babel/babel.config.js'; if (babelrc.extends !== babelrcExtends) { throw new Error(` You have your own babelrc. Please extends our babelrc: @@ -16,7 +16,7 @@ function getBabelConfigPath() { const userBabelrc = path.join(process.cwd(), '.babelrc'); const userBabelrcJson = path.join(process.cwd(), '.babelrc.json'); const userBabelJs = path.join(process.cwd(), 'babel.config.js'); - const defaultBabelrc = path.join(__dirname, '.babelrc.json'); + const defaultBabelrc = path.join(__dirname, 'babel.config.js'); if (fs.existsSync(userBabelrc)) { checkBabelJsonExtension(userBabelrc); diff --git a/tools/scripts-config-babel/babel.config.js b/tools/scripts-config-babel/babel.config.js new file mode 100644 index 0000000000..cb50ab45d6 --- /dev/null +++ b/tools/scripts-config-babel/babel.config.js @@ -0,0 +1,24 @@ +module.exports = { + presets: [ + [ + require.resolve('@babel/preset-env'), + { + targets: + 'last 1 year, not ie > 0, not samsung > 0, not opera > 0, not ios > 0, not op_mob > 0, not android > 0, not and_chr > 0, not and_ff > 0, not and_qq > 0', + }, + ], + [require.resolve('@babel/preset-react'), { runtime: 'automatic' }], + [require.resolve('@babel/preset-typescript'), { allExtensions: true, isTSX: true }], + ], + plugins: [ + require.resolve('@talend/babel-plugin-import-from-index'), + require.resolve('@talend/babel-plugin-assets-api'), + require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'), + require.resolve('@babel/plugin-proposal-class-properties'), + require.resolve('@babel/plugin-proposal-export-default-from'), + require.resolve('@babel/plugin-proposal-export-namespace-from'), + require.resolve('@babel/plugin-transform-object-assign'), + require.resolve('@babel/plugin-proposal-optional-chaining'), + [require.resolve('babel-plugin-angularjs-annotate'), { explicitOnly: true }], + ], +}; diff --git a/tools/scripts-config-babel/index.js b/tools/scripts-config-babel/index.js index 9e314debed..b76123ca37 100644 --- a/tools/scripts-config-babel/index.js +++ b/tools/scripts-config-babel/index.js @@ -1 +1 @@ -module.exports = require('./.babelrc.json'); +module.exports = require('./babel.config'); diff --git a/tools/scripts-config-babel/package.json b/tools/scripts-config-babel/package.json index c6ee7cd864..872ebf0e1b 100644 --- a/tools/scripts-config-babel/package.json +++ b/tools/scripts-config-babel/package.json @@ -14,11 +14,11 @@ "url": "https://github.com/Talend/ui.git" }, "scripts": { - "lint": "talend-scripts lint ./", + "lint": "eslint ./", "test": "jest" }, "dependencies": { - "@babel/core": "^7.22.20", + "@babel/core": "^7.23.2", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-export-default-from": "^7.22.17", "@babel/plugin-proposal-export-namespace-from": "^7.18.9", @@ -31,7 +31,12 @@ "@talend/babel-plugin-assets-api": "^1.1.0", "@talend/babel-plugin-import-from-index": "^1.5.1", "babel-core": "^7.0.0-bridge.0", - "babel-plugin-angularjs-annotate": "^0.10.0" + "babel-plugin-angularjs-annotate": "^0.10.0", + "jest": "^29.7.0" + }, + "devDependencies": { + "@babel/eslint-parser": "^7.22.15", + "eslint": "^7.32.0" }, "publishConfig": { "access": "public" diff --git a/tools/scripts-config-babel/test/nullish.test.js b/tools/scripts-config-babel/test/nullish.test.js index 4e494e3c8d..0b9ab3f87c 100644 --- a/tools/scripts-config-babel/test/nullish.test.js +++ b/tools/scripts-config-babel/test/nullish.test.js @@ -1,5 +1,5 @@ const babel = require('@babel/core'); -const options = require('../.babelrc.json'); +const options = require('../babel.config'); describe('@babel/plugin-syntax-nullish-coalescing-operator is installed', () => { it('should transpile nullish', () => { diff --git a/tools/scripts-config-eslint/__tests__/config.test.js b/tools/scripts-config-eslint/__tests__/config.test.js index 6177f153f9..fbf791fb69 100644 --- a/tools/scripts-config-eslint/__tests__/config.test.js +++ b/tools/scripts-config-eslint/__tests__/config.test.js @@ -1,5 +1,6 @@ describe('eslint config', () => { it('should require', () => { + // eslint-disable-next-line global-require const config = require('../index'); expect(config).toBeDefined(); }); diff --git a/tools/scripts-config-eslint/index.js b/tools/scripts-config-eslint/index.js index eb95f1ad63..ac633f2108 100644 --- a/tools/scripts-config-eslint/index.js +++ b/tools/scripts-config-eslint/index.js @@ -1,9 +1,15 @@ const fs = require('fs'); const path = require('path'); -const utils = require('@talend/scripts-utils'); + +function tsConfig() { + const appDirectory = fs.realpathSync(process.cwd()); + const resolveApp = relativePath => path.resolve(appDirectory, relativePath); + + return fs.existsSync(resolveApp('tsconfig.json')); +} const cwd = process.cwd(); -const isTS = utils.fs.tsConfig(); +const isTS = tsConfig(); const commentsRegex = /\/\/.*/g; const content = fs .readFileSync(path.join(__dirname, '.eslintrc.json')) diff --git a/tools/scripts-config-eslint/package.json b/tools/scripts-config-eslint/package.json index e4c9745bd6..1bf2f0fe81 100644 --- a/tools/scripts-config-eslint/package.json +++ b/tools/scripts-config-eslint/package.json @@ -14,12 +14,14 @@ "url": "https://github.com/Talend/ui.git" }, "scripts": { - "lint": "talend-scripts lint ./", - "test": "talend-scripts test" + "lint": "eslint index.js __tests__", + "test": "jest" + }, + "devDependencies": { + "jest": "^29.7.0" }, "dependencies": { "@babel/eslint-parser": "^7.22.15", - "@talend/scripts-utils": "^2.0.2", "@talend/eslint-plugin": "^1.0.1", "@typescript-eslint/parser": "^5.62.0", "@typescript-eslint/eslint-plugin": "^5.62.0", diff --git a/tools/scripts-config-react-webpack/config/icons.js b/tools/scripts-config-react-webpack/config/icons.js index b579854323..4026cc6fd7 100644 --- a/tools/scripts-config-react-webpack/config/icons.js +++ b/tools/scripts-config-react-webpack/config/icons.js @@ -14,6 +14,14 @@ function getThemeIcon(theme) { */ function getTalendIconsPath() { const main = require.resolve('@talend/icons'); + + if (main.indexOf('.pnpm') > -1) { + const startPath = main.substring(0, main.indexOf('icons')); + const regex = /@talend\+icons@([^\s/]+)/; + const match = main.match(regex); + const version = match[1]; + return `${startPath}icons@${version}/node_modules/@talend/icons`; + } const root = main.split('icons')[0]; return `${root}icons`; } diff --git a/tools/scripts-config-react-webpack/config/inject.js b/tools/scripts-config-react-webpack/config/inject.js index a90a2bea50..7a0ef24e22 100644 --- a/tools/scripts-config-react-webpack/config/inject.js +++ b/tools/scripts-config-react-webpack/config/inject.js @@ -1,7 +1,7 @@ const babel = require('@babel/core'); const fs = require('fs'); const path = require('path'); -const defaultOptions = require('@talend/scripts-config-babel/.babelrc.json'); +const defaultOptions = require('@talend/scripts-config-babel/babel.config.js'); const { minify } = require('terser'); // terser.minify is an async function, we use deasync to make it used as synced function within webpack diff --git a/tools/scripts-config-react-webpack/config/webpack.config.common.js b/tools/scripts-config-react-webpack/config/webpack.config.common.js index f9ff65b771..18b78c1e0a 100644 --- a/tools/scripts-config-react-webpack/config/webpack.config.common.js +++ b/tools/scripts-config-react-webpack/config/webpack.config.common.js @@ -39,12 +39,14 @@ function getCommonStyleLoaders(enableModules, isEnvDevelopmentServe) { importLoaders: 1, }; } - const styleLoader = isEnvDevelopmentServe ? 'style-loader' : MiniCssExtractPlugin.loader; + const styleLoader = isEnvDevelopmentServe + ? require.resolve('style-loader') + : MiniCssExtractPlugin.loader; return [ { loader: styleLoader, options: { esModule: false } }, - { loader: 'css-loader', options: cssOptions }, + { loader: require.resolve('css-loader'), options: cssOptions }, { - loader: 'postcss-loader', + loader: require.resolve('postcss-loader'), options: { postcssOptions: { plugins: ['autoprefixer'], @@ -55,11 +57,10 @@ function getCommonStyleLoaders(enableModules, isEnvDevelopmentServe) { ]; } -function getJSAndTSLoader(env, useTypescript) { +function getJSAndTSLoader() { return [ - !env.nocache && { loader: 'cache-loader' }, { - loader: 'babel-loader', + loader: require.resolve('babel-loader'), options: getBabelLoaderOptions(babelConfig), }, ].filter(Boolean); @@ -68,9 +69,9 @@ function getJSAndTSLoader(env, useTypescript) { function getSassLoaders(enableModules, sassData, isEnvDevelopmentServe) { const sourceMap = true; return getCommonStyleLoaders(enableModules, isEnvDevelopmentServe).concat( - { loader: 'resolve-url-loader', options: { sourceMap } }, + { loader: require.resolve('resolve-url-loader'), options: { sourceMap } }, { - loader: 'sass-loader', + loader: require.resolve('sass-loader'), options: { sourceMap, additionalData: sassData }, }, ); @@ -117,7 +118,7 @@ function getWebpackRules(srcDirectories, useTypescript, devMode) { test: /\.(js|ts|tsx)$/, exclude: /node_modules/, include: srcDirectories, - use: getJSAndTSLoader(process.env, useTypescript), + use: getJSAndTSLoader(), }, { test: /\.css$/, diff --git a/tools/scripts-config-react-webpack/config/webpack.config.js b/tools/scripts-config-react-webpack/config/webpack.config.js index 2c4662e967..37ae00cb99 100644 --- a/tools/scripts-config-react-webpack/config/webpack.config.js +++ b/tools/scripts-config-react-webpack/config/webpack.config.js @@ -292,7 +292,7 @@ module.exports = ({ getUserConfig, mode }) => { test: useTypescript ? /\.(js|ts|tsx)$/ : /\.js$/, exclude: /node_modules/, include: srcDirectories, - use: getJSAndTSLoader(env, useTypescript), + use: getJSAndTSLoader(), }, { test: /\.css$/, diff --git a/tools/scripts-config-react-webpack/config/webpack.config.umd.js b/tools/scripts-config-react-webpack/config/webpack.config.umd.js index 44884597e2..fd701e4535 100644 --- a/tools/scripts-config-react-webpack/config/webpack.config.umd.js +++ b/tools/scripts-config-react-webpack/config/webpack.config.umd.js @@ -55,7 +55,7 @@ module.exports = options => { { test: useTypescript ? /\.(js|ts|tsx)$/ : /\.js$/, exclude: /node_modules/, - use: getJSAndTSLoader(env, useTypescript), + use: getJSAndTSLoader(), }, { test: /\.scss$/, diff --git a/tools/scripts-config-react-webpack/package.json b/tools/scripts-config-react-webpack/package.json index f147a17753..627d86f5d5 100644 --- a/tools/scripts-config-react-webpack/package.json +++ b/tools/scripts-config-react-webpack/package.json @@ -14,10 +14,11 @@ "url": "https://github.com/Talend/ui.git" }, "scripts": { - "lint": "talend-scripts lint ./", + "lint": "eslint ./", "test": "echo \"Nothing to test\"" }, "dependencies": { + "@babel/core": "^7.23.2", "@sentry/webpack-plugin": "^1.20.1", "@talend/react-cmf-webpack-plugin": "^6.37.0", "@talend/scripts-config-babel": "^13.0.0", @@ -27,7 +28,6 @@ "@yarnpkg/lockfile": "^1.1.0", "autoprefixer": "^10.4.15", "babel-loader": "^9.1.3", - "cache-loader": "^4.1.0", "circular-dependency-plugin": "^5.2.2", "clean-webpack-plugin": "^4.0.0", "copy-webpack-plugin": "^10.2.4", @@ -58,9 +58,10 @@ "webpack-cli": "^4.10.0", "webpack-dev-server": "^4.15.1" }, - "peerDependencies": { - "@talend/icons": "*", - "react": "*" + "devDependencies": { + "@babel/eslint-parser": "^7.22.15", + "@talend/eslint-config": "^12.1.1", + "eslint": "^7.32.0" }, "publishConfig": { "access": "public" diff --git a/tools/scripts-core/src/scripts/build-lib.js b/tools/scripts-core/src/scripts/build-lib.js index bceed110a2..2ad021b659 100755 --- a/tools/scripts-core/src/scripts/build-lib.js +++ b/tools/scripts-core/src/scripts/build-lib.js @@ -1,8 +1,9 @@ /* eslint-disable no-console */ +import cpx from 'cpx2'; import fs from 'fs'; import path from 'path'; import rimraf from 'rimraf'; -import cpx from 'cpx2'; + import * as utils from '@talend/scripts-utils'; import { getUserConfigFile } from '../utils/env.js'; @@ -26,7 +27,7 @@ export default async function build(env, presetApi, unsafeOptions) { const tsRootPath = utils.path.getPkgRootPath('@talend/scripts-config-typescript'); const babelConfigPath = getUserConfigFile(['.babelrc', '.babelrc.json', 'babel.config.js']) || - path.join(babelRootPath, '.babelrc.json'); + path.join(babelRootPath, 'babel.config.js'); const tscConfigPath = getUserConfigFile(['tsconfig.build.json', 'tsconfig.json']) || path.join(tsRootPath, 'tsconfig.json'); diff --git a/tools/scripts-core/src/scripts/extends.js b/tools/scripts-core/src/scripts/extends.js index a9547051ff..424d60428d 100755 --- a/tools/scripts-core/src/scripts/extends.js +++ b/tools/scripts-core/src/scripts/extends.js @@ -130,10 +130,10 @@ export default async function extend(env, presetApi) { generateConfigFile({ configFileNames: ['.babelrc', '.babelrc.json', 'babel.config.js'], - defaultConfigFilePath: path.join(rootPath, '.babelrc.json'), + defaultConfigFilePath: path.join(rootPath, 'babel.config.js'), generateContent() { const configPath = utils.path.getPkgRootPath('@talend/scripts-config-babel'); - const presetConfigPath = path.join(configPath, '.babelrc.json'); + const presetConfigPath = path.join(configPath, 'babel.config.js'); const presetConfigRelativePath = path.relative(nodeModulesPath, presetConfigPath); return babelExtendsTemplate({ presetConfigRelativePath }); }, diff --git a/tools/scripts-utils/.eslintrc.json b/tools/scripts-utils/.eslintrc.json index 8464e11418..892f6e0fe8 100644 --- a/tools/scripts-utils/.eslintrc.json +++ b/tools/scripts-utils/.eslintrc.json @@ -1,4 +1,16 @@ { "root": true, - "extends": "@talend" + "extends": ["eslint:recommended", "plugin:prettier/recommended", "plugin:import/recommended"], + "env": { + "es6": true, + "node": true, + "jasmine": true, + "jest": true + }, + "parser": "@babel/eslint-parser", + "parserOptions": { + "ecmaVersion": 6, + "sourceType": "module", + "requireConfigFile": false + } } diff --git a/tools/scripts-utils/__tests__/path.test.js b/tools/scripts-utils/__tests__/path.test.js index df3cffad79..38e1cd4daf 100644 --- a/tools/scripts-utils/__tests__/path.test.js +++ b/tools/scripts-utils/__tests__/path.test.js @@ -1,6 +1,5 @@ /* eslint-disable no-console */ -import path from 'path'; -import utils from '../src'; +const utils = require('../src'); describe('utils.path', () => { describe('hereRelative', () => { @@ -10,8 +9,8 @@ describe('utils.path', () => { }); describe('getPkgRootPath', () => { it('should', () => { - expect(utils.path.getPkgRootPath('@talend/scripts-utils')).toMatch( - /ui\/tools\/scripts-utils/, + expect(utils.path.getPkgRootPath('@talend/scripts-config-babel')).toMatch( + /.*\/tools\/scripts-config-babel$/, ); }); }); diff --git a/tools/scripts-utils/__tests__/pkg.test.js b/tools/scripts-utils/__tests__/pkg.test.js index afe8de362b..b89b72766f 100644 --- a/tools/scripts-utils/__tests__/pkg.test.js +++ b/tools/scripts-utils/__tests__/pkg.test.js @@ -1,6 +1,6 @@ /* eslint-disable no-console */ -import path from 'path'; -import utils from '../src'; +const path = require('path'); +const utils = require('../src'); describe('utils.pkg', () => { const globalProcessCwd = global.process.cwd; diff --git a/tools/scripts-utils/package.json b/tools/scripts-utils/package.json index 16e3ad4685..10f05c3b51 100644 --- a/tools/scripts-utils/package.json +++ b/tools/scripts-utils/package.json @@ -4,14 +4,19 @@ "description": "", "main": "src/index.js", "scripts": { - "lint": "talend-scripts lint", - "test": "talend-scripts test" + "lint": "eslint ./", + "test": "jest .test.js" }, "dependencies": { "fs-extra": "^10.1.0", "glob": "^8.1.0", "which": "^2.0.2" }, + "devDependencies": { + "@babel/eslint-parser": "^7.22.15", + "eslint": "^7.32.0", + "jest": "^29.7.0" + }, "repository": { "type": "git", "url": "git+https://github.com/Talend/ui.git" diff --git a/tools/scripts-utils/src/babel.js b/tools/scripts-utils/src/babel.js index 6ff3380e9d..5452ddba30 100644 --- a/tools/scripts-utils/src/babel.js +++ b/tools/scripts-utils/src/babel.js @@ -5,10 +5,13 @@ const crypto = require('crypto'); function getLockFilePath(cwd = process.cwd()) { const yarnlockPath = path.join(cwd, 'yarn.lock'); const pkglockPath = path.join(cwd, 'package-lock.json'); + const pnpmLockPath = path.join(cwd, 'pnpm-lock.yaml'); if (fs.existsSync(yarnlockPath)) { return yarnlockPath; } else if (fs.existsSync(pkglockPath)) { return pkglockPath; + } else if (fs.existsSync(pnpmLockPath)) { + return pnpmLockPath; } const parentPath = path.join(cwd, '..'); if (parentPath === cwd) { diff --git a/tools/scripts-utils/src/pkg.js b/tools/scripts-utils/src/pkg.js index e6eefe2809..4a2106f918 100644 --- a/tools/scripts-utils/src/pkg.js +++ b/tools/scripts-utils/src/pkg.js @@ -18,7 +18,7 @@ function hasDependencies(pkg, name) { function hasPackageInstalled(name) { try { // eslint-disable-next-line import/no-dynamic-require, global-require - require(name); + require.resolve(name); return true; // eslint-disable-next-line no-empty } catch (e) {} diff --git a/yarn.lock b/yarn.lock index 119409afc8..ea89834ea9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -248,22 +248,22 @@ json5 "^2.1.2" semver "^6.3.0" -"@babel/core@^7.0.0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.22.20", "@babel/core@^7.22.9", "@babel/core@^7.7.5": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.20.tgz#e3d0eed84c049e2a2ae0a64d27b6a37edec385b7" - integrity sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA== +"@babel/core@^7.0.0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.22.20", "@babel/core@^7.22.9", "@babel/core@^7.23.2", "@babel/core@^7.7.5": + version "7.23.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94" + integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.22.13" - "@babel/generator" "^7.22.15" + "@babel/generator" "^7.23.0" "@babel/helper-compilation-targets" "^7.22.15" - "@babel/helper-module-transforms" "^7.22.20" - "@babel/helpers" "^7.22.15" - "@babel/parser" "^7.22.16" + "@babel/helper-module-transforms" "^7.23.0" + "@babel/helpers" "^7.23.2" + "@babel/parser" "^7.23.0" "@babel/template" "^7.22.15" - "@babel/traverse" "^7.22.20" - "@babel/types" "^7.22.19" - convert-source-map "^1.7.0" + "@babel/traverse" "^7.23.2" + "@babel/types" "^7.23.0" + convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" @@ -287,12 +287,12 @@ jsesc "^2.5.1" source-map "^0.5.0" -"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.17.3", "@babel/generator@^7.17.7", "@babel/generator@^7.22.15", "@babel/generator@^7.22.9", "@babel/generator@^7.7.2": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339" - integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA== +"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.17.3", "@babel/generator@^7.17.7", "@babel/generator@^7.22.9", "@babel/generator@^7.23.0", "@babel/generator@^7.7.2": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420" + integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g== dependencies: - "@babel/types" "^7.22.15" + "@babel/types" "^7.23.0" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" @@ -362,13 +362,13 @@ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== -"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be" - integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ== +"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" + integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== dependencies: - "@babel/template" "^7.22.5" - "@babel/types" "^7.22.5" + "@babel/template" "^7.22.15" + "@babel/types" "^7.23.0" "@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.22.5": version "7.22.5" @@ -391,10 +391,10 @@ dependencies: "@babel/types" "^7.22.15" -"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.17.7", "@babel/helper-module-transforms@^7.22.15", "@babel/helper-module-transforms@^7.22.20", "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz#da9edc14794babbe7386df438f3768067132f59e" - integrity sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A== +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.17.7", "@babel/helper-module-transforms@^7.22.15", "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9", "@babel/helper-module-transforms@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e" + integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw== dependencies: "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-module-imports" "^7.22.15" @@ -463,7 +463,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== -"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.22.19", "@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5": +"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== @@ -482,14 +482,14 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.22.19" -"@babel/helpers@^7.12.5", "@babel/helpers@^7.17.8", "@babel/helpers@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.15.tgz#f09c3df31e86e3ea0b7ff7556d85cdebd47ea6f1" - integrity sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw== +"@babel/helpers@^7.12.5", "@babel/helpers@^7.17.8", "@babel/helpers@^7.23.2": + version "7.23.2" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767" + integrity sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ== dependencies: "@babel/template" "^7.22.15" - "@babel/traverse" "^7.22.15" - "@babel/types" "^7.22.15" + "@babel/traverse" "^7.23.2" + "@babel/types" "^7.23.0" "@babel/highlight@^7.10.4", "@babel/highlight@^7.22.13": version "7.22.20" @@ -505,10 +505,10 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.9.tgz#f2dde0c682ccc264a9a8595efd030a5cc8fd2539" integrity sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg== -"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8", "@babel/parser@^7.20.15", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3", "@babel/parser@^7.22.15", "@babel/parser@^7.22.16", "@babel/parser@^7.22.7", "@babel/parser@^7.9.4": - version "7.22.16" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95" - integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8", "@babel/parser@^7.20.15", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3", "@babel/parser@^7.22.15", "@babel/parser@^7.22.7", "@babel/parser@^7.23.0", "@babel/parser@^7.9.4": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" + integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.15": version "7.22.15" @@ -1378,19 +1378,19 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.9", "@babel/traverse@^7.17.3", "@babel/traverse@^7.22.15", "@babel/traverse@^7.22.20", "@babel/traverse@^7.22.8", "@babel/traverse@^7.4.5": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.20.tgz#db572d9cb5c79e02d83e5618b82f6991c07584c9" - integrity sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw== +"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.9", "@babel/traverse@^7.17.3", "@babel/traverse@^7.22.8", "@babel/traverse@^7.23.2", "@babel/traverse@^7.4.5": + version "7.23.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" + integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw== dependencies: "@babel/code-frame" "^7.22.13" - "@babel/generator" "^7.22.15" + "@babel/generator" "^7.23.0" "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.22.5" + "@babel/helper-function-name" "^7.23.0" "@babel/helper-hoist-variables" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.22.16" - "@babel/types" "^7.22.19" + "@babel/parser" "^7.23.0" + "@babel/types" "^7.23.0" debug "^4.1.0" globals "^11.1.0" @@ -1402,13 +1402,13 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.17.0", "@babel/types@^7.2.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.22.19" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.19.tgz#7425343253556916e440e662bb221a93ddb75684" - integrity sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg== +"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.17.0", "@babel/types@^7.2.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" + integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg== dependencies: "@babel/helper-string-parser" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.19" + "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" "@base2/pretty-print-object@1.0.1": @@ -4934,13 +4934,13 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node-fetch@^2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660" - integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg== +"@types/node-fetch@^2.6.4", "@types/node-fetch@^2.6.6": + version "2.6.7" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.7.tgz#a1abe2ce24228b58ad97f99480fdcf9bbc6ab16d" + integrity sha512-lX17GZVpJ/fuCjguZ5b3TjEbSENxmEk1B2z02yoXSK9WMEWRivhdSY73wWMn6bpcCDAOh6qAdktpKHIlkDk2lg== dependencies: "@types/node" "*" - form-data "^3.0.0" + form-data "^4.0.0" "@types/node@*", "@types/node@>=10.0.0": version "20.6.2" @@ -5002,7 +5002,7 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@<18.0.0", "@types/react-dom@^18.2.0", "@types/react-dom@^18.2.4", "@types/react-dom@^18.2.7": +"@types/react-dom@<18.0.0", "@types/react-dom@^17.0.20", "@types/react-dom@^18.2.0", "@types/react-dom@^18.2.4", "@types/react-dom@^18.2.7": version "18.2.14" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.14.tgz#c01ba40e5bb57fc1dc41569bb3ccdb19eab1c539" integrity sha512-V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ== @@ -5040,7 +5040,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16", "@types/react@>=16.9.11", "@types/react@^16", "@types/react@^16.14.34", "@types/react@^18.2.0", "@types/react@^18.2.7", "@types/react@^18.2.8": +"@types/react@*", "@types/react@>=16", "@types/react@>=16.9.11", "@types/react@^16", "@types/react@^16.14.34", "@types/react@^17.0.65", "@types/react@^18.2.0", "@types/react@^18.2.7", "@types/react@^18.2.8": version "18.2.29" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.29.tgz#88b48a287e00f6fdcd6f95662878fb701ae18b27" integrity sha512-Z+ZrIRocWtdD70j45izShRwDuiB4JZqDegqMFW/I8aG5DxxLKOzVNoq62UIO82v9bdgi+DO1jvsb9sTEZUSm+Q== @@ -6695,11 +6695,6 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -buffer-json@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz#f73e13b1e42f196fe2fd67d001c7d7107edd7c23" - integrity sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw== - buffer@^5.5.0, buffer@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" @@ -6769,18 +6764,6 @@ cacache@^17.0.0: tar "^6.1.11" unique-filename "^3.0.0" -cache-loader@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-4.1.0.tgz#9948cae353aec0a1fcb1eafda2300816ec85387e" - integrity sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw== - dependencies: - buffer-json "^2.0.0" - find-cache-dir "^3.0.0" - loader-utils "^1.2.3" - mkdirp "^0.5.1" - neo-async "^2.6.1" - schema-utils "^2.0.0" - cachedir@^2.3.0: version "2.4.0" resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.4.0.tgz#7fef9cf7367233d7c88068fe6e34ed0d355a610d" @@ -10028,15 +10011,6 @@ fork-ts-checker-webpack-plugin@^8.0.0: semver "^7.3.5" tapable "^2.2.1" -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -13424,7 +13398,7 @@ mkdirp-classic@^0.5.2: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -14981,7 +14955,7 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2, prettier@^2.0.1, prettier@^2.7.1, prettier@^2.8.0, prettier@^2.8.3, prettier@^2.8.8: +prettier@^2, prettier@^2.0.1, prettier@^2.7.1, prettier@^2.8.0: version "2.8.8" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== @@ -16535,7 +16509,7 @@ scheduler@^0.23.0: dependencies: loose-envify "^1.1.0" -schema-utils@^2.0.0, schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: +schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==