fix: fix some esm build issue

- add commonjs plugin to all output format - install needed babel runtime deps to project
alibaba · Jan 7, 2022 · ca618bb · ca618bb
1 parent b80a414
commit ca618bb
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 12 deletions.
diff --git a/packages/middleware-rollup/examples/basic/package-lock.json b/packages/middleware-rollup/examples/basic/package-lock.json
diff --git a/packages/middleware-rollup/examples/basic/package.json b/packages/middleware-rollup/examples/basic/package.json
@@ -14,6 +14,7 @@
   },
   "dependencies": {
     "@alifd/next": "1.20.28",
+    "@babel/runtime": "^7.16.7",
     "@formily/core": "^2.0.0-rc.20",
     "@formily/next": "^2.0.0-rc.20",
     "@formily/react": "^2.0.0-rc.20",

diff --git a/packages/middleware-rollup/examples/basic/src/Component.tsx b/packages/middleware-rollup/examples/basic/src/Component.tsx
@@ -12,7 +12,10 @@ import "./sass-style.scss";
 
 const Component: React.FC<{ foo?: string; bar?: number }> = () => {
   useEffect(() => {
-    axios.get("https://alibaba.github.io/dawn/middleware.yml");
+    (async () => {
+      const ret = await axios.get("https://alibaba.github.io/dawn/middleware.yml");
+      console.log(ret);
+    })();
   }, []);
 
   return (

diff --git a/packages/middleware-rollup/package.json b/packages/middleware-rollup/package.json
@@ -37,7 +37,8 @@
     "@dawnjs/types": "^2.0.1",
     "@types/async": "^3.2.10",
     "@types/lodash": "^4.14.177",
-    "@types/postcss-import": "^14.0.0"
+    "@types/postcss-import": "^14.0.0",
+    "@types/semver": "^7.3.9"
   },
   "dependencies": {
     "@babel/core": "^7.16.0",
@@ -73,6 +74,7 @@
     "rollup-plugin-typescript2": "^0.31.1",
     "rollup-plugin-visualizer": "^5.5.2",
     "sass": "^1.44.0",
+    "semver": "^7.3.5",
     "tslib": "^2.3.1",
     "typescript": "^4.5.2"
   }

diff --git a/packages/middleware-rollup/src/getRollupConfig.ts b/packages/middleware-rollup/src/getRollupConfig.ts
@@ -247,9 +247,15 @@ export const getRollupConfig = async (
         nodeResolve({
           mainFields: ["module", "main"],
           extensions,
-          ...(target === "browser" ? { browser: true } : {}),
+          ...(target === "browser" ? { browser: true, preferBuiltins: false } : { preferBuiltins: true }),
           ...nodeResolveOpts,
         }),
+      type !== "dts" &&
+        commonjs({
+          transformMixedEsModules: true,
+          requireReturnsDefault: "auto",
+          ...commonjsOpts,
+        }),
       type !== "dts" &&
         !disableTypescript &&
         typescript2({
@@ -280,7 +286,6 @@ export const getRollupConfig = async (
       !parallel && progress(),
     ];
   };
-  const extraUmdPlugins = [commonjs(commonjsOpts)];
 
   switch (type) {
     case "esm":
@@ -375,7 +380,6 @@ export const getRollupConfig = async (
               name: umd && umd.name,
             },
             plugins: [
-              ...extraUmdPlugins,
               ...getPlugins(),
               replace({
                 preventAssignment: true,
@@ -407,7 +411,6 @@ export const getRollupConfig = async (
               name: umd && umd.name,
             },
             plugins: [
-              ...extraUmdPlugins,
               ...getPlugins({ minCSS: true }),
               replace({
                 preventAssignment: true,
@@ -432,7 +435,6 @@ export const getRollupConfig = async (
           },
           plugins: [
             ...getPlugins({ minCSS: (system && system.minify) || false }),
-            ...extraUmdPlugins,
             replace({
               preventAssignment: true,
               // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -456,7 +458,6 @@ export const getRollupConfig = async (
           },
           plugins: [
             ...getPlugins({ minCSS: (iife && iife.minify) || false }),
-            ...extraUmdPlugins,
             replace({
               preventAssignment: true,
               // eslint-disable-next-line @typescript-eslint/naming-convention

diff --git a/packages/middleware-rollup/src/opts.ts b/packages/middleware-rollup/src/opts.ts
@@ -2,6 +2,7 @@ import * as assert from "assert";
 import { basename, join } from "path";
 import { existsSync } from "fs";
 import { camelCase, merge } from "lodash";
+import semver from "semver";
 import { getExistFile } from "./utils";
 import { IDawnContext, IOpts } from "./types";
 
@@ -91,4 +92,22 @@ export const validateOpts = async (opts: IOpts, ctx: IDawnContext): Promise<void
       // );
     }
   }
+
+  if (opts.runtimeHelpers) {
+    let depName = "@babel/runtime";
+    if (opts.corejs) {
+      const corejsVersion = typeof opts.corejs === "number" ? opts.corejs : opts.corejs.version;
+      depName = `@babel/runtime-corejs${corejsVersion}`;
+    }
+    const depVersion = typeof opts.runtimeHelpers === "string" ? opts.runtimeHelpers : "*";
+
+    const installedDepVersion = ctx.project.dependencies?.[depName];
+    if (!installedDepVersion || !semver.satisfies(semver.minVersion(installedDepVersion), depVersion)) {
+      if (depVersion === "*") {
+        await ctx.mod.install(depName);
+      } else {
+        await ctx.mod.install(`${depName}@${depVersion}`);
+      }
+    }
+  }
 };