@nrwl/react 14.4.2 → 14.4.3

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [14.4.2](https://github.com/nrwl/nx/compare/14.4.1...14.4.2) (2022-07-05)
+## [14.4.3](https://github.com/nrwl/nx/compare/14.4.2...14.4.3) (2022-07-16)
 
 **Note:** Version bump only for package @nrwl/react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/react",
-  "version": "14.4.2",
+  "version": "14.4.3",
   "description": "The React plugin contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
     "type": "git",
@@ -32,14 +32,14 @@
   "dependencies": {
     "@babel/core": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@nrwl/cypress": "14.4.2",
-    "@nrwl/devkit": "14.4.2",
-    "@nrwl/jest": "14.4.2",
-    "@nrwl/js": "14.4.2",
-    "@nrwl/linter": "14.4.2",
-    "@nrwl/storybook": "14.4.2",
-    "@nrwl/web": "14.4.2",
-    "@nrwl/workspace": "14.4.2",
+    "@nrwl/cypress": "14.4.3",
+    "@nrwl/devkit": "14.4.3",
+    "@nrwl/jest": "14.4.3",
+    "@nrwl/js": "14.4.3",
+    "@nrwl/linter": "14.4.3",
+    "@nrwl/storybook": "14.4.3",
+    "@nrwl/web": "14.4.3",
+    "@nrwl/workspace": "14.4.3",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
     "@storybook/node-logger": "6.1.20",
     "@svgr/webpack": "^6.1.2",
@@ -54,5 +54,5 @@
     "webpack": "^5.58.1",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "f49de61f4c19a8418ecc9eb57966ef96d869b354"
+  "gitHead": "9f7df39875d04baa2e8b8f8f12796dea6b38752a"
 }

package/src/generators/application/lib/set-defaults.js

@@ -7,7 +7,7 @@ function setDefaults(host, options) {
         return;
     }
     const workspace = (0, devkit_1.readWorkspaceConfiguration)(host);
-    if (!workspace.defaultProject) {
+    if (!options.skipDefaultProject && !workspace.defaultProject) {
         workspace.defaultProject = options.projectName;
     }
     workspace.generators = workspace.generators || {};

package/src/generators/application/lib/set-defaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAGtB,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAI,OAAO,CAAC,iBAAiB,EAAE;QAC7B,OAAO;KACR;IAED,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;QAC7B,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;KAChD;IAED,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAE5C,MAAM,IAAI,qBAAQ,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,CAAE,CAAC;IAExD,SAAS,CAAC,UAAU,mCACf,SAAS,CAAC,UAAU,KACvB,aAAa,kCACR,IAAI,KACP,WAAW,kBACT,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,IACnB,IAAI,CAAC,WAAW,GAErB,SAAS,kBACP,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,IAAI,CAAC,SAAS,GAEnB,OAAO,kBACL,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,IACnB,IAAI,CAAC,OAAO,OAGpB,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC;AAvCD,kCAuCC"}
+{"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAGtB,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAI,OAAO,CAAC,iBAAiB,EAAE;QAC7B,OAAO;KACR;IAED,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;QAC5D,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;KAChD;IAED,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAE5C,MAAM,IAAI,qBAAQ,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,CAAE,CAAC;IAExD,SAAS,CAAC,UAAU,mCACf,SAAS,CAAC,UAAU,KACvB,aAAa,kCACR,IAAI,KACP,WAAW,kBACT,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,IACnB,IAAI,CAAC,WAAW,GAErB,SAAS,kBACP,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,IAAI,CAAC,SAAS,GAEnB,OAAO,kBACL,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,IACnB,IAAI,CAAC,OAAO,OAGpB,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC;AAvCD,kCAuCC"}

package/src/generators/application/schema.d.ts

@@ -26,6 +26,7 @@ export interface Schema {
   compiler?: 'babel' | 'swc';
   remotes?: string[];
   devServerPort?: number;
+  skipDefaultProject?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/application/schema.json

@@ -159,6 +159,11 @@
       "description": "The compiler to use.",
       "enum": ["babel", "swc"],
       "default": "babel"
+    },
+    "skipDefaultProject": {
+      "description": "Skip setting the project as the default project. When `false` (the default), the project is set as the default project only if there is no default project already set.",
+      "type": "boolean",
+      "default": false
     }
   },
   "required": []

package/src/generators/component-story/schema.json

@@ -8,7 +8,8 @@
   "properties": {
     "project": {
       "type": "string",
-      "description": "The project name where to add the components.",
+      "aliases": ["name", "projectName"],
+      "description": "The project where to add the components.",
       "examples": ["shared-ui-component"],
       "$default": {
         "$source": "projectName",

package/src/generators/remote/remote.js

@@ -17,7 +17,7 @@ exports.addModuleFederationFiles = addModuleFederationFiles;
 function remoteGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = (0, normalize_options_1.normalizeOptions)(host, schema);
-        const initApp = yield (0, application_1.default)(host, options);
+        const initApp = yield (0, application_1.default)(host, Object.assign(Object.assign({}, options), { skipDefaultProject: true }));
         if (schema.host) {
             (0, update_host_with_remote_1.updateHostWithRemote)(host, schema.host, options.name);
         }

package/src/generators/remote/remote.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,+BAA4B;AAC5B,yCAAuE;AACvE,2FAAqF;AAErF,4EAAwE;AACxE,4DAA8D;AAE9D,2EAAqE;AACrE,mGAA6F;AAG7F,SAAgB,wBAAwB,CACtC,IAAU,EACV,OAAyB;IAEzB,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,GACT,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,2BAA2B,CAAC,EAC5C,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;AACJ,CAAC;AAhBD,4DAgBC;AAED,SAAsB,eAAe,CAAC,IAAU,EAAE,MAAc;;QAC9D,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,IAAA,8CAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;SACvD;QAED,wEAAwE;QACxE,sEAAsE;QACtE,kBAAkB;QAClB,IAAI,CAAC,MAAM,CACT,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,EAC5C,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAClD,CAAC;QAEF,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxC,IAAA,gEAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,OAAO,CAAC,CAAC;IACnC,CAAC;CAAA;AAxBD,0CAwBC;AAED,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,+BAA4B;AAC5B,yCAAuE;AACvE,2FAAqF;AAErF,4EAAwE;AACxE,4DAA8D;AAE9D,2EAAqE;AACrE,mGAA6F;AAG7F,SAAgB,wBAAwB,CACtC,IAAU,EACV,OAAyB;IAEzB,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,GACT,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,2BAA2B,CAAC,EAC5C,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;AACJ,CAAC;AAhBD,4DAgBC;AAED,SAAsB,eAAe,CAAC,IAAU,EAAE,MAAc;;QAC9D,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCAC1C,OAAO,KACV,kBAAkB,EAAE,IAAI,IACxB,CAAC;QAEH,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,IAAA,8CAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;SACvD;QAED,wEAAwE;QACxE,sEAAsE;QACtE,kBAAkB;QAClB,IAAI,CAAC,MAAM,CACT,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,EAC5C,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAClD,CAAC;QAEF,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxC,IAAA,gEAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,OAAO,CAAC,CAAC;IACnC,CAAC;CAAA;AA3BD,0CA2BC;AAED,kBAAe,eAAe,CAAC"}

package/src/generators/stories/schema.json

@@ -2,18 +2,19 @@
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactStorybookStories",
-  "title": "Create React Storybook stories",
-  "description": "Create stories/specs for all components declared in an app or a library.",
+  "title": "Generate React Storybook stories",
+  "description": "Generate stories/specs for all components declared in a project.",
   "type": "object",
   "properties": {
     "project": {
       "type": "string",
-      "description": "Library or application name.",
+      "aliases": ["name", "projectName"],
+      "description": "Project for which to generate stories.",
       "$default": {
         "$source": "projectName",
         "index": 0
       },
-      "x-prompt": "What's name of the project for which you want to generate stories?"
+      "x-prompt": "For which project do you want to generate stories?"
     },
     "generateCypressSpecs": {
       "type": "boolean",

package/src/generators/storybook-configuration/schema.json

@@ -8,11 +8,14 @@
   "properties": {
     "name": {
       "type": "string",
-      "description": "Project name",
+      "aliases": ["project", "projectName"],
+      "description": "Project for which to generate Storybook configuration.",
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "For which project do you want to generate Storybook configuration?",
+      "x-dropdown": "projects"
     },
     "configureCypress": {
       "type": "boolean",

package/src/migrations/update-14-0-0/replace-testing-library-react-hook.js

@@ -14,8 +14,8 @@ function update(tree) {
                 if (!file.endsWith('.spec.ts'))
                     return;
                 const content = tree.read(file).toString();
-                if (content.includes('@testing-library/react-hook')) {
-                    tree.write(file, content.replace(/@testing-library\/react-hook/g, '@testing-library/react'));
+                if (content.includes('@testing-library/react-hooks')) {
+                    tree.write(file, content.replace(/@testing-library\/react-hooks/g, '@testing-library/react'));
                 }
             });
         });

package/src/migrations/update-14-0-0/replace-testing-library-react-hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"replace-testing-library-react-hook.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/replace-testing-library-react-hook.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,SAAsB,MAAM,CAAC,IAAU;;QACrC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YAC1B,IAAI,CAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,IAAI,0CAAE,QAAQ,MAAK,iBAAiB;gBAAE,OAAO;YAEjE,IAAA,6BAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;gBACrD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAAE,OAAO;gBAEvC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC3C,IAAI,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAC,EAAE;oBACnD,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,+BAA+B,EAC/B,wBAAwB,CACzB,CACF,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAA,0CAAiC,EAC/B,IAAI,EACJ,CAAC,8BAA8B,CAAC,EAChC,CAAC,8BAA8B,CAAC,CACjC,CAAC;IACJ,CAAC;CAAA;AA1BD,wBA0BC;AAED,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"replace-testing-library-react-hook.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/replace-testing-library-react-hook.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,SAAsB,MAAM,CAAC,IAAU;;QACrC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YAC1B,IAAI,CAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,IAAI,0CAAE,QAAQ,MAAK,iBAAiB;gBAAE,OAAO;YAEjE,IAAA,6BAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;gBACrD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAAE,OAAO;gBAEvC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC3C,IAAI,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE;oBACpD,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,gCAAgC,EAChC,wBAAwB,CACzB,CACF,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAA,0CAAiC,EAC/B,IAAI,EACJ,CAAC,8BAA8B,CAAC,EAChC,CAAC,8BAA8B,CAAC,CACjC,CAAC;IACJ,CAAC;CAAA;AA1BD,wBA0BC;AAED,kBAAe,MAAM,CAAC"}

package/.eslintrc.json

@@ -1,36 +0,0 @@
-{
-  "extends": "../../.eslintrc",
-  "rules": {},
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
-    },
-    {
-      "files": ["**/*.ts"],
-      "excludedFiles": ["./src/migrations/**"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          "@nrwl/workspace",
-          "@angular-devkit/core",
-          "@angular-devkit/schematics",
-          "@angular-devkit/architect"
-        ]
-      }
-    },
-    {
-      "files": [
-        "./package.json",
-        "./generators.json",
-        "./executors.json",
-        "./migrations.json"
-      ],
-      "parser": "jsonc-eslint-parser",
-      "rules": {
-        "@nrwl/nx/nx-plugin-checks": "error"
-      }
-    }
-  ],
-  "ignorePatterns": ["!**/*"]
-}