@nrwl/next 15.7.1 → 15.8.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.
- package/package.json +10 -10
- package/src/generators/application/lib/add-linting.js +3 -3
- package/src/generators/application/lib/add-linting.js.map +1 -1
- package/src/generators/application/lib/create-application-files.d.ts +1 -1
- package/src/generators/application/lib/create-application-files.js +3 -3
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +2 -2
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/schema.d.ts +0 -1
- package/src/generators/application/schema.json +0 -6
- package/src/generators/init/init.js +16 -10
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/library/library.js +2 -2
- package/src/generators/library/library.js.map +1 -1
- package/src/utils/styles.js +5 -5
- package/src/utils/styles.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/next",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.8.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,14 +35,14 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@babel/plugin-proposal-decorators": "^7.14.5",
|
|
38
|
-
"@nrwl/cypress": "15.
|
|
39
|
-
"@nrwl/devkit": "15.
|
|
40
|
-
"@nrwl/jest": "15.
|
|
41
|
-
"@nrwl/js": "15.
|
|
42
|
-
"@nrwl/linter": "15.
|
|
43
|
-
"@nrwl/react": "15.
|
|
44
|
-
"@nrwl/webpack": "15.
|
|
45
|
-
"@nrwl/workspace": "15.
|
|
38
|
+
"@nrwl/cypress": "15.8.0-beta.1",
|
|
39
|
+
"@nrwl/devkit": "15.8.0-beta.1",
|
|
40
|
+
"@nrwl/jest": "15.8.0-beta.1",
|
|
41
|
+
"@nrwl/js": "15.8.0-beta.1",
|
|
42
|
+
"@nrwl/linter": "15.8.0-beta.1",
|
|
43
|
+
"@nrwl/react": "15.8.0-beta.1",
|
|
44
|
+
"@nrwl/webpack": "15.8.0-beta.1",
|
|
45
|
+
"@nrwl/workspace": "15.8.0-beta.1",
|
|
46
46
|
"@svgr/webpack": "^6.1.2",
|
|
47
47
|
"chalk": "^4.1.0",
|
|
48
48
|
"dotenv": "~10.0.0",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"access": "public"
|
|
59
59
|
},
|
|
60
60
|
"types": "./index.d.ts",
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "347d6dd92077b793139c77a7a6bd9baf7a1f975c"
|
|
62
62
|
}
|
|
@@ -4,7 +4,7 @@ exports.addLinting = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const linter_1 = require("@nrwl/linter");
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
|
-
const
|
|
7
|
+
const lint_1 = require("@nrwl/react/src/utils/lint");
|
|
8
8
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
9
9
|
function addLinting(host, options) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -21,7 +21,7 @@ function addLinting(host, options) {
|
|
|
21
21
|
if (options.linter === linter_1.Linter.EsLint) {
|
|
22
22
|
(0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, '.eslintrc.json'), (json) => {
|
|
23
23
|
var _a, _b, _c;
|
|
24
|
-
json = (0,
|
|
24
|
+
json = (0, lint_1.extendReactEslintJson)(json);
|
|
25
25
|
// Turn off @next/next/no-html-link-for-pages since there is an issue with nextjs throwing linting errors
|
|
26
26
|
// TODO(nicholas): remove after Vercel updates nextjs linter to only lint ["*.ts", "*.tsx", "*.js", "*.jsx"]
|
|
27
27
|
json.ignorePatterns = [...json.ignorePatterns, '.next/**/*'];
|
|
@@ -59,7 +59,7 @@ function addLinting(host, options) {
|
|
|
59
59
|
return json;
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
|
-
const installTask = (0, devkit_1.addDependenciesToPackageJson)(host,
|
|
62
|
+
const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
|
|
63
63
|
return (0, run_tasks_in_serial_1.runTasksInSerial)(lintTask, installTask);
|
|
64
64
|
});
|
|
65
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAA4D;AAC5D,yCAMsB;AACtB,
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createApplicationFiles = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
|
-
const create_application_files_helpers_1 = require("./create-application-files.helpers");
|
|
6
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
|
-
const
|
|
6
|
+
const js_1 = require("@nrwl/js");
|
|
7
|
+
const create_application_files_helpers_1 = require("./create-application-files.helpers");
|
|
8
8
|
function createApplicationFiles(host, options) {
|
|
9
|
-
const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '', rootTsConfigPath: (0,
|
|
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
10
|
? options.style
|
|
11
11
|
: 'css' });
|
|
12
12
|
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files'), 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":";;;AAAA,+BAA4B;
|
|
1
|
+
{"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,yCAAgE;AAChE,iCAAyD;AAGzD,yFAG4C;AAE5C,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,EACR,gBAAgB,EAAE,IAAA,kCAA6B,EAC7C,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB,EACD,UAAU,EAAE,IAAA,+CAAY,EAAC,OAAO,CAAC,IAAI,CAAC,EACtC,YAAY,EAAE,IAAA,mDAAgB,GAAE,EAChC,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EACP,OAAO,CAAC,KAAK,KAAK,MAAM,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM;YAClD,CAAC,CAAC,OAAO,CAAC,KAAK;YACf,CAAC,CAAC,KAAK,GACZ,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,UAAU,CAAC,EAC3B,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,UAAU,OAAO,CAAC,QAAQ,WAAW,CAAC,CAAC;KAC7E;IAED,sDAAsD;IACtD,qFAAqF;IACrF,IAAI,OAAO,CAAC,GAAG,KAAK,KAAK,EAAE;QACzB,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,WAAW,CAAC,CAAC;KACnD;IAED,IAAI,OAAO,CAAC,YAAY,EAAE;QACxB,IAAI,CAAC,MAAM,CACT,GAAG,OAAO,CAAC,cAAc,UAAU,OAAO,CAAC,QAAQ,WAAW,OAAO,CAAC,KAAK,EAAE,CAC9E,CAAC;KACH;IAED,IAAI,OAAO,CAAC,KAAK,KAAK,mBAAmB,EAAE;QACzC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC,CAAC;KAC9D;IAED,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,aAAa,CAAC,CAAC;QACpD,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC,CAAC;KACxD;AACH,CAAC;AAlDD,wDAkDC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
|
-
const
|
|
4
|
+
const assertion_1 = require("@nrwl/react/src/utils/assertion");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
7
|
function normalizeOptions(host, options) {
|
|
@@ -21,7 +21,7 @@ function normalizeOptions(host, options) {
|
|
|
21
21
|
const styledModule = /^(css|scss|less|styl)$/.test(options.style)
|
|
22
22
|
? null
|
|
23
23
|
: options.style;
|
|
24
|
-
(0,
|
|
24
|
+
(0, assertion_1.assertValidStyle)(options.style);
|
|
25
25
|
return Object.assign(Object.assign({}, options), { 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,
|
|
26
26
|
e2eProjectRoot,
|
|
27
27
|
e2eProjectName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,+DAAmE;AACnE,yCAMsB;AACtB,yCAAsC;AAetC,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;IAE/C,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEzE,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,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,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;AA/CD,4CA+CC"}
|
|
@@ -76,12 +76,6 @@
|
|
|
76
76
|
"default": false,
|
|
77
77
|
"x-priority": "internal"
|
|
78
78
|
},
|
|
79
|
-
"skipWorkspaceJson": {
|
|
80
|
-
"description": "Skip updating `workspace.json` with default options based on values provided to this app (e.g. `babel`, `style`).",
|
|
81
|
-
"type": "boolean",
|
|
82
|
-
"default": false,
|
|
83
|
-
"x-priority": "internal"
|
|
84
|
-
},
|
|
85
79
|
"unitTestRunner": {
|
|
86
80
|
"type": "string",
|
|
87
81
|
"enum": ["jest", "none"],
|
|
@@ -6,32 +6,38 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
7
7
|
const jest_1 = require("@nrwl/jest");
|
|
8
8
|
const cypress_1 = require("@nrwl/cypress");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
9
|
+
const versions_1 = require("@nrwl/react/src/utils/versions");
|
|
10
|
+
const init_1 = require("@nrwl/react/src/generators/init/init");
|
|
11
|
+
const js_1 = require("@nrwl/js");
|
|
12
|
+
const versions_2 = require("../../utils/versions");
|
|
11
13
|
const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
|
|
12
14
|
function updateDependencies(host) {
|
|
13
15
|
return (0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
14
|
-
'@nrwl/next':
|
|
15
|
-
next:
|
|
16
|
-
react:
|
|
17
|
-
'react-dom':
|
|
18
|
-
tslib:
|
|
16
|
+
'@nrwl/next': versions_2.nxVersion,
|
|
17
|
+
next: versions_2.nextVersion,
|
|
18
|
+
react: versions_1.reactVersion,
|
|
19
|
+
'react-dom': versions_1.reactDomVersion,
|
|
20
|
+
tslib: versions_2.tsLibVersion,
|
|
19
21
|
}, {
|
|
20
|
-
'eslint-config-next':
|
|
22
|
+
'eslint-config-next': versions_2.eslintConfigNextVersion,
|
|
21
23
|
});
|
|
22
24
|
}
|
|
23
25
|
function nextInitGenerator(host, schema) {
|
|
24
26
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
27
|
+
yield (0, js_1.initGenerator)(host, {
|
|
28
|
+
js: schema.js,
|
|
29
|
+
skipFormat: true,
|
|
30
|
+
});
|
|
25
31
|
const tasks = [];
|
|
26
32
|
if (!schema.unitTestRunner || schema.unitTestRunner === 'jest') {
|
|
27
|
-
const jestTask = (0, jest_1.jestInitGenerator)(host, schema);
|
|
33
|
+
const jestTask = yield (0, jest_1.jestInitGenerator)(host, schema);
|
|
28
34
|
tasks.push(jestTask);
|
|
29
35
|
}
|
|
30
36
|
if (!schema.e2eTestRunner || schema.e2eTestRunner === 'cypress') {
|
|
31
37
|
const cypressTask = (0, cypress_1.cypressInitGenerator)(host, {});
|
|
32
38
|
tasks.push(cypressTask);
|
|
33
39
|
}
|
|
34
|
-
const reactTask = yield (0,
|
|
40
|
+
const reactTask = yield (0, init_1.default)(host, schema);
|
|
35
41
|
tasks.push(reactTask);
|
|
36
42
|
const installTask = updateDependencies(host);
|
|
37
43
|
tasks.push(installTask);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,2FAAqF;AACrF,qCAA+C;AAC/C,2CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,2FAAqF;AACrF,qCAA+C;AAC/C,2CAAqD;AACrD,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,IAAA,kBAAe,EAAC,IAAI,EAAE;YAC1B,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QACH,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EAAC,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,WAAW,GAAG,IAAA,8BAAoB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,cAAkB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtB,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,IAAA,uCAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAzBD,8CAyBC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,iBAAiB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.librarySchematic = exports.libraryGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const
|
|
6
|
+
const library_1 = require("@nrwl/react/src/generators/library/library");
|
|
7
7
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
8
8
|
const init_1 = require("../init/init");
|
|
9
9
|
function libraryGenerator(host, options) {
|
|
@@ -17,7 +17,7 @@ function libraryGenerator(host, options) {
|
|
|
17
17
|
const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
|
|
18
18
|
const initTask = yield (0, init_1.nextInitGenerator)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
|
|
19
19
|
tasks.push(initTask);
|
|
20
|
-
const libTask = yield (0,
|
|
20
|
+
const libTask = yield (0, library_1.libraryGenerator)(host, Object.assign(Object.assign({}, options), { compiler: 'swc' }));
|
|
21
21
|
tasks.push(libTask);
|
|
22
22
|
(0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, '.babelrc'), (json) => {
|
|
23
23
|
if (options.style === '@emotion/styled') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
package/src/utils/styles.js
CHANGED
|
@@ -2,16 +2,16 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addStyleDependencies = exports.NEXT_SPECIFIC_STYLE_DEPENDENCIES = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const styled_1 = require("@nrwl/react/src/utils/styled");
|
|
6
6
|
const versions_1 = require("./versions");
|
|
7
7
|
exports.NEXT_SPECIFIC_STYLE_DEPENDENCIES = {
|
|
8
8
|
'styled-components': {
|
|
9
|
-
dependencies:
|
|
10
|
-
devDependencies: Object.assign(Object.assign({},
|
|
9
|
+
dependencies: styled_1.CSS_IN_JS_DEPENDENCIES['styled-components'].dependencies,
|
|
10
|
+
devDependencies: Object.assign(Object.assign({}, styled_1.CSS_IN_JS_DEPENDENCIES['styled-components'].devDependencies), { 'babel-plugin-styled-components': versions_1.babelPluginStyledComponentsVersion }),
|
|
11
11
|
},
|
|
12
12
|
'@emotion/styled': {
|
|
13
|
-
dependencies: Object.assign(Object.assign({},
|
|
14
|
-
devDependencies:
|
|
13
|
+
dependencies: Object.assign(Object.assign({}, styled_1.CSS_IN_JS_DEPENDENCIES['@emotion/styled'].dependencies), { '@emotion/server': versions_1.emotionServerVersion }),
|
|
14
|
+
devDependencies: styled_1.CSS_IN_JS_DEPENDENCIES['@emotion/styled'].devDependencies,
|
|
15
15
|
},
|
|
16
16
|
css: {
|
|
17
17
|
dependencies: {},
|
package/src/utils/styles.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/styles.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,
|
|
1
|
+
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/styles.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,yDAAsE;AACtE,yCAMoB;AAEP,QAAA,gCAAgC,GAAG;IAC9C,mBAAmB,EAAE;QACnB,YAAY,EAAE,+BAAsB,CAAC,mBAAmB,CAAC,CAAC,YAAY;QACtE,eAAe,kCACV,+BAAsB,CAAC,mBAAmB,CAAC,CAAC,eAAe,KAC9D,gCAAgC,EAAE,6CAAkC,GACrE;KACF;IACD,iBAAiB,EAAE;QACjB,YAAY,kCACP,+BAAsB,CAAC,iBAAiB,CAAC,CAAC,YAAY,KACzD,iBAAiB,EAAE,+BAAoB,GACxC;QACD,eAAe,EAAE,+BAAsB,CAAC,iBAAiB,CAAC,CAAC,eAAe;KAC3E;IACD,GAAG,EAAE;QACH,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;KACpB;IACD,IAAI,EAAE;QACJ,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE,IAAI,EAAE,sBAAW,EAAE;KACvC;IACD,IAAI,EAAE;QACJ,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE;YACf,aAAa,EAAE,qBAAU;SAC1B;KACF;IACD,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,eAAe,EAAE,uBAAY;SAC9B;QACD,eAAe,EAAE,EAAE;KACpB;CACF,CAAC;AAEF,SAAgB,oBAAoB,CAClC,IAAU,EACV,KAAa;IAEb,MAAM,iBAAiB,GAAG,wCAAgC,CAAC,KAAK,CAAC,CAAC;IAElE,IAAI,CAAC,iBAAiB;QAAE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;IAExC,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ,iBAAiB,CAAC,YAAY,EAC9B,iBAAiB,CAAC,eAAe,CAClC,CAAC;IAEF,6EAA6E;IAC7E,oEAAoE;IACpE,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,MAAM,CAAC,EAAE;QAC3E,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,WAAW,mCAAQ,IAAI,CAAC,WAAW,KAAE,YAAY,EAAE,OAAO,GAAE,CAAC;YAClE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAxBD,oDAwBC"}
|