@nrwl/react 14.0.5 → 14.1.0-beta.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.
Files changed (17) hide show
  1. package/migrations.json +38 -1
  2. package/package.json +9 -9
  3. package/src/generators/component-cypress-spec/component-cypress-spec.js +20 -5
  4. package/src/generators/component-cypress-spec/component-cypress-spec.js.map +1 -1
  5. package/src/generators/component-story/component-story.d.ts +1 -0
  6. package/src/generators/component-story/component-story.js +23 -6
  7. package/src/generators/component-story/component-story.js.map +1 -1
  8. package/src/generators/component-story/files/__componentFileName__.stories.__fileExt__ +1 -1
  9. package/src/generators/stories/stories.d.ts +1 -0
  10. package/src/generators/stories/stories.js +5 -2
  11. package/src/generators/stories/stories.js.map +1 -1
  12. package/src/utils/ast-utils.d.ts +6 -5
  13. package/src/utils/ast-utils.js +53 -5
  14. package/src/utils/ast-utils.js.map +1 -1
  15. package/src/utils/versions.d.ts +9 -9
  16. package/src/utils/versions.js +11 -10
  17. package/src/utils/versions.js.map +1 -1
package/migrations.json CHANGED
@@ -297,7 +297,7 @@
297
297
  "alwaysAddToPackageJson": false
298
298
  },
299
299
  "styled-jsx": {
300
- "version": "5.0.2",
300
+ "version": "5.0.1",
301
301
  "alwaysAddToPackageJson": false
302
302
  },
303
303
  "eslint-plugin-react-hooks": {
@@ -387,6 +387,43 @@
387
387
  "alwaysAddToPackageJson": false
388
388
  }
389
389
  }
390
+ },
391
+ "14.0.6": {
392
+ "version": "14.0.6-beta.0",
393
+ "packages": {
394
+ "react": {
395
+ "version": "18.1.0",
396
+ "alwaysAddToPackageJson": false
397
+ },
398
+ "react-dom": {
399
+ "version": "18.1.0",
400
+ "alwaysAddToPackageJson": false
401
+ },
402
+ "react-is": {
403
+ "version": "18.1.0",
404
+ "alwaysAddToPackageJson": false
405
+ },
406
+ "@types/react": {
407
+ "version": "18.0.8",
408
+ "alwaysAddToPackageJson": false
409
+ },
410
+ "@types/react-dom": {
411
+ "version": "18.0.3",
412
+ "alwaysAddToPackageJson": false
413
+ },
414
+ "react-redux": {
415
+ "version": "8.0.1",
416
+ "alwaysAddToPackageJson": false
417
+ },
418
+ "react-test-renderer": {
419
+ "version": "18.1.0",
420
+ "alwaysAddToPackageJson": false
421
+ },
422
+ "eslint-plugin-react-hooks": {
423
+ "version": "4.5.0",
424
+ "alwaysAddToPackageJson": false
425
+ }
426
+ }
390
427
  }
391
428
  }
392
429
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/react",
3
- "version": "14.0.5",
3
+ "version": "14.1.0-beta.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.0.5",
36
- "@nrwl/devkit": "14.0.5",
37
- "@nrwl/jest": "14.0.5",
38
- "@nrwl/js": "14.0.5",
39
- "@nrwl/linter": "14.0.5",
40
- "@nrwl/storybook": "14.0.5",
41
- "@nrwl/web": "14.0.5",
42
- "@nrwl/workspace": "14.0.5",
35
+ "@nrwl/cypress": "14.1.0-beta.1",
36
+ "@nrwl/devkit": "14.1.0-beta.1",
37
+ "@nrwl/jest": "14.1.0-beta.1",
38
+ "@nrwl/js": "14.1.0-beta.1",
39
+ "@nrwl/linter": "14.1.0-beta.1",
40
+ "@nrwl/storybook": "14.1.0-beta.1",
41
+ "@nrwl/web": "14.1.0-beta.1",
42
+ "@nrwl/workspace": "14.1.0-beta.1",
43
43
  "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
44
44
  "@svgr/webpack": "^6.1.2",
45
45
  "chalk": "4.1.0",
