@nrwl/react 14.2.0-beta.4 → 14.2.0-rc.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,6 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- # [14.2.0-beta.4](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-beta.4) (2022-06-02)
6
+ # [14.2.0-rc.1](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-rc.1) (2022-06-03)
7
7
 
8
8
  **Note:** Version bump only for package @nrwl/react
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/react",
3
- "version": "14.2.0-beta.4",
3
+ "version": "14.2.0-rc.1",
4
4
  "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.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -32,14 +32,14 @@
32
32
  "dependencies": {
33
33
  "@babel/core": "^7.15.0",
34
34
  "@babel/preset-react": "^7.14.5",
35
- "@nrwl/cypress": "14.2.0-beta.4",
36
- "@nrwl/devkit": "14.2.0-beta.4",
37
- "@nrwl/jest": "14.2.0-beta.4",
38
- "@nrwl/js": "14.2.0-beta.4",
39
- "@nrwl/linter": "14.2.0-beta.4",
40
- "@nrwl/storybook": "14.2.0-beta.4",
41
- "@nrwl/web": "14.2.0-beta.4",
42
- "@nrwl/workspace": "14.2.0-beta.4",
35
+ "@nrwl/cypress": "14.2.0-rc.1",
36
+ "@nrwl/devkit": "14.2.0-rc.1",
37
+ "@nrwl/jest": "14.2.0-rc.1",
38
+ "@nrwl/js": "14.2.0-rc.1",
39
+ "@nrwl/linter": "14.2.0-rc.1",
40
+ "@nrwl/storybook": "14.2.0-rc.1",
41
+ "@nrwl/web": "14.2.0-rc.1",
42
+ "@nrwl/workspace": "14.2.0-rc.1",
43
43
  "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
44
44
  "@storybook/node-logger": "6.1.20",
45
45
  "@svgr/webpack": "^6.1.2",
@@ -54,5 +54,5 @@
54
54
  "webpack": "^5.58.1",
55
55
  "webpack-merge": "^5.8.0"
56
56
  },
57
- "gitHead": "1794cacf2e087d9f3bad4947105d4c689e7ebd61"
57
+ "gitHead": "2fb10593d18f88fb9c1da855bdbc1025d01071fe"
58
58
  }
@@ -10,9 +10,44 @@ const version_utils_1 = require("@nrwl/workspace/src/utilities/version-utils");
10
10
  const node_logger_1 = require("@storybook/node-logger");
11
11
  const path_1 = require("path");
12
12
  const semver_1 = require("semver");
13
+ const webpack_1 = require("webpack");
13
14
  const mergeWebpack = require("webpack-merge");
14
15
  const merge_plugins_1 = require("./merge-plugins");
15
16
  const reactWebpackConfig = require('../webpack');
17
+ // This is shamelessly taken from CRA and modified for NX use
18
+ // https://github.com/facebook/create-react-app/blob/4784997f0682e75eb32a897b4ffe34d735912e6c/packages/react-scripts/config/env.js#L71
19
+ function getClientEnvironment(mode) {
20
+ // Grab NODE_ENV and NX_* and STORYBOOK_* environment variables and prepare them to be
21
+ // injected into the application via DefinePlugin in webpack configuration.
22
+ const NX_PREFIX = /^NX_/i;
23
+ const STORYBOOK_PREFIX = /^STORYBOOK__/i;
24
+ const raw = Object.keys(process.env)
25
+ .filter((key) => NX_PREFIX.test(key) || STORYBOOK_PREFIX.test(key))
26
+ .reduce((env, key) => {
27
+ env[key] = process.env[key];
28
+ return env;
29
+ }, {
30
+ // Useful for determining whether we’re running in production mode.
31
+ NODE_ENV: process.env.NODE_ENV || mode,
32
+ // Environment variables for Storybook
33
+ // https://github.com/storybookjs/storybook/blob/bdf9e5ed854b8d34e737eee1a4a05add88265e92/lib/core-common/src/utils/envs.ts#L12-L21
34
+ NODE_PATH: process.env.NODE_PATH || '',
35
+ STORYBOOK: process.env.STORYBOOK || 'true',
36
+ // This is to support CRA's public folder feature.
37
+ // In production we set this to dot(.) to allow the browser to access these assets
38
+ // even when deployed inside a subpath. (like in GitHub pages)
39
+ // In development this is just empty as we always serves from the root.
40
+ PUBLIC_URL: mode === 'production' ? '.' : '',
41
+ });
42
+ // Stringify all values so we can feed into webpack DefinePlugin
43
+ const stringified = {
44
+ 'process.env': Object.keys(raw).reduce((env, key) => {
45
+ env[key] = JSON.stringify(raw[key]);
46
+ return env;
47
+ }, {}),
48
+ };
49
+ return { stringified };
50
+ }
16
51
  const babelDefault = () => {
17
52
  // Add babel plugin for styled-components or emotion.
18
53
  // We don't have a good way to know when a project uses one or the other, so
@@ -82,7 +117,7 @@ const webpack = (storybookWebpackConfig = {}, options) => tslib_1.__awaiter(void
82
117
  return mergeWebpack.merge(Object.assign(Object.assign({}, storybookWebpackConfig), { module: Object.assign(Object.assign({}, storybookWebpackConfig.module), { rules: [
83
118
  ...storybookWebpackConfig.module.rules,
84
119
  ...finalConfig.module.rules,
85
- ] }), 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)(...((_d = storybookWebpackConfig.plugins) !== null && _d !== void 0 ? _d : []), ...((_e = finalConfig.plugins) !== null && _e !== void 0 ? _e : [])) }), resolvedEmotionAliases);
120
+ ] }), 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);
86
121
  });
