@nx/node 17.0.0-beta.5 → 17.0.0-beta.8
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/node",
|
|
3
|
-
"version": "17.0.0-beta.
|
|
3
|
+
"version": "17.0.0-beta.8",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
|
|
6
6
|
"repository": {
|
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"tslib": "^2.3.0",
|
|
34
|
-
"@nx/devkit": "17.0.0-beta.
|
|
35
|
-
"@nx/jest": "17.0.0-beta.
|
|
36
|
-
"@nx/js": "17.0.0-beta.
|
|
37
|
-
"@nx/
|
|
38
|
-
"@nrwl/node": "17.0.0-beta.
|
|
34
|
+
"@nx/devkit": "17.0.0-beta.8",
|
|
35
|
+
"@nx/jest": "17.0.0-beta.8",
|
|
36
|
+
"@nx/js": "17.0.0-beta.8",
|
|
37
|
+
"@nx/eslint": "17.0.0-beta.8",
|
|
38
|
+
"@nrwl/node": "17.0.0-beta.8"
|
|
39
39
|
},
|
|
40
40
|
"publishConfig": {
|
|
41
41
|
"access": "public"
|
|
@@ -6,8 +6,8 @@ const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project
|
|
|
6
6
|
const jest_1 = require("@nx/jest");
|
|
7
7
|
const js_1 = require("@nx/js");
|
|
8
8
|
const versions_1 = require("@nx/js/src/utils/versions");
|
|
9
|
-
const
|
|
10
|
-
const lint_project_1 = require("@nx/
|
|
9
|
+
const eslint_1 = require("@nx/eslint");
|
|
10
|
+
const lint_project_1 = require("@nx/eslint/src/generators/lint-project/lint-project");
|
|
11
11
|
const path_1 = require("path");
|
|
12
12
|
const versions_2 = require("../../utils/versions");
|
|
13
13
|
const e2e_project_1 = require("../e2e-project/e2e-project");
|
|
@@ -163,7 +163,7 @@ function addProxy(tree, options) {
|
|
|
163
163
|
}
|
|
164
164
|
}
|
|
165
165
|
async function addLintingToApplication(tree, options) {
|
|
166
|
-
const lintTask = await (0,
|
|
166
|
+
const lintTask = await (0, eslint_1.lintProjectGenerator)(tree, {
|
|
167
167
|
linter: options.linter,
|
|
168
168
|
project: options.name,
|
|
169
169
|
tsConfigPaths: [
|
|
@@ -269,7 +269,7 @@ async function applicationGeneratorInternal(tree, schema) {
|
|
|
269
269
|
addAppFiles(tree, options);
|
|
270
270
|
addProject(tree, options);
|
|
271
271
|
updateTsConfigOptions(tree, options);
|
|
272
|
-
if (options.linter ===
|
|
272
|
+
if (options.linter === eslint_1.Linter.EsLint) {
|
|
273
273
|
const lintTask = await addLintingToApplication(tree, options);
|
|
274
274
|
tasks.push(lintTask);
|
|
275
275
|
}
|
|
@@ -348,7 +348,7 @@ async function normalizeOptions(host, options) {
|
|
|
348
348
|
: undefined,
|
|
349
349
|
appProjectRoot,
|
|
350
350
|
parsedTags,
|
|
351
|
-
linter: options.linter ??
|
|
351
|
+
linter: options.linter ?? eslint_1.Linter.EsLint,
|
|
352
352
|
unitTestRunner: options.unitTestRunner ?? 'jest',
|
|
353
353
|
rootProject: options.rootProject ?? false,
|
|
354
354
|
port: options.port ?? 3000,
|
|
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.e2eProjectGeneratorInternal = exports.e2eProjectGenerator = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
|
|
6
|
-
const
|
|
7
|
-
const global_eslint_config_1 = require("@nx/
|
|
6
|
+
const eslint_1 = require("@nx/eslint");
|
|
7
|
+
const global_eslint_config_1 = require("@nx/eslint/src/generators/init/global-eslint-config");
|
|
8
8
|
const path = require("path");
|
|
9
9
|
const versions_1 = require("../../utils/versions");
|
|
10
|
-
const eslint_file_1 = require("@nx/
|
|
10
|
+
const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
|
|
11
11
|
async function e2eProjectGenerator(host, options) {
|
|
12
12
|
return await e2eProjectGeneratorInternal(host, {
|
|
13
13
|
projectNameAndRootFormat: 'derived',
|
|
@@ -63,10 +63,10 @@ async function e2eProjectGeneratorInternal(host, _options) {
|
|
|
63
63
|
// axios is more than likely used in the application code, so install it as a regular dependency.
|
|
64
64
|
const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, { axios: versions_1.axiosVersion }, {});
|
|
65
65
|
tasks.push(installTask);
|
|
66
|
-
if (options.linter ===
|
|
67
|
-
const linterTask = await (0,
|
|
66
|
+
if (options.linter === eslint_1.Linter.EsLint) {
|
|
67
|
+
const linterTask = await (0, eslint_1.lintProjectGenerator)(host, {
|
|
68
68
|
project: options.e2eProjectName,
|
|
69
|
-
linter:
|
|
69
|
+
linter: eslint_1.Linter.EsLint,
|
|
70
70
|
skipFormat: true,
|
|
71
71
|
tsConfigPaths: [
|
|
72
72
|
(0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'tsconfig.json'),
|