@movable/studio-framework-build-config 2.42.1-canary.0 → 2.43.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movable/studio-framework-build-config",
-  "version": "2.42.1-canary.0",
+  "version": "2.43.0",
   "license": "MIT",
   "private": false,
   "author": "Movable Ink",
@@ -14,8 +14,8 @@
     "@babel/preset-env": "^7.14.1",
     "@babel/preset-react": "^7.14.5",
     "@babel/runtime-corejs2": "^7.14.0",
-    "@movable/rollup-plugin-manifest-merger": "^2.42.1-canary.0",
-    "@movable/rollup-plugin-package-manifest-validator": "^2.42.1-canary.0",
+    "@movable/rollup-plugin-manifest-merger": "^2.43.0",
+    "@movable/rollup-plugin-package-manifest-validator": "^2.43.0",
     "@rollup/plugin-url": "^6.0.0",
     "esbuild": "^0.15.14",
     "glob": "^7.1.7",
@@ -46,5 +46,5 @@
   "volta": {
     "extends": "../../package.json"
   },
-  "gitHead": "451954a037803969425f6bd06db7c1a4fd13883d"
+  "gitHead": "463c301a85be7f9a36d1695be3f4de3c75721d29"
 }

package/src/apps/data-loader.js

@@ -2,39 +2,17 @@ const esbuild = require('esbuild');
 const fs = require('fs').promises;
 const path = require('path');
 
-const { SERVE, ENVIRONMENT } = process.env;
+const { ENVIRONMENT } = process.env;
 
 const loaderHtmlSourceDefault = path.resolve(__dirname, './html/loader.html');
 const loaderDebugHtmlSourceDefault = path.resolve(__dirname, './html/loader-debug.html');
 
-function sleep(ms) {
-  return new Promise((res) => setTimeout(res, ms));
-}
-
-async function waitForFile(filePath) {
-  let waitCount = 0;
-  while (waitCount < 500) {
-    try {
-      await fs.stat(filePath);
-      break;
-    } catch (e) {
-      await sleep(200);
-      if (++waitCount >= 500) {
-        throw e;
-      }
-    }
-  }
-}
-
-module.exports = async function buildDataLoader(buildConfig = {}) {
+async function buildDataLoader(watchMode = false, buildConfig = {}) {
   if (typeof buildConfig !== 'object') {
     // might have passed dataLoader: true; if so, use defaults
     buildConfig = {};
   }
 
-  // We cannot write to dist before dist/index.js appears, or studio-tunnel will break
-  await waitForFile('./dist/index.js');
-
   console.log('Copying data loader wrappers: dist/loader.html, dist/loader-debug.html');
 
   await fs.copyFile(buildConfig.loaderHtml || loaderHtmlSourceDefault, './dist/loader.html');
@@ -42,6 +20,10 @@ module.exports = async function buildDataLoader(buildConfig = {}) {
 
   console.log('Building data loader: dist/loader.js');
 
+  if (watchMode) {
+    console.log('Watching for changes to data loader');
+  }
+
   esbuild.build({
     entryPoints: ['./app/loader/index.js'],
     outfile: 'dist/loader.js',
@@ -50,7 +32,31 @@ module.exports = async function buildDataLoader(buildConfig = {}) {
     bundle: true,
     logLevel: 'info',
     minify: ENVIRONMENT === 'production',
-    watch: !!SERVE,
+    watch: watchMode,
     ...buildConfig
   });
+}
+
+// Only invoke the first time rollup runs
+let dataLoaderBuilt = false;
+
+module.exports = function buildDataLoaderPlugin(options = {}) {
+  return {
+    name: 'build-data-loader',
+    closeBundle() {
+      if (dataLoaderBuilt) {
+        // closeBundle happens on every build; we only invoke esbuild the first time and
+        // it watches its own changes
+        return;
+      }
+
+      const { watchMode } = this.meta;
+      dataLoaderBuilt = true;
+
+      buildDataLoader(watchMode, options.dataLoader).catch((error) => {
+        console.error(error);
+        dataLoaderBuilt = false;
+      });
+    }
+  };
 };

package/src/apps/rollup.js

@@ -24,16 +24,6 @@ module.exports = function rollupConfig(passedConfig = {}) {
     ...passedConfig
   };
 
-  if (passedConfig.dataLoader) {
-    const { dataLoader } = passedConfig;
-    delete passedConfig.dataLoader;
-
-    buildDataLoader(dataLoader).catch((error) => {
-      console.error(error);
-      process.exit(1);
-    });
-  }
-
   const vendorTree = {
     input: inputFile,
     plugins: [
@@ -53,6 +43,7 @@ module.exports = function rollupConfig(passedConfig = {}) {
       replace({
         'process.env.NODE_ENV': JSON.stringify('production')
       }),
+      config.dataLoader ? buildDataLoader(config.dataLoader) : null,
       config.minify ? minify({ comments: false, sourceMap: true }) : null,
       config.serve ? serve() : null
     ].filter(Boolean),