@nrwl/react 14.6.0-beta.4 → 14.6.0-beta.7

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.6.0-beta.4](https://github.com/nrwl/nx/compare/14.5.6...14.6.0-beta.4) (2022-08-18)
+# [14.6.0-beta.7](https://github.com/nrwl/nx/compare/14.5.7...14.6.0-beta.7) (2022-08-19)
 
 **Note:** Version bump only for package @nrwl/react

package/migrations.json

@@ -59,6 +59,12 @@
       "version": "14.1.0-beta.0",
       "description": "Update external option in projects for Emotion",
       "factory": "./src/migrations/update-14-1-0/update-external-emotion-jsx-runtime"
+    },
+    "update-babel-jest-transform-option": {
+      "cli": "nx",
+      "version": "14.6.0-beta.0",
+      "description": "Update babel-jest to include the @nrwl/react/babel preset in project jest config",
+      "factory": "./src/migrations/update-14-6-0/add-preset-jest-config"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/react",
-  "version": "14.6.0-beta.4",
+  "version": "14.6.0-beta.7",
   "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.6.0-beta.4",
-    "@nrwl/devkit": "14.6.0-beta.4",
-    "@nrwl/jest": "14.6.0-beta.4",
-    "@nrwl/js": "14.6.0-beta.4",
-    "@nrwl/linter": "14.6.0-beta.4",
-    "@nrwl/storybook": "14.6.0-beta.4",
-    "@nrwl/web": "14.6.0-beta.4",
-    "@nrwl/workspace": "14.6.0-beta.4",
+    "@nrwl/cypress": "14.6.0-beta.7",
+    "@nrwl/devkit": "14.6.0-beta.7",
+    "@nrwl/jest": "14.6.0-beta.7",
+    "@nrwl/js": "14.6.0-beta.7",
+    "@nrwl/linter": "14.6.0-beta.7",
+    "@nrwl/storybook": "14.6.0-beta.7",
+    "@nrwl/web": "14.6.0-beta.7",
+    "@nrwl/workspace": "14.6.0-beta.7",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@svgr/webpack": "^6.1.2",
     "chalk": "4.1.0",
@@ -54,5 +54,5 @@
     "webpack": "^5.58.1",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "971bcbe32c4d42ffe4093daa8508f24726240a0c"
+  "gitHead": "c0dd2f58324ddc21383a76805f1b6fd19d2f4a3e"
 }

package/plugins/jest.js

@@ -11,7 +11,8 @@ module.exports = {
             // https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6
             const pascalCaseFilename = (0, devkit_1.names)(path.parse(filename).name).className;
             const componentName = `Svg${pascalCaseFilename}`;
-            return `const React = require('react');
+            return {
+                code: `const React = require('react');
       module.exports = {
         __esModule: true,
         default: ${assetFilename},
@@ -26,7 +27,8 @@ module.exports = {
             })
           };
         }),
