@nx/next 16.0.0-beta.4 → 16.0.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +8 -8
- package/src/generators/application/files/app/page.tsx__tmpl__ +5 -4
- package/src/generators/application/files/common/tsconfig.json__tmpl__ +2 -1
- package/src/generators/application/lib/add-cypress.js +1 -1
- package/src/generators/application/lib/add-cypress.js.map +1 -1
- package/src/generators/application/lib/add-linting.js +3 -2
- package/src/generators/application/lib/add-linting.js.map +1 -1
- package/src/generators/application/lib/create-application-files.js +29 -2
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +7 -3
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/schema.d.ts +1 -0
- package/src/generators/application/schema.json +7 -0
- package/src/generators/init/init.js +1 -1
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/init/schema.d.ts +1 -0
- package/src/generators/init/schema.json +7 -0
- /package/src/generators/application/files/common/{.babelrc__tmpl__ → __dot__babelrc} +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/next",
|
|
3
|
-
"version": "16.0.0-beta.
|
|
3
|
+
"version": "16.0.0-beta.5",
|
|
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.0.0-beta.
|
|
39
|
-
"@nx/devkit": "16.0.0-beta.
|
|
40
|
-
"@nx/js": "16.0.0-beta.
|
|
41
|
-
"@nx/linter": "16.0.0-beta.
|
|
42
|
-
"@nx/react": "16.0.0-beta.
|
|
43
|
-
"@nx/workspace": "16.0.0-beta.
|
|
38
|
+
"@nrwl/next": "16.0.0-beta.5",
|
|
39
|
+
"@nx/devkit": "16.0.0-beta.5",
|
|
40
|
+
"@nx/js": "16.0.0-beta.5",
|
|
41
|
+
"@nx/linter": "16.0.0-beta.5",
|
|
42
|
+
"@nx/react": "16.0.0-beta.5",
|
|
43
|
+
"@nx/workspace": "16.0.0-beta.5",
|
|
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": "
|
|
63
|
+
"gitHead": "04fed26279d04c2b02663df5872c6857eb7914bf"
|
|
64
64
|
}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
<% if (styledModule && (styledModule === 'styled-jsx' || styledModule === 'styled-components')) {%>
|
|
2
|
+
'use client';
|
|
3
|
+
<% }%>
|
|
1
4
|
<% if (styledModule && styledModule !== 'styled-jsx') {
|
|
2
5
|
var wrapper = 'StyledPage';
|
|
3
6
|
%>import styled from '<%= styledModule %>';<% } else {
|
|
@@ -11,7 +14,7 @@
|
|
|
11
14
|
const StyledPage = styled.div`<%- pageStyleContent %>`;
|
|
12
15
|
<% }%>
|
|
13
16
|
|
|
14
|
-
export async function Index() {
|
|
17
|
+
export default async function Index() {
|
|
15
18
|
/*
|
|
16
19
|
* Replace the elements below with your own.
|
|
17
20
|
*
|
|
@@ -23,6 +26,4 @@ export async function Index() {
|
|
|
23
26
|
<%- appContent %>
|
|
24
27
|
</<%= wrapper %>>
|
|
25
28
|
);
|
|
26
|
-
};
|
|
27
|
-
|
|
28
|
-
export default Index;
|
|
29
|
+
};
|
|
@@ -11,7 +11,8 @@
|
|
|
11
11
|
"noEmit": true,
|
|
12
12
|
"resolveJsonModule": true,
|
|
13
13
|
"isolatedModules": true,
|
|
14
|
-
"incremental": true
|
|
14
|
+
"incremental": true,
|
|
15
|
+
"plugins": [{ "name": "next" }]
|
|
15
16
|
},
|
|
16
17
|
"include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "next-env.d.ts"],
|
|
17
18
|
"exclude": ["node_modules", "jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
|
|
@@ -11,7 +11,7 @@ function addCypress(host, options) {
|
|
|
11
11
|
return () => { };
|
|
12
12
|
}
|
|
13
13
|
const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
|
|
14
|
-
return cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { linter: linter_1.Linter.EsLint, name:
|
|
14
|
+
return cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { linter: linter_1.Linter.EsLint, name: options.e2eProjectName, directory: options.directory, project: options.projectName, skipFormat: true }));
|
|
15
15
|
});
|
|
16
16
|
}
|
|
17
17
|
exports.addCypress = addCypress;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,uCAAiD;AACjD,uCAAoC;AAEpC,sDAAoD;AAGpD,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EAE/C,aAAa,EAAE,oBAAS,CAAC,CAAC;QAC5B,OAAO,uBAAuB,CAAC,IAAI,kCAC9B,OAAO,KACV,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,uCAAiD;AACjD,uCAAoC;AAEpC,sDAAoD;AAGpD,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EAE/C,aAAa,EAAE,oBAAS,CAAC,CAAC;QAC5B,OAAO,uBAAuB,CAAC,IAAI,kCAC9B,OAAO,KACV,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,OAAO,CAAC,cAAc,EAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,UAAU,EAAE,IAAI,IAChB,CAAC;IACL,CAAC;CAAA;AAhBD,gCAgBC"}
|
|
@@ -16,6 +16,7 @@ function addLinting(host, options) {
|
|
|
16
16
|
unitTestRunner: options.unitTestRunner,
|
|
17
17
|
eslintFilePatterns: [`${options.appProjectRoot}/**/*.{ts,tsx,js,jsx}`],
|
|
18
18
|
skipFormat: true,
|
|
19
|
+
rootProject: options.rootProject,
|
|
19
20
|
});
|
|
20
21
|
if (options.linter === linter_1.Linter.EsLint) {
|
|
21
22
|
(0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, '.eslintrc.json'), (json) => {
|
|
@@ -49,8 +50,8 @@ function addLinting(host, options) {
|
|
|
49
50
|
// add next.js configuration
|
|
50
51
|
json.extends.unshift(...['next', 'next/core-web-vitals']);
|
|
51
52
|
// remove nx/react plugin, as it conflicts with the next.js one
|
|
52
|
-
json.extends = json.extends.filter((name) => name !== 'plugin:@nx/nx/react');
|
|
53
|
-
json.extends.unshift('plugin:@nx/
|
|
53
|
+
json.extends = json.extends.filter((name) => name !== 'plugin:@nx/react' && name !== 'plugin:@nrwl/nx/react');
|
|
54
|
+
json.extends.unshift('plugin:@nx/react-typescript');
|
|
54
55
|
if (!json.env) {
|
|
55
56
|
json.env = {};
|
|
56
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":";;;;AAAA,uCAA0D;AAC1D,uCAOoB;AACpB,mDAGkC;AAGlC,SAAsB,UAAU,CAC9B,IAAU,EACV,OAAyB;;QAEzB,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC;aAC/D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,cAAc,uBAAuB,CAAC;YACtE,UAAU,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createApplicationFiles = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const path_1 = require("path");
|
|
5
6
|
const devkit_1 = require("@nx/devkit");
|
|
6
7
|
const js_1 = require("@nx/js");
|
|
7
8
|
const create_application_files_helpers_1 = require("./create-application-files.helpers");
|
|
8
9
|
function createApplicationFiles(host, options) {
|
|
9
|
-
const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { 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 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
11
|
? options.style
|
|
11
12
|
: 'css' });
|
|
12
13
|
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/common'), options.appProjectRoot, templateVariables);
|
|
@@ -16,6 +17,27 @@ function createApplicationFiles(host, options) {
|
|
|
16
17
|
else {
|
|
17
18
|
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/pages'), (0, path_1.join)(options.appProjectRoot, 'pages'), templateVariables);
|
|
18
19
|
}
|
|
20
|
+
if (options.rootProject) {
|
|
21
|
+
(0, devkit_1.updateJson)(host, 'tsconfig.base.json', (json) => {
|
|
22
|
+
const appJSON = (0, devkit_1.readJson)(host, 'tsconfig.json');
|
|
23
|
+
let { extends: _ } = json, updatedJson = tslib_1.__rest(json, ["extends"]);
|
|
24
|
+
updatedJson = Object.assign(Object.assign({}, devkit_1.updateJson), { compilerOptions: Object.assign(Object.assign({}, updatedJson.compilerOptions), appJSON.compilerOptions), include: [
|
|
25
|
+
...new Set([
|
|
26
|
+
...(updatedJson.include || []),
|
|
27
|
+
...(appJSON.include || []),
|
|
28
|
+
]),
|
|
29
|
+
], exclude: [
|
|
30
|
+
...new Set([
|
|
31
|
+
...(updatedJson.exclude || []),
|
|
32
|
+
...(appJSON.exclude || []),
|
|
33
|
+
'**e2e/**/*',
|
|
34
|
+
]),
|
|
35
|
+
] });
|
|
36
|
+
return updatedJson;
|
|
37
|
+
});
|
|
38
|
+
host.delete('tsconfig.json');
|
|
39
|
+
host.rename('tsconfig.base.json', 'tsconfig.json');
|
|
40
|
+
}
|
|
19
41
|
if (options.unitTestRunner === 'none') {
|
|
20
42
|
host.delete(`${options.appProjectRoot}/specs/${options.fileName}.spec.tsx`);
|
|
21
43
|
}
|
|
@@ -25,7 +47,12 @@ function createApplicationFiles(host, options) {
|
|
|
25
47
|
host.delete(`${options.appProjectRoot}/.babelrc`);
|
|
26
48
|
}
|
|
27
49
|
if (options.styledModule) {
|
|
28
|
-
|
|
50
|
+
if (options.appDir) {
|
|
51
|
+
host.delete(`${options.appProjectRoot}/app/page.module.${options.style}`);
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
host.delete(`${options.appProjectRoot}/pages/${options.fileName}.module.${options.style}`);
|
|
55
|
+
}
|
|
29
56
|
}
|
|
30
57
|
if (options.style !== 'styled-components') {
|
|
31
58
|
host.delete(`${options.appProjectRoot}/pages/_document.tsx`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":"
|
|
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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"}
|
|
@@ -12,9 +12,13 @@ function normalizeOptions(host, options) {
|
|
|
12
12
|
: (0, devkit_1.names)(options.name).fileName;
|
|
13
13
|
const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : (0, devkit_1.getWorkspaceLayout)(host).appsDir;
|
|
14
14
|
const appProjectName = appDirectory.replace(new RegExp('/', 'g'), '-');
|
|
15
|
-
const e2eProjectName = `${appProjectName}-e2e`;
|
|
16
|
-
const appProjectRoot =
|
|
17
|
-
|
|
15
|
+
const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
|
|
16
|
+
const appProjectRoot = options.rootProject
|
|
17
|
+
? '.'
|
|
18
|
+
: (0, devkit_1.joinPathFragments)(appsDir, appDirectory);
|
|
19
|
+
const e2eProjectRoot = options.rootProject
|
|
20
|
+
? '.'
|
|
21
|
+
: (0, devkit_1.joinPathFragments)(appsDir, `${appDirectory}-e2e`);
|
|
18
22
|
const parsedTags = options.tags
|
|
19
23
|
? options.tags.split(',').map((s) => s.trim())
|
|
20
24
|
: [];
|
|
@@ -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,GAAG,cAAc,MAAM,CAAC;
|
|
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"}
|
|
@@ -124,6 +124,13 @@
|
|
|
124
124
|
"default": false,
|
|
125
125
|
"description": "Enable experimental app directory for the project",
|
|
126
126
|
"x-prompt": "Do you want to use experimental app/ in this project?"
|
|
127
|
+
},
|
|
128
|
+
"rootProject": {
|
|
129
|
+
"description": "Create an application at the root of the workspace.",
|
|
130
|
+
"type": "boolean",
|
|
131
|
+
"default": false,
|
|
132
|
+
"hidden": true,
|
|
133
|
+
"x-priority": "internal"
|
|
127
134
|
}
|
|
128
135
|
},
|
|
129
136
|
"required": [],
|
|
@@ -33,7 +33,7 @@ function nextInitGenerator(host, schema) {
|
|
|
33
33
|
const cypressTask = yield cypressInitGenerator(host, {});
|
|
34
34
|
tasks.push(cypressTask);
|
|
35
35
|
}
|
|
36
|
-
const reactTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, schema), { skipFormat: true }));
|
|
36
|
+
const reactTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, schema), { skipFormat: true, skipBabelConfig: true }));
|
|
37
37
|
tasks.push(reactTask);
|
|
38
38
|
if (!schema.skipPackageJson) {
|
|
39
39
|
const installTask = updateDependencies(host);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AAEpB,2DAA6E;AAC7E,6DAAoE;AACpE,+BAA0D;AAE1D,mDAK8B;AAE9B,yEAAoE;AAEpE,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,UAAU,EAAE,oBAAS;QACrB,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;QAC5B,KAAK,EAAE,uBAAY;KACpB,EACD;QACE,oBAAoB,EAAE,kCAAuB;KAC9C,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,iBAAiB,CAAC,IAAU,EAAE,MAAkB;;QACpE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,kBAAe,EAAC,IAAI,kCACrB,MAAM,KACT,UAAU,EAAE,IAAI,IAChB,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAA,sBAAa,EACzC,UAAU,EACV,oBAAS,CACV,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;YAC/D,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAA,sBAAa,EAE5C,aAAa,EAAE,oBAAS,CAAC,CAAC;YAC5B,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,cAAkB,EAAC,IAAI,kCAC1C,MAAM,KACT,UAAU,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AAEpB,2DAA6E;AAC7E,6DAAoE;AACpE,+BAA0D;AAE1D,mDAK8B;AAE9B,yEAAoE;AAEpE,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,UAAU,EAAE,oBAAS;QACrB,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;QAC5B,KAAK,EAAE,uBAAY;KACpB,EACD;QACE,oBAAoB,EAAE,kCAAuB;KAC9C,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,iBAAiB,CAAC,IAAU,EAAE,MAAkB;;QACpE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,kBAAe,EAAC,IAAI,kCACrB,MAAM,KACT,UAAU,EAAE,IAAI,IAChB,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAA,sBAAa,EACzC,UAAU,EACV,oBAAS,CACV,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;YAC/D,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAA,sBAAa,EAE5C,aAAa,EAAE,oBAAS,CAAC,CAAC;YAC5B,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,cAAkB,EAAC,IAAI,kCAC1C,MAAM,KACT,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,IAAI,IACrB,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtB,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAC3B,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC7C,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,IAAA,uCAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAzCD,8CAyCC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,iBAAiB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}
|
|
@@ -33,6 +33,13 @@
|
|
|
33
33
|
"default": false,
|
|
34
34
|
"description": "Do not add dependencies to `package.json`.",
|
|
35
35
|
"x-priority": "internal"
|
|
36
|
+
},
|
|
37
|
+
"rootProject": {
|
|
38
|
+
"description": "Create an application at the root of the workspace.",
|
|
39
|
+
"type": "boolean",
|
|
40
|
+
"default": false,
|
|
41
|
+
"hidden": true,
|
|
42
|
+
"x-priority": "internal"
|
|
36
43
|
}
|
|
37
44
|
},
|
|
38
45
|
"required": []
|
|
File without changes
|