@soleil-se/build-app 1.11.1 → 1.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soleil-se/build-app",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "bin": {
     "build-app": "./bin/index.js",
     "sv-app-build": "./bin/index.js"

package/rollup/client.js

@@ -16,8 +16,9 @@ import getPostcssPlugin from './api/getPostcssPlugin.js';
 import getTerserPlugin from './api/getTerserPlugin.js';
 import getStringPlugin from './api/getStringPlugin.js';
 
-import sitevision from './plugins/sitevisionClient.js';
-import bundleSize from './plugins/bundleSize.js';
+import sitevisionPlugin from './plugins/sitevisionClient.js';
+import bundleSizePlugin from './plugins/bundleSize.js';
+import amdGlobalsPlugin from './plugins/amdGlobals.js';
 
 export default function rollupClient({
   debug,
@@ -35,14 +36,14 @@ export default function rollupClient({
   let bundleCache;
   let plugins;
 
-  const external = Object.keys(globals);
-  if (bundled) external.push(...getSitevisionClientPackages());
+  const external = bundled ? getSitevisionClientPackages() : Object.keys(globals);
 
   return async () => {
     if (!fse.existsSync(input)) return Promise.resolve();
 
     plugins = plugins || [
-      bundled ? sitevision() : false,
+      bundled ? sitevisionPlugin() : false,
+      bundled ? amdGlobalsPlugin({ globals }) : false,
       getReplaceClientPlugin(),
       getAliasClientPlugin(),
       getNodeResolvePlugin({ input }),
@@ -52,7 +53,7 @@ export default function rollupClient({
       getBabelClientPlugin(),
       json(),
       getStringPlugin(),
-      showSize && bundleSize(),
+      showSize && bundleSizePlugin(),
       getTerserPlugin({ debug }),
     ];
 

package/rollup/plugins/amdGlobals.js

@@ -0,0 +1,32 @@
+export default function amdGlobals({ globals } = {}) {
+  const ignored = [];
+
+  function shouldLoad(id) {
+    return !ignored.includes(id);
+  }
+
+  return {
+    name: 'rollup-plugin-amd-globals',
+    resolveId(importee) {
+      if (!Object.keys(globals).includes(importee)) {
+        // Should be handled as usual.
+        return null;
+      }
+      // Most likely a global dependency.
+      // Do not ask other plugins or check the file system to find it.
+      if (!ignored.includes(importee)) {
+        ignored.push(importee);
+      }
+      return importee;
+    },
+    load(id) {
+      if (shouldLoad(id)) {
+        return null;
+      }
+      // The virtual source code for the provided global dependency.
+      return {
+        code: `export default window['${globals[id]}'];`,
+      };
+    },
+  };
+}