@nx/storybook 23.0.0-beta.2 → 23.0.0-beta.21

package/src/utils/utilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/utilities.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,mBAAmB,EACnB,IAAI,EACL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,GAAG,QAAQ,YAAY,CAAC,CAAC;AAKlC,eAAO,MAAM,SAAS;;;;;;;;;CA0BrB,CAAC;AAGF,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,IAAI,UAatD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAuBrE;AAED,wBAAgB,4BAA4B,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAqB5E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOhE;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,eAAe,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtC,CAAC;AAEF,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,IAAI,CAYN;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,YAEnC;AAED,wBAAgB,uCAAuC,CAAC,OAAO,EAAE;IAC/D,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC3C,GAAG;IACF,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CA2EA;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CA4CjE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAcvE;AAED,wBAAgB,aAAa,IAAI,MAAM,CAQtC"}
+{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/utilities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,GAAG,QAAQ,YAAY,CAAC,CAAC;AAGlC,OAAO,EACL,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,SAAS;;;;;;;;CAQrB,CAAC;AAGF,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE/D;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOhE;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,eAAe,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtC,CAAC;AAEF,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,IAAI,CAYN;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,YAEnC;AAED,wBAAgB,uCAAuC,CAAC,OAAO,EAAE;IAC/D,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC3C,GAAG;IACF,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CA2EA;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CA4CjE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAcvE"}

package/src/utils/utilities.js

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Constants = void 0;
+exports.Constants = exports.getInstalledStorybookVersion = exports.storybookMajorVersion = void 0;
 exports.getStorybookVersionToInstall = getStorybookVersionToInstall;
-exports.storybookMajorVersion = storybookMajorVersion;
-exports.getInstalledStorybookVersion = getInstalledStorybookVersion;
 exports.safeFileDelete = safeFileDelete;
 exports.storybookConfigExistsCheck = storybookConfigExistsCheck;
 exports.dedupe = dedupe;
 exports.findStorybookAndBuildTargetsAndCompiler = findStorybookAndBuildTargetsAndCompiler;
 exports.isTheFileAStory = isTheFileAStory;
 exports.getTsSourceFile = getTsSourceFile;
-exports.pleaseUpgrade = pleaseUpgrade;
-const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const js_1 = require("@nx/js");
 const ts = require("typescript");
-const semver_1 = require("semver");
-const path_1 = require("path");
 const versions_1 = require("./versions");
+var versions_2 = require("./versions");
+Object.defineProperty(exports, "storybookMajorVersion", { enumerable: true, get: function () { return versions_2.storybookMajorVersion; } });
+Object.defineProperty(exports, "getInstalledStorybookVersion", { enumerable: true, get: function () { return versions_2.getInstalledStorybookVersion; } });
 exports.Constants = {
     addonDependencies: ['@storybook/addons'],
     tsConfigExclusions: ['stories', '**/*.stories.ts'],
@@ -26,76 +23,9 @@ exports.Constants = {
     },
     jsonIndentLevel: 2,
     coreAddonPrefix: '@storybook/addon-',
-    uiFrameworks7: [
-        '@storybook/angular',
-        '@storybook/html-webpack5',
-        '@storybook/nextjs',
-        '@storybook/preact-webpack5',
-        '@storybook/react-webpack5',
-        '@storybook/react-vite',
-        '@storybook/server-webpack5',
-        '@storybook/svelte-webpack5',
-        '@storybook/svelte-vite',
-        '@storybook/sveltekit',
-        '@storybook/vue-webpack5',
-        '@storybook/vue-vite',
-        '@storybook/vue3-webpack5',
-        '@storybook/vue3-vite',
-        '@storybook/web-components-webpack5',
-        '@storybook/web-components-vite',
-    ],
 };
 function getStorybookVersionToInstall(tree) {
-    let storybookVersionToInstall = versions_1.storybookVersion;
-    const installedStorybookMajorVersion = storybookMajorVersion(tree);
-    const installedStorybookVersion = getInstalledStorybookVersion(tree);
-    if (installedStorybookMajorVersion >= 7 && installedStorybookVersion) {
-        // Normalize the version by removing range operators (^, ~, etc.)
-        // coerce handles ranges like ^10.0.0 and returns a valid SemVer object
-        const coercedVersion = (0, semver_1.coerce)(installedStorybookVersion);
-        if (coercedVersion && (0, semver_1.gte)(coercedVersion.version, '7.0.0')) {
-            storybookVersionToInstall = installedStorybookVersion;
-        }
-    }
-    return storybookVersionToInstall;
-}
-function storybookMajorVersion(tree) {
-    let foundStorybookPackageVersion = null;
-    if (tree) {
-        foundStorybookPackageVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'storybook');
-    }
-    if (foundStorybookPackageVersion) {
-        try {
-            return (0, semver_1.major)(foundStorybookPackageVersion);
-        }
-        catch {
-            // unable to parse, fallback to requiring version from disk
-        }
-    }
-    try {
-        const storybookPackageVersion = require((0, path_1.join)('storybook', 'package.json')).version;
-        return (0, semver_1.major)(storybookPackageVersion);
-    }
-    catch {
-        return undefined;
-    }
-}
-function getInstalledStorybookVersion(tree) {
-    let foundStorybookPackageVersion = null;
-    if (tree) {
-        foundStorybookPackageVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'storybook');
-    }
-    if (foundStorybookPackageVersion) {
-        return foundStorybookPackageVersion;
-    }
-    // unable to find in root packageJson, fallback to requiring version from disk
-    try {
-        const storybookPackageVersion = require((0, path_1.join)('storybook', 'package.json')).version;
-        return storybookPackageVersion;
-    }
-    catch {
-        return undefined;
-    }
+    return (0, versions_1.versions)(tree).storybookVersion;
 }
 function safeFileDelete(tree, path) {
     if (tree.exists(path)) {
@@ -235,12 +165,3 @@ function getTsSourceFile(host, path) {
     const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
     return source;
 }
-function pleaseUpgrade() {
-    return `
-    Storybook 7 and lower are no longer maintained, and not supported in Nx. 
-    Please upgrade to Storybook 8.
-
-    Here is a guide on how to upgrade:
-    https://nx.dev/nx-api/storybook/generators/migrate-8
-    `;
-}

package/src/utils/versions.d.ts

@@ -1,9 +1,18 @@
+import { type Tree } from '@nx/devkit';
 export declare const nxVersion: any;
 export declare const litVersion = "^2.6.1";
 export declare const tsNodeVersion = "10.9.1";
 export declare const tsLibVersion = "^2.3.0";
+export declare const minSupportedStorybookVersion = "8.0.0";
 export declare const storybookVersion = "^10.1.0";
 export declare const reactVersion = "^18.2.0";
 export declare const viteVersion = "^6.0.0";
 export declare const coreJsVersion = "^3.36.1";
+type StorybookVersions = {
+    storybookVersion: string;
+};
+export declare function versions(tree: Tree): StorybookVersions;
+export declare function storybookMajorVersion(tree?: Tree): number | undefined;
+export declare function getInstalledStorybookVersion(tree?: Tree): string | undefined;
+export {};
 //# sourceMappingURL=versions.d.ts.map

package/src/utils/versions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAC/D,eAAO,MAAM,UAAU,WAAW,CAAC;AACnC,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,eAAO,MAAM,aAAa,YAAY,CAAC"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/versions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAI5E,eAAO,MAAM,SAAS,KAAwC,CAAC;AAC/D,eAAO,MAAM,UAAU,WAAW,CAAC;AACnC,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,eAAO,MAAM,4BAA4B,UAAU,CAAC;AAGpD,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,eAAO,MAAM,aAAa,YAAY,CAAC;AAEvC,KAAK,iBAAiB,GAAG;IACvB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAaF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,CAQtD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAOrE;AAED,wBAAgB,4BAA4B,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAc5E"}

package/src/utils/versions.js

@@ -1,11 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.coreJsVersion = exports.viteVersion = exports.reactVersion = exports.storybookVersion = exports.tsLibVersion = exports.tsNodeVersion = exports.litVersion = exports.nxVersion = void 0;
+exports.coreJsVersion = exports.viteVersion = exports.reactVersion = exports.storybookVersion = exports.minSupportedStorybookVersion = exports.tsLibVersion = exports.tsNodeVersion = exports.litVersion = exports.nxVersion = void 0;
+exports.versions = versions;
+exports.storybookMajorVersion = storybookMajorVersion;
+exports.getInstalledStorybookVersion = getInstalledStorybookVersion;
+const devkit_1 = require("@nx/devkit");
+const semver_1 = require("semver");
+const path_1 = require("path");
 exports.nxVersion = require('../../package.json').version;
 exports.litVersion = '^2.6.1';
 exports.tsNodeVersion = '10.9.1';
 exports.tsLibVersion = '^2.3.0';
+exports.minSupportedStorybookVersion = '8.0.0';
+// Fresh-install default. Latest supported major.
 exports.storybookVersion = '^10.1.0';
 exports.reactVersion = '^18.2.0';
 exports.viteVersion = '^6.0.0';
 exports.coreJsVersion = '^3.36.1';
+const latestVersions = {
+    storybookVersion: exports.storybookVersion,
+};
+const versionMap = {
+    8: { storybookVersion: '^8.6.11' },
+    9: { storybookVersion: '^9.0.5' },
+    10: { storybookVersion: '^10.1.0' },
+};
+function versions(tree) {
+    const installedStorybookMajor = storybookMajorVersion(tree);
+    if (installedStorybookMajor === undefined) {
+        return latestVersions;
+    }
+    return (versionMap[installedStorybookMajor] ?? latestVersions);
+}
+function storybookMajorVersion(tree) {
+    const installedVersion = getInstalledStorybookVersion(tree);
+    if (!installedVersion) {
+        return undefined;
+    }
+    const coerced = (0, semver_1.coerce)(installedVersion);
+    return coerced ? (0, semver_1.major)(coerced) : undefined;
+}
+function getInstalledStorybookVersion(tree) {
+    if (tree) {
+        const declared = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'storybook');
+        if (declared) {
+            return declared;
+        }
+    }
+    // Fall back to resolving from disk when no tree declaration is available.
+    try {
+        return require((0, path_1.join)('storybook', 'package.json')).version;
+    }
+    catch {
+        return undefined;
+    }
+}