@nx/react 16.1.4 → 16.2.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 (29) hide show
  1. package/index.d.ts +1 -1
  2. package/index.js +1 -2
  3. package/index.js.map +1 -1
  4. package/migrations.json +6 -0
  5. package/package.json +7 -7
  6. package/plugins/component-testing/index.js +18 -6
  7. package/plugins/component-testing/index.js.map +1 -1
  8. package/src/generators/application/lib/normalize-options.js +2 -0
  9. package/src/generators/application/lib/normalize-options.js.map +1 -1
  10. package/src/generators/application/schema.d.ts +0 -4
  11. package/src/generators/cypress-component-configuration/lib/add-files.js +10 -8
  12. package/src/generators/cypress-component-configuration/lib/add-files.js.map +1 -1
  13. package/src/generators/init/init.js +0 -1
  14. package/src/generators/init/init.js.map +1 -1
  15. package/src/generators/library/lib/normalize-options.js +3 -2
  16. package/src/generators/library/lib/normalize-options.js.map +1 -1
  17. package/src/generators/library/lib/update-app-routes.d.ts +1 -1
  18. package/src/generators/library/lib/update-app-routes.js +3 -4
  19. package/src/generators/library/lib/update-app-routes.js.map +1 -1
  20. package/src/migrations/update-16-2-0-remove-package/update-16-2-0-remove-package.d.ts +2 -0
  21. package/src/migrations/update-16-2-0-remove-package/update-16-2-0-remove-package.js +12 -0
  22. package/src/migrations/update-16-2-0-remove-package/update-16-2-0-remove-package.js.map +1 -0
  23. package/src/utils/lint.d.ts +0 -4
  24. package/src/utils/lint.js +1 -46
  25. package/src/utils/lint.js.map +1 -1
  26. package/tailwind.js +1 -1
  27. package/tailwind.js.map +1 -1
  28. package/src/generators/cypress-component-configuration/files/cypress/support/commands.ts__tpl__ +0 -42
  29. package/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__ +0 -8
package/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export { extraEslintDependencies, createReactEslintJson, extendReactEslintJson, } from './src/utils/lint';
1
+ export { extraEslintDependencies, extendReactEslintJson, } from './src/utils/lint';
2
2
  export { CSS_IN_JS_DEPENDENCIES } from './src/utils/styled';
3
3
  export { assertValidStyle } from './src/utils/assertion';
4
4
  export { reactDomVersion, reactVersion } from './src/utils/versions';
package/index.js CHANGED
@@ -1,10 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.setupTailwindGenerator = exports.componentTestGenerator = exports.cypressComponentConfigGenerator = exports.remoteGenerator = exports.hostGenerator = exports.storybookConfigurationGenerator = exports.storiesGenerator = exports.reduxGenerator = exports.reactInitGenerator = exports.libraryGenerator = exports.componentStoryGenerator = exports.componentCypressGenerator = exports.hookGenerator = exports.componentGenerator = exports.applicationGenerator = exports.reactVersion = exports.reactDomVersion = exports.assertValidStyle = exports.CSS_IN_JS_DEPENDENCIES = exports.extendReactEslintJson = exports.createReactEslintJson = exports.extraEslintDependencies = void 0;
3
+ exports.setupTailwindGenerator = exports.componentTestGenerator = exports.cypressComponentConfigGenerator = exports.remoteGenerator = exports.hostGenerator = exports.storybookConfigurationGenerator = exports.storiesGenerator = exports.reduxGenerator = exports.reactInitGenerator = exports.libraryGenerator = exports.componentStoryGenerator = exports.componentCypressGenerator = exports.hookGenerator = exports.componentGenerator = exports.applicationGenerator = exports.reactVersion = exports.reactDomVersion = exports.assertValidStyle = exports.CSS_IN_JS_DEPENDENCIES = exports.extendReactEslintJson = exports.extraEslintDependencies = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  var lint_1 = require("./src/utils/lint");
6
6
  Object.defineProperty(exports, "extraEslintDependencies", { enumerable: true, get: function () { return lint_1.extraEslintDependencies; } });
7
- Object.defineProperty(exports, "createReactEslintJson", { enumerable: true, get: function () { return lint_1.createReactEslintJson; } });
8
7
  Object.defineProperty(exports, "extendReactEslintJson", { enumerable: true, get: function () { return lint_1.extendReactEslintJson; } });
9
8
  var styled_1 = require("./src/utils/styled");
10
9
  Object.defineProperty(exports, "CSS_IN_JS_DEPENDENCIES", { enumerable: true, get: function () { return styled_1.CSS_IN_JS_DEPENDENCIES; } });
