@nrwl/workspace 14.8.8 → 14.9.0-beta.1
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/LICENSE +22 -22
- package/README.md +5 -26
- package/executors.json +4 -2
- package/generators.json +7 -52
- package/index.d.ts +4 -10
- package/index.js +4 -42
- package/index.js.map +1 -1
- package/migrations.json +20 -1
- package/package.json +33 -44
- package/presets/core.json +4 -9
- package/presets/npm.json +4 -12
- package/src/executors/counter/schema.json +1 -0
- package/src/executors/run-commands/schema.json +9 -1
- package/src/executors/run-script/schema.json +1 -0
- package/src/generators/ci-workflow/ci-workflow.d.ts +1 -1
- package/src/generators/ci-workflow/ci-workflow.js +13 -0
- package/src/generators/ci-workflow/ci-workflow.js.map +1 -1
- package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__ +0 -2
- package/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__ +36 -0
- package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__ +1 -4
- package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ +3 -3
- package/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__ +47 -0
- package/src/generators/ci-workflow/schema.json +5 -3
- package/src/generators/convert-to-nx-project/convert-to-nx-project.d.ts +1 -2
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js +62 -38
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map +1 -1
- package/src/generators/convert-to-nx-project/schema.d.ts +2 -0
- package/src/generators/convert-to-nx-project/schema.json +11 -6
- package/src/generators/library/files/lib/__dot__babelrc__tmpl__ +1 -1
- package/src/generators/library/files/lib/tsconfig.lib.json +2 -2
- package/src/generators/library/library.d.ts +2 -1
- package/src/generators/library/library.js +44 -33
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +1 -1
- package/src/generators/library/schema.json +9 -4
- package/src/generators/move/lib/create-project-configuration-in-new-destination.d.ts +3 -0
- package/src/generators/move/lib/{move-project-configuration.js → create-project-configuration-in-new-destination.js} +6 -9
- package/src/generators/move/lib/create-project-configuration-in-new-destination.js.map +1 -0
- package/src/generators/move/lib/{move-project.d.ts → move-project-files.d.ts} +1 -1
- package/src/generators/move/lib/{move-project.js → move-project-files.js} +4 -4
- package/src/generators/move/lib/move-project-files.js.map +1 -0
- package/src/generators/move/lib/update-cypress-config.js +8 -2
- package/src/generators/move/lib/update-cypress-config.js.map +1 -1
- package/src/generators/move/lib/update-default-project.js +4 -5
- package/src/generators/move/lib/update-default-project.js.map +1 -1
- package/src/generators/move/lib/update-implicit-dependencies.d.ts +0 -2
- package/src/generators/move/lib/update-implicit-dependencies.js +0 -2
- package/src/generators/move/lib/update-implicit-dependencies.js.map +1 -1
- package/src/generators/move/lib/update-imports.js +28 -18
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/move/move.js +5 -4
- package/src/generators/move/move.js.map +1 -1
- package/src/generators/move/schema.json +2 -1
- package/src/generators/{workspace/files → new/files-integrated-repo}/__dot__gitignore +2 -2
- package/src/generators/{workspace/files → new/files-integrated-repo}/__dot__vscode/extensions.json__tmpl__ +1 -1
- package/src/generators/new/files-integrated-repo/package.json__tmpl__ +14 -0
- package/src/generators/new/files-package-based-repo/__dot__gitignore +39 -0
- package/src/generators/new/files-package-based-repo/__dot__vscode/extensions.json__tmpl__ +8 -0
- package/src/generators/new/files-package-based-repo/package.json__tmpl__ +13 -0
- package/src/generators/new/files-readme/README.md.template +21 -0
- package/src/generators/new/files-root-app/__dot__gitignore +39 -0
- package/src/generators/new/files-root-app/__dot__vscode/extensions.json__tmpl__ +6 -0
- package/src/generators/new/files-root-app/package.json__tmpl__ +14 -0
- package/src/generators/new/generate-preset.d.ts +4 -0
- package/src/generators/new/generate-preset.js +131 -0
- package/src/generators/new/generate-preset.js.map +1 -0
- package/src/generators/new/generate-workspace-files.d.ts +3 -0
- package/src/generators/{workspace/workspace.js → new/generate-workspace-files.js} +81 -72
- package/src/generators/new/generate-workspace-files.js.map +1 -0
- package/src/generators/new/new.d.ts +11 -6
- package/src/generators/new/new.js +41 -212
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/new/schema.json +16 -7
- package/src/generators/npm-package/npm-package.js +3 -6
- package/src/generators/npm-package/npm-package.js.map +1 -1
- package/src/generators/preset/preset.d.ts +1 -2
- package/src/generators/preset/preset.js +57 -255
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/preset/schema.d.ts +5 -1
- package/src/generators/preset/schema.json +34 -7
- package/src/generators/remove/lib/check-project-is-safe-to-remove.d.ts +3 -0
- package/src/generators/remove/lib/check-project-is-safe-to-remove.js +26 -0
- package/src/generators/remove/lib/check-project-is-safe-to-remove.js.map +1 -0
- package/src/generators/remove/lib/check-targets.d.ts +1 -1
- package/src/generators/remove/lib/check-targets.js +33 -29
- package/src/generators/remove/lib/check-targets.js.map +1 -1
- package/src/generators/remove/lib/remove-project-references-in-config.d.ts +3 -0
- package/src/generators/remove/lib/remove-project-references-in-config.js +22 -0
- package/src/generators/remove/lib/remove-project-references-in-config.js.map +1 -0
- package/src/generators/remove/lib/update-jest-config.js +10 -5
- package/src/generators/remove/lib/update-jest-config.js.map +1 -1
- package/src/generators/remove/lib/update-tsconfig.d.ts +2 -2
- package/src/generators/remove/lib/update-tsconfig.js +23 -15
- package/src/generators/remove/lib/update-tsconfig.js.map +1 -1
- package/src/generators/remove/remove.js +6 -4
- package/src/generators/remove/remove.js.map +1 -1
- package/src/generators/remove/schema.json +2 -1
- package/src/generators/run-commands/run-commands.js +3 -1
- package/src/generators/run-commands/run-commands.js.map +1 -1
- package/src/generators/run-commands/schema.json +2 -1
- package/src/generators/utils/insert-import.js +10 -5
- package/src/generators/utils/insert-import.js.map +1 -1
- package/src/generators/utils/insert-statement.js +8 -3
- package/src/generators/utils/insert-statement.js.map +1 -1
- package/src/generators/utils/presets.d.ts +6 -5
- package/src/generators/utils/presets.js +5 -4
- package/src/generators/utils/presets.js.map +1 -1
- package/src/generators/workspace-generator/schema.json +3 -2
- package/src/migrations/update-12-5-0/add-target-dependencies.js +2 -2
- package/src/migrations/update-12-5-0/add-target-dependencies.js.map +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.d.ts +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.js +19 -9
- package/src/migrations/update-13-0-0/config-locations/config-locations.js.map +1 -1
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js +2 -2
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js.map +1 -1
- package/src/migrations/update-13-10-0/update-tasks-runner.js +4 -3
- package/src/migrations/update-13-10-0/update-tasks-runner.js.map +1 -1
- package/src/migrations/update-13-2-0/set-parallel-default.js +2 -2
- package/src/migrations/update-13-2-0/set-parallel-default.js.map +1 -1
- package/src/migrations/update-13-6-0/remove-old-task-runner-options.js +3 -3
- package/src/migrations/update-13-6-0/remove-old-task-runner-options.js.map +1 -1
- package/src/migrations/update-14-0-0/change-npm-script-executor.js +1 -1
- package/src/migrations/update-14-0-0/change-npm-script-executor.js.map +1 -1
- package/src/migrations/update-14-0-0/change-nx-json-presets.js +3 -3
- package/src/migrations/update-14-0-0/change-nx-json-presets.js.map +1 -1
- package/src/migrations/update-14-2-0/enable-source-analysis.js +14 -13
- package/src/migrations/update-14-2-0/enable-source-analysis.js.map +1 -1
- package/src/migrations/update-14-8-0/change-run-commands-executor.js +1 -1
- package/src/migrations/update-14-8-0/change-run-commands-executor.js.map +1 -1
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.d.ts +3 -0
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.js +15 -0
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.js.map +1 -0
- package/src/utilities/assets.d.ts +2 -2
- package/src/utilities/buildable-libs-utils.d.ts +18 -7
- package/src/utilities/buildable-libs-utils.js +28 -13
- package/src/utilities/buildable-libs-utils.js.map +1 -1
- package/src/utilities/plugins/plugin-capabilities.d.ts +1 -3
- package/src/utilities/plugins/plugin-capabilities.js +2 -75
- package/src/utilities/plugins/plugin-capabilities.js.map +1 -1
- package/src/utilities/run-tasks-in-serial.d.ts +6 -0
- package/src/utilities/run-tasks-in-serial.js +6 -0
- package/src/utilities/run-tasks-in-serial.js.map +1 -1
- package/src/utilities/set-default-collection.js +5 -5
- package/src/utilities/set-default-collection.js.map +1 -1
- package/src/utilities/ts-config.d.ts +5 -0
- package/src/utilities/ts-config.js +40 -0
- package/src/utilities/ts-config.js.map +1 -0
- package/src/utilities/typescript/compilation.d.ts +1 -1
- package/src/utilities/typescript/compilation.js +22 -12
- package/src/utilities/typescript/compilation.js.map +1 -1
- package/src/utilities/typescript/find-nodes.d.ts +5 -2
- package/src/utilities/typescript/find-nodes.js +7 -25
- package/src/utilities/typescript/find-nodes.js.map +1 -1
- package/src/utilities/typescript/get-source-nodes.d.ts +4 -1
- package/src/utilities/typescript/get-source-nodes.js +3 -0
- package/src/utilities/typescript/get-source-nodes.js.map +1 -1
- package/src/utilities/typescript.d.ts +8 -4
- package/src/utilities/typescript.js +21 -38
- package/src/utilities/typescript.js.map +1 -1
- package/src/utilities/version-utils.d.ts +3 -0
- package/src/utilities/version-utils.js +7 -12
- package/src/utilities/version-utils.js.map +1 -1
- package/src/utils/ast-utils.d.ts +0 -123
- package/src/utils/ast-utils.js +5 -546
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/cli-config-utils.d.ts +4 -3
- package/src/utils/cli-config-utils.js +4 -45
- package/src/utils/cli-config-utils.js.map +1 -1
- package/src/utils/lint.d.ts +0 -32
- package/src/utils/lint.js +0 -262
- package/src/utils/lint.js.map +1 -1
- package/src/utils/project-type.d.ts +1 -3
- package/src/utils/project-type.js +1 -8
- package/src/utils/project-type.js.map +1 -1
- package/src/utils/rules/add-install-task.d.ts +1 -1
- package/src/utils/rules/add-install-task.js +2 -2
- package/src/utils/rules/add-install-task.js.map +1 -1
- package/src/utils/rules/deleteFile.d.ts +1 -1
- package/src/utils/rules/format-files.js +0 -19
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/utils/rules/workspace.d.ts +1 -1
- package/src/utils/strings.d.ts +12 -0
- package/src/utils/strings.js +12 -0
- package/src/utils/strings.js.map +1 -1
- package/src/utils/testing-utils.d.ts +1 -1
- package/src/utils/testing-utils.js +6 -6
- package/src/utils/testing-utils.js.map +1 -1
- package/src/utils/testing.d.ts +1 -1
- package/src/utils/versions.d.ts +3 -4
- package/src/utils/versions.js +6 -5
- package/src/utils/versions.js.map +1 -1
- package/src/utils/workspace.d.ts +1 -1
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.d.ts +0 -2
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.js +0 -9
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.js.map +0 -1
- package/src/generators/move/lib/move-project-configuration.d.ts +0 -3
- package/src/generators/move/lib/move-project-configuration.js.map +0 -1
- package/src/generators/move/lib/move-project.js.map +0 -1
- package/src/generators/preset/files/pnpm-workspace/pnpm-workspace.yaml +0 -2
- package/src/generators/remove/lib/remove-project-config.d.ts +0 -8
- package/src/generators/remove/lib/remove-project-config.js +0 -32
- package/src/generators/remove/lib/remove-project-config.js.map +0 -1
- package/src/generators/utils/decorate-angular-cli.js__tmpl__ +0 -69
- package/src/generators/workspace/files/README.md__tmpl__ +0 -186
- package/src/generators/workspace/files/__dot__prettierignore +0 -4
- package/src/generators/workspace/files/package.json__tmpl__ +0 -18
- package/src/generators/workspace/schema.d.ts +0 -15
- package/src/generators/workspace/schema.json +0 -77
- package/src/generators/workspace/workspace.d.ts +0 -7
- package/src/generators/workspace/workspace.js.map +0 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.d.ts +0 -14
- package/src/tslint/nxEnforceModuleBoundariesRule.js +0 -177
- package/src/tslint/nxEnforceModuleBoundariesRule.js.map +0 -1
- package/src/utilities/ast-utils.d.ts +0 -22
- package/src/utilities/ast-utils.js +0 -182
- package/src/utilities/ast-utils.js.map +0 -1
- package/src/utilities/create-package-json.d.ts +0 -10
- package/src/utilities/create-package-json.js +0 -87
- package/src/utilities/create-package-json.js.map +0 -1
- package/src/utilities/executor-options-utils.d.ts +0 -13
- package/src/utilities/executor-options-utils.js +0 -36
- package/src/utilities/executor-options-utils.js.map +0 -1
- package/src/utilities/generate-globs.d.ts +0 -6
- package/src/utilities/generate-globs.js +0 -75
- package/src/utilities/generate-globs.js.map +0 -1
- package/src/utilities/prettier.d.ts +0 -6
- package/src/utilities/prettier.js +0 -38
- package/src/utilities/prettier.js.map +0 -1
- package/src/utils/app-root.d.ts +0 -1
- package/src/utils/app-root.js +0 -8
- package/src/utils/app-root.js.map +0 -1
- package/src/utils/graph-utils.d.ts +0 -5
- package/src/utils/graph-utils.js +0 -116
- package/src/utils/graph-utils.js.map +0 -1
- package/src/utils/rules/check-project-exists.d.ts +0 -10
- package/src/utils/rules/check-project-exists.js +0 -24
- package/src/utils/rules/check-project-exists.js.map +0 -1
- package/src/utils/rules/move-npm-packages.d.ts +0 -11
- package/src/utils/rules/move-npm-packages.js +0 -76
- package/src/utils/rules/move-npm-packages.js.map +0 -1
- package/src/utils/rules/rename-npm-packages.d.ts +0 -10
- package/src/utils/rules/rename-npm-packages.js +0 -81
- package/src/utils/rules/rename-npm-packages.js.map +0 -1
- package/src/utils/rules/rename-package-imports.d.ts +0 -10
- package/src/utils/rules/rename-package-imports.js +0 -58
- package/src/utils/rules/rename-package-imports.js.map +0 -1
- package/src/utils/rules/to-js.d.ts +0 -8
- package/src/utils/rules/to-js.js +0 -77
- package/src/utils/rules/to-js.js.map +0 -1
- package/src/utils/rules/update-karma-conf.d.ts +0 -8
- package/src/utils/rules/update-karma-conf.js +0 -36
- package/src/utils/rules/update-karma-conf.js.map +0 -1
- package/src/utils/runtime-lint-utils.d.ts +0 -80
- package/src/utils/runtime-lint-utils.js +0 -307
- package/src/utils/runtime-lint-utils.js.map +0 -1
- package/src/utils/update-packages-in-package-json.d.ts +0 -3
- package/src/utils/update-packages-in-package-json.js +0 -56
- package/src/utils/update-packages-in-package-json.js.map +0 -1
- package/src/utils/update-task.d.ts +0 -2
- package/src/utils/update-task.js +0 -83
- package/src/utils/update-task.js.map +0 -1
- /package/src/generators/{workspace/files → library/files/root}/tsconfig.base.json +0 -0
- /package/src/generators/{workspace/files → new/files-integrated-repo}/__dot__editorconfig +0 -0
- /package/src/generators/{workspace/files → new/files-integrated-repo}/tools/generators/.gitkeep +0 -0
- /package/src/generators/{workspace/files → new/files-integrated-repo}/tools/tsconfig.tools.json +0 -0
@@ -1,346 +1,148 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.
|
3
|
+
exports.presetGenerator = void 0;
|
4
4
|
const tslib_1 = require("tslib");
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
|
-
const path_1 = require("nx/src/utils/path");
|
7
|
-
const library_1 = require("../library/library");
|
8
|
-
const insert_import_1 = require("../utils/insert-import");
|
9
|
-
const insert_statement_1 = require("../utils/insert-statement");
|
10
6
|
const presets_1 = require("../utils/presets");
|
11
|
-
const path_2 = require("path");
|
12
7
|
function presetGenerator(tree, options) {
|
13
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
14
9
|
options = normalizeOptions(options);
|
15
|
-
yield createPreset(tree, options);
|
16
|
-
|
17
|
-
return () => {
|
10
|
+
const presetTask = yield createPreset(tree, options);
|
11
|
+
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
18
12
|
(0, devkit_1.installPackagesTask)(tree);
|
19
|
-
|
13
|
+
if (presetTask)
|
14
|
+
yield presetTask();
|
15
|
+
});
|
20
16
|
});
|
21
17
|
}
|
22
18
|
exports.presetGenerator = presetGenerator;
|
23
|
-
exports.presetSchematic = (0, devkit_1.convertNxGenerator)(presetGenerator);
|
24
19
|
exports.default = presetGenerator;
|
25
20
|
function createPreset(tree, options) {
|
21
|
+
var _a, _b;
|
26
22
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
27
23
|
if (options.preset === presets_1.Preset.Empty || options.preset === presets_1.Preset.Apps) {
|
28
24
|
return;
|
29
25
|
}
|
30
|
-
else if (options.preset === presets_1.Preset.
|
26
|
+
else if (options.preset === presets_1.Preset.AngularMonorepo) {
|
31
27
|
const { applicationGenerator: angularApplicationGenerator, } = require('@nrwl' + '/angular/generators');
|
32
|
-
|
28
|
+
return angularApplicationGenerator(tree, {
|
33
29
|
name: options.name,
|
34
30
|
style: options.style,
|
35
31
|
linter: options.linter,
|
36
|
-
|
32
|
+
standalone: options.standaloneApi,
|
33
|
+
routing: options.routing,
|
37
34
|
});
|
38
35
|
}
|
39
|
-
else if (options.preset === presets_1.Preset.
|
40
|
-
const { applicationGenerator:
|
41
|
-
|
36
|
+
else if (options.preset === presets_1.Preset.AngularStandalone) {
|
37
|
+
const { applicationGenerator: angularApplicationGenerator, } = require('@nrwl' + '/angular/generators');
|
38
|
+
return angularApplicationGenerator(tree, {
|
42
39
|
name: options.name,
|
43
40
|
style: options.style,
|
44
41
|
linter: options.linter,
|
45
|
-
|
42
|
+
routing: options.routing,
|
43
|
+
rootProject: true,
|
44
|
+
standalone: options.standaloneApi,
|
46
45
|
});
|
47
46
|
}
|
48
|
-
else if (options.preset === presets_1.Preset.
|
49
|
-
const { applicationGenerator:
|
50
|
-
|
51
|
-
yield nextApplicationGenerator(tree, {
|
47
|
+
else if (options.preset === presets_1.Preset.ReactMonorepo) {
|
48
|
+
const { applicationGenerator: reactApplicationGenerator, } = require('@nrwl' + '/react');
|
49
|
+
return reactApplicationGenerator(tree, {
|
52
50
|
name: options.name,
|
53
51
|
style: options.style,
|
54
52
|
linter: options.linter,
|
55
|
-
|
53
|
+
bundler: (_a = options.bundler) !== null && _a !== void 0 ? _a : 'webpack',
|
56
54
|
});
|
57
55
|
}
|
58
|
-
else if (options.preset === presets_1.Preset.
|
59
|
-
const { applicationGenerator:
|
60
|
-
|
61
|
-
yield webApplicationGenerator(tree, {
|
56
|
+
else if (options.preset === presets_1.Preset.ReactStandalone) {
|
57
|
+
const { applicationGenerator: reactApplicationGenerator, } = require('@nrwl' + '/react');
|
58
|
+
return reactApplicationGenerator(tree, {
|
62
59
|
name: options.name,
|
63
60
|
style: options.style,
|
64
61
|
linter: options.linter,
|
65
|
-
|
62
|
+
rootProject: true,
|
63
|
+
bundler: (_b = options.bundler) !== null && _b !== void 0 ? _b : 'vite',
|
64
|
+
e2eTestRunner: 'cypress',
|
65
|
+
unitTestRunner: options.bundler === 'vite' ? 'vitest' : 'jest',
|
66
66
|
});
|
67
|
-
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
68
|
-
'@ungap/custom-elements': '0.1.6',
|
69
|
-
});
|
70
|
-
addPolyfills(tree, `apps/${(0, devkit_1.names)(options.name).fileName}/src/polyfills.ts`, ['@ungap/custom-elements']);
|
71
67
|
}
|
72
|
-
else if (options.preset === presets_1.Preset.
|
73
|
-
const { applicationGenerator:
|
74
|
-
|
75
|
-
|
76
|
-
yield angularApplicationGenerator(tree, {
|
68
|
+
else if (options.preset === presets_1.Preset.NextJs) {
|
69
|
+
const { applicationGenerator: nextApplicationGenerator } = require('@nrwl' +
|
70
|
+
'/next');
|
71
|
+
return nextApplicationGenerator(tree, {
|
77
72
|
name: options.name,
|
78
73
|
style: options.style,
|
79
74
|
linter: options.linter,
|
80
|
-
skipFormat: true,
|
81
|
-
standaloneConfig: options.standaloneConfig,
|
82
75
|
});
|
83
|
-
yield nestApplicationGenerator(tree, {
|
84
|
-
name: 'api',
|
85
|
-
frontendProject: options.name,
|
86
|
-
linter: options.linter,
|
87
|
-
standaloneConfig: options.standaloneConfig,
|
88
|
-
});
|
89
|
-
yield (0, library_1.libraryGenerator)(tree, {
|
90
|
-
name: 'api-interfaces',
|
91
|
-
unitTestRunner: 'none',
|
92
|
-
linter: options.linter,
|
93
|
-
standaloneConfig: options.standaloneConfig,
|
94
|
-
});
|
95
|
-
connectAngularAndNest(tree, options);
|
96
76
|
}
|
97
|
-
else if (options.preset === presets_1.Preset.
|
98
|
-
const { applicationGenerator:
|
99
|
-
|
100
|
-
|
77
|
+
else if (options.preset === presets_1.Preset.WebComponents) {
|
78
|
+
const { applicationGenerator: webApplicationGenerator } = require('@nrwl' +
|
79
|
+
'/web');
|
80
|
+
return webApplicationGenerator(tree, {
|
101
81
|
name: options.name,
|
102
82
|
style: options.style,
|
103
83
|
linter: options.linter,
|
104
|
-
|
105
|
-
});
|
106
|
-
yield expressApplicationGenerator(tree, {
|
107
|
-
name: 'api',
|
108
|
-
frontendProject: options.name,
|
109
|
-
linter: options.linter,
|
110
|
-
standaloneConfig: options.standaloneConfig,
|
84
|
+
bundler: 'vite',
|
111
85
|
});
|
112
|
-
yield (0, library_1.libraryGenerator)(tree, {
|
113
|
-
name: 'api-interfaces',
|
114
|
-
unitTestRunner: 'none',
|
115
|
-
linter: options.linter,
|
116
|
-
standaloneConfig: options.standaloneConfig,
|
117
|
-
});
|
118
|
-
connectReactAndExpress(tree, options);
|
119
86
|
}
|
120
87
|
else if (options.preset === presets_1.Preset.Nest) {
|
121
88
|
const { applicationGenerator: nestApplicationGenerator } = require('@nrwl' +
|
122
89
|
'/nest');
|
123
|
-
|
90
|
+
return nestApplicationGenerator(tree, {
|
124
91
|
name: options.name,
|
125
92
|
linter: options.linter,
|
126
93
|
});
|
127
94
|
}
|
128
95
|
else if (options.preset === presets_1.Preset.Express) {
|
129
96
|
const { applicationGenerator: expressApplicationGenerator, } = require('@nrwl' + '/express');
|
130
|
-
|
97
|
+
return expressApplicationGenerator(tree, {
|
131
98
|
name: options.name,
|
132
99
|
linter: options.linter,
|
133
|
-
standaloneConfig: options.standaloneConfig,
|
134
100
|
});
|
135
101
|
}
|
136
102
|
else if (options.preset === presets_1.Preset.ReactNative) {
|
137
103
|
const { reactNativeApplicationGenerator } = require('@nrwl' +
|
138
104
|
'/react-native');
|
139
|
-
|
105
|
+
return reactNativeApplicationGenerator(tree, {
|
140
106
|
name: options.name,
|
141
107
|
linter: options.linter,
|
142
|
-
standaloneConfig: options.standaloneConfig,
|
143
108
|
e2eTestRunner: 'detox',
|
144
109
|
});
|
145
110
|
}
|
146
111
|
else if (options.preset === presets_1.Preset.Expo) {
|
147
112
|
const { expoApplicationGenerator } = require('@nrwl' + '/expo');
|
148
|
-
|
113
|
+
return expoApplicationGenerator(tree, {
|
149
114
|
name: options.name,
|
150
115
|
linter: options.linter,
|
151
|
-
standaloneConfig: options.standaloneConfig,
|
152
116
|
e2eTestRunner: 'detox',
|
153
117
|
});
|
154
118
|
}
|
155
|
-
else if (options.preset === presets_1.Preset.Core || options.preset === presets_1.Preset.NPM) {
|
156
|
-
setupPackageManagerWorkspaces(tree, options);
|
157
|
-
if (options.preset === presets_1.Preset.Core) {
|
158
|
-
tree.delete('workspace.json');
|
159
|
-
}
|
160
|
-
}
|
161
119
|
else if (options.preset === presets_1.Preset.TS) {
|
162
|
-
const c = (0, devkit_1.
|
120
|
+
const c = (0, devkit_1.readNxJson)(tree);
|
121
|
+
const { initGenerator } = require('@nrwl' + '/js');
|
163
122
|
c.workspaceLayout = {
|
164
123
|
appsDir: 'packages',
|
165
124
|
libsDir: 'packages',
|
166
125
|
};
|
167
|
-
(0, devkit_1.
|
126
|
+
(0, devkit_1.updateNxJson)(tree, c);
|
127
|
+
return initGenerator(tree, {});
|
128
|
+
}
|
129
|
+
else if (options.preset === presets_1.Preset.NodeServer) {
|
130
|
+
const { applicationGenerator: nodeApplicationGenerator } = require('@nrwl' +
|
131
|
+
'/node');
|
132
|
+
return nodeApplicationGenerator(tree, {
|
133
|
+
name: options.name,
|
134
|
+
linter: options.linter,
|
135
|
+
standaloneConfig: options.standaloneConfig,
|
136
|
+
framework: options.framework,
|
137
|
+
docker: options.docker,
|
138
|
+
rootProject: true,
|
139
|
+
});
|
168
140
|
}
|
169
141
|
else {
|
170
142
|
throw new Error(`Invalid preset ${options.preset}`);
|
171
143
|
}
|
172
144
|
});
|
173
145
|
}
|
174
|
-
function setupPackageManagerWorkspaces(tree, options) {
|
175
|
-
if (options.packageManager === 'pnpm') {
|
176
|
-
(0, devkit_1.generateFiles)(tree, (0, path_2.join)(__dirname, './files/pnpm-workspace'), '.', {});
|
177
|
-
}
|
178
|
-
else {
|
179
|
-
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
180
|
-
json.workspaces = ['packages/**'];
|
181
|
-
return json;
|
182
|
-
});
|
183
|
-
}
|
184
|
-
}
|
185
|
-
function connectAngularAndNest(host, options) {
|
186
|
-
var _a;
|
187
|
-
const { insertNgModuleImport } = require('@nrwl' +
|
188
|
-
'/angular/src/generators/utils');
|
189
|
-
host.write('libs/api-interfaces/src/lib/api-interfaces.ts', `export interface Message { message: string }`);
|
190
|
-
const modulePath = `apps/${options.name}/src/app/app.module.ts`;
|
191
|
-
(0, insert_import_1.insertImport)(host, modulePath, 'HttpClientModule', '@angular/common/http');
|
192
|
-
insertNgModuleImport(host, modulePath, 'HttpClientModule');
|
193
|
-
const importScope = (0, path_1.getImportPath)(options.npmScope, '');
|
194
|
-
const scopePrefix = options.npmScope ? `${options.npmScope}-` : '';
|
195
|
-
const style = (_a = options.style) !== null && _a !== void 0 ? _a : 'css';
|
196
|
-
host.write(`apps/${options.name}/src/app/app.component.ts`, `import { Component } from '@angular/core';
|
197
|
-
import { HttpClient } from '@angular/common/http';
|
198
|
-
import { Message } from '${importScope}api-interfaces';
|
199
|
-
|
200
|
-
@Component({
|
201
|
-
selector: '${scopePrefix}root',
|
202
|
-
templateUrl: './app.component.html',
|
203
|
-
styleUrls: ['./app.component.${style}']
|
204
|
-
})
|
205
|
-
export class AppComponent {
|
206
|
-
hello$ = this.http.get<Message>('/api/hello')
|
207
|
-
constructor(private http: HttpClient) {}
|
208
|
-
}
|
209
|
-
`);
|
210
|
-
host.write(`apps/${options.name}/src/app/app.component.spec.ts`, `import { Component } from '@angular/core';
|
211
|
-
import { TestBed, async } from '@angular/core/testing';
|
212
|
-
import { HttpClientModule } from '@angular/common/http';
|
213
|
-
import { AppComponent } from './app.component';
|
214
|
-
|
215
|
-
describe('AppComponent', () => {
|
216
|
-
beforeEach(async(() => {
|
217
|
-
TestBed.configureTestingModule({
|
218
|
-
declarations: [AppComponent],
|
219
|
-
imports: [HttpClientModule]
|
220
|
-
}).compileComponents();
|
221
|
-
}));
|
222
|
-
|
223
|
-
it('should create the app', () => {
|
224
|
-
const fixture = TestBed.createComponent(AppComponent);
|
225
|
-
const app = fixture.debugElement.componentInstance;
|
226
|
-
expect(app).toBeTruthy();
|
227
|
-
});
|
228
|
-
});
|
229
|
-
`);
|
230
|
-
host.write(`apps/${options.name}/src/app/app.component.html`, `<div style="text-align:center">
|
231
|
-
<h1>Welcome to ${options.name}!</h1>
|
232
|
-
<img
|
233
|
-
width="450"
|
234
|
-
src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png"
|
235
|
-
alt="Nx - Smart, Fast and Extensible Build System"
|
236
|
-
/>
|
237
|
-
</div>
|
238
|
-
<div>Message: {{ (hello$|async)|json }}</div>
|
239
|
-
`);
|
240
|
-
host.write(`apps/api/src/app/app.controller.ts`, `import { Controller, Get } from '@nestjs/common';
|
241
|
-
|
242
|
-
import { Message } from '${importScope}api-interfaces';
|
243
|
-
|
244
|
-
import { AppService } from './app.service';
|
245
|
-
|
246
|
-
@Controller()
|
247
|
-
export class AppController {
|
248
|
-
constructor(private readonly appService: AppService) {}
|
249
|
-
|
250
|
-
@Get('hello')
|
251
|
-
getData(): Message {
|
252
|
-
return this.appService.getData();
|
253
|
-
}
|
254
|
-
}
|
255
|
-
`);
|
256
|
-
host.write(`apps/api/src/app/app.service.ts`, `import { Injectable } from '@nestjs/common';
|
257
|
-
import { Message } from '${importScope}api-interfaces';
|
258
|
-
|
259
|
-
@Injectable()
|
260
|
-
export class AppService {
|
261
|
-
getData(): Message {
|
262
|
-
return { message: 'Welcome to api!' };
|
263
|
-
}
|
264
|
-
}
|
265
|
-
`);
|
266
|
-
}
|
267
|
-
function connectReactAndExpress(host, options) {
|
268
|
-
const importScope = (0, path_1.getImportPath)(options.npmScope, '');
|
269
|
-
host.write('libs/api-interfaces/src/lib/api-interfaces.ts', `export interface Message { message: string }`);
|
270
|
-
host.write(`apps/${options.name}/src/app/app.tsx`, `import React, { useEffect, useState } from 'react';
|
271
|
-
import { Message } from '${importScope}api-interfaces';
|
272
|
-
|
273
|
-
export const App = () => {
|
274
|
-
const [m, setMessage] = useState<Message>({ message: '' });
|
275
|
-
|
276
|
-
useEffect(() => {
|
277
|
-
fetch('/api')
|
278
|
-
.then(r => r.json())
|
279
|
-
.then(setMessage);
|
280
|
-
}, []);
|
281
|
-
|
282
|
-
return (
|
283
|
-
<>
|
284
|
-
<div style={{ textAlign: 'center' }}>
|
285
|
-
<h1>Welcome to ${options.name}!</h1>
|
286
|
-
<img
|
287
|
-
width="450"
|
288
|
-
src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png"
|
289
|
-
alt="Nx - Smart, Fast and Extensible Build System"
|
290
|
-
/>
|
291
|
-
</div>
|
292
|
-
<div>{m.message}</div>
|
293
|
-
</>
|
294
|
-
);
|
295
|
-
};
|
296
|
-
|
297
|
-
export default App;
|
298
|
-
`);
|
299
|
-
host.write(`apps/${options.name}/src/app/app.spec.tsx`, `import { cleanup, getByText, render, waitFor } from '@testing-library/react';
|
300
|
-
import React from 'react';
|
301
|
-
import App from './app';
|
302
|
-
|
303
|
-
describe('App', () => {
|
304
|
-
afterEach(() => {
|
305
|
-
delete global['fetch'];
|
306
|
-
cleanup();
|
307
|
-
});
|
308
|
-
|
309
|
-
it('should render successfully', async () => {
|
310
|
-
global['fetch'] = jest.fn().mockResolvedValueOnce({
|
311
|
-
json: () => ({
|
312
|
-
message: 'my message'
|
313
|
-
})
|
314
|
-
});
|
315
|
-
|
316
|
-
const { baseElement } = render(<App />);
|
317
|
-
await waitFor(() => getByText(baseElement, 'my message'));
|
318
|
-
});
|
319
|
-
});
|
320
|
-
`);
|
321
|
-
host.write(`apps/api/src/main.ts`, `import * as express from 'express';
|
322
|
-
import { Message } from '${importScope}api-interfaces';
|
323
|
-
|
324
|
-
const app = express();
|
325
|
-
|
326
|
-
const greeting: Message = { message: 'Welcome to api!' };
|
327
|
-
|
328
|
-
app.get('/api', (req, res) => {
|
329
|
-
res.send(greeting);
|
330
|
-
});
|
331
|
-
|
332
|
-
const port = process.env.port || 3333;
|
333
|
-
const server = app.listen(port, () => {
|
334
|
-
console.log('Listening at http://localhost:' + port + '/api');
|
335
|
-
});
|
336
|
-
server.on('error', console.error);
|
337
|
-
`);
|
338
|
-
}
|
339
|
-
function addPolyfills(host, polyfillsPath, polyfills) {
|
340
|
-
for (const polyfill of polyfills) {
|
341
|
-
(0, insert_statement_1.insertStatement)(host, polyfillsPath, `import '${polyfill}';\n`);
|
342
|
-
}
|
343
|
-
}
|
344
146
|
function normalizeOptions(options) {
|
345
147
|
options.name = (0, devkit_1.names)(options.name).fileName;
|
346
148
|
return options;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
|
@@ -5,9 +5,13 @@ export interface Schema {
|
|
5
5
|
name: string;
|
6
6
|
npmScope?: string;
|
7
7
|
style?: string;
|
8
|
-
cli: string;
|
9
8
|
linter?: string;
|
10
9
|
preset: Preset;
|
11
10
|
standaloneConfig?: boolean;
|
11
|
+
framework?: string;
|
12
12
|
packageManager?: PackageManager;
|
13
|
+
bundler?: 'vite' | 'webpack';
|
14
|
+
docker?: boolean;
|
15
|
+
routing?: boolean;
|
16
|
+
standaloneApi?: boolean;
|
13
17
|
}
|
@@ -18,16 +18,17 @@
|
|
18
18
|
"description": "Npm scope for importing libs.",
|
19
19
|
"type": "string"
|
20
20
|
},
|
21
|
-
"cli": {
|
22
|
-
"description": "CLI powering the workspace.",
|
23
|
-
"type": "string"
|
24
|
-
},
|
25
21
|
"linter": {
|
26
22
|
"description": "The tool to use for running lint checks.",
|
27
23
|
"type": "string",
|
28
|
-
"enum": ["
|
24
|
+
"enum": ["eslint"],
|
29
25
|
"default": "eslint"
|
30
26
|
},
|
27
|
+
"routing": {
|
28
|
+
"description": "Add routing to the generated application.",
|
29
|
+
"type": "boolean",
|
30
|
+
"default": true
|
31
|
+
},
|
31
32
|
"style": {
|
32
33
|
"description": "The file extension to be used for style files.",
|
33
34
|
"type": "string",
|
@@ -36,7 +37,10 @@
|
|
36
37
|
"message": "Which stylesheet format would you like to use?",
|
37
38
|
"type": "list",
|
38
39
|
"items": [
|
39
|
-
{
|
40
|
+
{
|
41
|
+
"value": "css",
|
42
|
+
"label": "CSS"
|
43
|
+
},
|
40
44
|
{
|
41
45
|
"value": "scss",
|
42
46
|
"label": "SASS(.scss) [ http://sass-lang.com ]"
|
@@ -52,14 +56,37 @@
|
|
52
56
|
]
|
53
57
|
}
|
54
58
|
},
|
59
|
+
"standaloneApi": {
|
60
|
+
"description": "Use Standalone Components if generating an Angular application.",
|
61
|
+
"type": "boolean",
|
62
|
+
"default": false
|
63
|
+
},
|
55
64
|
"standaloneConfig": {
|
56
65
|
"description": "Split the project configurations into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
57
|
-
"type": "boolean"
|
66
|
+
"type": "boolean",
|
67
|
+
"default": true,
|
68
|
+
"x-deprecated": "Nx only supports standaloneConfig"
|
58
69
|
},
|
59
70
|
"packageManager": {
|
60
71
|
"description": "The package manager used to install dependencies.",
|
61
72
|
"type": "string",
|
62
73
|
"enum": ["npm", "yarn", "pnpm"]
|
74
|
+
},
|
75
|
+
"framework": {
|
76
|
+
"description": "The framework which the application is using",
|
77
|
+
"type": "string",
|
78
|
+
"enum": ["express", "koa", "fastify", "nest", "none"]
|
79
|
+
},
|
80
|
+
"bundler": {
|
81
|
+
"description": "The bundler to use for building the application.",
|
82
|
+
"type": "string",
|
83
|
+
"enum": ["webpack", "vite"],
|
84
|
+
"default": "vite"
|
85
|
+
},
|
86
|
+
"docker": {
|
87
|
+
"description": "Generate a Dockerfile",
|
88
|
+
"type": "boolean",
|
89
|
+
"default": false
|
63
90
|
}
|
64
91
|
}
|
65
92
|
}
|
@@ -0,0 +1,26 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.checkProjectIsSafeToRemove = void 0;
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
5
|
+
const path_1 = require("path");
|
6
|
+
function checkProjectIsSafeToRemove(tree, schema, project) {
|
7
|
+
if (project.root === '.') {
|
8
|
+
throw new Error(`"${schema.projectName}" is the root project. Running this would delete every file in your workspace.`);
|
9
|
+
}
|
10
|
+
if (schema.forceRemove) {
|
11
|
+
devkit_1.logger.warn(`You have passed --forceRemove`);
|
12
|
+
return;
|
13
|
+
}
|
14
|
+
const containedProjects = [];
|
15
|
+
for (const [_, p] of (0, devkit_1.getProjects)(tree)) {
|
16
|
+
if (project.name !== p.name &&
|
17
|
+
!(0, devkit_1.normalizePath)((0, path_1.relative)(project.root, p.root)).startsWith('..')) {
|
18
|
+
containedProjects.push(p.name);
|
19
|
+
}
|
20
|
+
}
|
21
|
+
if (containedProjects.length > 0) {
|
22
|
+
throw new Error(`"${schema.projectName}" is a project that has nested projects within it. Removing this project would remove the following projects as well:\n - ${containedProjects.join('\n - ')}\nPass --forceRemove to remove all of the above projects`);
|
23
|
+
}
|
24
|
+
}
|
25
|
+
exports.checkProjectIsSafeToRemove = checkProjectIsSafeToRemove;
|
26
|
+
//# sourceMappingURL=check-project-is-safe-to-remove.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"check-project-is-safe-to-remove.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB,+BAAgC;AAEhC,SAAgB,0BAA0B,CACxC,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,IAAI,MAAM,CAAC,WAAW,gFAAgF,CACvG,CAAC;KACH;IACD,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,eAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO;KACR;IACD,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACtC,IACE,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;YACvB,CAAC,IAAA,sBAAa,EAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/D;YACA,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAChC;KACF;IACD,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,IACE,MAAM,CAAC,WACT,6HAA6H,iBAAiB,CAAC,IAAI,CACjJ,OAAO,CACR,0DAA0D,CAC5D,CAAC;KACH;AACH,CAAC;AAhCD,gEAgCC"}
|
@@ -1,6 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.checkTargets = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
4
5
|
const devkit_1 = require("@nrwl/devkit");
|
5
6
|
/**
|
6
7
|
* Check whether the project to be removed has builders targetted by another project
|
@@ -10,41 +11,44 @@ const devkit_1 = require("@nrwl/devkit");
|
|
10
11
|
* @param schema The options provided to the schematic
|
11
12
|
*/
|
12
13
|
function checkTargets(tree, schema) {
|
13
|
-
|
14
|
-
|
15
|
-
}
|
16
|
-
const errors = [];
|
17
|
-
(0, devkit_1.getProjects)(tree).forEach((projectConfig, projectName) => {
|
18
|
-
if (projectName === schema.projectName) {
|
14
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
15
|
+
if (schema.forceRemove) {
|
19
16
|
return;
|
20
17
|
}
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
18
|
+
const graph = yield (0, devkit_1.createProjectGraphAsync)();
|
19
|
+
const errors = [];
|
20
|
+
(0, devkit_1.getProjects)(tree).forEach((projectConfig, projectName) => {
|
21
|
+
if (projectName === schema.projectName) {
|
22
|
+
return;
|
23
|
+
}
|
24
|
+
Object.entries(projectConfig.targets || {}).forEach(([, targetConfig]) => {
|
25
|
+
checkIfProjectIsUsed(targetConfig, (value) => {
|
26
|
+
try {
|
27
|
+
const { project } = (0, devkit_1.parseTargetString)(value, graph);
|
28
|
+
if (project === schema.projectName) {
|
29
|
+
errors.push(`"${value}" is used by "${projectName}"`);
|
30
|
+
}
|
31
|
+
}
|
32
|
+
catch (err) {
|
33
|
+
/**
|
34
|
+
* It threw because the target string was not
|
35
|
+
* in the format of project:target:configuration
|
36
|
+
*
|
37
|
+
* In that case, we don't care about it.
|
38
|
+
* So we can ignore this error.
|
39
|
+
*/
|
27
40
|
}
|
28
|
-
}
|
29
|
-
catch (err) {
|
30
|
-
/**
|
31
|
-
* It threw because the target string was not
|
32
|
-
* in the format of project:target:configuration
|
33
|
-
*
|
34
|
-
* In that case, we don't care about it.
|
35
|
-
* So we can ignore this error.
|
36
|
-
*/
|
37
|
-
}
|
41
|
+
});
|
38
42
|
});
|
39
43
|
});
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
44
|
+
if (errors.length > 0) {
|
45
|
+
let message = `${schema.projectName} is still targeted by some projects:\n\n`;
|
46
|
+
for (let error of errors) {
|
47
|
+
message += `${error}\n`;
|
48
|
+
}
|
49
|
+
throw new Error(message);
|
45
50
|
}
|
46
|
-
|
47
|
-
}
|
51
|
+
});
|
48
52
|
}
|
49
53
|
exports.checkTargets = checkTargets;
|
50
54
|
function checkIfProjectIsUsed(config, callback) {
|