fix(ci): restore storybook and e2e task parity

Author: ScriptedAlchemy

.github/workflows/bundle-size.yml

@@ -53,14 +53,18 @@ jobs:
 
       - name: Prepare base worktree
         run: |
-          BASE_REF=${CI_LOCAL_BASE_REF:-origin/main}
+          BASE_REF=${CI_LOCAL_BASE_REF:-${{ github.event.pull_request.base.sha }}}
           BASE_PATH=".ci-local-base-${RANDOM}-${RANDOM}"
-          LOCAL_BASE_REF="${BASE_REF#origin/}"
           echo "BASE_REF=$BASE_REF" >> "$GITHUB_ENV"
           echo "BASE_PATH=$BASE_PATH" >> "$GITHUB_ENV"
-          echo "LOCAL_BASE_REF=$LOCAL_BASE_REF" >> "$GITHUB_ENV"
           git worktree add "$BASE_PATH" "$BASE_REF"
-          git -C "$BASE_PATH" branch -f "$LOCAL_BASE_REF" "$BASE_REF" || true
+          case "$BASE_REF" in
+            origin/*)
+              LOCAL_BASE_REF="${BASE_REF#origin/}"
+              echo "LOCAL_BASE_REF=$LOCAL_BASE_REF" >> "$GITHUB_ENV"
+              git -C "$BASE_PATH" branch -f "$LOCAL_BASE_REF" "$BASE_REF" || true
+              ;;
+          esac
 
       - name: Restore Turborepo cache (base worktree)
         uses: actions/cache@v5

package.json

@@ -38,8 +38,8 @@
     "e2e:router": "node tools/scripts/run-router-e2e.mjs --mode=dev",
     "e2e:shared-tree-shaking:runtime-infer": "npx kill-port --port 3001,3002 && pnpm exec turbo run test:e2e --filter=shared-tree-shaking-no-server-host && lsof -ti tcp:3001,3002 | xargs kill",
     "e2e:shared-tree-shaking:server-calc": "npx kill-port --port 3001,3002,3003 && pnpm exec turbo run test:e2e --filter=shared-tree-shaking-with-server-host && lsof -ti tcp:3001,3002,3003 | xargs kill",
-    "e2e:devtools:dev": "npx kill-port 3009 3010 3011 3012 3013 4001 && pnpm run app:manifest:dev & echo \"done\" && npx wait-on tcp:3009 tcp:3010 tcp:3011 tcp:3012 tcp:3013 && sleep 10 && pnpm exec turbo run e2e:devtools --filter=@module-federation/devtools",
-    "e2e:devtools:prod": "npx kill-port 3009 3010 3011 3012 3013 4001 && npx kill-port 3009 3010 3011 3012 3013 4001 && pnpm run app:manifest:prod & echo \"done\" && npx wait-on tcp:3009 tcp:3010 tcp:3011 tcp:3012 tcp:3013 && sleep 30 && pnpm exec turbo run e2e:devtools --filter=@module-federation/devtools",
+    "e2e:devtools:dev": "npx kill-port 3009 3010 3011 3012 3013 4001 && pnpm run app:manifest:dev & echo \"done\" && npx wait-on tcp:3009 tcp:3010 tcp:3011 tcp:3012 tcp:3013 && sleep 10 && pnpm exec turbo run test:e2e --filter=@module-federation/devtools",
+    "e2e:devtools:prod": "npx kill-port 3009 3010 3011 3012 3013 4001 && npx kill-port 3009 3010 3011 3012 3013 4001 && pnpm run app:manifest:prod & echo \"done\" && npx wait-on tcp:3009 tcp:3010 tcp:3011 tcp:3012 tcp:3013 && sleep 30 && pnpm exec turbo run test:e2e --filter=@module-federation/devtools",
     "enhanced:rstest": "pnpm --filter @module-federation/enhanced run build && NODE_OPTIONS=--experimental-vm-modules npx rstest -c packages/enhanced/rstest.config.ts",
     "lint": "pnpm run lint:packages",
     "test": "pnpm exec turbo run test",

packages/storybook-addon/package.json

@@ -53,6 +53,7 @@
     "@module-federation/sdk": "workspace:*"
   },
   "devDependencies": {
+    "@nx/module-federation": ">= 16.0.0",
     "jest-fixed-jsdom": "^0.0.9",
     "@module-federation/utilities": "workspace:*",
     "@rsbuild/core": "2.0.0-beta.2",
@@ -82,6 +83,9 @@
     "@nx/react": {
       "optional": true
     },
+    "@nx/module-federation": {
+      "optional": true
+    },
     "@nx/webpack": {
       "optional": true
     },

packages/storybook-addon/src/lib/storybook-addon.ts

@@ -8,6 +8,7 @@ import {
   type WebpackPluginInstance,
 } from 'webpack';
 import { normalizeStories } from '@storybook/core/common';
+import withModuleFederation from '../utils/with-module-federation.js';
 import { correctImportPath } from '../utils/correctImportPath.js';
 
 // TODO: Only reserve `storybook/internal/node-logger` in next major release.
@@ -39,11 +40,7 @@ type Options = {
   };
   configDir: string;
 };
-
-export const withModuleFederation = async (options: ModuleFederationConfig) => {
-  const module = await import('../utils/with-module-federation.js');
-  return module.default(options);
-};
+export { withModuleFederation };
 
 export const webpack = async (
   webpackConfig: Configuration,