Merge branch 'next' into pr/philsawicki/13411

storybookjs · Mar 12, 2021 · a26812a · a26812a
2 parents 47e2962 + 94a86bd
commit a26812a
Show file tree

Hide file tree

Showing 1,625 changed files with 43,403 additions and 15,607 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -12,13 +12,24 @@ const withTests = {
   ],
 };
 
+const modules = process.env.BABEL_ESM === 'true' ? false : 'auto';
+
 module.exports = {
   ignore: [
     './lib/codemod/src/transforms/__testfixtures__',
     './lib/postinstall/src/__testfixtures__',
   ],
   presets: [
-    ['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
+    [
+      '@babel/preset-env',
+      {
+        shippedProposals: true,
+        useBuiltIns: 'usage',
+        corejs: '3',
+        targets: 'defaults',
+        modules,
+      },
+    ],
     '@babel/preset-typescript',
     '@babel/preset-react',
     '@babel/preset-flow',
@@ -52,7 +63,16 @@ module.exports = {
     {
       test: './lib',
       presets: [
-        ['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
+        [
+          '@babel/preset-env',
+          {
+            shippedProposals: true,
+            useBuiltIns: 'usage',
+            corejs: '3',
+            modules,
+            targets: 'defaults',
+          },
+        ],
         '@babel/preset-react',
       ],
       plugins: [
@@ -71,6 +91,11 @@ module.exports = {
     {
       test: [
         './lib/node-logger',
+        './lib/core',
+        './lib/core-common',
+        './lib/core-server',
+        './lib/builder-webpack4',
+        './lib/builder-webpack5',
         './lib/codemod',
         './addons/storyshots',
         '**/src/server/**',
@@ -83,8 +108,9 @@ module.exports = {
             shippedProposals: true,
             useBuiltIns: 'usage',
             targets: {
-              node: '8.11',
+              node: '10',
             },
+            modules,
             corejs: '3',
           },
         ],
@@ -104,5 +130,22 @@ module.exports = {
         test: withTests,
       },
     },
+    {
+      test: ['**/virtualModuleEntry.template.js'],
+      presets: [
+        [
+          '@babel/preset-env',
+          {
+            shippedProposals: true,
+            useBuiltIns: 'usage',
+            targets: {
+              node: '10',
+            },
+            corejs: '3',
+            modules: false,
+          },
+        ],
+      ],
+    },
   ],
 };