@nrwl/next 15.9.1 → 15.9.3
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 +7 -7
- package/src/executors/server/lib/default-server.js +2 -5
- package/src/executors/server/lib/default-server.js.map +1 -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/component/component.d.ts +1 -0
- package/src/generators/component/component.js +4 -1
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/schema.json +10 -0
- package/src/generators/init/init.js +1 -1
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/library/library.js +4 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/page/page.js +4 -1
- package/src/generators/page/page.js.map +1 -1
- package/src/generators/page/schema.d.ts +1 -0
- package/src/generators/page/schema.json +6 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/next",
|
|
3
|
-
"version": "15.9.
|
|
3
|
+
"version": "15.9.3",
|
|
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,11 +35,11 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@babel/plugin-proposal-decorators": "^7.14.5",
|
|
38
|
-
"@nrwl/devkit": "15.9.
|
|
39
|
-
"@nrwl/js": "15.9.
|
|
40
|
-
"@nrwl/linter": "15.9.
|
|
41
|
-
"@nrwl/react": "15.9.
|
|
42
|
-
"@nrwl/workspace": "15.9.
|
|
38
|
+
"@nrwl/devkit": "15.9.3",
|
|
39
|
+
"@nrwl/js": "15.9.3",
|
|
40
|
+
"@nrwl/linter": "15.9.3",
|
|
41
|
+
"@nrwl/react": "15.9.3",
|
|
42
|
+
"@nrwl/workspace": "15.9.3",
|
|
43
43
|
"@svgr/webpack": "^6.1.2",
|
|
44
44
|
"chalk": "^4.1.0",
|
|
45
45
|
"copy-webpack-plugin": "^10.2.4",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"access": "public"
|
|
60
60
|
},
|
|
61
61
|
"types": "./index.d.ts",
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "80792b60b9de4322bbd71cd4601d03ab0b294c4e"
|
|
63
63
|
}
|
|
@@ -3,21 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.defaultServer = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const express = require("express");
|
|
6
|
-
const path = require("path");
|
|
7
|
-
const next_1 = require("next");
|
|
8
6
|
/**
|
|
9
7
|
* Adapted from https://github.com/zeit/next.js/blob/master/examples/with-custom-reverse-proxy/server.js
|
|
10
8
|
* @param settings
|
|
11
9
|
*/
|
|
12
10
|
function defaultServer(settings, proxyConfig) {
|
|
13
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
-
const
|
|
12
|
+
const next = require('next');
|
|
13
|
+
const app = next(settings);
|
|
15
14
|
const handle = app.getRequestHandler();
|
|
16
15
|
yield app.prepare();
|
|
17
16
|
const server = express();
|
|
18
17
|
server.disable('x-powered-by');
|
|
19
|
-
// Serve shared assets copied to `public` folder
|
|
20
|
-
server.use(express.static(path.resolve(settings.dir, 'public')));
|
|
21
18
|
// Set up the proxy.
|
|
22
19
|
if (proxyConfig) {
|
|
23
20
|
const proxyMiddleware = require('http-proxy-middleware').createProxyMiddleware;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-server.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/server/lib/default-server.ts"],"names":[],"mappings":";;;;AAAA,mCAAmC;
|
|
1
|
+
{"version":3,"file":"default-server.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/server/lib/default-server.ts"],"names":[],"mappings":";;;;AAAA,mCAAmC;AAGnC;;;GAGG;AACH,SAAsB,aAAa,CACjC,QAA2B,EAC3B,WAAyB;;QAEzB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;QAEvC,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;QAEpB,MAAM,MAAM,GAAoB,OAAO,EAAE,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE/B,oBAAoB;QACpB,IAAI,WAAW,EAAE;YACf,MAAM,eAAe,GACnB,OAAO,CAAC,uBAAuB,CAAC,CAAC,qBAAqB,CAAC;YACzD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3C,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC7D,CAAC,CAAC,CAAC;SACJ;QAED,wEAAwE;QACxE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAEhD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;CAAA;AA1BD,sCA0BC"}
|
|
@@ -11,7 +11,7 @@ function addCypress(host, options) {
|
|
|
11
11
|
return () => { };
|
|
12
12
|
}
|
|
13
13
|
const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/cypress', versions_1.nxVersion);
|
|
14
|
-
return cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { linter: linter_1.Linter.EsLint, name: `${options.name}-e2e`, directory: options.directory, project: options.projectName }));
|
|
14
|
+
return cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { linter: linter_1.Linter.EsLint, name: `${options.name}-e2e`, 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,yCAAmD;AACnD,yCAAsC;AAEtC,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,eAAe,EAAE,oBAAS,CAAC,CAAC;QAC9B,OAAO,uBAAuB,CAAC,IAAI,kCAC9B,OAAO,KACV,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,yCAAmD;AACnD,yCAAsC;AAEtC,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,eAAe,EAAE,oBAAS,CAAC,CAAC;QAC9B,OAAO,uBAAuB,CAAC,IAAI,kCAC9B,OAAO,KACV,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,UAAU,EAAE,IAAI,IAChB,CAAC;IACL,CAAC;CAAA;AAhBD,gCAgBC"}
|
|
@@ -8,6 +8,7 @@ interface Schema {
|
|
|
8
8
|
flat?: boolean;
|
|
9
9
|
pascalCaseFiles?: boolean;
|
|
10
10
|
pascalCaseDirectory?: boolean;
|
|
11
|
+
skipFormat?: boolean;
|
|
11
12
|
}
|
|
12
13
|
export declare function componentGenerator(host: Tree, options: Schema): Promise<import("@nrwl/devkit").GeneratorCallback>;
|
|
13
14
|
export default componentGenerator;
|
|
@@ -20,8 +20,11 @@ function getDirectory(host, options) {
|
|
|
20
20
|
*/
|
|
21
21
|
function componentGenerator(host, options) {
|
|
22
22
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const componentInstall = yield (0, react_1.componentGenerator)(host, Object.assign(Object.assign({}, options), { directory: getDirectory(host, options), classComponent: false, routing: false }));
|
|
23
|
+
const componentInstall = yield (0, react_1.componentGenerator)(host, Object.assign(Object.assign({}, options), { directory: getDirectory(host, options), classComponent: false, routing: false, skipFormat: true }));
|
|
24
24
|
const styledInstall = (0, styles_1.addStyleDependencies)(host, options.style);
|
|
25
|
+
if (!options.skipFormat) {
|
|
26
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
27
|
+
}
|
|
25
28
|
return (0, devkit_1.runTasksInSerial)(styledInstall, componentInstall);
|
|
26
29
|
});
|
|
27
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/component/component.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/component/component.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAEtB,uCAA4E;AAE5E,+CAA0D;AAa1D,SAAS,YAAY,CAAC,IAAU,EAAE,OAAe;IAC/C,MAAM,SAAS,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACpC,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC;IAE/D,OAAO,OAAO,CAAC,SAAS;QACtB,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,WAAW,KAAK,aAAa;YAC/B,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,SAAsB,kBAAkB,CAAC,IAAU,EAAE,OAAe;;QAClE,MAAM,gBAAgB,GAAG,MAAM,IAAA,0BAAuB,EAAC,IAAI,kCACtD,OAAO,KACV,SAAS,EAAE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,EACtC,cAAc,EAAE,KAAK,EACrB,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,aAAa,GAAG,IAAA,6BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAEhE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAC3D,CAAC;CAAA;AAhBD,gDAgBC;AAED,kBAAe,kBAAkB,CAAC;AACrB,QAAA,kBAAkB,GAAG,IAAA,2BAAkB,EAAC,kBAAkB,CAAC,CAAC"}
|
|
@@ -59,6 +59,10 @@
|
|
|
59
59
|
{
|
|
60
60
|
"value": "styled-jsx",
|
|
61
61
|
"label": "styled-jsx [ https://www.npmjs.com/package/styled-jsx ]"
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
"value": "none",
|
|
65
|
+
"label": "None"
|
|
62
66
|
}
|
|
63
67
|
]
|
|
64
68
|
}
|
|
@@ -102,6 +106,12 @@
|
|
|
102
106
|
"description": "Use pascal case directory name (e.g. `App/App.tsx`).",
|
|
103
107
|
"alias": "R",
|
|
104
108
|
"default": false
|
|
109
|
+
},
|
|
110
|
+
"skipFormat": {
|
|
111
|
+
"description": "Skip formatting files.",
|
|
112
|
+
"type": "boolean",
|
|
113
|
+
"default": false,
|
|
114
|
+
"x-priority": "internal"
|
|
105
115
|
}
|
|
106
116
|
},
|
|
107
117
|
"required": ["name", "project"],
|
|
@@ -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, schema);
|
|
36
|
+
const reactTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, schema), { skipFormat: 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,yCAOsB;AAEtB,6DAA+E;AAC/E,+DAAsE;AACtE,iCAA4D;AAE5D,mDAK8B;AAE9B,yEAAoE;AAEpE,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,YAAY,EAAE,oBAAS;QACvB,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,YAAY,EACZ,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,eAAe,EAAE,oBAAS,CAAC,CAAC;YAC9B,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,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAEtB,6DAA+E;AAC/E,+DAAsE;AACtE,iCAA4D;AAE5D,mDAK8B;AAE9B,yEAAoE;AAEpE,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,YAAY,EAAE,oBAAS;QACvB,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,YAAY,EACZ,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,eAAe,EAAE,oBAAS,CAAC,CAAC;YAC9B,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,IAChB,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;AAxCD,8CAwCC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,iBAAiB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}
|
|
@@ -16,7 +16,7 @@ function libraryGenerator(host, options) {
|
|
|
16
16
|
const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
|
|
17
17
|
const initTask = yield (0, init_1.nextInitGenerator)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
|
|
18
18
|
tasks.push(initTask);
|
|
19
|
-
const libTask = yield (0, library_1.libraryGenerator)(host, Object.assign(Object.assign({}, options), { compiler: 'swc' }));
|
|
19
|
+
const libTask = yield (0, library_1.libraryGenerator)(host, Object.assign(Object.assign({}, options), { compiler: 'swc', skipFormat: true }));
|
|
20
20
|
tasks.push(libTask);
|
|
21
21
|
(0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, '.babelrc'), (json) => {
|
|
22
22
|
if (options.style === '@emotion/styled') {
|
|
@@ -61,6 +61,9 @@ function libraryGenerator(host, options) {
|
|
|
61
61
|
});
|
|
62
62
|
return json;
|
|
63
63
|
});
|
|
64
|
+
if (!options.skipFormat) {
|
|
65
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
66
|
+
}
|
|
64
67
|
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
65
68
|
});
|
|
66
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,11 @@ const styles_1 = require("../../utils/styles");
|
|
|
13
13
|
function pageGenerator(host, options) {
|
|
14
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
15
|
const directory = options.directory ? `pages/${options.directory}` : 'pages';
|
|
16
|
-
const componentTask = yield (0, react_1.componentGenerator)(host, Object.assign(Object.assign({}, options), { directory, pascalCaseFiles: false, export: false, classComponent: false, routing: false, skipTests: !options.withTests, flat: !!options.flat, fileName: !options.flat ? 'index' : undefined }));
|
|
16
|
+
const componentTask = yield (0, react_1.componentGenerator)(host, Object.assign(Object.assign({}, options), { directory, pascalCaseFiles: false, export: false, classComponent: false, routing: false, skipTests: !options.withTests, flat: !!options.flat, fileName: !options.flat ? 'index' : undefined, skipFormat: true }));
|
|
17
17
|
const styledTask = (0, styles_1.addStyleDependencies)(host, options.style);
|
|
18
|
+
if (!options.skipFormat) {
|
|
19
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
20
|
+
}
|
|
18
21
|
return (0, devkit_1.runTasksInSerial)(componentTask, styledTask);
|
|
19
22
|
});
|
|
20
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/page/page.ts"],"names":[],"mappings":";;;;AAAA,uCAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/page/page.ts"],"names":[],"mappings":";;;;AAAA,uCAA4E;AAC5E,yCAKsB;AAEtB,+CAA0D;AAG1D;;;;GAIG;AACH,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAe;;QAC7D,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC7E,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAuB,EAAC,IAAI,kCACnD,OAAO,KACV,SAAS,EACT,eAAe,EAAE,KAAK,EACtB,MAAM,EAAE,KAAK,EACb,cAAc,EAAE,KAAK,EACrB,OAAO,EAAE,KAAK,EACd,SAAS,EAAE,CAAC,OAAO,CAAC,SAAS,EAC7B,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EACpB,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAC7C,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,UAAU,GAAG,IAAA,6BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAE7D,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;CAAA;AAtBD,sCAsBC;AAED,kBAAe,aAAa,CAAC;AAChB,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAC"}
|
|
@@ -94,6 +94,12 @@
|
|
|
94
94
|
"type": "boolean",
|
|
95
95
|
"description": "Create component at the source root rather than its own directory.",
|
|
96
96
|
"default": false
|
|
97
|
+
},
|
|
98
|
+
"skipFormat": {
|
|
99
|
+
"description": "Skip formatting files.",
|
|
100
|
+
"type": "boolean",
|
|
101
|
+
"default": false,
|
|
102
|
+
"x-priority": "internal"
|
|
97
103
|
}
|
|
98
104
|
},
|
|
99
105
|
"required": ["name", "project"],
|