fix babel config using resolve + fix all extends

Talend · Oct 13, 2023 · dd7cc38 · dd7cc38
1 parent 18486f8
commit dd7cc38
Show file tree

Hide file tree

Showing 31 changed files with 33 additions and 33 deletions.
diff --git 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/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-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/.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/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/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/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/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
@@ -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/.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/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/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/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/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/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/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/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/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/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/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-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-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
@@ -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/.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/scripts-config-babel/CHANGELOG.md b/tools/scripts-config-babel/CHANGELOG.md
@@ -16,7 +16,7 @@
 
   ```diff
   {
-  -	"extends": "@talend/scripts-config-babel/.babelrc.json"
+  -	"extends": "@talend/scripts-config-babel/babel.config.js"
   +	"extends": "@talend/scripts-config-babel"
   }
   ```

diff --git 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/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-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-core/src/scripts/build-lib.js b/tools/scripts-core/src/scripts/build-lib.js
@@ -26,7 +26,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
@@ -131,10 +131,10 @@ export default async function extend() {
 
 	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/.babelrc b/tools/scripts-utils/.babelrc
@@ -1,3 +1,3 @@
 {
-    "extends": "@talend/scripts-config-babel/.babelrc.json"
+    "extends": "@talend/scripts-config-babel/babel.config.js"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ @@
       ```diff
       {
-      -	"extends": "@talend/scripts-config-babel/.babelrc.json"
+      -	"extends": "@talend/scripts-config-babel/babel.config.js"
       +	"extends": "@talend/scripts-config-babel"
       }
       ```
@@ Expand Down @@