@web/storybook-builder 0.1.6 → 0.1.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @web/storybook-builder
 
+## 0.1.7
+
+### Patch Changes
+
+- cbcc56f2: fix tocbot exports for addon-docs
+- 5a428555: prebundle required CommonJS modules for addon-docs
+- 916da5f0: resolve @storybook/react-dom-shim for addon-docs
+
 ## 0.1.6
 
 ### Patch Changes

package/dist/esbuild-plugin-commonjs-named-exports.d.ts

@@ -0,0 +1,3 @@
+import type { Plugin } from 'esbuild';
+export declare function esbuildPluginCommonjsNamedExports(module: string, namedExports: string[]): Plugin;
+//# sourceMappingURL=esbuild-plugin-commonjs-named-exports.d.ts.map

package/dist/esbuild-plugin-commonjs-named-exports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-plugin-commonjs-named-exports.d.ts","sourceRoot":"","sources":["../src/esbuild-plugin-commonjs-named-exports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEtC,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CA0BhG"}

package/dist/esbuild-plugin-commonjs-named-exports.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.esbuildPluginCommonjsNamedExports = void 0;
+function esbuildPluginCommonjsNamedExports(module, namedExports) {
+    return {
+        name: 'commonjs-named-exports',
+        setup(build) {
+            build.onResolve({ filter: new RegExp(`^${module}$`) }, args => {
+                return {
+                    path: args.path,
+                    namespace: `commonjs-named-exports-${module}`,
+                    pluginData: {
+                        resolveDir: args.resolveDir,
+                    },
+                };
+            });
+            build.onLoad({ filter: /.*/, namespace: `commonjs-named-exports-${module}` }, async (args) => {
+                return {
+                    resolveDir: args.pluginData.resolveDir,
+                    contents: `
+            import { default as commonjsExports } from '${module}?force-original';
+            ${namedExports
+                        .map(name => `export const ${name} = commonjsExports.${name};`)
+                        .join('\n')}
+          `,
+                };
+            });
+        },
+    };
+}
+exports.esbuildPluginCommonjsNamedExports = esbuildPluginCommonjsNamedExports;
+//# sourceMappingURL=esbuild-plugin-commonjs-named-exports.js.map

package/dist/esbuild-plugin-commonjs-named-exports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-plugin-commonjs-named-exports.js","sourceRoot":"","sources":["../src/esbuild-plugin-commonjs-named-exports.ts"],"names":[],"mappings":";;;AAEA,SAAgB,iCAAiC,CAAC,MAAc,EAAE,YAAsB;IACtF,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,KAAK,CAAC,KAAK;YACT,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE;gBAC5D,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,SAAS,EAAE,0BAA0B,MAAM,EAAE;oBAC7C,UAAU,EAAE;wBACV,UAAU,EAAE,IAAI,CAAC,UAAU;qBAC5B;iBACF,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,0BAA0B,MAAM,EAAE,EAAE,EAAE,KAAK,EAAC,IAAI,EAAC,EAAE;gBACzF,OAAO;oBACL,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;oBACtC,QAAQ,EAAE;0DACsC,MAAM;cAClD,YAAY;yBACX,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,gBAAgB,IAAI,sBAAsB,IAAI,GAAG,CAAC;yBAC9D,IAAI,CAAC,IAAI,CAAC;WACd;iBACF,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AA1BD,8EA0BC"}

