fix: SSR not supports node 14.x optional chaining

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node_version: [8.x, 10.x, 12.x]
+        node_version: [8.x, 10.x, 12.x, 14.x]
         os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@v2

packages/babel-preset-umi/package.json

@@ -28,6 +28,7 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-class-properties": "7.10.4",
+    "@babel/plugin-proposal-optional-chaining": "7.10.4",
     "@babel/plugin-proposal-decorators": "7.10.4",
     "@babel/plugin-proposal-do-expressions": "7.10.4",
     "@babel/plugin-proposal-export-default-from": "7.10.4",

packages/babel-preset-umi/src/index.ts

@@ -66,6 +66,10 @@ export default (context: any, opts: IOpts = {}) => {
       ],
     ].filter(Boolean),
     plugins: [
+      [
+        require('@babel/plugin-proposal-optional-chaining').default,
+        { loose: false },
+      ],
       require('@babel/plugin-syntax-top-level-await').default,
       // Necessary to include regardless of the environment because
       // in practice some other transforms (such as object-rest-spread)

packages/bundler-utils/src/getTargetsAndBrowsersList.test.ts

@@ -57,5 +57,5 @@ test('ssr', () => {
   expect(targets).toEqual({
     node: 6,
   });
-  expect(browserslist).toEqual(['node >= 6']);
+  expect(browserslist).toEqual(['ie >= 10', 'chrome >= 0', 'firefox >= 0']);
 });

packages/bundler-utils/src/getTargetsAndBrowsersList.ts

@@ -10,25 +10,46 @@ interface IOpts {
   type: IBundlerConfigType;
 }
 
+/**
+ * set default browserslist using `targets` config
+ * client bundle: without node
+ * server bundle: `targets` with node, `browserslist` without node
+ *
+ * @param param0
+ */
 export default function ({ config, type }: IOpts) {
-  let targets: ITargets = config.targets || {};
+  const configTargets: ITargets = config.targets || {};
 
-  targets = Object.keys(targets)
+  const targets = Object.keys(configTargets)
     .filter((key) => {
       // filter false and 0 targets
-      if (targets[key] === false) return false;
-      if (type === BundlerConfigType.ssr) return key === 'node';
-      else return key !== 'node';
+      if (configTargets[key] === false) return false;
+      if (type === BundlerConfigType.ssr) {
+        return key === 'node';
+      }
+      return key !== 'node';
     })
     .reduce((memo, key) => {
-      memo[key] = targets[key];
+      memo[key] = configTargets[key];
       return memo;
     }, {} as any);
 
+  const browserTargets = Object.keys(configTargets)
+    .filter((key) => {
+      // filter false and 0 targets
+      if (configTargets[key] === false) return false;
+      return key !== 'node';
+    })
+    .reduce((memo, key) => {
+      memo[key] = configTargets[key];
+      return memo;
+    }, {} as any);
   const browserslist =
-    targets.browsers ||
-    Object.keys(targets).map((key) => {
-      return `${key} >= ${targets[key] === true ? '0' : targets[key]}`;
+    configTargets.browsers ||
+    Object.keys(browserTargets).map((key) => {
+      return `${key} >= ${
+        browserTargets[key] === true ? '0' : browserTargets[key]
+      }`;
     });
 
   return {

yarn.lock

@@ -787,6 +787,14 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
+"@babel/plugin-proposal-optional-chaining@7.10.4", "@babel/plugin-proposal-optional-chaining@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7"
+  integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+
 "@babel/plugin-proposal-optional-chaining@7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.7.4.tgz#3f04c2de1a942cbd3008324df8144b9cbc0ca0ba"
@@ -795,14 +803,6 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-chaining" "^7.7.4"
 
-"@babel/plugin-proposal-optional-chaining@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7"
-  integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-
 "@babel/plugin-proposal-optional-chaining@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"