package/src/generators/component-cypress-spec/component-cypress-spec.js CHANGED
@@ -43,11 +43,25 @@ function createComponentSpecFile(tree, { project, componentPath, js, cypressProj
43
43
  throw new Error(`Failed to read ${componentFilePath}`);
44
44
  }
45
45
  const sourceFile = ts.createSourceFile(componentFilePath, contents, ts.ScriptTarget.Latest, true);
46
- const cmpDeclaration = (0, ast_utils_1.getComponentName)(sourceFile);
46
+ const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
47
47
  if (!cmpDeclaration) {
48
- throw new Error(`Could not find any React component in file ${componentFilePath}`);
48
+ const componentNodes = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile);
49
+ if (componentNodes === null || componentNodes === void 0 ? void 0 : componentNodes.length) {
50
+ componentNodes.forEach((declaration) => {
51
+ findPropsAndGenerateFileForCypress(tree, sourceFile, declaration, e2eLibIntegrationFolderPath, componentName, project, js, true);
52
+ });
53
+ }
54
+ else {
55
+ throw new Error(`Could not find any React component in file ${componentFilePath}`);
56
+ }
49
57
  }
50
- const propsInterface = (0, ast_utils_1.getComponentPropsInterface)(sourceFile);
58
+ else {
59
+ findPropsAndGenerateFileForCypress(tree, sourceFile, cmpDeclaration, e2eLibIntegrationFolderPath, componentName, project, js);
60
+ }
61
+ }
62
+ exports.createComponentSpecFile = createComponentSpecFile;
63
+ function findPropsAndGenerateFileForCypress(tree, sourceFile, cmpDeclaration, e2eLibIntegrationFolderPath, componentName, project, js, fromNodeArray) {
64
+ const propsInterface = (0, ast_utils_1.getComponentPropsInterface)(sourceFile, cmpDeclaration);
51
65
  let props = [];
52
66
  if (propsInterface) {
53
67
  props = propsInterface.members.map((member) => {
@@ -57,7 +71,9 @@ function createComponentSpecFile(tree, { project, componentPath, js, cypressProj
57
71
  };
58
72
  });
59
73
  }
60
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files'), `${e2eLibIntegrationFolderPath}/${componentName}`, {
74
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files'), `${e2eLibIntegrationFolderPath}/${fromNodeArray
75
+ ? componentName + '--' + cmpDeclaration.name.text
76
+ : componentName}`, {
61
77
  projectName: project,
62
78
  componentName,
63
79
  componentSelector: cmpDeclaration.name.text,
@@ -65,7 +81,6 @@ function createComponentSpecFile(tree, { project, componentPath, js, cypressProj
65
81
  fileExt: js ? 'js' : 'ts',
66
82
  });
67
83
  }
68
- exports.createComponentSpecFile = createComponentSpecFile;
69
84
  exports.default = componentCypressGenerator;
70
85
  exports.componentCypressSchematic = (0, devkit_1.convertNxGenerator)(componentCypressGenerator);
71
86
  //# sourceMappingURL=component-cypress-spec.js.map
package/src/generators/component-cypress-spec/component-cypress-spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":";;;AAAA,qDAI+B;AAE/B,iCAAiC;AACjC,yCAMsB;AAStB,SAAgB,yBAAyB,CACvC,IAAU,EACV,MAAqC;IAErC,uBAAuB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACxC,CAAC;AALD,8DAKC;AAED,+DAA+D;AAC/D,SAAgB,mBAAmB,CAAC,QAAuB;IACzD,MAAM,iBAAiB,GAAwB;QAC7C,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE;QACjC,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAChC,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,KAAK;KACtC,CAAC;IAEF,MAAM,aAAa,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAClD,IAAI,OAAO,aAAa,KAAK,SAAS,EAAE;QACtC,OAAO,EAAE,CAAC;KACX;SAAM,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;QAC5C,OAAO,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KAC1C;SAAM;QACL,OAAO,aAAa,CAAC;KACtB;AACH,CAAC;AAfD,kDAeC;AAED,SAAgB,uBAAuB,CACrC,IAAU,EACV,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,cAAc,EAAiC;IAE7E,MAAM,cAAc,GAAG,cAAc,IAAI,GAAG,OAAO,MAAM,CAAC;IAC1D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,2BAA2B,GAAG,GAClC,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,UAC/B,cAAc,CAAC;IAEf,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAC5E,MAAM,aAAa,GAAG,iBAAiB;SACpC,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAC7C,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;SACnB,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;SACnB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEtB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IACvD,IAAI,QAAQ,KAAK,IAAI,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,kBAAkB,iBAAiB,EAAE,CAAC,CAAC;KACxD;IAED,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,iBAAiB,EACjB,QAAQ,EACR,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,4BAAgB,EAAC,UAAU,CAAC,CAAC;IACpD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,cAAc,GAAG,IAAA,wCAA4B,EAAC,UAAU,CAAC,CAAC;QAChE,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,EAAE;YAC1B,cAAc,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBACrC,kCAAkC,CAChC,IAAI,EACJ,UAAU,EACV,WAAW,EACX,2BAA2B,EAC3B,aAAa,EACb,OAAO,EACP,EAAE,EACF,IAAI,CACL,CAAC;YACJ,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,IAAI,KAAK,CACb,8CAA8C,iBAAiB,EAAE,CAClE,CAAC;SACH;KACF;SAAM;QACL,kCAAkC,CAChC,IAAI,EACJ,UAAU,EACV,cAAc,EACd,2BAA2B,EAC3B,aAAa,EACb,OAAO,EACP,EAAE,CACH,CAAC;KACH;AACH,CAAC;AA9DD,0DA8DC;AAED,SAAS,kCAAkC,CACzC,IAAU,EACV,UAAyB,EACzB,cAAuB,EACvB,2BAAmC,EACnC,aAAqB,EACrB,OAAe,EACf,EAAW,EACX,aAAuB;IAEvB,MAAM,cAAc,GAAG,IAAA,sCAA0B,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAE9E,IAAI,KAAK,GAGH,EAAE,CAAC;IAET,IAAI,cAAc,EAAE;QAClB,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAA4B,EAAE,EAAE;YAClE,OAAO;gBACL,IAAI,EAAG,MAAM,CAAC,IAAsB,CAAC,IAAI;gBACzC,YAAY,EAAE,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;aACpD,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,EACvC,GAAG,2BAA2B,IAC5B,aAAa;QACX,CAAC,CAAC,aAAa,GAAG,IAAI,GAAI,cAAsB,CAAC,IAAI,CAAC,IAAI;QAC1D,CAAC,CAAC,aACN,EAAE,EACF;QACE,WAAW,EAAE,OAAO;QACpB,aAAa;QACb,iBAAiB,EAAG,cAAsB,CAAC,IAAI,CAAC,IAAI;QACpD,KAAK;QACL,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;KAC1B,CACF,CAAC;AACJ,CAAC;AAED,kBAAe,yBAAyB,CAAC;AAC5B,QAAA,yBAAyB,GAAG,IAAA,2BAAkB,EACzD,yBAAyB,CAC1B,CAAC"}
package/src/generators/component-story/component-story.d.ts CHANGED
@@ -6,6 +6,7 @@ export interface CreateComponentStoriesFileSchema {
6
6
  }
7
7
  export declare function getArgsDefaultValue(property: ts.SyntaxKind): string;
8
8
  export declare function createComponentStoriesFile(host: Tree, { project, componentPath }: CreateComponentStoriesFileSchema): void;
9
+ export declare function findPropsAndGenerateFile(host: Tree, sourceFile: ts.SourceFile, cmpDeclaration: ts.Node, componentDirectory: string, name: string, isPlainJs: boolean, fileExt: string, fromNodeArray?: boolean): void;
9
10
  export declare function componentStoryGenerator(host: Tree, schema: CreateComponentStoriesFileSchema): Promise<void>;
10
11
  export default componentStoryGenerator;
11
12
  export declare const componentStorySchematic: (generatorOptions: CreateComponentStoriesFileSchema) => (tree: any, context: any) => Promise<any>;
package/src/generators/component-story/component-story.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.componentStorySchematic = exports.componentStoryGenerator = exports.createComponentStoriesFile = exports.getArgsDefaultValue = void 0;
3
+ exports.componentStorySchematic = exports.componentStoryGenerator = exports.findPropsAndGenerateFile = exports.createComponentStoriesFile = exports.getArgsDefaultValue = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
6
  const ts = require("typescript");
@@ -45,11 +45,25 @@ function createComponentStoriesFile(host, { project, componentPath }) {
45
45
  throw new Error(`Failed to read ${componentFilePath}`);
46
46
  }
47
47
  const sourceFile = ts.createSourceFile(componentFilePath, contents, ts.ScriptTarget.Latest, true);
48
- const cmpDeclaration = (0, ast_utils_1.getComponentName)(sourceFile);
48
+ const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
49
49
  if (!cmpDeclaration) {
50
- throw new Error(`Could not find any React component in file ${componentFilePath}`);
50
+ const componentNodes = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile);
51
+ if (componentNodes === null || componentNodes === void 0 ? void 0 : componentNodes.length) {
52
+ componentNodes.forEach((declaration) => {
53
+ findPropsAndGenerateFile(host, sourceFile, declaration, componentDirectory, name, isPlainJs, fileExt, componentNodes.length > 1);
54
+ });
55
+ }
56
+ else {
57
+ throw new Error(`Could not find any React component in file ${componentFilePath}`);
58
+ }
51
59
  }
52
- const propsInterface = (0, ast_utils_1.getComponentPropsInterface)(sourceFile);
60
+ else {
61
+ findPropsAndGenerateFile(host, sourceFile, cmpDeclaration, componentDirectory, name, isPlainJs, fileExt);
62
+ }
63
+ }
64
+ exports.createComponentStoriesFile = createComponentStoriesFile;
65
+ function findPropsAndGenerateFile(host, sourceFile, cmpDeclaration, componentDirectory, name, isPlainJs, fileExt, fromNodeArray) {
66
+ const propsInterface = (0, ast_utils_1.getComponentPropsInterface)(sourceFile, cmpDeclaration);
53
67
  let propsTypeName = null;
54
68
  let props = [];
55
69
  let argTypes = [];
@@ -73,7 +87,10 @@ function createComponentStoriesFile(host, { project, componentPath }) {
73
87
  props = props.filter((p) => p && p.defaultValue !== undefined);
74
88
  }
75
89
  (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files'), (0, devkit_1.normalizePath)(componentDirectory), {
76
- componentFileName: name,
90
+ componentFileName: fromNodeArray
91
+ ? `${name}--${cmpDeclaration.name.text}`
92
+ : name,
93
+ componentImportFileName: name,
77
94
  propsTypeName,
78
95
  props,
79
96
  argTypes,
@@ -82,7 +99,7 @@ function createComponentStoriesFile(host, { project, componentPath }) {
82
99
  fileExt,
83
100
  });
84
101
  }
85
- exports.createComponentStoriesFile = createComponentStoriesFile;
102
+ exports.findPropsAndGenerateFile = findPropsAndGenerateFile;
86
103
  function componentStoryGenerator(host, schema) {
87
104
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
88
105
  createComponentStoriesFile(host, schema);
package/src/generators/component-story/component-story.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-story/component-story.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-story/component-story.ts"],"names":[],"mappings":"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"}
package/src/generators/component-story/files/__componentFileName__.stories.__fileExt__ CHANGED
@@ -1,5 +1,5 @@
1
1
  <% if ( !isPlainJs ) { %>import { Story, Meta } from '@storybook/react';<% } %>
2
- import<% if ( !isPlainJs ) { %> { <% } %> <%= componentName %><% if ( propsTypeName && !isPlainJs ) { %>, <%= propsTypeName %> <% } %> <% if ( !isPlainJs ) { %> } <% } %> from './<%= componentFileName %>';
2
+ import<% if ( !isPlainJs ) { %> { <% } %> <%= componentName %><% if ( propsTypeName && !isPlainJs ) { %>, <%= propsTypeName %> <% } %> <% if ( !isPlainJs ) { %> } <% } %> from './<%= componentImportFileName %>';
3
3
 
4
4
  export default {
5
5
  component: <%= componentName %>,
package/src/generators/stories/stories.d.ts CHANGED
@@ -6,6 +6,7 @@ export interface StorybookStoriesSchema {
6
6
  cypressProject?: string;
7
7
  }
8
8
  export declare function projectRootPath(tree: Tree, sourceRoot: string, projectType: ProjectType): string;
9
+ export declare function containsComponentDeclaration(tree: Tree, componentPath: string): boolean;
9
10
  export declare function createAllStories(tree: Tree, projectName: string, generateCypressSpecs: boolean, js: boolean, cypressProject?: string): Promise<void>;
10
11
  export declare function storiesGenerator(host: Tree, schema: StorybookStoriesSchema): Promise<void>;
11
12
  export default storiesGenerator;
package/src/generators/stories/stories.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.storiesSchematic = exports.storiesGenerator = exports.createAllStories = exports.projectRootPath = void 0;
3
+ exports.storiesSchematic = exports.storiesGenerator = exports.createAllStories = exports.containsComponentDeclaration = exports.projectRootPath = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const component_story_1 = require("../component-story/component-story");
6
6
  const component_cypress_spec_1 = require("../component-cypress-spec/component-cypress-spec");
@@ -22,13 +22,16 @@ function projectRootPath(tree, sourceRoot, projectType) {
22
22
  }
23
23
  exports.projectRootPath = projectRootPath;
24
24
  function containsComponentDeclaration(tree, componentPath) {
25
+ var _a;
25
26
  const contents = tree.read(componentPath, 'utf-8');
26
27
  if (contents === null) {
27
28
  throw new Error(`Failed to read ${componentPath}`);
28
29
  }
29
30
  const sourceFile = ts.createSourceFile(componentPath, contents, ts.ScriptTarget.Latest, true);
30
- return !!(0, ast_utils_1.getComponentName)(sourceFile);
31
+ return !!((0, ast_utils_1.getComponentNode)(sourceFile) ||
32
+ ((_a = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile)) === null || _a === void 0 ? void 0 : _a.length));
31
33
  }
34
+ exports.containsComponentDeclaration = containsComponentDeclaration;
32
35
  function createAllStories(tree, projectName, generateCypressSpecs, js, cypressProject) {
33
36
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
34
37
  const projects = (0, devkit_1.getProjects)(tree);
package/src/generators/stories/stories.js.map CHANGED
@@ -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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"}
package/src/utils/ast-utils.d.ts CHANGED
@@ -2,10 +2,11 @@ import * as ts from 'typescript';
2
2
  import { StringChange } from '@nrwl/devkit';
3
3
  export declare function addImport(source: ts.SourceFile, statement: string): StringChange[];
4
4
  export declare function findMainRenderStatement(source: ts.SourceFile): ts.CallExpression | null;
5
- export declare function findDefaultExport(source: ts.SourceFile): ts.Node | null;
6
- export declare function findDefaultExportDeclaration(source: ts.SourceFile): ts.Node | null;
5
+ export declare function findDefaultExport(source: ts.SourceFile): ts.VariableDeclaration | ts.FunctionDeclaration | ts.ClassDeclaration | null;
6
+ export declare function findDefaultExportDeclaration(source: ts.SourceFile): ts.VariableDeclaration | ts.FunctionDeclaration | ts.ClassDeclaration | null;
7
+ export declare function findExportDeclarationsForJsx(source: ts.SourceFile): Array<ts.VariableDeclaration | ts.FunctionDeclaration | ts.ClassDeclaration> | null;
7
8
  export declare function findDefaultExportIdentifier(source: ts.SourceFile): ts.Identifier | null;
8
- export declare function findDefaultClassOrFunction(source: ts.SourceFile): ts.FunctionDeclaration | ts.ClassDeclaration | null;
9
+ export declare function findDefaultClassOrFunction(source: ts.SourceFile | null): ts.FunctionDeclaration | ts.ClassDeclaration | null;
9
10
  export declare function findComponentImportPath(componentName: string, source: ts.SourceFile): string;
10
11
  export declare function findElements(source: ts.SourceFile, tagName: string): ts.Node[];
11
12
  export declare function findClosestOpening(tagName: string, node: ts.Node): any;
@@ -23,5 +24,5 @@ export declare function updateReduxStore(sourcePath: string, source: ts.SourceFi
23
24
  reducerName: string;
24
25
  modulePath: string;
25
26
  }): StringChange[];
26
- export declare function getComponentName(sourceFile: ts.SourceFile): ts.Node | null;
27
- export declare function getComponentPropsInterface(sourceFile: ts.SourceFile): ts.InterfaceDeclaration | null;
27
+ export declare function getComponentNode(sourceFile: ts.SourceFile): ts.Node | null;
28
+ export declare function getComponentPropsInterface(sourceFile: ts.SourceFile, cmpDeclaration: ts.Node): ts.InterfaceDeclaration | null;
package/src/utils/ast-utils.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getComponentPropsInterface = exports.getComponentName = exports.updateReduxStore = exports.addReduxStoreToMain = exports.addBrowserRouter = exports.addRoute = exports.addInitialRoutes = exports.isTag = exports.findClosestOpening = exports.findElements = exports.findComponentImportPath = exports.findDefaultClassOrFunction = exports.findDefaultExportIdentifier = exports.findDefaultExportDeclaration = exports.findDefaultExport = exports.findMainRenderStatement = exports.addImport = void 0;
3
+ exports.getComponentPropsInterface = exports.getComponentNode = exports.updateReduxStore = exports.addReduxStoreToMain = exports.addBrowserRouter = exports.addRoute = exports.addInitialRoutes = exports.isTag = exports.findClosestOpening = exports.findElements = exports.findComponentImportPath = exports.findDefaultClassOrFunction = exports.findDefaultExportIdentifier = exports.findExportDeclarationsForJsx = exports.findDefaultExportDeclaration = exports.findDefaultExport = exports.findMainRenderStatement = exports.addImport = void 0;
4
4
  const ts = require("typescript");
5
5
  const find_nodes_1 = require("@nrwl/workspace/src/utilities/typescript/find-nodes");
6
6
  const devkit_1 = require("@nrwl/devkit");
@@ -81,6 +81,55 @@ function findDefaultExportDeclaration(source) {
81
81
  }
82
82
  }
83
83
  exports.findDefaultExportDeclaration = findDefaultExportDeclaration;
84
+ function findExportDeclarationsForJsx(source) {
85
+ const variables = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.VariableDeclaration);
86
+ const variableStatements = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.VariableStatement);
87
+ const fns = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.FunctionDeclaration);
88
+ const cls = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.ClassDeclaration);
89
+ const exportDeclarations = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.ExportDeclaration);
90
+ let componentNamesNodes = [];
91
+ exportDeclarations.forEach((node) => {
92
+ componentNamesNodes = [
93
+ ...componentNamesNodes,
94
+ ...(0, find_nodes_1.findNodes)(node, ts.SyntaxKind.ExportSpecifier),
95
+ ];
96
+ });
97
+ const componentNames = componentNamesNodes === null || componentNamesNodes === void 0 ? void 0 : componentNamesNodes.map((node) => node.getText());
98
+ const all = [...variables, ...variableStatements, ...fns, ...cls];
99
+ let foundExport;
100
+ let foundJSX;
101
+ const nodesContainingJSX = all.filter((x) => {
102
+ foundJSX = (0, find_nodes_1.findNodes)(x, [
103
+ ts.SyntaxKind.JsxSelfClosingElement,
104
+ ts.SyntaxKind.JsxOpeningElement,
105
+ ]);
106
+ return foundJSX === null || foundJSX === void 0 ? void 0 : foundJSX.length;
107
+ });
108
+ const exported = nodesContainingJSX.filter((x) => {
109
+ var _a, _b, _c;
110
+ foundExport = (0, find_nodes_1.findNodes)(x, ts.SyntaxKind.ExportKeyword);
111
+ if (x.kind === ts.SyntaxKind.VariableStatement) {
112
+ const nameNode = (_a = (0, find_nodes_1.findNodes)(x, ts.SyntaxKind.VariableDeclaration)) === null || _a === void 0 ? void 0 : _a[0];
113
+ return (((_b = nameNode === null || nameNode === void 0 ? void 0 : nameNode.name) === null || _b === void 0 ? void 0 : _b.kind) === ts.SyntaxKind.Identifier ||
114
+ (foundExport === null || foundExport === void 0 ? void 0 : foundExport.length) ||
115
+ (componentNames === null || componentNames === void 0 ? void 0 : componentNames.includes((_c = nameNode === null || nameNode === void 0 ? void 0 : nameNode.name) === null || _c === void 0 ? void 0 : _c.getText())));
116
+ }
117
+ else {
118
+ return ((x.name.kind === ts.SyntaxKind.Identifier && (foundExport === null || foundExport === void 0 ? void 0 : foundExport.length)) ||
119
+ (componentNames === null || componentNames === void 0 ? void 0 : componentNames.includes(x.name.getText())));
120
+ }
121
+ });
122
+ const exportedDeclarations = exported.map((x) => {
123
+ var _a;
124
+ if (x.kind === ts.SyntaxKind.VariableStatement) {
125
+ const nameNode = (_a = (0, find_nodes_1.findNodes)(x, ts.SyntaxKind.VariableDeclaration)) === null || _a === void 0 ? void 0 : _a[0];
126
+ return nameNode;
127
+ }
128
+ return x;
129
+ });
130
+ return exportedDeclarations || null;
131
+ }
132
+ exports.findExportDeclarationsForJsx = findExportDeclarationsForJsx;
84
133
  function findDefaultExportIdentifier(source) {
85
134
  const exports = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.ExportAssignment);
86
135
  const identifier = exports
@@ -348,7 +397,7 @@ function updateReduxStore(sourcePath, source, feature) {
348
397
  ];
349
398
  }
350
399
  exports.updateReduxStore = updateReduxStore;
351
- function getComponentName(sourceFile) {
400
+ function getComponentNode(sourceFile) {
352
401
  const defaultExport = findDefaultExport(sourceFile);
353
402
  if (!(defaultExport &&
354
403
  ((0, find_nodes_1.findNodes)(defaultExport, ts.SyntaxKind.JsxElement).length > 0 ||
@@ -358,9 +407,8 @@ function getComponentName(sourceFile) {
358
407
  }
359
408
  return defaultExport;
360
409
  }
361
- exports.getComponentName = getComponentName;
362
- function getComponentPropsInterface(sourceFile) {
363
- const cmpDeclaration = getComponentName(sourceFile);
410
+ exports.getComponentNode = getComponentNode;
411
+ function getComponentPropsInterface(sourceFile, cmpDeclaration) {
364
412
  let propsTypeName = null;
365
413
  if (ts.isFunctionDeclaration(cmpDeclaration)) {
366
414
  const propsParam = cmpDeclaration.parameters.find((x) => ts.isParameter(x) && x.name.text === 'props');
package/src/utils/ast-utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/ast-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/ast-utils.ts"],"names":[],"mappings":"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"}
package/src/utils/versions.d.ts CHANGED
@@ -1,9 +1,9 @@
1
1
  export declare const nxVersion = "*";
2
- export declare const reactVersion = "18.0.0";
3
- export declare const reactDomVersion = "18.0.0";
4
- export declare const reactIsVersion = "18.0.0";
5
- export declare const typesReactVersion = "18.0.1";
6
- export declare const typesReactDomVersion = "18.0.0";
2
+ export declare const reactVersion = "18.1.0";
3
+ export declare const reactDomVersion = "18.1.0";
4
+ export declare const reactIsVersion = "18.1.0";
5
+ export declare const typesReactVersion = "18.0.8";
6
+ export declare const typesReactDomVersion = "18.0.3";
7
7
  export declare const typesReactIsVersion = "17.0.3";
8
8
  export declare const typesNodeVersion = "16.11.7";
9
9
  export declare const styledComponentsVersion = "5.3.5";
@@ -11,15 +11,15 @@ export declare const typesStyledComponentsVersion = "5.1.25";
11
11
  export declare const emotionStyledVersion = "11.8.1";
12
12
  export declare const emotionReactVersion = "11.9.0";
13
13
  export declare const emotionBabelPlugin = "11.9.2";
14
- export declare const styledJsxVersion = "5.0.2";
14
+ export declare const styledJsxVersion = "5.0.1";
15
15
  export declare const reactRouterDomVersion = "6.3.0";
16
16
  export declare const typesReactRouterDomVersion = "5.3.3";
17
17
  export declare const testingLibraryReactVersion = "13.1.1";
18
18
  export declare const reduxjsToolkitVersion = "1.8.1";
19
- export declare const reactReduxVersion = "8.0.0";
20
- export declare const reactTestRendererVersion = "18.0.0";
19
+ export declare const reactReduxVersion = "8.0.1";
20
+ export declare const reactTestRendererVersion = "18.1.0";
21
21
  export declare const eslintPluginImportVersion = "2.26.0";
22
22
  export declare const eslintPluginJsxA11yVersion = "6.5.1";
23
23
  export declare const eslintPluginReactVersion = "7.29.4";
24
- export declare const eslintPluginReactHooksVersion = "4.4.0";
24
+ export declare const eslintPluginReactHooksVersion = "4.5.0";
25
25
  export declare const babelPluginStyledComponentsVersion = "1.10.7";
package/src/utils/versions.js CHANGED
@@ -1,12 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactTestRendererVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactVersion = exports.typesReactRouterDomVersion = exports.reactRouterDomVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.typesNodeVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxVersion = void 0;
4
- exports.nxVersion = '14.0.5';
5
- exports.reactVersion = '18.0.0';
6
- exports.reactDomVersion = '18.0.0';
7
- exports.reactIsVersion = '18.0.0';
8
- exports.typesReactVersion = '18.0.1';
9
- exports.typesReactDomVersion = '18.0.0';
4
+ exports.nxVersion = '14.1.0-beta.1';
5
+ exports.reactVersion = '18.1.0';
6
+ exports.reactDomVersion = '18.1.0';
7
+ exports.reactIsVersion = '18.1.0';
8
+ exports.typesReactVersion = '18.0.8';
9
+ exports.typesReactDomVersion = '18.0.3';
10
10
  exports.typesReactIsVersion = '17.0.3';
11
11
  exports.typesNodeVersion = '16.11.7';
12
12
  exports.styledComponentsVersion = '5.3.5';
@@ -14,16 +14,17 @@ exports.typesStyledComponentsVersion = '5.1.25';
14
14
  exports.emotionStyledVersion = '11.8.1';
15
15
  exports.emotionReactVersion = '11.9.0';
16
16
  exports.emotionBabelPlugin = '11.9.2';
17
- exports.styledJsxVersion = '5.0.2';
17
+ // WARNING: This needs to be in sync with Next.js' dependency or else there might be issues.
18
+ exports.styledJsxVersion = '5.0.1';
18
19
  exports.reactRouterDomVersion = '6.3.0';
19
20
  exports.typesReactRouterDomVersion = '5.3.3';
20
21
  exports.testingLibraryReactVersion = '13.1.1';
21
22
  exports.reduxjsToolkitVersion = '1.8.1';
22
- exports.reactReduxVersion = '8.0.0';
23
- exports.reactTestRendererVersion = '18.0.0';
23
+ exports.reactReduxVersion = '8.0.1';
24
+ exports.reactTestRendererVersion = '18.1.0';
24
25
  exports.eslintPluginImportVersion = '2.26.0';
25
26
  exports.eslintPluginJsxA11yVersion = '6.5.1';
26
27
  exports.eslintPluginReactVersion = '7.29.4';
27
- exports.eslintPluginReactHooksVersion = '4.4.0';
28
+ exports.eslintPluginReactHooksVersion = '4.5.0';
28
29
  exports.babelPluginStyledComponentsVersion = '1.10.7';
29
30
  //# sourceMappingURL=versions.js.map
package/src/utils/versions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAE/B,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAE7B,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AAExC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAE9B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAE3B,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AAErC,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AAEtC,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,iBAAiB,GAAG,OAAO,CAAC;AAC5B,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AAEpC,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,6BAA6B,GAAG,OAAO,CAAC;AAExC,QAAA,kCAAkC,GAAG,QAAQ,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAE/B,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAE7B,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AAExC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAE3C,4FAA4F;AAC/E,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAE3B,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AAErC,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AAEtC,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,iBAAiB,GAAG,OAAO,CAAC;AAC5B,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AAEpC,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,6BAA6B,GAAG,OAAO,CAAC;AAExC,QAAA,kCAAkC,GAAG,QAAQ,CAAC"}