@nx/next 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 (30) hide show
  1. package/migrations.json +16 -0
  2. package/package.json +8 -8
  3. package/plugins/with-less.js +0 -5
  4. package/plugins/with-less.js.map +1 -1
  5. package/plugins/with-nx.js +3 -1
  6. package/plugins/with-nx.js.map +1 -1
  7. package/plugins/with-stylus.js +0 -5
  8. package/plugins/with-stylus.js.map +1 -1
  9. package/src/generators/application/files/app/layout.tsx__tmpl__ +1 -5
  10. package/src/generators/application/files/common/next.config.js__tmpl__ +0 -20
  11. package/src/generators/application/files/common/tsconfig.json__tmpl__ +11 -1
  12. package/src/generators/application/lib/add-project.js +1 -2
  13. package/src/generators/application/lib/add-project.js.map +1 -1
  14. package/src/generators/application/lib/create-application-files.js +6 -1
  15. package/src/generators/application/lib/create-application-files.js.map +1 -1
  16. package/src/generators/application/lib/normalize-options.d.ts +1 -0
  17. package/src/generators/application/lib/normalize-options.js +8 -6
  18. package/src/generators/application/lib/normalize-options.js.map +1 -1
  19. package/src/generators/application/lib/show-possible-warnings.js +1 -1
  20. package/src/generators/application/lib/show-possible-warnings.js.map +1 -1
  21. package/src/generators/application/schema.json +3 -3
  22. package/src/generators/cypress-component-configuration/cypress-component-configuration.js +20 -16
  23. package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map +1 -1
  24. package/src/generators/library/lib/normalize-options.js +2 -2
  25. package/src/generators/library/lib/normalize-options.js.map +1 -1
  26. package/src/utils/versions.d.ts +4 -4
  27. package/src/utils/versions.js +4 -4
  28. package/src/generators/cypress-component-configuration/files/cypress/support/commands.ts__tpl__ +0 -42
  29. package/src/generators/cypress-component-configuration/files/cypress/support/styles.ct.css__tpl__ +0 -4
  30. package/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__ +0 -6
package/migrations.json CHANGED
@@ -316,6 +316,22 @@
316
316
  "alwaysAddToPackageJson": false
317
317
  }
318
318
  }
319
+ },
320
+ "16.2.0": {
321
+ "version": "16.2.0-beta.0",
322
+ "requires": {
323
+ "next": ">=13.0.0"
324
+ },
325
+ "packages": {
326
+ "next": {
327
+ "version": "13.4.1",
328
+ "alwaysAddToPackageJson": false
329
+ },
330
+ "eslint-config-next": {
331
+ "version": "13.4.1",
332
+ "alwaysAddToPackageJson": false
333
+ }
334
+ }
319
335
  }
320
336
  }
321
337
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/next",
3
- "version": "16.1.4",
3
+ "version": "16.2.0-beta.1",
4
4
  "private": false,
5
5
  "description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
6
6
  "repository": {
@@ -35,12 +35,12 @@
35
35
  },
36
36
  "dependencies": {
37
37
  "@babel/plugin-proposal-decorators": "^7.14.5",
38
- "@nrwl/next": "16.1.4",
39
- "@nx/devkit": "16.1.4",
40
- "@nx/js": "16.1.4",
41
- "@nx/linter": "16.1.4",
42
- "@nx/react": "16.1.4",
43
- "@nx/workspace": "16.1.4",
38
+ "@nrwl/next": "16.2.0-beta.1",
39
+ "@nx/devkit": "16.2.0-beta.1",
40
+ "@nx/js": "16.2.0-beta.1",
41
+ "@nx/linter": "16.2.0-beta.1",
42
+ "@nx/react": "16.2.0-beta.1",
43
+ "@nx/workspace": "16.2.0-beta.1",
44
44
  "@svgr/webpack": "^6.1.2",
45
45
  "chalk": "^4.1.0",
46
46
  "copy-webpack-plugin": "^10.2.4",
@@ -60,5 +60,5 @@
60
60
  "access": "public"
61
61
  },
62
62
  "types": "./index.d.ts",
63
- "gitHead": "16f098804653374057eff7e2f9565fb4c7a90b29"
63
+ "gitHead": "79fa3fb0ead486e33a7e00b5c13a0f2545278202"
64
64
  }
