Add postinstall step during build

reggie3 · May 5, 2021 · ae5931d · ae5931d
1 parent 4dbb97a
commit ae5931d
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 69 deletions.
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
@@ -21,8 +21,5 @@
     "@types/cookie-signature": "^1.0.3",
     "@types/jsesc": "^2.5.1"
   },
-  "scripts": {
-    "postinstall": "node ./scripts/postinstall.js"
-  },
   "sideEffects": false
 }
diff --git a/packages/remix-node/scripts/postinstall.ts b/packages/remix-node/scripts/postinstall.ts
@@ -2,7 +2,7 @@ import * as path from "path";
 
 async function run() {
   try {
-    await require("remix/setup").installMagicExports(
+    await require("remix/magic").installMagicExports(
       path.resolve(__dirname, "..", "magicExports")
     );
   } catch (error) {

diff --git a/packages/remix-node/tsconfig.json b/packages/remix-node/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["__tests__/**/*"],
+  "exclude": ["__tests__/**/*", "scripts/**/*"],
   "compilerOptions": {
     "lib": ["ES2019"],
     "target": "ES2019",

diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
@@ -13,8 +13,5 @@
     "react": ">=16.8",
     "react-dom": ">=16.8"
   },
-  "scripts": {
-    "postinstall": "node ./scripts/postinstall.js"
-  },
   "sideEffects": false
 }
diff --git a/packages/remix-react/scripts/postinstall.ts b/packages/remix-react/scripts/postinstall.ts
@@ -2,7 +2,7 @@ import * as path from "path";
 
 async function run() {
   try {
-    await require("remix/setup").installMagicExports(
+    await require("remix/magic").installMagicExports(
       path.resolve(__dirname, "..", "magicExports")
     );
   } catch (error) {

diff --git a/packages/remix-react/tsconfig.json b/packages/remix-react/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["__tests__/**/*"],
+  "exclude": ["__tests__/**/*", "scripts/**/*"],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2020"],
     "target": "ES2020",

diff --git a/packages/remix/setup.ts → packages/remix/magic.ts b/packages/remix/setup.ts → packages/remix/magic.ts
diff --git a/rollup.config.js b/rollup.config.js
@@ -8,6 +8,24 @@ function isBareModuleId(id) {
   return !id.startsWith(".") && !path.isAbsolute(id);
 }
 
+/** @return {import('rollup').Plugin} */
+function copyAsset(
+  file,
+  { fileName = path.basename(file), transform = null } = {}
+) {
+  return {
+    name: "copy-asset",
+    buildStart() {
+      this.addWatchFile(file);
+    },
+    generateBundle() {
+      let source = fs.readFileSync(file);
+      if (transform) source = transform(source);
+      this.emitFile({ type: "asset", fileName, source });
+    }
+  };
+}
+
 const licenseFile = path.resolve(__dirname, "LICENSE.md");
 const license = fs.readFileSync(licenseFile, "utf-8");
 const licenseBanner = "// " + license.split("\n").join("\n// ");
@@ -32,16 +50,10 @@ let createRemix = {
     nodeResolve({
       extensions: [".ts"]
     }),
+    copyAsset(path.resolve(__dirname, "packages/create-remix/package.json")),
+    copyAsset(path.resolve(__dirname, "packages/create-remix/README.md")),
     copy({
       targets: [
-        {
-          src: path.resolve(__dirname, "packages/create-remix/package.json"),
-          dest: "build/node_modules/create-remix"
-        },
-        {
-          src: path.resolve(__dirname, "packages/create-remix/README.md"),
-          dest: "build/node_modules/create-remix"
-        },
         {
           src: path.resolve(__dirname, "packages/create-remix/templates/*"),
           dest: "build/node_modules/create-remix/templates"
@@ -69,32 +81,21 @@ let remix = {
       exclude: /node_modules/,
       extensions: [".ts"]
     }),
-    copy({
-      targets: [
-        {
-          src: path.resolve(__dirname, "packages/remix/package.json"),
-          dest: "build/node_modules/remix"
-        },
-        {
-          src: path.resolve(__dirname, "packages/remix/README.md"),
-          dest: "build/node_modules/remix"
-        }
-      ]
-    })
+    copyAsset(path.resolve(__dirname, "packages/remix/package.json")),
+    copyAsset(path.resolve(__dirname, "packages/remix/README.md"))
   ]
 };
 
 /** @type {import("rollup").RollupOptions} */
-let remixSetup = {
+let remixMagic = {
   external(id) {
     return isBareModuleId(id);
   },
-  input: path.resolve(__dirname, "packages/remix/setup.ts"),
+  input: path.resolve(__dirname, "packages/remix/magic.ts"),
   output: {
     banner: licenseBanner,
     dir: "build/node_modules/remix",
-    format: "cjs",
-    preserveModules: true
+    format: "cjs"
   },
   plugins: [
     babel({
@@ -152,12 +153,9 @@ let remixDev = {
     nodeResolve({
       extensions: [".ts"]
     }),
+    copyAsset(path.resolve(__dirname, "packages/remix-dev/package.json")),
     copy({
       targets: [
-        {
-          src: path.resolve(__dirname, "packages/remix-dev/package.json"),
-          dest: "build/node_modules/@remix-run/dev"
-        },
         {
           src: path.resolve(__dirname, "packages/remix-dev/compiler/shims"),
           dest: "build/node_modules/@remix-run/dev/compiler"
@@ -212,13 +210,17 @@ let remixNode = {
     nodeResolve({
       extensions: [".ts", ".tsx"]
     }),
-    copy({
-      targets: [
-        {
-          src: path.resolve(__dirname, "packages/remix-node/package.json"),
-          dest: "build/node_modules/@remix-run/node"
-        }
-      ]
+    copyAsset(path.resolve(__dirname, "packages/remix-node/package.json"), {
+      transform(source) {
+        let packageJson = {
+          ...JSON.parse(source),
+          scripts: {
+            postinstall: "node scripts/postinstall.js"
+          }
+        };
+
+        return JSON.stringify(packageJson, null, 2);
+      }
     })
   ]
 };
@@ -308,14 +310,7 @@ function getServerConfig(name) {
       nodeResolve({
         extensions: [".ts", ".tsx"]
       }),
-      copy({
-        targets: [
-          {
-            src: path.resolve(__dirname, `packages/remix-${name}/package.json`),
-            dest: `build/node_modules/@remix-run/${name}`
-          }
-        ]
-      })
+      copyAsset(path.resolve(__dirname, `packages/remix-${name}/package.json`))
     ]
   };
 }
@@ -348,13 +343,17 @@ let remixReact = {
     nodeResolve({
       extensions: [".ts", ".tsx"]
     }),
-    copy({
-      targets: [
-        {
-          src: path.resolve(__dirname, "packages/remix-react/package.json"),
-          dest: "build/node_modules/@remix-run/react"
-        }
-      ]
+    copyAsset(path.resolve(__dirname, "packages/remix-react/package.json"), {
+      transform(source) {
+        let packageJson = {
+          ...JSON.parse(source),
+          scripts: {
+            postinstall: "node scripts/postinstall.js"
+          }
+        };
+
+        return JSON.stringify(packageJson, null, 2);
+      }
     })
   ]
 };
@@ -468,14 +467,7 @@ let remixServe = {
     nodeResolve({
       extensions: [".ts", ".tsx"]
     }),
-    copy({
-      targets: [
-        {
-          src: path.resolve(__dirname, "packages/remix-serve/package.json"),
-          dest: `build/node_modules/@remix-run/serve`
-        }
-      ]
-    })
+    copyAsset(path.resolve(__dirname, "packages/remix-serve/package.json"))
   ]
 };
 
@@ -505,7 +497,7 @@ let remixServeCli = {
 let builds = [
   createRemix,
   remix,
-  remixSetup,
+  remixMagic,
   remixBrowser,
   remixDev,
   remixDevCli,