@nx/storybook 22.7.0-beta.0 → 22.7.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "22.7.0-beta.0",
+  "version": "22.7.0-beta.10",
   "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": {
@@ -19,7 +19,8 @@
     "Testing"
   ],
   "main": "./index.js",
-  "typings": "./index.d.ts",
+  "type": "commonjs",
+  "types": "./index.d.ts",
   "author": "Isaac Mann",
   "license": "MIT",
   "bugs": {
@@ -33,16 +34,16 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-beta.0",
+    "@nx/devkit": "22.7.0-beta.10",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "22.7.0-beta.0",
-    "@nx/js": "22.7.0-beta.0",
-    "@nx/eslint": "22.7.0-beta.0"
+    "@nx/cypress": "22.7.0-beta.10",
+    "@nx/js": "22.7.0-beta.10",
+    "@nx/eslint": "22.7.0-beta.10"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.0",
+    "nx": "22.7.0-beta.10",
     "storybook": "9.0.6"
   },
   "peerDependencies": {
@@ -50,7 +51,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "types": "./index.d.ts",
-  "type": "commonjs"
+  }
 }

package/src/executors/build-storybook/build-storybook.impl.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = buildStorybookExecutor;
 const devkit_1 = require("@nx/devkit");
@@ -21,8 +54,8 @@ async function runInstance(options) {
     const installedStorybookVersion = (0, utilities_1.getInstalledStorybookVersion)();
     const hasCoreServerInStorybookPackage = (0, semver_1.gte)(installedStorybookVersion, '8.2.0');
     const storybookCore = await (hasCoreServerInStorybookPackage
-        ? Promise.resolve().then(() => require('storybook/internal/core-server')) : // This is needed for backwards compatibility - but we do not have the package installed in the nx repo
-     Promise.resolve().then(() => require('@storybook/core-server')));
+        ? Promise.resolve().then(() => __importStar(require('storybook/internal/core-server'))) : // This is needed for backwards compatibility - but we do not have the package installed in the nx repo
+     Promise.resolve().then(() => __importStar(require('@storybook/core-server'))));
     const env = process.env.NODE_ENV ?? 'production';
     process.env.NODE_ENV = env;
     return storybookCore.build({

package/src/executors/storybook/storybook.impl.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = storybookExecutor;
 const utilities_1 = require("../../utils/utilities");
@@ -24,8 +57,8 @@ async function runInstance(options) {
     const installedStorybookVersion = (0, utilities_1.getInstalledStorybookVersion)();
     const hasCoreServerInStorybookPackage = (0, semver_1.gte)(installedStorybookVersion, '8.2.0');
     const storybookCore = await (hasCoreServerInStorybookPackage
-        ? Promise.resolve().then(() => require('storybook/internal/core-server')) : // This is needed for backwards compatibility - but we do not have the package installed in the nx repo
-     Promise.resolve().then(() => require('@storybook/core-server')));
+        ? Promise.resolve().then(() => __importStar(require('storybook/internal/core-server'))) : // This is needed for backwards compatibility - but we do not have the package installed in the nx repo
+     Promise.resolve().then(() => __importStar(require('@storybook/core-server'))));
     const env = process.env.NODE_ENV ?? 'development';
     process.env.NODE_ENV = env;
     return storybookCore.build({

package/src/generators/migrate-10/calling-storybook-cli.js

@@ -18,7 +18,7 @@ function callUpgrade(schema) {
         });
         (0, child_process_1.execSync)(`${pm.dlx} ${packageManager === 'yarn' ? 'storybook' : 'storybook@latest'} upgrade ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
             stdio: [0, 1, 2],
-            windowsHide: false,
+            windowsHide: true,
         });
         devkit_1.output.log({
             title: `Storybook packages upgraded.`,

package/src/generators/migrate-8/calling-storybook-cli.js

@@ -18,7 +18,7 @@ function callUpgrade(schema) {
         });
         (0, child_process_1.execSync)(`${pm.dlx} ${packageManager === 'yarn' ? 'storybook' : 'storybook@latest'} upgrade ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
             stdio: [0, 1, 2],
-            windowsHide: false,
+            windowsHide: true,
         });
         devkit_1.output.log({
             title: `Storybook packages upgraded.`,
@@ -68,7 +68,7 @@ function callAutomigrate(allStorybookProjects, schema) {
             });
             (0, child_process_1.execSync)(`${commandToRun}  ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
                 stdio: 'inherit',
-                windowsHide: false,
+                windowsHide: true,
             });
             resultOfMigration.successfulProjects[projectName] = commandToRun;
         }

package/src/generators/migrate-9/calling-storybook-cli.js

@@ -18,7 +18,7 @@ function callUpgrade(schema) {
         });
         (0, child_process_1.execSync)(`${pm.dlx} ${packageManager === 'yarn' ? 'storybook' : 'storybook@latest'} upgrade ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
             stdio: [0, 1, 2],
-            windowsHide: false,
+            windowsHide: true,
         });
         devkit_1.output.log({
             title: `Storybook packages upgraded.`,
@@ -68,7 +68,7 @@ function callAutomigrate(allStorybookProjects, schema) {
             });
             (0, child_process_1.execSync)(`${commandToRun}  ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
                 stdio: 'inherit',
-                windowsHide: false,
+                windowsHide: true,
                 env: process.env,
             });
             resultOfMigration.successfulProjects[projectName] = commandToRun;

package/src/migrations/update-21-1-0/update-sb-9.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = changeStorybookTargets;
+const tslib_1 = require("tslib");
 const output_1 = require("nx/src/utils/output");
-const migrate_9_1 = require("../../generators/migrate-9/migrate-9");
+const migrate_9_1 = tslib_1.__importDefault(require("../../generators/migrate-9/migrate-9"));
 const utilities_1 = require("../../utils/utilities");
 async function changeStorybookTargets(tree) {
     const storybookVersion = (0, utilities_1.storybookMajorVersion)();

package/src/migrations/update-22-1-0/migrate-to-storybook-10.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = migrateToStorybook10;
+const tslib_1 = require("tslib");
 const output_1 = require("nx/src/utils/output");
-const migrate_10_1 = require("../../generators/migrate-10/migrate-10");
+const migrate_10_1 = tslib_1.__importDefault(require("../../generators/migrate-10/migrate-10"));
 async function migrateToStorybook10(tree) {
     output_1.output.log({
         title: 'Migrating Storybook to v10',

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":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAQd,MAAM,YAAY,CAAC;AAepB,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;AAeD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,sBAAsB,CA4B7D,CAAC;AAEF,eAAO,MAAM,aAAa,uCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAQd,MAAM,YAAY,CAAC;AAapB,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;AAeD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,sBAAsB,CAgC7D,CAAC;AAEF,eAAO,MAAM,aAAa,uCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -12,7 +12,6 @@ const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const util_1 = require("@nx/js/src/plugins/typescript/util");
-const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
@@ -34,8 +33,9 @@ exports.createNodes = [
         const optionsHash = (0, file_hasher_1.hashObject)(normalizedOptions);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `storybook-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache), configFilePaths, normalizedOptions, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache, pmc), configFilePaths, normalizedOptions, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
@@ -43,7 +43,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, pmc) {
     let projectRoot = '';
     if (configFilePath.includes('/.storybook')) {
         projectRoot = (0, path_1.dirname)(configFilePath).replace('/.storybook', '');
@@ -62,7 +62,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     }
     const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
     const projectName = buildProjectName(projectRoot, context.workspaceRoot);
-    targetsCache[hash] ??= await buildStorybookTargets(configFilePath, projectRoot, options, context, projectName);
+    targetsCache[hash] ??= await buildStorybookTargets(configFilePath, projectRoot, options, context, projectName, pmc);
     const result = {
         projects: {
             [projectRoot]: {
@@ -73,7 +73,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     };
     return result;
 }
-async function buildStorybookTargets(configFilePath, projectRoot, options, context, projectName) {
+async function buildStorybookTargets(configFilePath, projectRoot, options, context, projectName, pmc) {
     const buildOutputs = getOutputs();
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     // First attempt to do a very fast lookup for the framework

package/project.json

@@ -1,69 +0,0 @@
-{
-    "name": "storybook",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/storybook",
-    "projectType": "library",
-    "targets": {
-        "build": {
-            "outputs": ["{workspaceRoot}/dist/packages/storybook/README.md"],
-            "command": "node ./scripts/copy-readme.js storybook"
-        },
-        "nx-release-publish": {
-            "executor": "@nx/js:release-publish",
-            "options": {
-                "packageRoot": "dist/packages/storybook"
-            },
-            "dependsOn": ["^nx-release-publish"]
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    {
-                        "input": "packages/storybook",
-                        "glob": "**/files/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/storybook",
-                        "glob": "**/project-files/.storybook/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/storybook",
-                        "glob": "**/project-files-ts/.storybook/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/storybook",
-                        "glob": "**/*.json",
-                        "ignore": [
-                            "**/tsconfig*.json",
-                            "project.json",
-                            ".eslintrc.json",
-                            "**/test-configs/**"
-                        ],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/storybook",
-                        "glob": "**/*.js",
-                        "ignore": ["**/jest.config.js"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/storybook",
-                        "glob": "**/*.d.ts",
-                        "output": "/"
-                    },
-                    {
-                        "input": "",
-                        "glob": "LICENSE",
-                        "output": "/"
-                    }
-                ]
-            }
-        }
-    }
-}