back to preset-env

vanilla-extract-css · Dec 27, 2023 · e6416a8 · e6416a8
1 parent 6a88b91
commit e6416a8
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 59 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -1,6 +1,15 @@
 module.exports = {
   presets: [
-    ['@babel/preset-modules', { loose: true }],
+    [
+      '@babel/preset-env',
+      {
+        bugfixes: true,
+        targets: {
+          browsers: 'defaults',
+          node: 'current',
+        },
+      },
+    ],
     '@babel/preset-typescript',
   ],
 };
diff --git a/package.json b/package.json
@@ -27,7 +27,6 @@
   "dependencies": {
     "@babel/core": "^7.20.7",
     "@babel/preset-env": "^7.20.2",
-    "@babel/preset-modules": "^0.1.6",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@changesets/changelog-github": "^0.4.8",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/site/babel.config.js b/site/babel.config.js
@@ -1,7 +1,10 @@
 module.exports = {
   presets: [
+    [
+      '@babel/preset-env',
+      { bugfixes: true, targets: 'last 2 Chrome versions' },
+    ],
     '@babel/preset-typescript',
     ['@babel/preset-react', { runtime: 'automatic' }],
-    ['@babel/preset-env', { targets: { node: 14 } }],
   ],
 };
diff --git a/site/webpack.config.js b/site/webpack.config.js
@@ -45,7 +45,7 @@ module.exports = [
     },
     mode,
     resolve: {
-      extensions: ['.js', '.json', '.ts', '.tsx'],
+      extensions: ['.ts', '.tsx', '.js', '.json'],
     },
     module: {
       rules: [
@@ -55,15 +55,7 @@ module.exports = [
             {
               loader: 'babel-loader',
               options: {
-                babelrc: false,
-                presets: [
-                  '@babel/preset-typescript',
-                  [
-                    '@babel/preset-env',
-                    { modules: false, targets: 'last 2 Chrome versions' },
-                  ],
-                  ['@babel/preset-react', { runtime: 'automatic' }],
-                ],
+                babelrc: true,
               },
             },
           ],
@@ -122,7 +114,7 @@ module.exports = [
     entry: require.resolve('./src/render.tsx'),
     mode,
     resolve: {
-      extensions: ['.js', '.json', '.ts', '.tsx'],
+      extensions: ['.ts', '.tsx', '.js', '.json'],
     },
     module: {
       rules: [
@@ -132,15 +124,7 @@ module.exports = [
             {
               loader: 'babel-loader',
               options: {
-                babelrc: false,
-                presets: [
-                  '@babel/preset-typescript',
-                  [
-                    '@babel/preset-env',
-                    { modules: false, targets: 'last 2 Chrome versions' },
-                  ],
-                  ['@babel/preset-react', { runtime: 'automatic' }],
-                ],
+                babelrc: true,
               },
             },
           ],

diff --git a/test-helpers/src/startFixture/webpack.ts b/test-helpers/src/startFixture/webpack.ts
@@ -76,9 +76,15 @@ export const startWebpackFixture = (
                 options: {
                   babelrc: false,
                   presets: [
-                    [require.resolve('@babel/preset-modules'), { loose: true }],
+                    [
+                      require.resolve('@babel/preset-env'),
+                      { bugfixes: true, targets: { esmodules: true } },
+                    ],
                     require.resolve('@babel/preset-typescript'),
-                    require.resolve('@babel/preset-react'),
+                    [
+                      require.resolve('@babel/preset-react'),
+                      { runtime: 'automatic' },
+                    ],
                   ],
                 },
               },