@@ -5,10 +5,6 @@ const tslib_1 = require("tslib");
5
5
  // Adapted from https://raw.githubusercontent.com/elado/next-with-less/main/src/index.js
6
6
  const webpack_merge_1 = require("webpack-merge");
7
7
  const addLessToRegExp = (rx) => new RegExp(rx.source.replace('|sass', '|sass|less'), rx.flags);
8
- function patchNextCSSWithLess(nextCSSModule = require('next/dist/build/webpack/config/blocks/css')) {
9
- nextCSSModule.regexLikeCss = addLessToRegExp(nextCSSModule.regexLikeCss);
10
- }
11
- patchNextCSSWithLess();
12
8
  function withLess(configOrFn) {
13
9
  return (phase) => tslib_1.__awaiter(this, void 0, void 0, function* () {
14
10
  const baseConfig = typeof configOrFn === 'function' ? yield configOrFn(phase) : configOrFn;
@@ -76,5 +72,4 @@ function withLess(configOrFn) {
76
72
  exports.withLess = withLess;
77
73
  module.exports = withLess;
78
74
  module.exports.withLess = withLess;
79
- module.exports.patchNext = patchNextCSSWithLess;
80
75
  //# sourceMappingURL=with-less.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"with-less.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-less.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"with-less.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-less.ts"],"names":[],"mappings":"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"}
@@ -102,14 +102,16 @@ function withNx(_nextConfig = {}, context = getWithNxContext()) {
102
102
  // See: https://github.com/nrwl/nx/issues/16692, https://github.com/vercel/next.js/issues/49169
103
103
  // TODO(jack): Remove this once Nx is refactored to invoke CLI directly.
104
104
  forNextVersion('>=13.4.0', () => {
105
+ var _a;
105
106
  process.env['__NEXT_PRIVATE_PREBUNDLED_REACT'] =
106
107
  // Not in Next 13.3 or earlier, so need to access config via string
107
- _nextConfig.experimental['serverActions'] ? 'experimental' : 'next';
108
+ ((_a = _nextConfig.experimental) === null || _a === void 0 ? void 0 : _a['serverActions']) ? 'experimental' : 'next';
108
109
  });
109
110
  return (phase) => tslib_1.__awaiter(this, void 0, void 0, function* () {
110
111
  const { PHASE_PRODUCTION_SERVER } = yield Promise.resolve().then(() => require('next/constants'));
111
112
  if (phase === PHASE_PRODUCTION_SERVER) {
112
113
  // If we are running an already built production server, just return the configuration.
114
+ // NOTE: Avoid any `require(...)` or `import(...)` statements here. Development dependencies are not available at production runtime.
113
115
  const { nx } = _nextConfig, validNextConfig = tslib_1.__rest(_nextConfig, ["nx"]);
114
116
  return Object.assign(Object.assign({}, validNextConfig), { distDir: yield determineDistDirForProdServer(_nextConfig) });
115
117
  }
@@ -1 +1 @@
1
- {"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-nx.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-nx.ts"],"names":[],"mappings":"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"}
@@ -5,10 +5,6 @@ const tslib_1 = require("tslib");
5
5
  // Adapted from https://raw.githubusercontent.com/elado/next-with-less/main/src/index.js
6
6
  const webpack_merge_1 = require("webpack-merge");
7
7
  const addStylusToRegExp = (rx) => new RegExp(rx.source.replace('|sass', '|sass|styl'), rx.flags);
8
- function patchNextCSSWithStylus(nextCSSModule = require('next/dist/build/webpack/config/blocks/css')) {
9
- nextCSSModule.regexLikeCss = addStylusToRegExp(nextCSSModule.regexLikeCss);
10
- }
11
- patchNextCSSWithStylus();
12
8
  function withStylus(configOrFn) {
13
9
  return (phase) => tslib_1.__awaiter(this, void 0, void 0, function* () {
14
10
  const baseConfig = typeof configOrFn === 'function' ? yield configOrFn(phase) : configOrFn;
@@ -76,5 +72,4 @@ function withStylus(configOrFn) {
76
72
  exports.withStylus = withStylus;
77
73
  module.exports = withStylus;
78
74
  module.exports.withStylus = withStylus;
79
- module.exports.patchNext = patchNextCSSWithStylus;
80
75
  //# sourceMappingURL=with-stylus.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"with-stylus.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-stylus.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"with-stylus.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-stylus.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,7 @@
1
- import Head from 'next/head';
2
1
  import './global.<%= stylesExt %>';
3
2
 
4
3
  export const metadata = {
5
- title: 'Nx Next App',
4
+ title: 'Welcome to <%= name %>',
6
5
  description: 'Generated by create-nx-workspace',
7
6
  }
8
7
 
@@ -13,9 +12,6 @@ export default function RootLayout({
13
12
  }) {
14
13
  return (
15
14
  <html lang="en">
16
- <Head>
17
- <title>Welcome to <%= name %>!</title>
18
- </Head>
19
15
  <body>{children}</body>
20
16
  </html>
21
17
  )
@@ -17,11 +17,6 @@ const nextConfig = {
17
17
  // See: https://github.com/gregberge/svgr
18
18
  svgr: false,
19
19
  },
20
- <% if(appDir) { %>
21
- experimental: {
22
- appDir: true
23
- },
24
- <% } %>
25
20
  };
26
21
 
27
22
  const plugins = [
@@ -43,11 +38,6 @@ const nextConfig = {
43
38
  // See: https://github.com/gregberge/svgr
44
39
  svgr: false,
45
40
  },
46
- <% if(appDir) { %>
47
- experimental: {
48
- appDir: true
49
- },
50
- <% } %>
51
41
  };
52
42
 
53
43
  const plugins = [
@@ -72,11 +62,6 @@ const nextConfig = {
72
62
  // See: https://github.com/gregberge/svgr
73
63
  svgr: false,
74
64
  },
75
- <% if(appDir) { %>
76
- experimental: {
77
- appDir: true
78
- },
79
- <% } %>
80
65
  };
81
66
 
82
67
  const plugins = [
@@ -96,11 +81,6 @@ const nextConfig = {
96
81
  // See: https://github.com/gregberge/svgr
97
82
  svgr: false,
98
83
  },
99
- <% if(appDir) { %>
100
- experimental: {
101
- appDir: true
102
- },
103
- <% } %>
104
84
  };
105
85
 
106
86
  const plugins = [
@@ -14,6 +14,16 @@
14
14
  "incremental": true,
15
15
  "plugins": [{ "name": "next" }]
16
16
  },
17
- "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "next-env.d.ts"],
17
+ "include": [
18
+ "**/*.ts",
19
+ "**/*.tsx",
20
+ "**/*.js",
21
+ "**/*.jsx",
22
+ <% if (appDir) { %>
23
+ "<%= layoutTypeSrcPath %>",
24
+ "<%= layoutTypeDistPath %>",
25
+ <% } %>
26
+ "next-env.d.ts"
27
+ ],
18
28
  "exclude": ["node_modules", "jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
19
29
  }
@@ -4,14 +4,13 @@ exports.addProject = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  function addProject(host, options) {
6
6
  const targets = {};
7
- const outputPath = (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot, ...(options.rootProject ? [options.name] : []));
8
7
  targets.build = {
9
8
  executor: '@nx/next:build',
10
9
  outputs: ['{options.outputPath}'],
11
10
  defaultConfiguration: 'production',
12
11
  options: {
13
12
  root: options.appProjectRoot,
14
- outputPath: outputPath,
13
+ outputPath: options.outputPath,
15
14
  },
16
15
  configurations: {
17
16
  development: {
@@ -1 +1 @@
1
- {"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AACA,uCAKoB;AAEpB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,MAAM,OAAO,GAAwB,EAAE,CAAC;IAExC,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAClC,MAAM,EACN,OAAO,CAAC,cAAc,EACtB,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAC/C,CAAC;IACF,OAAO,CAAC,KAAK,GAAG;QACd,QAAQ,EAAE,gBAAgB;QAC1B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,oBAAoB,EAAE,YAAY;QAClC,OAAO,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,cAAc;YAC5B,UAAU,EAAE,UAAU;SACvB;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,UAAU,EAAE,OAAO,CAAC,cAAc;aACnC;YACD,UAAU,EAAE,EAAE;SACf;KACF,CAAC;IAEF,OAAO,CAAC,KAAK,GAAG;QACd,QAAQ,EAAE,iBAAiB;QAC3B,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC3C,GAAG,EAAE,IAAI;SACV;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;gBACvD,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;gBACtD,GAAG,EAAE,KAAK;aACX;SACF;KACF,CAAC;IAEF,OAAO,CAAC,MAAM,GAAG;QACf,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;SACvD;KACF,CAAC;IAEF,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,OAAO,CAAC,cAAc;QAClC,WAAW,EAAE,aAAa;QAC1B,OAAO;QACP,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,oBAC5C,OAAO,EACV,CAAC;AACL,CAAC;AA7DD,gCA6DC"}
1
+ {"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AAEpB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,MAAM,OAAO,GAAwB,EAAE,CAAC;IAExC,OAAO,CAAC,KAAK,GAAG;QACd,QAAQ,EAAE,gBAAgB;QAC1B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,oBAAoB,EAAE,YAAY;QAClC,OAAO,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,cAAc;YAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,UAAU,EAAE,OAAO,CAAC,cAAc;aACnC;YACD,UAAU,EAAE,EAAE;SACf;KACF,CAAC;IAEF,OAAO,CAAC,KAAK,GAAG;QACd,QAAQ,EAAE,iBAAiB;QAC3B,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC3C,GAAG,EAAE,IAAI;SACV;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;gBACvD,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;gBACtD,GAAG,EAAE,KAAK;aACX;SACF;KACF,CAAC;IAEF,OAAO,CAAC,MAAM,GAAG;QACf,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;SACvD;KACF,CAAC;IAEF,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,OAAO,CAAC,cAAc;QAClC,WAAW,EAAE,aAAa;QAC1B,OAAO;QACP,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,oBAC5C,OAAO,EACV,CAAC;AACL,CAAC;AAxDD,gCAwDC"}
@@ -7,7 +7,12 @@ const devkit_1 = require("@nx/devkit");
7
7
  const js_1 = require("@nx/js");
8
8
  const create_application_files_helpers_1 = require("./create-application-files.helpers");
9
9
  function createApplicationFiles(host, options) {
10
- const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { dot: '.', tmpl: '', rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot), appContent: (0, create_application_files_helpers_1.createAppJsx)(options.name), styleContent: (0, create_application_files_helpers_1.createStyleRules)(), pageStyleContent: `.page {}`, stylesExt: options.style === 'less' || options.style === 'styl'
10
+ const offsetFromRoot = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
11
+ const layoutTypeSrcPath = (0, devkit_1.joinPathFragments)(offsetFromRoot, options.appProjectRoot, '.next/types/**/*.ts');
12
+ const layoutTypeDistPath = (0, devkit_1.joinPathFragments)(offsetFromRoot, options.outputPath, '.next/types/**/*.ts');
13
+ const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { dot: '.', tmpl: '', offsetFromRoot,
14
+ layoutTypeSrcPath,
15
+ layoutTypeDistPath, rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot), appContent: (0, create_application_files_helpers_1.createAppJsx)(options.name), styleContent: (0, create_application_files_helpers_1.createStyleRules)(), pageStyleContent: `.page {}`, stylesExt: options.style === 'less' || options.style === 'styl'
11
16
  ? options.style
12
17
  : 'css' });
13
18
  (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/common'), options.appProjectRoot, templateVariables);
@@ -1 +1 @@
1
- {"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ import { Schema } from '../schema';
3
3
  export interface NormalizedSchema extends Schema {
4
4
  projectName: string;
5
5
  appProjectRoot: string;
6
+ outputPath: string;
6
7
  e2eProjectName: string;
7
8
  e2eProjectRoot: string;
8
9
  parsedTags: string[];
@@ -7,6 +7,7 @@ const linter_1 = require("@nx/linter");
7
7
  function normalizeOptions(host, options) {
8
8
  var _a;
9
9
  const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
10
+ const name = (0, devkit_1.names)(options.name).fileName;
10
11
  const appDirectory = projectDirectory
11
12
  ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
12
13
  : (0, devkit_1.names)(options.name).fileName;
@@ -19,21 +20,22 @@ function normalizeOptions(host, options) {
19
20
  const e2eProjectRoot = options.rootProject
20
21
  ? '.'
21
22
  : (0, devkit_1.joinPathFragments)(appsDir, `${appDirectory}-e2e`);
23
+ const outputPath = (0, devkit_1.joinPathFragments)('dist', appProjectRoot, ...(options.rootProject ? [name] : []));
22
24
  const parsedTags = options.tags
23
25
  ? options.tags.split(',').map((s) => s.trim())
24
26
  : [];
25
27
  const fileName = 'index';
26
- const appDir = (_a = options.appDir) !== null && _a !== void 0 ? _a : false;
28
+ const appDir = (_a = options.appDir) !== null && _a !== void 0 ? _a : true;
27
29
  const styledModule = /^(css|scss|less|styl)$/.test(options.style)
28
30
  ? null
29
31
  : options.style;
30
32
  (0, assertion_1.assertValidStyle)(options.style);
31
- return Object.assign(Object.assign({}, options), { appDir, name: (0, devkit_1.names)(options.name).fileName, projectName: appProjectName, linter: options.linter || linter_1.Linter.EsLint, unitTestRunner: options.unitTestRunner || 'jest', e2eTestRunner: options.e2eTestRunner || 'cypress', style: options.style || 'css', appProjectRoot,
32
- e2eProjectRoot,
33
+ return Object.assign(Object.assign({}, options), { appDir,
34
+ appProjectRoot,
33
35
  e2eProjectName,
34
- parsedTags,
35
- fileName,
36
- styledModule });
36
+ e2eProjectRoot, e2eTestRunner: options.e2eTestRunner || 'cypress', fileName, linter: options.linter || linter_1.Linter.EsLint, name,
37
+ outputPath,
38
+ parsedTags, projectName: appProjectName, style: options.style || 'css', styledModule, unitTestRunner: options.unitTestRunner || 'jest' });
37
39
  }
38
40
  exports.normalizeOptions = normalizeOptions;
39
41
  //# sourceMappingURL=normalize-options.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,6DAAiE;AACjE,uCAMoB;AACpB,uCAAoC;AAepC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IAEF,MAAM,YAAY,GAAG,gBAAgB;QACnC,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;IAEjC,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IAEpE,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACvE,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,cAAc,MAAM,CAAC;IAE7E,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAE7C,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEtD,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;IAEzB,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,KAAK,CAAC;IAEvC,MAAM,YAAY,GAAG,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/D,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAElB,IAAA,4BAAgB,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhC,uCACK,OAAO,KACV,MAAM,EACN,IAAI,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAClC,WAAW,EAAE,cAAc,EAC3B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,eAAM,CAAC,MAAM,EACvC,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,MAAM,EAChD,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,SAAS,EACjD,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK,EAC7B,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,QAAQ;QACR,YAAY,IACZ;AACJ,CAAC;AAvDD,4CAuDC"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,6DAAiE;AACjE,uCAMoB;AACpB,uCAAoC;AAgBpC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAE1C,MAAM,YAAY,GAAG,gBAAgB;QACnC,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;IAEjC,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IAEpE,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACvE,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,cAAc,MAAM,CAAC;IAE7E,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAE7C,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEtD,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAClC,MAAM,EACN,cAAc,EACd,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACvC,CAAC;IAEF,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;IAEzB,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,CAAC;IAEtC,MAAM,YAAY,GAAG,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/D,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAElB,IAAA,4BAAgB,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhC,uCACK,OAAO,KACV,MAAM;QACN,cAAc;QACd,cAAc;QACd,cAAc,EACd,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,SAAS,EACjD,QAAQ,EACR,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,eAAM,CAAC,MAAM,EACvC,IAAI;QACJ,UAAU;QACV,UAAU,EACV,WAAW,EAAE,cAAc,EAC3B,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK,EAC7B,YAAY,EACZ,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,MAAM,IAChD;AACJ,CAAC;AA/DD,4CA+DC"}
@@ -4,7 +4,7 @@ exports.showPossibleWarnings = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  function showPossibleWarnings(tree, options) {
6
6
  if (options.style === '@emotion/styled' && options.appDir) {
7
- devkit_1.logger.warn(`Emotion may not work with the experimental appDir layout. See: https://beta.nextjs.org/docs/styling/css-in-js`);
7
+ devkit_1.logger.warn(`Emotion may not work with the App Router. See: https://beta.nextjs.org/docs/styling/css-in-js`);
8
8
  }
9
9
  }
10
10
  exports.showPossibleWarnings = showPossibleWarnings;
@@ -1 +1 @@
1
- {"version":3,"file":"show-possible-warnings.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/show-possible-warnings.ts"],"names":[],"mappings":";;;AAAA,uCAA0C;AAG1C,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAAyB;IACxE,IAAI,OAAO,CAAC,KAAK,KAAK,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE;QACzD,eAAM,CAAC,IAAI,CACT,+GAA+G,CAChH,CAAC;KACH;AACH,CAAC;AAND,oDAMC"}
1
+ {"version":3,"file":"show-possible-warnings.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/show-possible-warnings.ts"],"names":[],"mappings":";;;AAAA,uCAA0C;AAG1C,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAAyB;IACxE,IAAI,OAAO,CAAC,KAAK,KAAK,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE;QACzD,eAAM,CAAC,IAAI,CACT,+FAA+F,CAChG,CAAC;KACH;AACH,CAAC;AAND,oDAMC"}
@@ -121,9 +121,9 @@
121
121
  },
122
122
  "appDir": {
123
123
  "type": "boolean",
124
- "default": false,
125
- "description": "Enable experimental app directory for the project",
126
- "x-prompt": "Do you want to use experimental app/ in this project?"
124
+ "default": true,
125
+ "description": "Enable the App Router for this project.",
126
+ "x-prompt": "Would you like to use the App Router (recommended)?"
127
127
  },
128
128
  "rootProject": {
129
129
  "description": "Create an application at the root of the workspace.",
@@ -10,21 +10,21 @@ const path_1 = require("path");
10
10
  function cypressComponentConfiguration(tree, options) {
11
11
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
12
12
  const tasks = [];
13
- const { cypressComponentConfiguration } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
14
- tasks.push(yield cypressComponentConfiguration(tree, {
13
+ const { cypressComponentConfiguration: baseCyCtConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
14
+ tasks.push(yield baseCyCtConfig(tree, {
15
15
  project: options.project,
16
16
  skipFormat: true,
17
17
  }));
18
- const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
19
- projectConfig.targets['component-test'].options = Object.assign(Object.assign({}, projectConfig.targets['component-test'].options), { skipServe: true });
20
- (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
21
- yield addFiles(tree, projectConfig, options);
22
18
  const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
23
19
  tasks.push(yield webpackInitGenerator(tree, {
24
20
  compiler: 'swc',
25
21
  uiFramework: 'react',
26
22
  skipFormat: true,
27
23
  }));
24
+ const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
25
+ projectConfig.targets['component-test'].options = Object.assign(Object.assign({}, projectConfig.targets['component-test'].options), { skipServe: true });
26
+ (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
27
+ yield addFiles(tree, projectConfig, options);
28
28
  if (!options.skipFormat) {
29
29
  yield (0, devkit_1.formatFiles)(tree);
30
30
  }
@@ -34,21 +34,25 @@ function cypressComponentConfiguration(tree, options) {
34
34
  exports.cypressComponentConfiguration = cypressComponentConfiguration;
35
35
  function addFiles(tree, projectConfig, opts) {
36
36
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
37
- const cypressConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
38
- if (tree.exists(cypressConfigPath)) {
39
- tree.delete(cypressConfigPath);
40
- }
41
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), projectConfig.root, {
42
- tailwind: ['js', 'cjs'].some((ext) => tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, `tailwind.config.${ext}`))),
43
- tpl: '',
44
- });
37
+ const { addMountDefinition, addDefaultCTConfig } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
45
38
  const ctFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
46
- tree.write(ctFile, `${tree.read(ctFile, 'utf-8')}import './styles.ct.css';`);
39
+ const updatedCommandFile = yield addMountDefinition(tree.read(ctFile, 'utf-8'));
40
+ tree.write(ctFile, `import { mount } from 'cypress/react18';\nimport './styles.ct.css';\n${updatedCommandFile}`);
41
+ const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
42
+ const updatedCyConfig = yield addDefaultCTConfig(tree.read(cyFile, 'utf-8'));
43
+ tree.write(cyFile, `import { nxComponentTestingPreset } from '@nx/next/plugins/component-testing';\n${updatedCyConfig}`);
44
+ const isUsingTailwind = ['js', 'cjs'].some((ext) => tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, `tailwind.config.${ext}`)));
45
+ tree.write((0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'styles.ct.css'), `/* This is where you can load global styles to apply to all components. */
46
+ ${isUsingTailwind
47
+ ? `@tailwind base;
48
+ @tailwind components;
49
+ @tailwind utilities;`
50
+ : ''}
51
+ `);
47
52
  if (opts.generateTests) {
48
53
  const filePaths = [];
49
54
  (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
50
55
  const fromProjectRootPath = (0, path_1.relative)(projectConfig.root, filePath);
51
- console.log({ fromProjectRootPath, filePath });
52
56
  // we don't generate tests for pages/server-side/appDir components
53
57
  if (fromProjectRootPath.includes('pages') ||
54
58
  fromProjectRootPath.includes('server') ||
@@ -1 +1 @@
1
- {"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/cypress-component-configuration/cypress-component-configuration.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
  function normalizeOptions(host, options) {
6
7
  var _a;
7
8
  const name = (0, devkit_1.names)(options.name).fileName;
@@ -10,8 +11,7 @@ function normalizeOptions(host, options) {
10
11
  : name;
11
12
  const { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
12
13
  const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
13
- const { npmScope } = (0, devkit_1.getWorkspaceLayout)(host);
14
- return Object.assign(Object.assign({}, options), { importPath: (_a = options.importPath) !== null && _a !== void 0 ? _a : (0, devkit_1.getImportPath)(npmScope, projectDirectory), projectRoot });
14
+ return Object.assign(Object.assign({}, options), { importPath: (_a = options.importPath) !== null && _a !== void 0 ? _a : (0, get_import_path_1.getImportPath)(host, projectDirectory), projectRoot });
15
15
  }
16
16
  exports.normalizeOptions = normalizeOptions;
17
17
  //# sourceMappingURL=normalize-options.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AAQpB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IACjE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC9C,uCACK,OAAO,KACV,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAA,sBAAa,EAAC,QAAQ,EAAE,gBAAgB,CAAC,EAC3E,WAAW,IACX;AACJ,CAAC;AAjBD,4CAiBC"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,uCAAgF;AAChF,sEAAiE;AAQjE,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IACjE,uCACK,OAAO,KACV,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAA,+BAAa,EAAC,IAAI,EAAE,gBAAgB,CAAC,EACvE,WAAW,IACX;AACJ,CAAC;AAhBD,4CAgBC"}
@@ -1,9 +1,9 @@
1
1
  export declare const nxVersion: any;
2
- export declare const nextVersion = "13.3.0";
3
- export declare const eslintConfigNextVersion = "13.3.0";
4
- export declare const sassVersion = "1.61.0";
2
+ export declare const nextVersion = "13.4.1";
3
+ export declare const eslintConfigNextVersion = "13.4.1";
4
+ export declare const sassVersion = "1.62.1";
5
5
  export declare const lessLoader = "11.1.0";
6
6
  export declare const stylusLoader = "7.1.0";
7
- export declare const emotionServerVersion = "11.10.0";
7
+ export declare const emotionServerVersion = "11.11.0";
8
8
  export declare const babelPluginStyledComponentsVersion = "1.10.7";
9
9
  export declare const tsLibVersion = "^2.3.0";
@@ -2,12 +2,12 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.stylusLoader = exports.lessLoader = exports.sassVersion = exports.eslintConfigNextVersion = exports.nextVersion = exports.nxVersion = void 0;
4
4
  exports.nxVersion = require('../../package.json').version;
5
- exports.nextVersion = '13.3.0';
6
- exports.eslintConfigNextVersion = '13.3.0';
7
- exports.sassVersion = '1.61.0';
5
+ exports.nextVersion = '13.4.1';
6
+ exports.eslintConfigNextVersion = '13.4.1';
7
+ exports.sassVersion = '1.62.1';
8
8
  exports.lessLoader = '11.1.0';
9
9
  exports.stylusLoader = '7.1.0';
10
- exports.emotionServerVersion = '11.10.0';
10
+ exports.emotionServerVersion = '11.11.0';
11
11
  exports.babelPluginStyledComponentsVersion = '1.10.7';
12
12
  exports.tsLibVersion = '^2.3.0';
13
13
  //# sourceMappingURL=versions.js.map
@@ -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,4 +0,0 @@
1
- /* This is where you can load global styles to apply to all components. */
2
- <% if(tailwind) { %>@tailwind base;
3
- @tailwind components;
4
- @tailwind utilities;<% } %>
@@ -1,6 +0,0 @@
1
- import { defineConfig } from 'cypress';
2
- import { nxComponentTestingPreset } from '@nx/next/plugins/component-testing';
3
-
4
- export default defineConfig({
5
- component: nxComponentTestingPreset(__filename),
6
- });