package/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/react/index.ts"],"names":[],"mappings":";;;;AAAA,yCAI0B;AAHxB,+GAAA,uBAAuB,OAAA;AACvB,6GAAA,qBAAqB,OAAA;AACrB,6GAAA,qBAAqB,OAAA;AAEvB,6CAA4D;AAAnD,gHAAA,sBAAsB,OAAA;AAC/B,mDAAyD;AAAhD,6GAAA,gBAAgB,OAAA;AACzB,iDAAqE;AAA5D,2GAAA,eAAe,OAAA;AAAE,wGAAA,YAAY,OAAA;AACtC,wEAAgF;AAAvE,mHAAA,oBAAoB,OAAA;AAC7B,kEAA0E;AAAjE,+GAAA,kBAAkB,OAAA;AAC3B,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yGAA2G;AAAlG,mIAAA,yBAAyB,OAAA;AAClC,oFAA2F;AAAlF,0HAAA,uBAAuB,OAAA;AAChC,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,mDAAgE;AAAvD,0GAAA,kBAAkB,OAAA;AAC3B,sDAA8D;AAArD,uGAAA,cAAc,OAAA;AACvB,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,wFAAyG;AAAhG,gIAAA,+BAA+B,OAAA;AACxC,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yDAAiE;AAAxD,yGAAA,eAAe,OAAA;AACxB,oIAAmI;AAA1H,kJAAA,+BAA+B,OAAA;AACxC,iFAAwF;AAA/E,wHAAA,sBAAsB,OAAA;AAC/B,iFAAwF;AAA/E,wHAAA,sBAAsB,OAAA;AAE/B,+DAAqC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/react/index.ts"],"names":[],"mappings":";;;;AAAA,yCAG0B;AAFxB,+GAAA,uBAAuB,OAAA;AACvB,6GAAA,qBAAqB,OAAA;AAEvB,6CAA4D;AAAnD,gHAAA,sBAAsB,OAAA;AAC/B,mDAAyD;AAAhD,6GAAA,gBAAgB,OAAA;AACzB,iDAAqE;AAA5D,2GAAA,eAAe,OAAA;AAAE,wGAAA,YAAY,OAAA;AACtC,wEAAgF;AAAvE,mHAAA,oBAAoB,OAAA;AAC7B,kEAA0E;AAAjE,+GAAA,kBAAkB,OAAA;AAC3B,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yGAA2G;AAAlG,mIAAA,yBAAyB,OAAA;AAClC,oFAA2F;AAAlF,0HAAA,uBAAuB,OAAA;AAChC,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,mDAAgE;AAAvD,0GAAA,kBAAkB,OAAA;AAC3B,sDAA8D;AAArD,uGAAA,cAAc,OAAA;AACvB,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,wFAAyG;AAAhG,gIAAA,+BAA+B,OAAA;AACxC,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yDAAiE;AAAxD,yGAAA,eAAe,OAAA;AACxB,oIAAmI;AAA1H,kJAAA,+BAA+B,OAAA;AACxC,iFAAwF;AAA/E,wHAAA,sBAAsB,OAAA;AAC/B,iFAAwF;AAA/E,wHAAA,sBAAsB,OAAA;AAE/B,+DAAqC"}
package/migrations.json CHANGED
@@ -89,6 +89,12 @@
89
89
  "version": "16.0.0-beta.1",
90
90
  "description": "Replace @nrwl/react with @nx/react",
91
91
  "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
92
+ },
93
+ "update-16-2-0-remove-package": {
94
+ "cli": "nx",
95
+ "version": "16.2.0-beta.0",
96
+ "description": "Remove react-test-renderer from package.json",
97
+ "implementation": "./src/migrations/update-16-2-0-remove-package/update-16-2-0-remove-package"
92
98
  }
93
99
  },
94
100
  "packageJsonUpdates": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/react",
3
- "version": "16.1.4",
3
+ "version": "16.2.0-beta.1",
4
4
  "private": false,
5
5
  "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.",
6
6
  "repository": {
@@ -31,11 +31,11 @@
31
31
  "migrations": "./migrations.json"
32
32
  },
33
33
  "dependencies": {
34
- "@nrwl/react": "16.1.4",
35
- "@nx/devkit": "16.1.4",
36
- "@nx/js": "16.1.4",
37
- "@nx/linter": "16.1.4",
38
- "@nx/web": "16.1.4",
34
+ "@nrwl/react": "16.2.0-beta.1",
35
+ "@nx/devkit": "16.2.0-beta.1",
36
+ "@nx/js": "16.2.0-beta.1",
37
+ "@nx/linter": "16.2.0-beta.1",
38
+ "@nx/web": "16.2.0-beta.1",
39
39
  "@phenomnomnominal/tsquery": "~5.0.1",
40
40
  "@svgr/webpack": "^6.1.2",
41
41
  "chalk": "^4.1.0",
@@ -46,5 +46,5 @@
46
46
  "access": "public"
47
47
  },
48
48
  "types": "./index.d.ts",
49
- "gitHead": "16f098804653374057eff7e2f9565fb4c7a90b29"
49
+ "gitHead": "79fa3fb0ead486e33a7e00b5c13a0f2545278202"
50
50
  }
@@ -26,12 +26,12 @@ const path_1 = require("path");
26
26
  * @param options override options
27
27
  */