-      };`;
+      };`,
+            };
         }
         if (JS_SOURCE_EXTENSIONS.includes(path.extname(filename))) {
             const transformer = getJsTransform();
@@ -34,7 +36,9 @@ module.exports = {
                 return transformer.process(src, filename, options);
         }
         // Fallback for unknown extensions
-        return `module.exports = ${assetFilename};`;
+        return {
+            code: `module.exports = ${assetFilename};`,
+        };
     },
 };
 function getJsTransform() {

package/plugins/jest.js.map

@@ -1 +1 @@
-{"version":3,"file":"jest.js","sourceRoot":"","sources":["../../../../packages/react/plugins/jest.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAC7B,yCAAqC;AAErC,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE5E,MAAM,CAAC,OAAO,GAAG;IACf,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE9D,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAC5B,gDAAgD;YAChD,kHAAkH;YAClH,MAAM,kBAAkB,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC;YACtE,MAAM,aAAa,GAAG,MAAM,kBAAkB,EAAE,CAAC;YACjD,OAAO;;;mBAGM,aAAa;oDACoB,aAAa;;;;;;;0BAOvC,aAAa;;;;SAI9B,CAAC;SACL;QAED,IAAI,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE;YACzD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;YACrC,IAAI,WAAW;gBAAE,OAAO,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SACrE;QAED,kCAAkC;QAClC,OAAO,oBAAoB,aAAa,GAAG,CAAC;IAC9C,CAAC;CACF,CAAC;AAEF,SAAS,cAAc;IACrB,IAAI;QACF,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;KACtC;IAAC,WAAM;QACN,UAAU;KACX;IAED,IAAI;QACF,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,iBAAiB,EAAE,CAAC;KACjD;IAAC,WAAM;QACN,UAAU;KACX;AACH,CAAC"}
+{"version":3,"file":"jest.js","sourceRoot":"","sources":["../../../../packages/react/plugins/jest.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAC7B,yCAAqC;AAErC,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE5E,MAAM,CAAC,OAAO,GAAG;IACf,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE9D,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAC5B,gDAAgD;YAChD,kHAAkH;YAClH,MAAM,kBAAkB,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC;YACtE,MAAM,aAAa,GAAG,MAAM,kBAAkB,EAAE,CAAC;YACjD,OAAO;gBACL,IAAI,EAAE;;;mBAGK,aAAa;oDACoB,aAAa;;;;;;;0BAOvC,aAAa;;;;SAI9B;aACF,CAAC;SACH;QAED,IAAI,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE;YACzD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;YACrC,IAAI,WAAW;gBAAE,OAAO,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SACrE;QAED,kCAAkC;QAClC,OAAO;YACL,IAAI,EAAE,oBAAoB,aAAa,GAAG;SAC3C,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,SAAS,cAAc;IACrB,IAAI;QACF,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;KACtC;IAAC,WAAM;QACN,UAAU;KACX;IAED,IAAI;QACF,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,iBAAiB,EAAE,CAAC;KACjD;IAAC,WAAM;QACN,UAAU;KACX;AACH,CAAC"}

package/src/migrations/update-14-6-0/add-preset-jest-config.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nrwl/devkit';
+export declare function addBabelJestPresetTransformerOption(tree: Tree): void;
+export default addBabelJestPresetTransformerOption;

package/src/migrations/update-14-6-0/add-preset-jest-config.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addBabelJestPresetTransformerOption = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+function addBabelJestPresetTransformerOption(tree) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (options, project, target, configuration) => {
+        if (options.jestConfig &&
+            tree.exists(options.jestConfig) &&
+            isReactProject(tree, (0, devkit_1.readProjectConfiguration)(tree, project))) {
+            const oldConfig = tree.read(options.jestConfig, 'utf-8');
+            const updatedConfig = tsquery_1.tsquery.replace(oldConfig, 'PropertyAssignment > StringLiteral[value="babel-jest"]', (node) => {
+                return `['babel-jest', { presets: ['@nrwl/react/babel'] }]`;
+            });
+            tree.write(options.jestConfig, updatedConfig);
+        }
+    });
+}
+exports.addBabelJestPresetTransformerOption = addBabelJestPresetTransformerOption;
+function isReactProject(tree, projectConfig) {
+    var _a, _b;
+    const knownInvalidExecutors = [
+        '@nrwl/next:build',
+        '@nrwl/angular',
+        '@angular-devkit/build-angular:browser',
+        '@nrwl/js:tsc',
+        '@nrwl/js:swc',
+        '@nrwl/workspace:run-commands',
+        'nx:run-commands',
+        '@nrwl/node:webpack',
+    ];
+    if (knownInvalidExecutors.includes((_b = (_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) ||
+        tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'next.config.js'))) {
+        return false;
+    }
+    return true;
+}
+exports.default = addBabelJestPresetTransformerOption;
+//# sourceMappingURL=add-preset-jest-config.js.map

package/src/migrations/update-14-6-0/add-preset-jest-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-preset-jest-config.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-6-0/add-preset-jest-config.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,iGAA8F;AAC9F,uDAAoD;AAGpD,SAAgB,mCAAmC,CAAC,IAAU;IAC5D,IAAA,+CAAsB,EACpB,IAAI,EACJ,iBAAiB,EACjB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE;QAC1C,IACE,OAAO,CAAC,UAAU;YAClB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;YAC/B,cAAc,CAAC,IAAI,EAAE,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EAC7D;YACA,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACzD,MAAM,aAAa,GAAG,iBAAO,CAAC,OAAO,CACnC,SAAS,EACT,wDAAwD,EACxD,CAAC,IAAmB,EAAE,EAAE;gBACtB,OAAO,oDAAoD,CAAC;YAC9D,CAAC,CACF,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;SAC/C;IACH,CAAC,CACF,CAAC;AACJ,CAAC;AAtBD,kFAsBC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,aAAmC;;IACrE,MAAM,qBAAqB,GAAG;QAC5B,kBAAkB;QAClB,eAAe;QACf,uCAAuC;QACvC,cAAc;QACd,cAAc;QACd,8BAA8B;QAC9B,iBAAiB;QACjB,oBAAoB;KACrB,CAAC;IACF,IACE,qBAAqB,CAAC,QAAQ,CAAC,MAAA,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,0CAAE,KAAK,0CAAE,QAAQ,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,EACpE;QACA,OAAO,KAAK,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,kBAAe,mCAAmC,CAAC"}

package/src/utils/jest-utils.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestConfigContent = void 0;
 function updateJestConfigContent(content) {
-    return content.replace('transform: {', "transform: {\n    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',");
+    return content
+        .replace('transform: {', "transform: {\n    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',")
+        .replace(`'babel-jest'`, `['babel-jest', { presets: ['@nrwl/react/babel'] }]`);
 }
 exports.updateJestConfigContent = updateJestConfigContent;
 //# sourceMappingURL=jest-utils.js.map

package/src/utils/jest-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"jest-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/jest-utils.ts"],"names":[],"mappings":";;;AAAA,SAAgB,uBAAuB,CAAC,OAAe;IACrD,OAAO,OAAO,CAAC,OAAO,CACpB,cAAc,EACd,wFAAwF,CACzF,CAAC;AACJ,CAAC;AALD,0DAKC"}
+{"version":3,"file":"jest-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/jest-utils.ts"],"names":[],"mappings":";;;AAAA,SAAgB,uBAAuB,CAAC,OAAe;IACrD,OAAO,OAAO;SACX,OAAO,CACN,cAAc,EACd,wFAAwF,CACzF;SACA,OAAO,CACN,cAAc,EACd,oDAAoD,CACrD,CAAC;AACN,CAAC;AAVD,0DAUC"}