@nrwl/react 15.5.3 → 15.6.0-beta.1

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.
 
-## [15.5.3](https://github.com/nrwl/nx/compare/15.5.2...15.5.3) (2023-01-20)
+# [15.6.0-beta.1](https://github.com/nrwl/nx/compare/15.5.1...15.6.0-beta.1) (2023-01-23)
 
 **Note:** Version bump only for package @nrwl/react

package/README.md

@@ -43,38 +43,18 @@ npm init nx-workspace
 yarn create nx-workspace
 ```
 
-The `create-nx-workspace` command will ask you to select a preset, which will configure some plugins and create your applications to help you get started.
-
-```
-? What to create in the new workspace (Use arrow keys)
-❯ apps              [an empty workspace with no plugins with a layout that works best for building apps]
-  core              [an empty workspace with no plugins set up to publish npm packages (similar to yarn workspaces)]
-  ts                [an empty workspace with the JS/TS plugin preinstalled]
-  react             [a workspace with a single React application]
-  angular           [a workspace with a single Angular application]
-  next.js           [a workspace with a single Next.js application]
-  nest              [a workspace with a single Nest application]
-  express           [a workspace with a single Express application]
-  web components    [a workspace with a single app built using web components]
-  react-native      [a workspace with a single React Native application]
-```
-
-Select the preset that works best for you
-
-### Adding Nx to an Existing Monorepo
+### Adding Nx to an Existing Repository
 
 Run:
 
 ```bash