28
28
  function nxComponentTestingPreset(pathToConfig, options) {
29
+ const normalizedProjectRootPath = ['.ts', '.js'].some((ext) => pathToConfig.endsWith(ext))
30
+ ? pathToConfig
31
+ : (0, path_1.dirname)(pathToConfig);
29
32
  if ((options === null || options === void 0 ? void 0 : options.bundler) === 'vite') {
30
33
  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: 'vite' }), { viteConfig: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
31
- const normalizedPath = ['.ts', '.js'].some((ext) => pathToConfig.endsWith(ext))
32
- ? pathToConfig
33
- : (0, path_1.dirname)(pathToConfig);
34
- const viteConfigPath = findViteConfig(normalizedPath);
34
+ const viteConfigPath = findViteConfig(normalizedProjectRootPath);
35
35
  const { mergeConfig, loadConfigFromFile, searchForWorkspaceRoot } = (yield Promise.resolve().then(() => require('vite')));
36
36
  const resolved = yield loadConfigFromFile({
37
37
  mode: 'watch',
@@ -41,7 +41,7 @@ function nxComponentTestingPreset(pathToConfig, options) {
41
41
  server: {
42
42
  fs: {
43
43
  allow: [
44
- searchForWorkspaceRoot(normalizedPath),
44
+ searchForWorkspaceRoot(normalizedProjectRootPath),
45
45
  devkit_1.workspaceRoot,
46
46
  (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'node_modules/vite'),
47
47
  ],
@@ -74,7 +74,7 @@ function nxComponentTestingPreset(pathToConfig, options) {
74
74
  devkit_1.logger.warn(e);
75
75
  const { buildBaseWebpackConfig } = require('./webpack-fallback');
76
76
  webpackConfig = buildBaseWebpackConfig({
77
- tsConfigPath: 'cypress/tsconfig.cy.json',
77
+ tsConfigPath: findTsConfig(normalizedProjectRootPath),
78
78
  compiler: 'babel',
79
79
  });
80
80
  }
@@ -150,4 +150,16 @@ function findViteConfig(projectRootFullPath) {
150
150
  }
151
151
  }
152
152
  }
153
+ function findTsConfig(projectRoot) {
154
+ const potentialConfigs = [
155
+ 'cypress/tsconfig.json',
156
+ 'cypress/tsconfig.cy.json',
157
+ 'tsconfig.cy.json',
158
+ ];
159
+ for (const config of potentialConfigs) {
160
+ if ((0, fs_1.existsSync)((0, path_1.join)(projectRoot, config))) {
161
+ return config;
162
+ }
163
+ }
164
+ }
153
165
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,8 @@ const assertion_1 = require("../../../utils/assertion");
5
5
  const devkit_1 = require("@nx/devkit");
6
6
  const find_free_port_1 = require("./find-free-port");
7
7
  function normalizeDirectory(options) {
8
+ var _a;
9
+ options.directory = (_a = options.directory) === null || _a === void 0 ? void 0 : _a.replace(/\\{1,2}/g, '/');
8
10
  const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
9
11
  return projectDirectory
10
12
  ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,wDAA4D;AAC5D,uCAMoB;AACpB,qDAAgD;AAEhD,SAAgB,kBAAkB,CAAC,OAAe;IAChD,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvE,OAAO,gBAAgB;QACrB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,gBAAgB,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACvE,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;AACnC,CAAC;AALD,gDAKC;AAED,SAAgB,oBAAoB,CAAC,OAAe;IAClD,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;AACxE,CAAC;AAFD,oDAEC;AAED,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAE1C,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IACpE,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,sBAAa,EAAC,GAAG,OAAO,IAAI,YAAY,EAAE,CAAC,CAAC;IAEhD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAEzD,MAAM,YAAY,GAAG,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QACpE,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAElB,IAAA,4BAAgB,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhC,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;QAC9B,OAAO,CAAC,cAAc,GAAG,QAAQ,CAAC;KACnC;IAED,MAAM,UAAU,GAAG,gCACd,OAAO,KACV,IAAI,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAClC,WAAW,EAAE,cAAc,EAC3B,cAAc;QACd,cAAc;QACd,UAAU;QACV,QAAQ;QACR,YAAY,EACZ,SAAS,EAAE,OAAO,CAAC,KAAK,KAAK,MAAM,GAChB,CAAC;IAEtB,UAAU,CAAC,OAAO,GAAG,MAAA,UAAU,CAAC,OAAO,mCAAI,KAAK,CAAC;IACjD,UAAU,CAAC,MAAM,GAAG,MAAA,UAAU,CAAC,MAAM,mCAAI,IAAI,CAAC;IAC9C,UAAU,CAAC,cAAc,GAAG,MAAA,UAAU,CAAC,cAAc,mCAAI,KAAK,CAAC;IAC/D,UAAU,CAAC,QAAQ,GAAG,MAAA,UAAU,CAAC,QAAQ,mCAAI,OAAO,CAAC;IACrD,UAAU,CAAC,OAAO,GAAG,MAAA,UAAU,CAAC,OAAO,mCAAI,SAAS,CAAC;IACrD,UAAU,CAAC,cAAc;QACvB,MAAA,UAAU,CAAC,cAAc,mCACzB,CAAC,UAAU,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACtD,UAAU,CAAC,aAAa,GAAG,MAAA,UAAU,CAAC,aAAa,mCAAI,SAAS,CAAC;IACjE,UAAU,CAAC,aAAa,GAAG,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,aAAa,CAAC;IAC1E,MAAA,UAAU,CAAC,aAAa,oCAAxB,UAAU,CAAC,aAAa,GAAK,IAAA,6BAAY,EAAC,IAAI,CAAC,EAAC;IAChD,UAAU,CAAC,OAAO,GAAG,MAAA,UAAU,CAAC,OAAO,mCAAI,KAAK,CAAC;IAEjD,OAAO,UAAU,CAAC;AACpB,CAAC;AA1DD,4CA0DC"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,wDAA4D;AAC5D,uCAMoB;AACpB,qDAAgD;AAEhD,SAAgB,kBAAkB,CAAC,OAAe;;IAChD,OAAO,CAAC,SAAS,GAAG,MAAA,OAAO,CAAC,SAAS,0CAAE,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAChE,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvE,OAAO,gBAAgB;QACrB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,gBAAgB,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACvE,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;AACnC,CAAC;AAND,gDAMC;AAED,SAAgB,oBAAoB,CAAC,OAAe;IAClD,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;AACxE,CAAC;AAFD,oDAEC;AAED,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAE1C,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IACpE,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,sBAAa,EAAC,GAAG,OAAO,IAAI,YAAY,EAAE,CAAC,CAAC;IAEhD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAEzD,MAAM,YAAY,GAAG,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QACpE,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAElB,IAAA,4BAAgB,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhC,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;QAC9B,OAAO,CAAC,cAAc,GAAG,QAAQ,CAAC;KACnC;IAED,MAAM,UAAU,GAAG,gCACd,OAAO,KACV,IAAI,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAClC,WAAW,EAAE,cAAc,EAC3B,cAAc;QACd,cAAc;QACd,UAAU;QACV,QAAQ;QACR,YAAY,EACZ,SAAS,EAAE,OAAO,CAAC,KAAK,KAAK,MAAM,GAChB,CAAC;IAEtB,UAAU,CAAC,OAAO,GAAG,MAAA,UAAU,CAAC,OAAO,mCAAI,KAAK,CAAC;IACjD,UAAU,CAAC,MAAM,GAAG,MAAA,UAAU,CAAC,MAAM,mCAAI,IAAI,CAAC;IAC9C,UAAU,CAAC,cAAc,GAAG,MAAA,UAAU,CAAC,cAAc,mCAAI,KAAK,CAAC;IAC/D,UAAU,CAAC,QAAQ,GAAG,MAAA,UAAU,CAAC,QAAQ,mCAAI,OAAO,CAAC;IACrD,UAAU,CAAC,OAAO,GAAG,MAAA,UAAU,CAAC,OAAO,mCAAI,SAAS,CAAC;IACrD,UAAU,CAAC,cAAc;QACvB,MAAA,UAAU,CAAC,cAAc,mCACzB,CAAC,UAAU,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACtD,UAAU,CAAC,aAAa,GAAG,MAAA,UAAU,CAAC,aAAa,mCAAI,SAAS,CAAC;IACjE,UAAU,CAAC,aAAa,GAAG,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,aAAa,CAAC;IAC1E,MAAA,UAAU,CAAC,aAAa,oCAAxB,UAAU,CAAC,aAAa,GAAK,IAAA,6BAAY,EAAC,IAAI,CAAC,EAAC;IAChD,UAAU,CAAC,OAAO,GAAG,MAAA,UAAU,CAAC,OAAO,mCAAI,KAAK,CAAC;IAEjD,OAAO,UAAU,CAAC;AACpB,CAAC;AA1DD,4CA0DC"}
@@ -9,10 +9,6 @@ export interface Schema {
9
9
  tags?: string;
10
10
  unitTestRunner?: 'jest' | 'vitest' | 'none';
11
11
  inSourceTests?: boolean;
12
- /**
13
- * @deprecated
14
- */
15
- babelJest?: boolean;
16
12
  e2eTestRunner: 'cypress' | 'none';
17
13
  linter: Linter;
18
14
  pascalCaseFiles?: boolean;
@@ -9,19 +9,21 @@ const ct_utils_1 = require("../../../utils/ct-utils");
9
9
  function addFiles(tree, projectConfig, options, found) {
10
10
  var _a;
11
11
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
12
- const cypressConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
13
- if (tree.exists(cypressConfigPath)) {
14
- tree.delete(cypressConfigPath);
15
- }
12
+ // must dyanmicaly import to prevent packages not using cypress from erroring out
13
+ // when importing react
14
+ const { addMountDefinition, addDefaultCTConfig } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
16
15
  const actualBundler = yield (0, ct_utils_1.getBundlerFromTarget)(found, tree);
17
16
  if (options.bundler && options.bundler !== actualBundler) {
18
17
  devkit_1.logger.warn(`You have specified ${options.bundler} as the bundler but this project is configured to use ${actualBundler}.
19
18
  This may cause errors. If you are seeing errors, try removing the --bundler option.`);
20
19
  }
21
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), projectConfig.root, {
22
- tpl: '',
23
- bundler: (_a = options.bundler) !== null && _a !== void 0 ? _a : actualBundler,
24
- });
20
+ const bundlerToUse = (_a = options.bundler) !== null && _a !== void 0 ? _a : actualBundler;
21
+ const commandFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
22
+ const updatedCommandFile = yield addMountDefinition(tree.read(commandFile, 'utf-8'));
23
+ tree.write(commandFile, `import { mount } from 'cypress/react18';\n${updatedCommandFile}`);
24
+ const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
25
+ const updatedCyConfig = yield addDefaultCTConfig(tree.read(cyFile, 'utf-8'), { bundler: bundlerToUse });
26
+ tree.write(cyFile, `import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';\n${updatedCyConfig}`);
25
27
  if (options.bundler === 'webpack' ||
26
28
  (!options.bundler && actualBundler === 'webpack')) {
27
29
  (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/webpack': versions_1.nxVersion });
@@ -1 +1 @@
1
- {"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AACpB,oDAAkD;AAClD,wEAA6E;AAE7E,sDAIiC;AAEjC,SAAsB,QAAQ,CAC5B,IAAU,EACV,aAAmC,EACnC,OAA4C,EAC5C,KAAkB;;;QAElB,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;SAChC;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,+BAAoB,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE9D,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,KAAK,aAAa,EAAE;YACxD,eAAM,CAAC,IAAI,CACT,sBAAsB,OAAO,CAAC,OAAO,yDAAyD,aAAa;0FACvB,CACrF,CAAC;SACH;QAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC3C,aAAa,CAAC,IAAI,EAClB;YACE,GAAG,EAAE,EAAE;YACP,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,aAAa;SAC1C,CACF,CAAC;QAEF,IACE,OAAO,CAAC,OAAO,KAAK,SAAS;YAC7B,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,aAAa,KAAK,SAAS,CAAC,EACjD;YACA,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,oBAAS,EAAE,CAAC,CAAC;SACtE;QAED,IACE,OAAO,CAAC,OAAO,KAAK,MAAM;YAC1B,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,aAAa,KAAK,MAAM,CAAC,EAC9C;YACA,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,oBAAS,EAAE,CAAC,CAAC;SACnE;QAED,IAAI,OAAO,CAAC,aAAa,EAAE;YACzB,MAAM,SAAS,GAAG,EAAE,CAAC;YACrB,IAAA,6BAAoB,EAAC,IAAI,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAChE,IAAI,IAAA,sBAAW,EAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;oBAC/B,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC1B;YACH,CAAC,CAAC,CAAC;YAEH,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,IAAA,uCAAsB,EAAC,IAAI,EAAE;oBACjC,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,aAAa,EAAE,QAAQ;iBACxB,CAAC,CAAC;aACJ;SACF;;CACF;AA9DD,4BA8DC"}
1
+ {"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AACpB,oDAAkD;AAClD,wEAA6E;AAE7E,sDAIiC;AAEjC,SAAsB,QAAQ,CAC5B,IAAU,EACV,aAAmC,EACnC,OAA4C,EAC5C,KAAkB;;;QAElB,iFAAiF;QACjF,uBAAuB;QACvB,MAAM,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,GAAG,2CACjD,8BAA8B,EAC/B,CAAC;QACF,MAAM,aAAa,GAAG,MAAM,IAAA,+BAAoB,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE9D,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,KAAK,aAAa,EAAE;YACxD,eAAM,CAAC,IAAI,CACT,sBAAsB,OAAO,CAAC,OAAO,yDAAyD,aAAa;0FACvB,CACrF,CAAC;SACH;QAED,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,aAAa,CAAC;QAEtD,MAAM,WAAW,GAAG,IAAA,0BAAiB,EACnC,aAAa,CAAC,IAAI,EAClB,SAAS,EACT,SAAS,EACT,cAAc,CACf,CAAC;QAEF,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CACjD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAChC,CAAC;QACF,IAAI,CAAC,KAAK,CACR,WAAW,EACX,6CAA6C,kBAAkB,EAAE,CAClE,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAC1E,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAC9C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAE1B,EAAE,OAAO,EAAE,YAAY,EAAE,CAC1B,CAAC;QACF,IAAI,CAAC,KAAK,CACR,MAAM,EACN,oFAAoF,eAAe,EAAE,CACtG,CAAC;QAEF,IACE,OAAO,CAAC,OAAO,KAAK,SAAS;YAC7B,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,aAAa,KAAK,SAAS,CAAC,EACjD;YACA,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,oBAAS,EAAE,CAAC,CAAC;SACtE;QAED,IACE,OAAO,CAAC,OAAO,KAAK,MAAM;YAC1B,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,aAAa,KAAK,MAAM,CAAC,EAC9C;YACA,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,oBAAS,EAAE,CAAC,CAAC;SACnE;QAED,IAAI,OAAO,CAAC,aAAa,EAAE;YACzB,MAAM,SAAS,GAAG,EAAE,CAAC;YACrB,IAAA,6BAAoB,EAAC,IAAI,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAChE,IAAI,IAAA,sBAAW,EAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;oBAC/B,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC1B;YACH,CAAC,CAAC,CAAC;YAEH,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,IAAA,uCAAsB,EAAC,IAAI,EAAE;oBACjC,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,aAAa,EAAE,QAAQ;iBACxB,CAAC,CAAC;aACJ;SACF;;CACF;AA5ED,4BA4EC"}
@@ -27,7 +27,6 @@ function updateDependencies(host, schema) {
27
27
  '@types/react': versions_1.typesReactVersion,
28
28
  '@types/react-dom': versions_1.typesReactDomVersion,
29
29
  '@testing-library/react': versions_1.testingLibraryReactVersion,
30
- 'react-test-renderer': versions_1.reactTestRendererVersion,
31
30
  });
32
31
  }
33
32
  function initRootBabelConfig(tree, schema) {
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.normalizeOptions = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
+ const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
5
6
  const assertion_1 = require("../../../utils/assertion");
6
7
  function normalizeOptions(host, options) {
7
8
  var _a, _b;
@@ -12,13 +13,13 @@ function normalizeOptions(host, options) {
12
13
  : name;
13
14
  const projectName = fullProjectDirectory.replace(new RegExp('/', 'g'), '-');
14
15
  const fileName = projectName;
15
- const { libsDir: defaultLibsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(host);
16
+ const { libsDir: defaultLibsDir } = (0, devkit_1.getWorkspaceLayout)(host);
16
17
  const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDir;
17
18
  const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
18
19
  const parsedTags = options.tags
19
20
  ? options.tags.split(',').map((s) => s.trim())
20
21
  : [];
21
- const importPath = options.importPath || (0, devkit_1.getImportPath)(npmScope, fullProjectDirectory);
22
+ const importPath = options.importPath || (0, get_import_path_1.getImportPath)(host, fullProjectDirectory);
22
23
  let bundler = (_a = options.bundler) !== null && _a !== void 0 ? _a : 'none';
23
24
  if (bundler === 'none') {
24
25
  if (options.publishable) {
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
- import { Tree } from 'nx/src/generators/tree';
1
+ import { Tree } from '@nx/devkit';
2
2
  import { NormalizedSchema } from '../schema';
3
3
  export declare function updateAppRoutes(host: Tree, options: NormalizedSchema): import("@nx/devkit").GeneratorCallback;
@@ -2,12 +2,12 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.updateAppRoutes = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
- const path_1 = require("nx/src/utils/path");
6
5
  const ast_utils_1 = require("../../../utils/ast-utils");
7
6
  const ast_utils_2 = require("../../../utils/ast-utils");
8
7
  const maybe_js_1 = require("./maybe-js");
9
8
  const versions_1 = require("../../../utils/versions");
10
9
  const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
10
+ const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
11
11
  let tsModule;
12
12
  function updateAppRoutes(host, options) {
13
13
  if (!options.appMain || !options.appSourceRoot) {
@@ -18,7 +18,7 @@ function updateAppRoutes(host, options) {
18
18
  if (!componentImportPath) {
19
19
  throw new Error(`Could not find App component in ${options.appMain} (Hint: you can omit --appProject, or make sure App exists)`);
20
20
  }
21
- const appComponentPath = (0, path_1.joinPathFragments)(options.appSourceRoot, (0, maybe_js_1.maybeJs)(options, `${componentImportPath}.tsx`));
21
+ const appComponentPath = (0, devkit_1.joinPathFragments)(options.appSourceRoot, (0, maybe_js_1.maybeJs)(options, `${componentImportPath}.tsx`));
22
22
  const routerTask = (0, devkit_1.addDependenciesToPackageJson)(host, { 'react-router-dom': versions_1.reactRouterDomVersion }, { '@types/react-router-dom': versions_1.typesReactRouterDomVersion });
23
23
  // addBrowserRouterToMain
24
24
  const isRouterPresent = content.match(/react-router-dom/);
@@ -38,11 +38,10 @@ function updateAppRoutes(host, options) {
38
38
  // addNewAppRoute
39
39
  {
40
40
  const { content: componentContent, source: componentSource } = readComponent(host, appComponentPath);
41
- const { npmScope } = (0, devkit_1.getWorkspaceLayout)(host);
42
41
  const changes = (0, devkit_1.applyChangesToString)(componentContent, (0, ast_utils_1.addRoute)(appComponentPath, componentSource, {
43
42
  routePath: options.routePath,
44
43
  componentName: (0, devkit_1.names)(options.name).className,
45
- moduleName: (0, path_1.getImportPath)(npmScope, options.projectDirectory),
44
+ moduleName: (0, get_import_path_1.getImportPath)(host, options.projectDirectory),
46
45
  }));
47
46
  host.write(appComponentPath, changes);
48
47
  }
@@ -1 +1 @@
1
- {"version":3,"file":"update-app-routes.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/update-app-routes.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAEpB,4CAAqE;AAIrE,wDAIkC;AAClC,wDAA4D;AAC5D,yCAAqC;AACrC,sDAGiC;AACjC,qFAAiF;AAEjF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;QAC9C,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE,MAAM,mBAAmB,GAAG,IAAA,mCAAuB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEnE,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,OAAO,6DAA6D,CAChH,CAAC;KACH;IAED,MAAM,gBAAgB,GAAG,IAAA,wBAAiB,EACxC,OAAO,CAAC,aAAa,EACrB,IAAA,kBAAO,EAAC,OAAO,EAAE,GAAG,mBAAmB,MAAM,CAAC,CAC/C,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,qCAA4B,EAC7C,IAAI,EACJ,EAAE,kBAAkB,EAAE,gCAAqB,EAAE,EAC7C,EAAE,yBAAyB,EAAE,qCAA0B,EAAE,CAC1D,CAAC;IAEF,yBAAyB;IACzB,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAC1D,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,OAAO,EACP,IAAA,4BAAgB,EAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAC1C,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KACtC;IAED,sBAAsB;IACtB;QACE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,GAC1D,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxC,MAAM,wBAAwB,GAAG,gBAAgB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC5E,IAAI,CAAC,wBAAwB,EAAE;YAC7B,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,gBAAgB,EAChB,IAAA,4BAAgB,EAAC,gBAAgB,EAAE,eAAe,CAAC,CACpD,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;SACvC;KACF;IAED,iBAAiB;IACjB;QACE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,GAC1D,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,gBAAgB,EAChB,IAAA,oBAAQ,EAAC,gBAAgB,EAAE,eAAe,EAAE;YAC1C,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,aAAa,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS;YAC5C,UAAU,EAAE,IAAA,oBAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAAC;SAC9D,CAAC,CACH,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;KACvC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAnED,0CAmEC;AAED,SAAS,aAAa,CACpB,IAAU,EACV,IAAY;IAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;KACxC;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzC,MAAM,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACtC,IAAI,EACJ,OAAO,EACP,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC"}
1
+ {"version":3,"file":"update-app-routes.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/update-app-routes.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ import { Tree } from '@nx/devkit';
2
+ export default function removePackage(tree: Tree): Promise<void>;
@@ -0,0 +1,12 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const tslib_1 = require("tslib");
4
+ const devkit_1 = require("@nx/devkit");
5
+ function removePackage(tree) {
6
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
7
+ (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['react-test-renderer']);
8
+ yield (0, devkit_1.formatFiles)(tree);
9
+ });
10
+ }
11
+ exports.default = removePackage;
12
+ //# sourceMappingURL=update-16-2-0-remove-package.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"update-16-2-0-remove-package.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-16-2-0-remove-package/update-16-2-0-remove-package.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AAEpB,SAA8B,aAAa,CAAC,IAAU;;QACpD,IAAA,0CAAiC,EAAC,IAAI,EAAE,EAAE,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACrE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAHD,gCAGC"}
@@ -31,7 +31,3 @@ export declare const extendReactEslintJson: (json: Linter.Config) => {
31
31
  rules?: Partial<Linter.RulesRecord>;
32
32
  extends: string[];
33
33
  };
34
- /**
35
- * @deprecated Use {@link extendReactEslintJson} instead.
36
- */
37
- export declare const createReactEslintJson: (projectRoot: string, setParserOptionsProject: boolean) => Linter.Config;
package/src/utils/lint.js CHANGED
@@ -1,8 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createReactEslintJson = exports.extendReactEslintJson = exports.extraEslintDependencies = void 0;
3
+ exports.extendReactEslintJson = exports.extraEslintDependencies = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const devkit_1 = require("@nx/devkit");
6
5
  const versions_1 = require("./versions");
7
6
  exports.extraEslintDependencies = {
8
7
  dependencies: {},
@@ -18,48 +17,4 @@ const extendReactEslintJson = (json) => {
18
17
  return Object.assign({ extends: ['plugin:@nx/react', ...(pluginExtends || [])] }, config);
19
18
  };
20
19
  exports.extendReactEslintJson = extendReactEslintJson;
21
- /**
22
- * @deprecated Use {@link extendReactEslintJson} instead.
23
- */
24
- const createReactEslintJson = (projectRoot, setParserOptionsProject) => ({
25
- extends: ['plugin:@nx/react', `${(0, devkit_1.offsetFromRoot)(projectRoot)}.eslintrc.json`],
26
- ignorePatterns: ['!**/*'],
27
- overrides: [
28
- {
29
- files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
30
- /**
31
- * NOTE: We no longer set parserOptions.project by default when creating new projects.
32
- *
33
- * We have observed that users rarely add rules requiring type-checking to their Nx workspaces, and therefore
34
- * do not actually need the capabilites which parserOptions.project provides. When specifying parserOptions.project,
35
- * typescript-eslint needs to create full TypeScript Programs for you. When omitting it, it can perform a simple
36
- * parse (and AST tranformation) of the source files it encounters during a lint run, which is much faster and much
37
- * less memory intensive.
38
- *
39
- * In the rare case that users attempt to add rules requiring type-checking to their setup later on (and haven't set
40
- * parserOptions.project), the executor will attempt to look for the particular error typescript-eslint gives you
41
- * and provide feedback to the user.
42
- */
43
- parserOptions: !setParserOptionsProject
44
- ? undefined
45
- : {
46
- project: [`${projectRoot}/tsconfig.*?.json`],
47
- },
48
- /**
49
- * Having an empty rules object present makes it more obvious to the user where they would
50
- * extend things from if they needed to
51
- */
52
- rules: {},
53
- },
54
- {
55
- files: ['*.ts', '*.tsx'],
56
- rules: {},
57
- },
58
- {
59
- files: ['*.js', '*.jsx'],
60
- rules: {},
61
- },
62
- ],
63
- });
64
- exports.createReactEslintJson = createReactEslintJson;
65
20
  //# sourceMappingURL=lint.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/lint.ts"],"names":[],"mappings":";;;;AAAA,uCAA4C;AAE5C,yCAKoB;AAEP,QAAA,uBAAuB,GAAG;IACrC,YAAY,EAAE,EAAE;IAChB,eAAe,EAAE;QACf,sBAAsB,EAAE,oCAAyB;QACjD,wBAAwB,EAAE,qCAA0B;QACpD,qBAAqB,EAAE,mCAAwB;QAC/C,2BAA2B,EAAE,wCAA6B;KAC3D;CACF,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,IAAmB,EAAE,EAAE;IAC3D,MAAM,EAAE,OAAO,EAAE,aAAa,KAAgB,IAAI,EAAf,MAAM,kBAAK,IAAI,EAA5C,WAAqC,CAAO,CAAC;IAEnD,uBACE,OAAO,EAAE,CAAC,kBAAkB,EAAE,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,IACpD,MAAM,EACT;AACJ,CAAC,CAAC;AAPW,QAAA,qBAAqB,yBAOhC;AAEF;;GAEG;AACI,MAAM,qBAAqB,GAAG,CACnC,WAAmB,EACnB,uBAAgC,EACjB,EAAE,CAAC,CAAC;IACnB,OAAO,EAAE,CAAC,kBAAkB,EAAE,GAAG,IAAA,uBAAc,EAAC,WAAW,CAAC,gBAAgB,CAAC;IAC7E,cAAc,EAAE,CAAC,OAAO,CAAC;IACzB,SAAS,EAAE;QACT;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;YACzC;;;;;;;;;;;;eAYG;YACH,aAAa,EAAE,CAAC,uBAAuB;gBACrC,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC;oBACE,OAAO,EAAE,CAAC,GAAG,WAAW,mBAAmB,CAAC;iBAC7C;YACL;;;eAGG;YACH,KAAK,EAAE,EAAE;SACV;QACD;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACxB,KAAK,EAAE,EAAE;SACV;QACD;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACxB,KAAK,EAAE,EAAE;SACV;KACF;CACF,CAAC,CAAC;AA1CU,QAAA,qBAAqB,yBA0C/B"}
1
+ {"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/lint.ts"],"names":[],"mappings":";;;;AAEA,yCAKoB;AAEP,QAAA,uBAAuB,GAAG;IACrC,YAAY,EAAE,EAAE;IAChB,eAAe,EAAE;QACf,sBAAsB,EAAE,oCAAyB;QACjD,wBAAwB,EAAE,qCAA0B;QACpD,qBAAqB,EAAE,mCAAwB;QAC/C,2BAA2B,EAAE,wCAA6B;KAC3D;CACF,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,IAAmB,EAAE,EAAE;IAC3D,MAAM,EAAE,OAAO,EAAE,aAAa,KAAgB,IAAI,EAAf,MAAM,kBAAK,IAAI,EAA5C,WAAqC,CAAO,CAAC;IAEnD,uBACE,OAAO,EAAE,CAAC,kBAAkB,EAAE,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,IACpD,MAAM,EACT;AACJ,CAAC,CAAC;AAPW,QAAA,qBAAqB,yBAOhC"}
package/tailwind.js CHANGED
@@ -7,7 +7,7 @@ const generate_globs_1 = require("@nx/js/src/utils/generate-globs");
7
7
  * @param dirPath workspace relative directory path that will be used to infer the parent project and dependencies
8
8
  * @param fileGlobPattern pass a custom glob pattern to be used
9
9
  */
10
- function createGlobPatternsForDependencies(dirPath, fileGlobPattern = '/**/!(*.stories|*.spec).{tsx,jsx,js,html}') {
10
+ function createGlobPatternsForDependencies(dirPath, fileGlobPattern = '/**/!(*.stories|*.spec).{tsx,ts,jsx,js,html}') {
11
11
  try {
12
12
  return (0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPattern);
13
13
  }
package/tailwind.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tailwind.js","sourceRoot":"","sources":["../../../packages/react/tailwind.ts"],"names":[],"mappings":";;;AAAA,oEAAuG;AAEvG;;;;GAIG;AACH,SAAgB,iCAAiC,CAC/C,OAAe,EACf,kBAA0B,2CAA2C;IAErE,IAAI;QACF,OAAO,IAAA,kDAAe,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;KAClD;IAAC,OAAO,CAAC,EAAE;QACV;;;;;;;;WAQG;QACH,OAAO,CAAC,IAAI,CACV,kFAAkF;YAChF,GAAG,CAAC,CAAC,OAAO,IAAI,CACnB,CAAC;QACF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAtBD,8EAsBC"}
1
+ {"version":3,"file":"tailwind.js","sourceRoot":"","sources":["../../../packages/react/tailwind.ts"],"names":[],"mappings":";;;AAAA,oEAAuG;AAEvG;;;;GAIG;AACH,SAAgB,iCAAiC,CAC/C,OAAe,EACf,kBAA0B,8CAA8C;IAExE,IAAI;QACF,OAAO,IAAA,kDAAe,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;KAClD;IAAC,OAAO,CAAC,EAAE;QACV;;;;;;;;WAQG;QACH,OAAO,CAAC,IAAI,CACV,kFAAkF;YAChF,GAAG,CAAC,CAAC,OAAO,IAAI,CACnB,CAAC;QACF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAtBD,8EAsBC"}
@@ -1,42 +0,0 @@
1
- /// <reference types="cypress" />
2
- import { mount } from 'cypress/react18'
3
-
4
- // ***********************************************
5
- // This example commands.ts shows you how to
6
- // create various custom commands and overwrite
7
- // existing commands.
8
- //
9
- // For more comprehensive examples of custom
10
- // commands please read more here:
11
- // https://on.cypress.io/custom-commands
12
- // ***********************************************
13
-
14
- declare global {
15
- // eslint-disable-next-line @typescript-eslint/no-namespace
16
- namespace Cypress {
17
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
18
- interface Chainable<Subject> {
19
- login(email: string, password: string): void;
20
- mount: typeof mount;
21
- }
22
- }
23
- }
24
-
25
- Cypress.Commands.add('mount', mount)
26
-
27
- //
28
- // -- This is a parent command --
29
- Cypress.Commands.add('login', (email, password) => {
30
- console.log('Custom command example: Login', email, password);
31
- });
32
- //
33
- // -- This is a child command --
34
- // Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
35
- //
36
- //
37
- // -- This is a dual command --
38
- // Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
39
- //
40
- //
41
- // -- This will overwrite an existing command --
42
- // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
@@ -1,8 +0,0 @@
1
- import { defineConfig } from 'cypress';
2
- import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';
3
-
4
- export default defineConfig({
5
- component: nxComponentTestingPreset(__filename, {
6
- bundler: '<%= bundler %>'
7
- }),
8
- });