@nx/storybook 23.0.0-beta.18 → 23.0.0-beta.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "23.0.0-beta.18",
+  "version": "23.0.0-beta.19",
   "private": false,
   "description": "The Nx Plugin for Storybook contains executors and generators for allowing your workspace to use the powerful Storybook integration testing & documenting capabilities.",
   "repository": {
@@ -34,20 +34,20 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.18",
+    "@nx/devkit": "23.0.0-beta.19",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "23.0.0-beta.18",
-    "@nx/js": "23.0.0-beta.18",
-    "@nx/eslint": "23.0.0-beta.18"
+    "@nx/cypress": "23.0.0-beta.19",
+    "@nx/js": "23.0.0-beta.19",
+    "@nx/eslint": "23.0.0-beta.19"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.18",
+    "nx": "23.0.0-beta.19",
     "storybook": "9.0.6"
   },
   "peerDependencies": {
-    "@nx/web": "23.0.0-beta.18",
+    "@nx/web": "23.0.0-beta.19",
     "storybook": ">=7.0.0 <11.0.0"
   },
   "peerDependenciesMeta": {

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/plugins/plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAMd,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,sBAAsB;IACrC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,sBAAsB,CAiC7D,CAAC;AAEF,eAAO,MAAM,aAAa,uCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/plugins/plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,kBAAkB,EAIlB,aAAa,EAMd,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,sBAAsB;IACrC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,sBAAsB,CA+D7D,CAAC;AAEF,eAAO,MAAM,aAAa,uCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -29,7 +29,27 @@ exports.createNodes = [
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache, pmc, lockFileName), configFilePaths, normalizedOptions, context);
+            const { entries, preErrors } = await filterStorybookConfigs(configFilePaths, context);
+            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.projectRoot), normalizedOptions, context, entries.map(() => [lockFileName]));
+            let results = [];
+            let nodeErrors = [];
+            try {
+                results = await (0, devkit_1.createNodesFromFiles)((configFile, _, ctx, idx) => createNodesInternal(configFile, normalizedOptions, ctx, targetsCache, pmc, entries[idx].projectRoot, projectHashes[idx]), entries.map((e) => e.configFile), normalizedOptions, context);
+            }
+            catch (e) {
+                if (e instanceof devkit_1.AggregateCreateNodesError) {
+                    results = e.partialResults ?? [];
+                    nodeErrors = e.errors;
+                }
+                else {
+                    throw e;
+                }
+            }
+            const allErrors = [...preErrors, ...nodeErrors];
+            if (allErrors.length > 0) {
+                throw new devkit_1.AggregateCreateNodesError(allErrors, results);
+            }
+            return results;
         }
         finally {
             targetsCache.writeToDisk();
@@ -37,7 +57,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, pmc, lockFileName) {
+function getProjectRootFromConfigPath(configFilePath) {
     let projectRoot = '';
     if (configFilePath.includes('/.storybook')) {
         projectRoot = (0, path_1.dirname)(configFilePath).replace('/.storybook', '');
@@ -48,13 +68,9 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     if (projectRoot === '') {
         projectRoot = '.';
     }
-    // Do not create a project if package.json and project.json isn't there.
-    const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
-    if (!siblingFiles.includes('package.json') &&
-        !siblingFiles.includes('project.json')) {
-        return {};
-    }
-    const hash = await (0, internal_1.calculateHashForCreateNodes)(projectRoot, options, context, [lockFileName]);
+    return projectRoot;
+}
+async function createNodesInternal(configFilePath, options, context, targetsCache, pmc, projectRoot, hash) {
     const projectName = buildProjectName(projectRoot, context.workspaceRoot);
     if (!targetsCache.has(hash)) {
         targetsCache.set(hash, await buildStorybookTargets(configFilePath, projectRoot, options, context, projectName, pmc));
@@ -228,6 +244,28 @@ function getOutputs() {
     ];
     return outputs;
 }
+async function filterStorybookConfigs(configFiles, context) {
+    const preErrors = [];
+    const candidates = await Promise.all(configFiles.map(async (configFile) => {
+        try {
+            const projectRoot = getProjectRootFromConfigPath(configFile);
+            const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+            if (!siblingFiles.includes('package.json') &&
+                !siblingFiles.includes('project.json')) {
+                return null;
+            }
+            return { configFile, projectRoot };
+        }
+        catch (e) {
+            preErrors.push([configFile, e]);
+            return null;
+        }
+    }));
+    return {
+        entries: candidates.filter((c) => c !== null),
+        preErrors,
+    };
+}
 function normalizeOptions(options) {
     return {
         buildStorybookTargetName: options.buildStorybookTargetName ?? 'build-storybook',