-npx add-nx-to-monorepo@latest
+npx nx@latest init
 ```
 
 ## Documentation & Resources
 
-A few links to help you get started:
-
-- [Nx.Dev: Documentation, Guides, Interactive Tutorials](https://nx.dev)
-- [Tutorial: Adding Nx to an Existing Monorepo](/recipes/adopting-nx/adding-to-monorepo)
+- [Nx.Dev: Documentation, Guides, Tutorials](https://nx.dev)
+- [Intro to Nx](https://nx.dev/getting-started/intro)
 - [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 

package/babel.d.ts

@@ -1 +1,16 @@
-export {};
+interface NxReactBabelOptions {
+    runtime?: string;
+    importSource?: string;
+    useBuiltIns?: boolean | string;
+    decorators?: {
+        decoratorsBeforeExport?: boolean;
+        legacy?: boolean;
+    };
+    classProperties?: {
+        loose?: boolean;
+    };
+}
+declare function getReactPresetOptions({ presetOptions, env }: {
+    presetOptions: any;
+    env: any;
+}): Record<string, string | boolean>;

package/babel.js

@@ -1,5 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+/*
+ * Babel preset to provide React support for Nx.
+ */
 module.exports = function (api, options) {
     api.assertVersion(7);
     const env = api.env();
@@ -7,7 +8,7 @@ module.exports = function (api, options) {
      * pagesDir is set when being transpiled by Next.js
      */
     const isNextJs = api.caller((caller) => caller === null || caller === void 0 ? void 0 : caller.pagesDir);
-    const presets = [['@nrwl/web/babel', options]];
+    const presets = [['@nrwl/js/babel', options]];
     /**
      * Next.js already includes the preset-react, and including it
      * the second time here results in having two instances of this preset.

package/babel.js.map

@@ -1 +1 @@
-{"version":3,"file":"babel.js","sourceRoot":"","sources":["../../../packages/react/babel.ts"],"names":[],"mappings":";;AAWA,MAAM,CAAC,OAAO,GAAG,UAAU,GAAQ,EAAE,OAA4B;IAC/D,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC;IACtB;;OAEG;IACH,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAU,CAAC,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;IAEtD;;;;;;;;;;OAUG;IACH,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,CAAC,IAAI,CAAC;YACX,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;YACtC,qBAAqB,CAAC;gBACpB,aAAa,EAAE,OAAO;gBACtB,GAAG;aACJ,CAAC;SACH,CAAC,CAAC;KACJ;IAED,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,qBAAqB,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE;;IACnD,MAAM,kBAAkB,GAAqC;QAC3D,OAAO,EAAE,MAAA,aAAa,CAAC,OAAO,mCAAI,WAAW;QAC7C,WAAW,EAAE,GAAG,KAAK,YAAY;KAClC,CAAC;IAEF,sFAAsF;IACtF,4CAA4C;IAC5C,IAAI,kBAAkB,CAAC,OAAO,KAAK,WAAW,EAAE;QAC9C,kBAAkB,CAAC,WAAW,GAAG,IAAI,CAAC;KACvC;IAED,IAAI,aAAa,CAAC,YAAY,EAAE;QAC9B,kBAAkB,CAAC,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;KAC9D;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"babel.js","sourceRoot":"","sources":["../../../packages/react/babel.ts"],"names":[],"mappings":"AAAA;;GAEG;AAeH,MAAM,CAAC,OAAO,GAAG,UAAU,GAAQ,EAAE,OAA4B;IAC/D,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC;IACtB;;OAEG;IACH,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAU,CAAC,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC;IAErD;;;;;;;;;;OAUG;IACH,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,CAAC,IAAI,CAAC;YACX,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;YACtC,qBAAqB,CAAC;gBACpB,aAAa,EAAE,OAAO;gBACtB,GAAG;aACJ,CAAC;SACH,CAAC,CAAC;KACJ;IAED,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,qBAAqB,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE;;IACnD,MAAM,kBAAkB,GAAqC;QAC3D,OAAO,EAAE,MAAA,aAAa,CAAC,OAAO,mCAAI,WAAW;QAC7C,WAAW,EAAE,GAAG,KAAK,YAAY;KAClC,CAAC;IAEF,sFAAsF;IACtF,4CAA4C;IAC5C,IAAI,kBAAkB,CAAC,OAAO,KAAK,WAAW,EAAE;QAC9C,kBAAkB,CAAC,WAAW,GAAG,IAAI,CAAC;KACvC;IAED,IAAI,aAAa,CAAC,YAAY,EAAE;QAC9B,kBAAkB,CAAC,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;KAC9D;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/react",
-  "version": "15.5.3",
+  "version": "15.6.0-beta.1",
   "private": false,
   "description": "The React plugin for Nx 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": {
@@ -31,17 +31,16 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/devkit": "15.5.3",
-    "@nrwl/linter": "15.5.3",
-    "@nrwl/workspace": "15.5.3",
+    "@nrwl/devkit": "15.6.0-beta.1",
+    "@nrwl/linter": "15.6.0-beta.1",
+    "@nrwl/workspace": "15.6.0-beta.1",
     "@phenomnomnominal/tsquery": "4.1.1",
     "chalk": "^4.1.0",
-    "minimatch": "3.0.5",
-    "semver": "7.3.4"
+    "minimatch": "3.0.5"
   },
   "publishConfig": {
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "7285ee50fca7136f38ce159ef3ed2977b8e7816a"
+  "gitHead": "b424d0c4f2c93177b1aff808f8b269c1b55f2d06"
 }

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 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 with_react_1 = require("../with-react");
-const webpack_2 = require("@nrwl/webpack");
 // 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,28 +42,20 @@ 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"');
+    // 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, 
         // These are blank because root is the absolute path to .storybook folder
@@ -76,50 +64,19 @@ const webpack = (storybookWebpackConfig = {}, options) => tslib_1.__awaiter(void
             scripts: true,
             styles: true,
             vendors: false,
-        }, styles: [], optimization: {}, tsConfig: tsconfigPath, extractCss: storybookWebpackConfig.mode === 'production', target: 'web' });
-    const isScriptOptimizeOn = storybookWebpackConfig.mode !== 'development';
-    const extractCss = storybookWebpackConfig.mode === 'production';
+        }, styles: (_a = options.styles) !== null && _a !== void 0 ? _a : [], optimization: {}, tsConfig: tsconfigPath, extractCss: storybookWebpackConfig.mode === 'production', target: 'web' });
     // ESM build for modern browsers.
     let baseWebpackConfig = {};
-    const configure = (0, config_1.composePlugins)((0, webpack_2.withNx)({ skipTypeChecking: true }), (0, webpack_2.withWeb)(), (0, with_react_1.withReact)());
+    const configure = (0, config_1.composePlugins)(withNx({ skipTypeChecking: true }), withWeb(), (0, with_react_1.withReact)());
     const finalConfig = configure(baseWebpackConfig, {
         options: builderOptions,
         context: {}, // The context is not used here.
     });
-    // 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: [
+    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);
+                .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/src/generators/storybook-configuration/configuration.js

@@ -75,6 +75,10 @@ function storybookConfigurationGenerator(host, schema) {
             tsConfiguration: schema.tsConfiguration,
             configureTestRunner: schema.configureTestRunner,
             bundler,
+            storybook7betaConfiguration: schema.storybook7betaConfiguration,
+            storybook7UiFramework: bundler === 'vite'
+                ? '@storybook/react-vite'
+                : '@storybook/react-webpack5',
         });
         if (schema.generateStories) {
             yield generateStories(host, schema);

package/src/generators/storybook-configuration/configuration.js.map

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

package/src/generators/storybook-configuration/schema.d.ts

@@ -13,4 +13,5 @@ export interface StorybookConfigureSchema {
   ignorePaths?: string[];
   bundler?: 'webpack' | 'vite';
   configureTestRunner?: boolean;
+  storybook7betaConfiguration?: boolean;
 }

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

@@ -86,6 +86,12 @@
       "description": "The Storybook builder to use.",
       "enum": ["vite", "webpack"],
       "x-priority": "important"
+    },
+    "storybook7betaConfiguration": {
+      "description": "Configure your workspace to use Storybook 7, even though Storybook v7 is still in beta.",
+      "type": "boolean",
+      "default": false,
+      "hidden": true
     }
   },
   "required": ["name"],