@nx/node 16.8.0-beta.1 → 16.8.0-beta.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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/node",
|
|
3
|
-
"version": "16.8.0-beta.
|
|
3
|
+
"version": "16.8.0-beta.3",
|
|
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": {
|
|
@@ -30,17 +30,17 @@
|
|
|
30
30
|
"migrations": "./migrations.json"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@nrwl/node": "16.8.0-beta.
|
|
34
|
-
"@nx/devkit": "16.8.0-beta.
|
|
35
|
-
"@nx/jest": "16.8.0-beta.
|
|
36
|
-
"@nx/js": "16.8.0-beta.
|
|
37
|
-
"@nx/linter": "16.8.0-beta.
|
|
38
|
-
"@nx/workspace": "16.8.0-beta.
|
|
33
|
+
"@nrwl/node": "16.8.0-beta.3",
|
|
34
|
+
"@nx/devkit": "16.8.0-beta.3",
|
|
35
|
+
"@nx/jest": "16.8.0-beta.3",
|
|
36
|
+
"@nx/js": "16.8.0-beta.3",
|
|
37
|
+
"@nx/linter": "16.8.0-beta.3",
|
|
38
|
+
"@nx/workspace": "16.8.0-beta.3",
|
|
39
39
|
"tslib": "^2.3.0"
|
|
40
40
|
},
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
44
|
"type": "commonjs",
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "dcd48165a485bc8db57a1fb02b96a0772de3b7e9"
|
|
46
46
|
}
|
|
@@ -7,8 +7,8 @@ const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project
|
|
|
7
7
|
const linter_1 = require("@nx/linter");
|
|
8
8
|
const global_eslint_config_1 = require("@nx/linter/src/generators/init/global-eslint-config");
|
|
9
9
|
const path = require("path");
|
|
10
|
-
const path_1 = require("path");
|
|
11
10
|
const versions_1 = require("../../utils/versions");
|
|
11
|
+
const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
|
|
12
12
|
function e2eProjectGenerator(host, options) {
|
|
13
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
14
|
return yield e2eProjectGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, options));
|
|
@@ -62,31 +62,13 @@ function e2eProjectGeneratorInternal(host, _options) {
|
|
|
62
62
|
rootProject: options.rootProject,
|
|
63
63
|
});
|
|
64
64
|
tasks.push(linterTask);
|
|
65
|
-
(
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
? [global_eslint_config_1.globalTypeScriptOverrides, global_eslint_config_1.globalJavaScriptOverrides]
|
|
73
|
-
: []),
|
|
74
|
-
/**
|
|
75
|
-
* In order to ensure maximum efficiency when typescript-eslint generates TypeScript Programs
|
|
76
|
-
* behind the scenes during lint runs, we need to make sure the project is configured to use its
|
|
77
|
-
* own specific tsconfigs, and not fall back to the ones in the root of the workspace.
|
|
78
|
-
*/
|
|
79
|
-
{
|
|
80
|
-
files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
|
|
81
|
-
/**
|
|
82
|
-
* Having an empty rules object present makes it more obvious to the user where they would
|
|
83
|
-
* extend things from if they needed to
|
|
84
|
-
*/
|
|
85
|
-
rules: {},
|
|
86
|
-
},
|
|
87
|
-
];
|
|
88
|
-
return json;
|
|
89
|
-
});
|
|
65
|
+
if (options.rootProject && (0, eslint_file_1.isEslintConfigSupported)(host)) {
|
|
66
|
+
(0, eslint_file_1.addPluginsToLintConfig)(host, options.e2eProjectRoot, '@nx');
|
|
67
|
+
(0, eslint_file_1.replaceOverridesInLintConfig)(host, options.e2eProjectRoot, [
|
|
68
|
+
global_eslint_config_1.typeScriptOverride,
|
|
69
|
+
global_eslint_config_1.javaScriptOverride,
|
|
70
|
+
]);
|
|
71
|
+
}
|
|
90
72
|
}
|
|
91
73
|
if (!options.skipFormat) {
|
|
92
74
|
yield (0, devkit_1.formatFiles)(host);
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setupDockerSchematic = exports.setupDockerGenerator = exports.updateProjectConfig = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
+
const path_1 = require("path");
|
|
6
7
|
function normalizeOptions(tree, setupOptions) {
|
|
7
8
|
var _a, _b, _c;
|
|
8
9
|
return Object.assign(Object.assign({}, setupOptions), { project: (_a = setupOptions.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject, targetName: (_b = setupOptions.targetName) !== null && _b !== void 0 ? _b : 'docker-build', buildTarget: (_c = setupOptions.buildTarget) !== null && _c !== void 0 ? _c : 'build' });
|
|
@@ -18,7 +19,7 @@ function addDocker(tree, options) {
|
|
|
18
19
|
}
|
|
19
20
|
else {
|
|
20
21
|
const outputPath = (_a = project.targets[`${options.buildTarget}`]) === null || _a === void 0 ? void 0 : _a.options.outputPath;
|
|
21
|
-
(0, devkit_1.generateFiles)(tree, (0,
|
|
22
|
+
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), project.root, {
|
|
22
23
|
tmpl: '',
|
|
23
24
|
app: project.sourceRoot,
|
|
24
25
|
buildLocation: outputPath,
|