@nrwl/react 14.8.8 → 14.9.0-beta.1

package/plugins/component-testing/index.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxComponentTestingPreset = void 0;
+const tslib_1 = require("tslib");
 const cypress_preset_1 = require("@nrwl/cypress/plugins/cypress-preset");
 const devkit_1 = require("@nrwl/devkit");
-const normalize_options_1 = require("@nrwl/webpack/src/executors/webpack/lib/normalize-options");
-const get_webpack_config_1 = require("@nrwl/webpack/src/executors/webpack/lib/get-webpack-config");
-const custom_webpack_1 = require("@nrwl/webpack/src/utils/webpack/custom-webpack");
-const webpack_fallback_1 = require("./webpack-fallback");
+const ct_helpers_1 = require("@nrwl/cypress/src/utils/ct-helpers");
 /**
  * React nx preset for Cypress Component Testing
  *
@@ -26,13 +24,16 @@ const webpack_fallback_1 = require("./webpack-fallback");
  * @param options override options
  */
 function nxComponentTestingPreset(pathToConfig, options) {
+    if ((options === null || options === void 0 ? void 0 : options.bundler) === 'vite') {
+        return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', devServer: Object.assign({}, { framework: 'react', bundler: 'vite' }) });
+    }
     let webpackConfig;
     try {
         const graph = (0, devkit_1.readCachedProjectGraph)();
-        const { targets: ctTargets, name: ctProjectName } = (0, cypress_preset_1.getProjectConfigByPath)(graph, pathToConfig);
+        const { targets: ctTargets, name: ctProjectName } = (0, ct_helpers_1.getProjectConfigByPath)(graph, pathToConfig);
         const ctTargetName = (options === null || options === void 0 ? void 0 : options.ctTargetName) || 'component-test';
         const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
-        const ctExecutorContext = (0, cypress_preset_1.createExecutorContext)(graph, ctTargets, ctProjectName, ctTargetName, ctConfigurationName);
+        const ctExecutorContext = (0, ct_helpers_1.createExecutorContext)(graph, ctTargets, ctProjectName, ctTargetName, ctConfigurationName);
         const ctExecutorOptions = (0, devkit_1.readTargetOptions)({
             project: ctProjectName,
             target: ctTargetName,
@@ -48,18 +49,13 @@ function nxComponentTestingPreset(pathToConfig, options) {
         devkit_1.logger.warn((0, devkit_1.stripIndents) `Unable to build a webpack config with the project graph. 
       Falling back to default webpack config.`);
         devkit_1.logger.warn(e);
-        webpackConfig = (0, webpack_fallback_1.buildBaseWebpackConfig)({
-            tsConfigPath: 'tsconfig.cy.json',
+        const { buildBaseWebpackConfig } = require('./webpack-fallback');
+        webpackConfig = buildBaseWebpackConfig({
+            tsConfigPath: 'cypress/tsconfig.cy.json',
             compiler: 'babel',
         });
     }
-    return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { devServer: {
-            // cypress uses string union type,
-            // need to use const to prevent typing to string
-            framework: 'react',
-            bundler: 'webpack',
-            webpackConfig,
-        } });
+    return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', devServer: Object.assign(Object.assign({}, { framework: 'react', bundler: 'webpack' }), { webpackConfig }) });
 }
 exports.nxComponentTestingPreset = nxComponentTestingPreset;
 /**
@@ -90,7 +86,7 @@ function withSchemaDefaults(target, context) {
 }
 function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
     var _a, _b;
-    const parsed = (0, devkit_1.parseTargetString)(buildTarget);
+    const parsed = (0, devkit_1.parseTargetString)(buildTarget, graph);
     const buildableProjectConfig = (_a = graph.nodes[parsed.project]) === null || _a === void 0 ? void 0 : _a.data;
     const ctProjectConfig = (_b = graph.nodes[componentTestingProjectName]) === null || _b === void 0 ? void 0 : _b.data;
     if (!buildableProjectConfig || !ctProjectConfig) {
@@ -100,36 +96,27 @@ function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
     Has component config? ${!!ctProjectConfig}
     `);
     }
-    const context = (0, cypress_preset_1.createExecutorContext)(graph, buildableProjectConfig.targets, parsed.project, parsed.target, parsed.target);
-    const options = (0, normalize_options_1.normalizeOptions)(withSchemaDefaults(parsed, context), devkit_1.workspaceRoot, buildableProjectConfig.sourceRoot);
-    const isScriptOptimizeOn = typeof options.optimization === 'boolean'
-        ? options.optimization
-        : options.optimization && options.optimization.scripts
-            ? options.optimization.scripts
-            : false;
-    let customWebpack;
+    const context = (0, ct_helpers_1.createExecutorContext)(graph, buildableProjectConfig.targets, parsed.project, parsed.target, parsed.target);
+    const { normalizeOptions, } = require('@nrwl/webpack/src/executors/webpack/lib/normalize-options');
+    const { resolveCustomWebpackConfig, } = require('@nrwl/webpack/src/utils/webpack/custom-webpack');
+    const { getWebpackConfig, } = require('@nrwl/webpack/src/executors/webpack/lib/get-webpack-config');
+    const options = normalizeOptions(withSchemaDefaults(parsed, context), devkit_1.workspaceRoot, buildableProjectConfig.root, buildableProjectConfig.sourceRoot);
     if (options.webpackConfig) {
-        customWebpack = (0, custom_webpack_1.resolveCustomWebpackConfig)(options.webpackConfig, options.tsConfig);
-        if (typeof customWebpack.then === 'function') {
-            // cypress configs have to be sync.
-            // TODO(caleb): there might be a workaround with setUpNodeEvents preprocessor?
-            devkit_1.logger.warn((0, devkit_1.stripIndents) `Nx React Component Testing Preset currently doesn't support custom async webpack configs. 
-      Skipping the custom webpack config option '${options.webpackConfig}'`);
-            customWebpack = null;
-        }
-    }
-    const defaultWebpack = (0, get_webpack_config_1.getWebpackConfig)(context, options, true, isScriptOptimizeOn, {
-        root: ctProjectConfig.root,
-        sourceRoot: ctProjectConfig.sourceRoot,
-        configuration: parsed.configuration,
-    });
-    if (customWebpack) {
-        return customWebpack(defaultWebpack, {
-            options,
-            context,
-            configuration: parsed.configuration,
+        let customWebpack;
+        customWebpack = resolveCustomWebpackConfig(options.webpackConfig, options.tsConfig);
+        return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            customWebpack = yield customWebpack;
+            // TODO(jack): Once webpackConfig is always set in @nrwl/webpack:webpack, we no longer need this default.
+            const defaultWebpack = getWebpackConfig(context, Object.assign(Object.assign({}, options), { root: devkit_1.workspaceRoot, projectRoot: ctProjectConfig.root, sourceRoot: ctProjectConfig.sourceRoot }));
+            if (customWebpack) {
+                return yield customWebpack(defaultWebpack, {
+                    options,
+                    context,
+                    configuration: parsed.configuration,
+                });
+            }
+            return defaultWebpack;
         });
     }
-    return defaultWebpack;
 }
 //# sourceMappingURL=index.js.map

package/plugins/component-testing/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":";;;AAAA,yEAK8C;AAE9C,yCAUsB;AAEtB,iGAA6F;AAC7F,mGAA8F;AAC9F,mFAA4F;AAC5F,yDAA4D;AAE5D;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,wBAAwB,CACtC,YAAoB,EACpB,OAAmC;IAEnC,IAAI,aAAa,CAAC;IAClB,IAAI;QACF,MAAM,KAAK,GAAG,IAAA,+BAAsB,GAAE,CAAC;QACvC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,IAAA,uCAAsB,EACxE,KAAK,EACL,YAAY,CACb,CAAC;QACF,MAAM,YAAY,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,KAAI,gBAAgB,CAAC;QAC/D,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;QAExE,MAAM,iBAAiB,GAAG,IAAA,sCAAqB,EAC7C,KAAK,EACL,SAAS,EACT,aAAa,EACb,YAAY,EACZ,mBAAmB,CACpB,CAAC;QAEF,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC;YACE,OAAO,EAAE,aAAa;YACtB,MAAM,EAAE,YAAY;YACpB,aAAa,EAAE,mBAAmB;SACnC,EACD,iBAAiB,CAClB,CAAC;QAEF,MAAM,WAAW,GAAG,iBAAiB,CAAC,eAAe,CAAC;QAEtD,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CACb,gEAAgE,YAAY,oBAAoB,aAAa,WAAW,CACzH,CAAC;SACH;QAED,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;KACvE;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,IAAI,CACT,IAAA,qBAAY,EAAA;8CAC4B,CACzC,CAAC;QACF,eAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,aAAa,GAAG,IAAA,yCAAsB,EAAC;YACrC,YAAY,EAAE,kBAAkB;YAChC,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;KACJ;IACD,uCACK,IAAA,oCAAmB,EAAC,YAAY,CAAC,KACpC,SAAS,EAAE;YACT,kCAAkC;YAClC,gDAAgD;YAChD,SAAS,EAAE,OAAO;YAClB,OAAO,EAAE,SAAS;YAClB,aAAa;SACL,IACV;AACJ,CAAC;AA7DD,4DA6DC;AAED;;GAEG;AACH,SAAS,kBAAkB,CACzB,MAAc,EACd,OAAwB;;IAExB,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAAyB,MAAM,EAAE,OAAO,CAAC,CAAC;IAE3E,MAAA,OAAO,CAAC,QAAQ,oCAAhB,OAAO,CAAC,QAAQ,GAAK,OAAO,EAAC;IAC7B,MAAA,OAAO,CAAC,gBAAgB,oCAAxB,OAAO,CAAC,gBAAgB,GAAK,IAAI,EAAC;IAClC,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,YAAY,oCAApB,OAAO,CAAC,YAAY,GAAK,IAAI,EAAC;IAC9B,MAAA,OAAO,CAAC,SAAS,oCAAjB,OAAO,CAAC,SAAS,GAAK,IAAI,EAAC;IAC3B,MAAA,OAAO,CAAC,MAAM,oCAAd,OAAO,CAAC,MAAM,GAAK,EAAE,EAAC;IACtB,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;IACvB,MAAA,OAAO,CAAC,MAAM,oCAAd,OAAO,CAAC,MAAM,GAAK,EAAE,EAAC;IACtB,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;IACvB,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,aAAa,oCAArB,OAAO,CAAC,aAAa,GAAK,MAAM,EAAC;IACjC,MAAA,OAAO,CAAC,UAAU,oCAAlB,OAAO,CAAC,UAAU,GAAK,IAAI,EAAC;IAC5B,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,UAAU,oCAAlB,OAAO,CAAC,UAAU,GAAK,CAAC,EAAC;IACzB,MAAA,OAAO,CAAC,gBAAgB,oCAAxB,OAAO,CAAC,gBAAgB,GAAK,EAAE,EAAC;IAChC,MAAA,OAAO,CAAC,mBAAmB,oCAA3B,OAAO,CAAC,mBAAmB,GAAK,IAAI,EAAC;IACrC,MAAA,OAAO,CAAC,iBAAiB,oCAAzB,OAAO,CAAC,iBAAiB,GAAK,IAAI,EAAC;IACnC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAmB,EACnB,WAAmB,EACnB,2BAAmC;;IAEnC,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAAC,WAAW,CAAC,CAAC;IAE9C,MAAM,sBAAsB,GAAG,MAAA,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,0CAAE,IAAI,CAAC;IACjE,MAAM,eAAe,GAAG,MAAA,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,0CAAE,IAAI,CAAC;IAEvE,IAAI,CAAC,sBAAsB,IAAI,CAAC,eAAe,EAAE;QAC/C,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA;0BACN,WAAW;wBACb,CAAC,CAAC,sBAAsB;4BACpB,CAAC,CAAC,eAAe;KACxC,CAAC,CAAC;KACJ;IACD,MAAM,OAAO,GAAG,IAAA,sCAAqB,EACnC,KAAK,EACL,sBAAsB,CAAC,OAAO,EAC9B,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,MAAM,CACd,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAC9B,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,sBAAa,EACb,sBAAsB,CAAC,UAAW,CACnC,CAAC;IAEF,MAAM,kBAAkB,GACtB,OAAO,OAAO,CAAC,YAAY,KAAK,SAAS;QACvC,CAAC,CAAC,OAAO,CAAC,YAAY;QACtB,CAAC,CAAC,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO;YACtD,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO;YAC9B,CAAC,CAAC,KAAK,CAAC;IAEZ,IAAI,aAAa,CAAC;IAClB,IAAI,OAAO,CAAC,aAAa,EAAE;QACzB,aAAa,GAAG,IAAA,2CAA0B,EACxC,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,QAAQ,CACjB,CAAC;QAEF,IAAI,OAAO,aAAa,CAAC,IAAI,KAAK,UAAU,EAAE;YAC5C,mCAAmC;YACnC,8EAA8E;YAC9E,eAAM,CAAC,IAAI,CAAC,IAAA,qBAAY,EAAA;mDACqB,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC;YACvE,aAAa,GAAG,IAAI,CAAC;SACtB;KACF;IAED,MAAM,cAAc,GAAG,IAAA,qCAAgB,EACrC,OAAO,EACP,OAAO,EACP,IAAI,EACJ,kBAAkB,EAClB;QACE,IAAI,EAAE,eAAe,CAAC,IAAI;QAC1B,UAAU,EAAE,eAAe,CAAC,UAAU;QACtC,aAAa,EAAE,MAAM,CAAC,aAAa;KACpC,CACF,CAAC;IAEF,IAAI,aAAa,EAAE;QACjB,OAAO,aAAa,CAAC,cAAc,EAAE;YACnC,OAAO;YACP,OAAO;YACP,aAAa,EAAE,MAAM,CAAC,aAAa;SACpC,CAAC,CAAC;KACJ;IACD,OAAO,cAAc,CAAC;AACxB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":"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"}

package/plugins/component-testing/webpack-fallback.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildBaseWebpackConfig = void 0;
-const get_webpack_config_1 = require("@nrwl/webpack/src/executors/webpack/lib/get-webpack-config");
 const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
+const webpack_1 = require("@nrwl/webpack");
 function buildBaseWebpackConfig({ tsConfigPath = 'tsconfig.cy.json', compiler = 'babel', }) {
     const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
     const config = {
@@ -76,7 +76,7 @@ exports.buildBaseWebpackConfig = buildBaseWebpackConfig;
 const loaderModulesOptions = {
     modules: {
         mode: 'local',
-        getLocalIdent: get_webpack_config_1.getCSSModuleLocalIdent,
+        getLocalIdent: webpack_1.getCSSModuleLocalIdent,
     },
     importLoaders: 1,
 };

package/plugins/component-testing/webpack-fallback.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack-fallback.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/webpack-fallback.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpack-fallback.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/webpack-fallback.ts"],"names":[],"mappings":"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"}

package/plugins/jest.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
 const JS_SOURCE_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.cjs'];
 module.exports = {
     process(src, filename, options) {
+        var _a, _b;
         const assetFilename = JSON.stringify(path.basename(filename));
         if (filename.match(/\.svg$/)) {
             // Based on how SVGR generates a component name:
@@ -31,7 +32,7 @@ module.exports = {
             };
         }
         if (JS_SOURCE_EXTENSIONS.includes(path.extname(filename))) {
-            const transformer = getJsTransform();
+            const transformer = getJsTransform((_b = (_a = options.config) === null || _a === void 0 ? void 0 : _a.transform) !== null && _b !== void 0 ? _b : []);
             if (transformer)
                 return transformer.process(src, filename, options);
         }
@@ -41,17 +42,20 @@ module.exports = {
         };
     },
 };
-function getJsTransform() {
+function getJsTransform(transformers) {
+    var _a;
     try {
-        return require('babel-jest').default;
+        if ((_a = transformers === null || transformers === void 0 ? void 0 : transformers[1]) === null || _a === void 0 ? void 0 : _a.includes('@swc/jest')) {
+            return require('@swc/jest').createTransformer();
+        }
     }
-    catch (_a) {
+    catch (_b) {
         // ignored
     }
     try {
-        return require('@swc/jest').createTransformer();
+        return require('babel-jest').default.createTransformer();
     }
-    catch (_b) {
+    catch (_c) {
         // ignored
     }
 }

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;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"}
+{"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,CAAC,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,SAAS,mCAAI,EAAE,CAAC,CAAC;YACpE,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,CAAC,YAAwC;;IAC9D,IAAI;QACF,IAAI,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,CAAC,CAAC,0CAAE,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC5C,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,iBAAiB,EAAE,CAAC;SACjD;KACF;IAAC,WAAM;QACN,UAAU;KACX;IAED,IAAI;QACF,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;KAC1D;IAAC,WAAM;QACN,UAAU;KACX;AACH,CAAC"}

package/plugins/storybook/index.d.ts

@@ -1,7 +1,3 @@
 import { Configuration } from 'webpack';
-export declare const babelDefault: () => Record<string, (string | [
-    string,
-    object
-])[]>;
 export declare const core: (prev: any, options: any) => any;
 export declare const webpack: (storybookWebpackConfig: Configuration, options: any) => Promise<Configuration>;

package/plugins/storybook/index.js

@@ -1,17 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webpack = exports.core = exports.babelDefault = void 0;
+exports.webpack = exports.core = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const config_1 = require("@nrwl/webpack/src/utils/config");
-const get_webpack_config_1 = require("@nrwl/webpack/src/executors/webpack/lib/get-webpack-config");
-const version_utils_1 = require("@nrwl/workspace/src/utilities/version-utils");
 const path_1 = require("path");
-const semver_1 = require("semver");
 const webpack_1 = require("webpack");
-const mergeWebpack = require("webpack-merge");
 const merge_plugins_1 = require("./merge-plugins");
-const reactWebpackConfig = require('../webpack');
+const with_react_1 = require("../with-react");
 // This is shamelessly taken from CRA and modified for NX use
 // https://github.com/facebook/create-react-app/blob/4784997f0682e75eb32a897b4ffe34d735912e6c/packages/react-scripts/config/env.js#L71
 function getClientEnvironment(mode) {
@@ -46,82 +42,36 @@ function getClientEnvironment(mode) {
     };
     return { stringified };
 }
-const babelDefault = () => {
-    // Add babel plugin for styled-components or emotion.
-    // We don't have a good way to know when a project uses one or the other, so
-    // add the plugin only if the other style package isn't used.
-    const packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(devkit_1.workspaceRoot, 'package.json'));
-    const deps = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies);
-    const hasStyledComponents = !!deps['styled-components'];
-    const plugins = [];
-    if (hasStyledComponents) {
-        plugins.push(['styled-components', { ssr: false }]);
-    }
-    return {
-        presets: [],
-        plugins: [...plugins],
-    };
-};
-exports.babelDefault = babelDefault;
 const core = (prev, options) => (Object.assign(Object.assign({}, prev), { disableWebpackDefaults: true }));
 exports.core = core;
 const webpack = (storybookWebpackConfig = {}, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d, _e;
-    devkit_1.logger.info('=> Loading Nrwl React Storybook preset from "@nrwl/react/plugins/storybook"');
+    devkit_1.logger.info('=> Loading Nx React Storybook Addon from "@nrwl/react/plugins/storybook"');
+    // In case anyone is missing dep and did not run migrations.
+    // See: https://github.com/nrwl/nx/issues/14455
+    try {
+        require.resolve('@nrwl/webpack');
+    }
+    catch (_f) {
+        throw new Error(`'@nrwl/webpack' package is not installed. Install it and try again.`);
+    }
+    const { withNx, withWeb } = require('@nrwl/webpack');
     const tsconfigPath = (0, path_1.join)(options.configDir, 'tsconfig.json');
-    const builderOptions = Object.assign(Object.assign({}, options), { root: options.configDir, sourceRoot: '', fileReplacements: [], sourceMap: {
-            hidden: false,
-            scripts: true,
-            styles: true,
-            vendors: false,
-        }, styles: [], optimization: {}, tsConfig: tsconfigPath, extractCss: storybookWebpackConfig.mode === 'production' });
-    const esm = true;
-    const isScriptOptimizeOn = storybookWebpackConfig.mode !== 'development';
-    const extractCss = storybookWebpackConfig.mode === 'production';
+    const builderOptions = Object.assign(Object.assign({}, options), { root: options.configDir, 
+        // These are blank because root is the absolute path to .storybook folder
+        projectRoot: '', sourceRoot: '', fileReplacements: [], sourceMap: true, styles: (_a = options.styles) !== null && _a !== void 0 ? _a : [], optimization: {}, tsConfig: tsconfigPath, extractCss: storybookWebpackConfig.mode === 'production', target: 'web' });
     // ESM build for modern browsers.
-    const baseWebpackConfig = mergeWebpack.merge([
-        (0, config_1.getBaseWebpackPartial)(builderOptions, {
-            esm,
-            isScriptOptimizeOn,
-            skipTypeCheck: true,
-        }),
-        (0, get_webpack_config_1.getStylesPartial)(options.workspaceRoot, options.configDir, builderOptions, extractCss),
-    ]);
-    // run it through the React customizations
-    const finalConfig = reactWebpackConfig(baseWebpackConfig);
-    // Check whether the project .babelrc uses @emotion/babel-plugin. There's currently
-    // a Storybook issue (https://github.com/storybookjs/storybook/issues/13277) which apparently
-    // doesn't work with `@emotion/*` >= v11
-    // this is a workaround to fix that
-    let resolvedEmotionAliases = {};
-    const packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(devkit_1.workspaceRoot, 'package.json'));
-    const deps = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies);
-    const emotionReactVersion = deps['@emotion/react'];
-    if (emotionReactVersion &&
-        (0, semver_1.gte)((0, version_utils_1.checkAndCleanWithSemver)('@emotion/react', emotionReactVersion), '11.0.0')) {
-        try {
-            const babelrc = (0, devkit_1.readJsonFile)(options.babelrcPath ||
-                (0, devkit_1.joinPathFragments)(options.configDir, '../', '.babelrc'));
-            if ((_a = babelrc === null || babelrc === void 0 ? void 0 : babelrc.plugins) === null || _a === void 0 ? void 0 : _a.includes('@emotion/babel-plugin')) {
-                resolvedEmotionAliases = {
-                    resolve: {
-                        alias: {
-                            '@emotion/core': (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'node_modules', '@emotion/react'),
-                            '@emotion/styled': (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'node_modules', '@emotion/styled'),
-                            'emotion-theming': (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'node_modules', '@emotion/react'),
-                        },
-                    },
-                };
-            }
-        }
-        catch (error) {
-            // silently ignore if the .babelrc doesn't exist
-        }
-    }
-    return mergeWebpack.merge(Object.assign(Object.assign({}, storybookWebpackConfig), { module: Object.assign(Object.assign({}, storybookWebpackConfig.module), { rules: [
+    let baseWebpackConfig = {};
+    const configure = (0, config_1.composePluginsSync)(withNx({ skipTypeChecking: true }), withWeb(), (0, with_react_1.withReact)());
+    const finalConfig = configure(baseWebpackConfig, {
+        options: builderOptions,
+        context: { root: devkit_1.workspaceRoot }, // The context is not used here.
+    });
+    return Object.assign(Object.assign({}, storybookWebpackConfig), { module: Object.assign(Object.assign({}, storybookWebpackConfig.module), { rules: [
                 ...storybookWebpackConfig.module.rules,
                 ...finalConfig.module.rules,
-            ] }), resolve: Object.assign(Object.assign({}, storybookWebpackConfig.resolve), { plugins: (0, merge_plugins_1.mergePlugins)(...((_b = storybookWebpackConfig.resolve.plugins) !== null && _b !== void 0 ? _b : []), ...((_c = finalConfig.resolve.plugins) !== null && _c !== void 0 ? _c : [])) }), plugins: (0, merge_plugins_1.mergePlugins)(new webpack_1.DefinePlugin(getClientEnvironment(storybookWebpackConfig.mode).stringified), ...((_d = storybookWebpackConfig.plugins) !== null && _d !== void 0 ? _d : []), ...((_e = finalConfig.plugins) !== null && _e !== void 0 ? _e : [])) }), resolvedEmotionAliases);
+            ] }), resolve: Object.assign(Object.assign({}, storybookWebpackConfig.resolve), { plugins: (0, merge_plugins_1.mergePlugins)(...((_b = storybookWebpackConfig.resolve.plugins) !== null && _b !== void 0 ? _b : []), ...((_c = finalConfig.resolve
+                .plugins) !== null && _c !== void 0 ? _c : [])) }), plugins: (0, merge_plugins_1.mergePlugins)(new webpack_1.DefinePlugin(getClientEnvironment(storybookWebpackConfig.mode).stringified), ...((_d = storybookWebpackConfig.plugins) !== null && _d !== void 0 ? _d : []), ...((_e = finalConfig.plugins) !== null && _e !== void 0 ? _e : [])) });
 });
 exports.webpack = webpack;
 //# sourceMappingURL=index.js.map

package/plugins/storybook/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/index.ts"],"names":[],"mappings":"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"}

package/plugins/storybook/merge-plugins.d.ts

@@ -1,3 +1,3 @@
-import { RuleSetRule, WebpackPluginInstance } from 'webpack';
+import { ResolvePluginInstance, RuleSetRule, WebpackPluginInstance } from 'webpack';
 export declare const mergeRules: (...args: RuleSetRule[]) => (RuleSetRule | WebpackPluginInstance)[];
-export declare const mergePlugins: (...args: WebpackPluginInstance[]) => WebpackPluginInstance[];
+export declare const mergePlugins: (...args: (WebpackPluginInstance | ResolvePluginInstance)[]) => (WebpackPluginInstance | ResolvePluginInstance)[];

package/plugins/storybook/merge-plugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-plugins.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/merge-plugins.ts"],"names":[],"mappings":";;;AAEO,MAAM,UAAU,GAAG,CAAC,GAAG,IAAmB,EAAE,EAAE,CACnD,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IAC1B,IACE,KAAK,CAAC,IAAI,CACR,CAAC,cAAc,EAAE,EAAE,CACjB,cAAc,CAAC,WAAW,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAC5D,EACD;QACA,OAAO,KAAK,CAAC;KACd;IACD,OAAO,CAAC,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC;AAC1B,CAAC,EAAE,EAA6B,CAAC,CAAC;AAXvB,QAAA,UAAU,cAWa;AAE7B,MAAM,YAAY,GAAG,CAC1B,GAAG,IAA6B,EACP,EAAE,CAC3B,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,IACE,OAAO,CAAC,IAAI,CACV,CAAC,cAAc,EAAE,EAAE,CACjB,cAAc,CAAC,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,WAAW,CAAC,IAAI,CAC9D,EACD;QACA,OAAO,OAAO,CAAC;KAChB;IACD,OAAO,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC,EAAE,EAA6B,CAAC,CAAC;AAbvB,QAAA,YAAY,gBAaW"}
+{"version":3,"file":"merge-plugins.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/merge-plugins.ts"],"names":[],"mappings":";;;AAMO,MAAM,UAAU,GAAG,CAAC,GAAG,IAAmB,EAAE,EAAE,CACnD,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IAC1B,IACE,KAAK,CAAC,IAAI,CACR,CAAC,cAAc,EAAE,EAAE,CACjB,cAAc,CAAC,WAAW,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAC5D,EACD;QACA,OAAO,KAAK,CAAC;KACd;IACD,OAAO,CAAC,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC;AAC1B,CAAC,EAAE,EAA6B,CAAC,CAAC;AAXvB,QAAA,UAAU,cAWa;AAE7B,MAAM,YAAY,GAAG,CAC1B,GAAG,IAAuD,EACP,EAAE,CACrD,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,IACE,OAAO,CAAC,IAAI,CACV,CAAC,cAAc,EAAE,EAAE,CACjB,cAAc,CAAC,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,WAAW,CAAC,IAAI,CAC9D,EACD;QACA,OAAO,OAAO,CAAC;KAChB;IACD,OAAO,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC,EAAE,EAAuD,CAAC,CAAC;AAbjD,QAAA,YAAY,gBAaqC"}

package/plugins/webpack.d.ts

@@ -1,2 +1,3 @@
-import type { Configuration } from 'webpack';
-export declare function getWebpackConfig(config: Configuration): Configuration;
+/** @deprecated use `import { withReact } from '@nrwl/react'` */
+declare const getWebpackConfig: (config: import("webpack").Configuration, context: import("../../../build/packages/webpack").NxWebpackExecutionContext) => import("webpack").Configuration;
+export { getWebpackConfig };

package/plugins/webpack.js

@@ -1,77 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWebpackConfig = void 0;
-const ReactRefreshPlugin = require("@pmmmwh/react-refresh-webpack-plugin");
-// Add React-specific configuration
-function getWebpackConfig(config) {
-    var _a;
-    config.module.rules.push({
-        test: /\.svg$/,
-        oneOf: [
-            // If coming from JS/TS or MDX file, then transform into React component using SVGR.
-            {
-                issuer: /\.(js|ts|md)x?$/,
-                use: [
-                    {
-                        loader: require.resolve('@svgr/webpack'),
-                        options: {
-                            svgo: false,
-                            titleProp: true,
-                            ref: true,
-                        },
-                    },
-                    {
-                        loader: require.resolve('url-loader'),
-                        options: {
-                            limit: 10000,
-                            name: '[name].[hash:7].[ext]',
-                            esModule: false,
-                        },
-                    },
-                ],
-            },
-            // Fallback to plain URL loader.
-            {
-                use: [
-                    {
-                        loader: require.resolve('url-loader'),
-                        options: {
-                            limit: 10000,
-                            name: '[name].[hash:7].[ext]',
-                        },
-                    },
-                ],
-            },
-        ],
-    });
-    if (config.mode === 'development' && ((_a = config['devServer']) === null || _a === void 0 ? void 0 : _a.hot)) {
-        // add `react-refresh/babel` to babel loader plugin
-        const babelLoader = config.module.rules.find((rule) => {
-            var _a;
-            return typeof rule !== 'string' &&
-                ((_a = rule.loader) === null || _a === void 0 ? void 0 : _a.toString().includes('babel-loader'));
-        });
-        if (babelLoader && typeof babelLoader !== 'string') {
-            babelLoader.options['plugins'] = [
-                ...(babelLoader.options['plugins'] || []),
-                [
-                    require.resolve('react-refresh/babel'),
-                    {
-                        skipEnvCheck: true,
-                    },
-                ],
-            ];
-        }
-        // add https://github.com/pmmmwh/react-refresh-webpack-plugin to webpack plugin
-        config.plugins.push(new ReactRefreshPlugin());
-    }
-    // enable webpack node api
-    config.node = {
-        __dirname: true,
-        __filename: true,
-    };
-    return config;
-}
+const with_react_1 = require("./with-react");
+// Support existing default exports as well as new named export.
+const legacyExport = (0, with_react_1.withReact)();
+legacyExport.withReact = with_react_1.withReact;
+/** @deprecated use `import { withReact } from '@nrwl/react'` */
+// This is here for backward compatibility if anyone imports {getWebpackConfig} directly.
+// TODO(jack): Remove in Nx 16
+const getWebpackConfig = (0, with_react_1.withReact)();
 exports.getWebpackConfig = getWebpackConfig;
-module.exports = getWebpackConfig;
+legacyExport.getWebpackConfig = getWebpackConfig;
+module.exports = legacyExport;
 //# sourceMappingURL=webpack.js.map

package/plugins/webpack.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../../packages/react/plugins/webpack.ts"],"names":[],"mappings":";;;AACA,2EAA4E;AAE5E,mCAAmC;AACnC,SAAgB,gBAAgB,CAAC,MAAqB;;IACpD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE;YACL,oFAAoF;YACpF;gBACE,MAAM,EAAE,iBAAiB;gBACzB,GAAG,EAAE;oBACH;wBACE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;wBACxC,OAAO,EAAE;4BACP,IAAI,EAAE,KAAK;4BACX,SAAS,EAAE,IAAI;4BACf,GAAG,EAAE,IAAI;yBACV;qBACF;oBACD;wBACE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;wBACrC,OAAO,EAAE;4BACP,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,uBAAuB;4BAC7B,QAAQ,EAAE,KAAK;yBAChB;qBACF;iBACF;aACF;YACD,gCAAgC;YAChC;gBACE,GAAG,EAAE;oBACH;wBACE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;wBACrC,OAAO,EAAE;4BACP,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,uBAAuB;yBAC9B;qBACF;iBACF;aACF;SACF;KACF,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,KAAI,MAAA,MAAM,CAAC,WAAW,CAAC,0CAAE,GAAG,CAAA,EAAE;QAC7D,mDAAmD;QACnD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAC1C,CAAC,IAAI,EAAE,EAAE;;YACP,OAAA,OAAO,IAAI,KAAK,QAAQ;iBACxB,MAAA,IAAI,CAAC,MAAM,0CAAE,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAA,CAAA;SAAA,CACnD,CAAC;QACF,IAAI,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YAClD,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG;gBAC/B,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBACzC;oBACE,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;oBACtC;wBACE,YAAY,EAAE,IAAI;qBACnB;iBACF;aACF,CAAC;SACH;QACD,+EAA+E;QAC/E,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAC;KAC/C;IAED,0BAA0B;IAC1B,MAAM,CAAC,IAAI,GAAG;QACZ,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;KACjB,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAtED,4CAsEC;AAED,MAAM,CAAC,OAAO,GAAG,gBAAgB,CAAC"}
+{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../../packages/react/plugins/webpack.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAEzC,gEAAgE;AAChE,MAAM,YAAY,GAAQ,IAAA,sBAAS,GAAE,CAAC;AACtC,YAAY,CAAC,SAAS,GAAG,sBAAS,CAAC;AAEnC,gEAAgE;AAChE,yFAAyF;AACzF,8BAA8B;AAC9B,MAAM,gBAAgB,GAAG,IAAA,sBAAS,GAAE,CAAC;AAM5B,4CAAgB;AAJzB,YAAY,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;AAEjD,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC"}

package/plugins/with-react.d.ts

@@ -0,0 +1,12 @@
+import type { Configuration } from 'webpack';
+import type { WithWebOptions } from '@nrwl/webpack';
+import type { NxWebpackExecutionContext } from '@nrwl/webpack';
+interface WithReactOptions extends WithWebOptions {
+    svgr?: false;
+}
+/**
+ * @param {WithReactOptions} pluginOptions
+ * @returns {NxWebpackPlugin}
+ */
+export declare function withReact(pluginOptions?: WithReactOptions): (config: Configuration, context: NxWebpackExecutionContext) => Configuration;
+export {};

package/plugins/with-react.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withReact = void 0;
+const processed = new Set();
+function addHotReload(config) {
+    var _a;
+    if (config.mode === 'development' && ((_a = config['devServer']) === null || _a === void 0 ? void 0 : _a.hot)) {
+        // add `react-refresh/babel` to babel loader plugin
+        const babelLoader = config.module.rules.find((rule) => {
+            var _a;
+            return typeof rule !== 'string' &&
+                ((_a = rule.loader) === null || _a === void 0 ? void 0 : _a.toString().includes('babel-loader'));
+        });
+        if (babelLoader && typeof babelLoader !== 'string') {
+            babelLoader.options['plugins'] = [
+                ...(babelLoader.options['plugins'] || []),
+                [
+                    require.resolve('react-refresh/babel'),
+                    {
+                        skipEnvCheck: true,
+                    },
+                ],
+            ];
+        }
+        const ReactRefreshPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
+        config.plugins.push(new ReactRefreshPlugin());
+    }
+}
+// We remove potentially conflicting rules that target SVGs because we use @svgr/webpack loader
+// See https://github.com/nrwl/nx/issues/14383
+function removeSvgLoaderIfPresent(config) {
+    const svgLoaderIdx = config.module.rules.findIndex((rule) => typeof rule === 'object' && rule.test.toString().includes('svg'));
+    if (svgLoaderIdx === -1)
+        return;
+    config.module.rules.splice(svgLoaderIdx, 1);
+}
+/**
+ * @param {WithReactOptions} pluginOptions
+ * @returns {NxWebpackPlugin}
+ */
+function withReact(pluginOptions = {}) {
+    return function configure(config, context) {
+        const { withWeb } = require('@nrwl/webpack');
+        if (processed.has(config))
+            return config;
+        // Apply web config for CSS, JSX, index.html handling, etc.
+        config = withWeb(pluginOptions)(config, context);
+        addHotReload(config);
+        if ((pluginOptions === null || pluginOptions === void 0 ? void 0 : pluginOptions.svgr) !== false) {
+            removeSvgLoaderIfPresent(config);
+            config.module.rules.push({
+                test: /\.svg$/,
+                issuer: /\.(js|ts|md)x?$/,
+                use: [
+                    {
+                        loader: require.resolve('@svgr/webpack'),
+                        options: {
+                            svgo: false,
+                            titleProp: true,
+                            ref: true,
+                        },
+                    },
+                    {
+                        loader: require.resolve('file-loader'),
+                        options: {
+                            name: '[name].[hash].[ext]',
+                        },
+                    },
+                ],
+            });
+        }
+        // enable webpack node api
+        config.node = {
+            __dirname: true,
+            __filename: true,
+        };
+        processed.add(config);
+        return config;
+    };
+}
+exports.withReact = withReact;
+//# sourceMappingURL=with-react.js.map

package/plugins/with-react.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"with-react.js","sourceRoot":"","sources":["../../../../packages/react/plugins/with-react.ts"],"names":[],"mappings":"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"}