@nx/storybook 16.5.0 → 16.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "16.5.0",
+  "version": "16.5.2",
   "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": {
@@ -30,12 +30,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/storybook": "16.5.0",
-    "@nx/cypress": "16.5.0",
-    "@nx/devkit": "16.5.0",
-    "@nx/js": "16.5.0",
-    "@nx/linter": "16.5.0",
-    "@nx/workspace": "16.5.0",
+    "@nrwl/storybook": "16.5.2",
+    "@nx/cypress": "16.5.2",
+    "@nx/devkit": "16.5.2",
+    "@nx/js": "16.5.2",
+    "@nx/linter": "16.5.2",
+    "@nx/workspace": "16.5.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "dotenv": "~10.0.0",
     "semver": "7.5.3"
@@ -44,5 +44,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "eaebcc34f92db2200dab0bde2e2e1dde107a47bf"
+  "gitHead": "928273940d11aa7dea87cb625a92f2c3ec62e726"
 }

package/src/generators/configuration/lib/util-functions.js

@@ -375,7 +375,7 @@ function createProjectStorybookDir(tree, projectName, uiFramework, js, tsConfigu
 exports.createProjectStorybookDir = createProjectStorybookDir;
 function getTsConfigPath(tree, projectName, path) {
     const { root, projectType } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    return (0, path_1.join)(root, path && path.length > 0
+    return (0, path_1.join)(root, (path === null || path === void 0 ? void 0 : path.length) > 0
         ? path
         : projectType === 'application'
             ? 'tsconfig.app.json'
@@ -393,7 +393,8 @@ function addBuildStorybookToCacheableOperations(tree) {
 }
 exports.addBuildStorybookToCacheableOperations = addBuildStorybookToCacheableOperations;
 function projectIsRootProjectInStandaloneWorkspace(projectRoot) {
-    return (0, path_1.relative)(devkit_1.workspaceRoot, projectRoot).length === 0;
+    var _a;
+    return ((_a = (0, path_1.relative)(devkit_1.workspaceRoot, projectRoot)) === null || _a === void 0 ? void 0 : _a.length) === 0;
 }
 exports.projectIsRootProjectInStandaloneWorkspace = projectIsRootProjectInStandaloneWorkspace;
 function workspaceHasRootProject(tree) {
@@ -449,20 +450,20 @@ function getViteConfigFilePath(tree, projectRoot, configFile) {
 }
 exports.getViteConfigFilePath = getViteConfigFilePath;
 function renameAndMoveOldTsConfig(projectRoot, pathToStorybookConfigFile, tree) {
-    if (pathToStorybookConfigFile) {
+    if (pathToStorybookConfigFile && tree.exists(pathToStorybookConfigFile)) {
         (0, devkit_1.updateJson)(tree, pathToStorybookConfigFile, (json) => {
-            var _a;
+            var _a, _b, _c, _d;
             if ((_a = json.extends) === null || _a === void 0 ? void 0 : _a.startsWith('../')) {
                 // drop one level of nesting
                 json.extends = json.extends.replace('../', './');
             }
-            for (let i = 0; i < json.files.length; i++) {
+            for (let i = 0; i < ((_b = json.files) === null || _b === void 0 ? void 0 : _b.length); i++) {
                 // drop one level of nesting
                 if (json.files[i].startsWith('../../../')) {
                     json.files[i] = json.files[i].replace('../../../', '../../');
                 }
             }
-            for (let i = 0; i < json.include.length; i++) {
+            for (let i = 0; i < ((_c = json.include) === null || _c === void 0 ? void 0 : _c.length); i++) {
                 if (json.include[i].startsWith('../')) {
                     json.include[i] = json.include[i].replace('../', '');
                 }
@@ -473,7 +474,7 @@ function renameAndMoveOldTsConfig(projectRoot, pathToStorybookConfigFile, tree)
                     json.include[i] = '.storybook/*.ts';
                 }
             }
-            for (let i = 0; i < json.exclude.length; i++) {
+            for (let i = 0; i < ((_d = json.exclude) === null || _d === void 0 ? void 0 : _d.length); i++) {
                 if (json.exclude[i].startsWith('../')) {
                     json.exclude[i] = json.exclude[i].replace('../', 'src/');
                 }
@@ -483,14 +484,26 @@ function renameAndMoveOldTsConfig(projectRoot, pathToStorybookConfigFile, tree)
         tree.rename(pathToStorybookConfigFile, (0, devkit_1.joinPathFragments)(projectRoot, `tsconfig.storybook.json`));
     }
     const projectTsConfig = (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json');
-    (0, devkit_1.updateJson)(tree, projectTsConfig, (json) => {
-        for (let i = 0; i < json.references.length; i++) {
-            if (json.references[i].path === './.storybook/tsconfig.json') {
-                json.references[i].path = './tsconfig.storybook.json';
-                break;
+    if (tree.exists(projectTsConfig)) {
+        (0, devkit_1.updateJson)(tree, projectTsConfig, (json) => {
+            var _a;
+            for (let i = 0; i < ((_a = json.references) === null || _a === void 0 ? void 0 : _a.length); i++) {
+                if (json.references[i].path === './.storybook/tsconfig.json') {
+                    json.references[i].path = './tsconfig.storybook.json';
+                    break;
+                }
             }
-        }
-        return json;
-    });
+            return json;
+        });
+    }
+    const projectEsLintFile = (0, devkit_1.joinPathFragments)(projectRoot, '.eslintrc.json');
+    if (tree.exists(projectEsLintFile)) {
+        (0, devkit_1.updateJson)(tree, projectEsLintFile, (json) => {
+            const jsonString = JSON.stringify(json);
+            const newJsonString = jsonString.replace(/\.storybook\/tsconfig\.json/g, 'tsconfig.storybook.json');
+            json = JSON.parse(newJsonString);
+            return json;
+        });
+    }
 }
 exports.renameAndMoveOldTsConfig = renameAndMoveOldTsConfig;

package/src/utils/utilities.js

@@ -181,6 +181,7 @@ function isTheFileAStory(tree, path) {
             ]);
             importSpecifiers.forEach((importSpecifier) => {
                 if (importSpecifier.getText() === 'Story' ||
+                    importSpecifier.getText() === 'Meta' ||
                     importSpecifier.getText() === 'storiesOf' ||
                     importSpecifier.getText() === 'ComponentStory') {
                     nodeContainsStoryImport = true;

package/src/utils/versions.d.ts

@@ -6,4 +6,4 @@ export declare const litVersion = "^2.6.1";
 export declare const tsNodeVersion = "10.9.1";
 export declare const storybookVersion = "^7.0.24";
 export declare const reactVersion = "^18.2.0";
-export declare const viteVersion = "^4.3.4";
+export declare const viteVersion = "~4.3.9";

package/src/utils/versions.js

@@ -9,4 +9,4 @@ exports.litVersion = '^2.6.1';
 exports.tsNodeVersion = '10.9.1';
 exports.storybookVersion = '^7.0.24';
 exports.reactVersion = '^18.2.0';
-exports.viteVersion = '^4.3.4';
+exports.viteVersion = '~4.3.9';