package/dist/rollup-plugin-prebundle-modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup-plugin-prebundle-modules.d.ts","sourceRoot":"","sources":["../src/rollup-plugin-prebundle-modules.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGrC,eAAO,MAAM,sBAAsB,qCAAqC,CAAC;AAEzE,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CA0ChF;AAiBD,eAAO,MAAM,UAAU,UAoBtB,CAAC"}
+{"version":3,"file":"rollup-plugin-prebundle-modules.d.ts","sourceRoot":"","sources":["../src/rollup-plugin-prebundle-modules.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIrC,eAAO,MAAM,sBAAsB,qCAAqC,CAAC;AAEzE,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAsDhF;AAKD,eAAO,MAAM,UAAU,UA2BtB,CAAC"}

package/dist/rollup-plugin-prebundle-modules.js

@@ -27,6 +27,7 @@ exports.CANDIDATES = exports.rollupPluginPrebundleModules = exports.PREBUNDLED_M
 const core_common_1 = require("@storybook/core-common");
 const esbuild_1 = require("esbuild");
 const path_1 = require("path");
+const esbuild_plugin_commonjs_named_exports_js_1 = require("./esbuild-plugin-commonjs-named-exports.js");
 const get_node_module_dir_js_1 = require("./get-node-module-dir.js");
 exports.PREBUNDLED_MODULES_DIR = 'node_modules/.prebundled_modules';
 function rollupPluginPrebundleModules(env) {
@@ -34,8 +35,8 @@ function rollupPluginPrebundleModules(env) {
     return {
         name: 'rollup-plugin-prebundle-modules',
         async buildStart() {
-            const esbuildCommonjsPlugin = (await Promise.resolve().then(() => __importStar(require('@chialab/esbuild-plugin-commonjs')))).default; // for CJS compatibility
-            const modules = getModules();
+            const esbuildPluginCommonjs = (await Promise.resolve().then(() => __importStar(require('@chialab/esbuild-plugin-commonjs')))).default; // for CJS compatibility
+            const modules = exports.CANDIDATES.filter(moduleExists);
             for (const module of modules) {
                 modulePaths[module] = (0, path_1.join)(process.cwd(), exports.PREBUNDLED_MODULES_DIR, module.endsWith('.js') ? module : `${module}.js`);
             }
@@ -46,13 +47,17 @@ function rollupPluginPrebundleModules(env) {
                 format: 'esm',
                 splitting: true,
                 sourcemap: true,
-                alias: {
-                    assert: require.resolve('browser-assert'),
-                    lodash: (0, get_node_module_dir_js_1.getNodeModuleDir)('lodash-es'),
-                    path: require.resolve('path-browserify'),
-                },
+                alias: Object.assign({ assert: require.resolve('browser-assert'), lodash: (0, get_node_module_dir_js_1.getNodeModuleDir)('lodash-es'), path: require.resolve('path-browserify') }, (moduleExists('@storybook/react-dom-shim') && {
+                    '@storybook/react-dom-shim': getReactDomShimAlias(),
+                })),
                 define: Object.assign({}, (0, core_common_1.stringifyProcessEnvs)(env)),
-                plugins: [esbuildCommonjsPlugin()],
+                plugins: [
+                    /* for @storybook/addon-docs */
+                    // tocbot can't be automatically transformed by @chialab/esbuild-plugin-commonjs
+                    // so we need a manual wrapper
+                    (0, esbuild_plugin_commonjs_named_exports_js_1.esbuildPluginCommonjsNamedExports)('tocbot', ['init', 'destroy']),
+                    esbuildPluginCommonjs(),
+                ],
             });
         },
         async resolveId(source) {
@@ -61,22 +66,14 @@ function rollupPluginPrebundleModules(env) {
     };
 }
 exports.rollupPluginPrebundleModules = rollupPluginPrebundleModules;
-function getModules() {
-    const include = exports.CANDIDATES.filter(id => {
-        try {
-            require.resolve(id, { paths: [process.cwd()] });
-            return true;
-        }
-        catch (e) {
-            return false;
-        }
-    });
-    return include;
-}
 // this is different to https://github.com/storybookjs/storybook/blob/v7.0.0/code/lib/builder-vite/src/optimizeDeps.ts#L7
 // builder-vite bundles different dependencies for performance reasons
 // we aim only at browserifying NodeJS dependencies (CommonJS/process.env/...)
 exports.CANDIDATES = [
+    /* for different packages */
+    'tiny-invariant',
+    /* for @storybook/addon-interactions */
+    'jest-mock',
     // @testing-library has ESM, but imports/exports are not working correctly between packages
     // specifically "@testing-library/user-event" has "dist/esm/utils/misc/getWindow.js" (see https://cdn.jsdelivr.net/npm/@testing-library/user-event@14.4.3/dist/esm/utils/misc/getWindow.js)
     // which uses "@testing-library/dom" in `import { getWindowFromNode } from '@testing-library/dom/dist/helpers.js';`
@@ -84,13 +81,33 @@ exports.CANDIDATES = [
     // and instead gets resolved to "@testing-library/dom" CommonJS "dist/helpers.js" (see https://cdn.jsdelivr.net/npm/@testing-library/dom@9.3.1/dist/helpers.js)
     '@testing-library/dom',
     '@testing-library/user-event',
-    // CommonJS module used in Storybook MJS files
+    /* for @storybook/addon-docs */
+    '@storybook/react-dom-shim',
+    'color-convert',
     'doctrine',
-    // CommonJS module used in Storybook MJS files
-    'jest-mock',
-    // CommonJS module used in Storybook MJS files
+    'lodash/cloneDeep.js',
     'lodash/mapValues.js',
-    // ESM, but uses `process.env.NODE_ENV`
-    'tiny-invariant',
+    'lodash/pickBy.js',
+    'lodash/throttle.js',
+    'lodash/uniq.js',
+    'memoizerific',
+    'react',
+    'react-dom',
+    'tocbot',
 ];
+function getReactDomShimAlias() {
+    const { version } = require('react-dom');
+    return version.startsWith('18')
+        ? require.resolve('@storybook/react-dom-shim/dist/react-18').replace(/\.js$/, '.mjs')
+        : require.resolve('@storybook/react-dom-shim').replace(/\.js$/, '.mjs');
+}
+function moduleExists(moduleName) {
+    try {
+        require.resolve(moduleName, { paths: [process.cwd()] });
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+}
 //# sourceMappingURL=rollup-plugin-prebundle-modules.js.map

package/dist/rollup-plugin-prebundle-modules.js.map

@@ -1 +1 @@
-{"version":3,"file":"rollup-plugin-prebundle-modules.js","sourceRoot":"","sources":["../src/rollup-plugin-prebundle-modules.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA8D;AAC9D,qCAAgC;AAChC,+BAA4B;AAE5B,qEAA4D;AAE/C,QAAA,sBAAsB,GAAG,kCAAkC,CAAC;AAEzE,SAAgB,4BAA4B,CAAC,GAA2B;IACtE,MAAM,WAAW,GAA2B,EAAE,CAAC;IAE/C,OAAO;QACL,IAAI,EAAE,iCAAiC;QAEvC,KAAK,CAAC,UAAU;YACd,MAAM,qBAAqB,GAAG,CAAC,wDAAa,kCAAkC,GAAC,CAAC,CAAC,OAAO,CAAC,CAAC,wBAAwB;YAElH,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;YAE7B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,WAAW,CAAC,MAAM,CAAC,GAAG,IAAA,WAAI,EACxB,OAAO,CAAC,GAAG,EAAE,EACb,8BAAsB,EACtB,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,CACjD,CAAC;aACH;YAED,MAAM,IAAA,eAAK,EAAC;gBACV,WAAW,EAAE,OAAO;gBACpB,MAAM,EAAE,8BAAsB;gBAC9B,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,IAAI;gBACf,SAAS,EAAE,IAAI;gBACf,KAAK,EAAE;oBACL,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;oBACzC,MAAM,EAAE,IAAA,yCAAgB,EAAC,WAAW,CAAC;oBACrC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC;iBACzC;gBACD,MAAM,oBACD,IAAA,kCAAoB,EAAC,GAAG,CAAC,CAC7B;gBACD,OAAO,EAAE,CAAC,qBAAqB,EAAE,CAAC;aACnC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,MAAM;YACpB,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC;AA1CD,oEA0CC;AAED,SAAS,UAAU;IACjB,MAAM,OAAO,GAAG,kBAAU,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;QACrC,IAAI;YACF,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YAChD,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,yHAAyH;AACzH,sEAAsE;AACtE,8EAA8E;AACjE,QAAA,UAAU,GAAG;IACxB,2FAA2F;IAC3F,2LAA2L;IAC3L,mHAAmH;IACnH,uKAAuK;IACvK,+JAA+J;IAC/J,sBAAsB;IACtB,6BAA6B;IAE7B,8CAA8C;IAC9C,UAAU;IAEV,8CAA8C;IAC9C,WAAW;IAEX,8CAA8C;IAC9C,qBAAqB;IAErB,uCAAuC;IACvC,gBAAgB;CACjB,CAAC"}
+{"version":3,"file":"rollup-plugin-prebundle-modules.js","sourceRoot":"","sources":["../src/rollup-plugin-prebundle-modules.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web/storybook-builder",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "publishConfig": {
     "access": "public"
   },