87
122
  exports.webpack = webpack;
88
123
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/index.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ import NxWelcome from "./nx-welcome";
5
5
 
6
6
  <% if (classComponent) { %>
7
7
  export class App extends Component {
8
- render() {
8
+ override render() {
9
9
  <% } else { %>
10
10
  export function App() {
11
11
  <% } %>
@@ -8,6 +8,7 @@ const ast_utils_1 = require("../../utils/ast-utils");
8
8
  const ts = require("typescript");
9
9
  const devkit_1 = require("@nrwl/devkit");
10
10
  const path_1 = require("path");
11
+ const utilities_1 = require("@nrwl/storybook/src/utils/utilities");
11
12
  function projectRootPath(tree, sourceRoot, projectType) {
12
13
  let projectDir = '';
13
14
  if (projectType === 'application') {
@@ -43,11 +44,15 @@ function createAllStories(tree, projectName, generateCypressSpecs, js, cypressPr
43
44
  if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
44
45
  (path.endsWith('.js') && !path.endsWith('.spec.js')) ||
45
46
  (path.endsWith('.jsx') && !path.endsWith('.spec.jsx'))) {
46
- const ext = path.slice(path.lastIndexOf('.'));
47
- const storyPath = `${path.split(ext)[0]}.stories${ext}`;
48
- // only add component if a stories file doesnt already exist
49
- if (!tree.exists(storyPath)) {
50
- componentPaths.push(path);
47
+ // Check if file is NOT a story (either ts/tsx or js/jsx)
48
+ if (!(0, utilities_1.isTheFileAStory)(tree, path)) {
49
+ // Since the file is not a story
50
+ // Let's see if the .stories.* file exists
51
+ const ext = path.slice(path.lastIndexOf('.'));
52
+ const storyPath = `${path.split(ext)[0]}.stories${ext}`;
53
+ if (!tree.exists(storyPath)) {
54
+ componentPaths.push(path);
55
+ }
51
56
  }
52
57
  }
53
58
  });
@@ -1 +1 @@
1
- {"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/stories/stories.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/stories/stories.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ export interface StorybookConfigureSchema {
6
6
  generateStories?: boolean;
7
7
  generateCypressSpecs?: boolean;
8
8
  js?: boolean;
9
+ tsConfiguration?: boolean;
9
10
  linter?: Linter;
10
11
  cypressDirectory?: string;
11
12
  standaloneConfig?: boolean;
@@ -38,7 +38,12 @@
38
38
  },
39
39
  "js": {
40
40
  "type": "boolean",
41
- "description": "Generate JavaScript files rather than TypeScript files.",
41
+ "description": "Generate JavaScript story files rather than TypeScript story files.",
42
+ "default": false
43
+ },
44
+ "tsConfiguration": {
45
+ "type": "boolean",
46
+ "description": "Configure your project with TypeScript. Generate main.ts and preview.ts files, instead of main.js and preview.js.",
42
47
  "default": false
43
48
  },
44
49
  "linter": {