@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
package/src/utils/rules/to-js.js
DELETED
@@ -1,77 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.maybeJs = exports.updateTsConfigsToJs = exports.toJS = void 0;
|
4
|
-
const typescript_1 = require("typescript");
|
5
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
6
|
-
const core_1 = require("@angular-devkit/core");
|
7
|
-
const ast_utils_1 = require("../ast-utils");
|
8
|
-
function toJS() {
|
9
|
-
return (0, schematics_1.chain)([
|
10
|
-
(0, schematics_1.forEach)((0, schematics_1.when)((path) => path.endsWith('.ts') || path.endsWith('.tsx'), (entry) => {
|
11
|
-
const original = entry.content.toString('utf-8');
|
12
|
-
const result = (0, typescript_1.transpile)(original, {
|
13
|
-
allowJs: true,
|
14
|
-
jsx: typescript_1.JsxEmit.Preserve,
|
15
|
-
target: typescript_1.ScriptTarget.ESNext,
|
16
|
-
});
|
17
|
-
return {
|
18
|
-
content: Buffer.from(result, 'utf-8'),
|
19
|
-
path: (0, core_1.normalize)(entry.path.replace(/\.tsx?$/, '.js')),
|
20
|
-
};
|
21
|
-
})),
|
22
|
-
]);
|
23
|
-
}
|
24
|
-
exports.toJS = toJS;
|
25
|
-
function updateTsConfigsToJs(options) {
|
26
|
-
const paths = {
|
27
|
-
tsConfig: (0, core_1.normalize)(`${options.projectRoot}/tsconfig.json`),
|
28
|
-
tsConfigLib: (0, core_1.normalize)(`${options.projectRoot}/tsconfig.lib.json`),
|
29
|
-
tsConfigApp: (0, core_1.normalize)(`${options.projectRoot}/tsconfig.app.json`),
|
30
|
-
};
|
31
|
-
const getProjectType = (tree) => {
|
32
|
-
if (tree.exists(paths.tsConfigApp)) {
|
33
|
-
return 'application';
|
34
|
-
}
|
35
|
-
if (tree.exists(paths.tsConfigLib)) {
|
36
|
-
return 'library';
|
37
|
-
}
|
38
|
-
throw new schematics_1.SchematicsException(`project is missing tsconfig.lib.json or tsconfig.app.json`);
|
39
|
-
};
|
40
|
-
const getConfigFileForUpdate = (tree) => {
|
41
|
-
const projectType = getProjectType(tree);
|
42
|
-
if (projectType === 'library') {
|
43
|
-
return paths.tsConfigLib;
|
44
|
-
}
|
45
|
-
if (projectType === 'application') {
|
46
|
-
return paths.tsConfigApp;
|
47
|
-
}
|
48
|
-
};
|
49
|
-
return (0, schematics_1.chain)([
|
50
|
-
(0, ast_utils_1.updateJsonInTree)(paths.tsConfig, (json) => {
|
51
|
-
if (json.compilerOptions) {
|
52
|
-
json.compilerOptions.allowJs = true;
|
53
|
-
}
|
54
|
-
else {
|
55
|
-
json.compilerOptions = { allowJs: true };
|
56
|
-
}
|
57
|
-
return json;
|
58
|
-
}),
|
59
|
-
(tree) => {
|
60
|
-
const updateConfigPath = getConfigFileForUpdate(tree);
|
61
|
-
return (0, ast_utils_1.updateJsonInTree)(updateConfigPath, (json) => {
|
62
|
-
json.include = uniq([...json.include, '**/*.js']);
|
63
|
-
json.exclude = uniq([...json.exclude, '**/*.spec.js']);
|
64
|
-
return json;
|
65
|
-
});
|
66
|
-
},
|
67
|
-
]);
|
68
|
-
}
|
69
|
-
exports.updateTsConfigsToJs = updateTsConfigsToJs;
|
70
|
-
const uniq = (value) => [...new Set(value)];
|
71
|
-
function maybeJs(options, path) {
|
72
|
-
return options.js && (path.endsWith('.ts') || path.endsWith('.tsx'))
|
73
|
-
? path.replace(/\.tsx?$/, '.js')
|
74
|
-
: path;
|
75
|
-
}
|
76
|
-
exports.maybeJs = maybeJs;
|
77
|
-
//# sourceMappingURL=to-js.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"to-js.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/to-js.ts"],"names":[],"mappings":"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"}
|
@@ -1,8 +0,0 @@
|
|
1
|
-
import { Rule } from '@angular-devkit/schematics';
|
2
|
-
/**
|
3
|
-
* This returns a Rule which changes the default Angular CLI Generated karma.conf.js
|
4
|
-
* @param options Object containing projectROot
|
5
|
-
*/
|
6
|
-
export declare function updateKarmaConf(options: {
|
7
|
-
projectName: string;
|
8
|
-
}): Rule;
|
@@ -1,36 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.updateKarmaConf = void 0;
|
4
|
-
const ast_utils_1 = require("../ast-utils");
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
6
|
-
/**
|
7
|
-
* This returns a Rule which changes the default Angular CLI Generated karma.conf.js
|
8
|
-
* @param options Object containing projectROot
|
9
|
-
*/
|
10
|
-
function updateKarmaConf(options) {
|
11
|
-
return (host) => {
|
12
|
-
const project = (0, ast_utils_1.getProjectConfig)(host, options.projectName);
|
13
|
-
const projectRoot = project.root.replace(/\/$/, '');
|
14
|
-
const karmaPath = project.architect.test.options.karmaConfig;
|
15
|
-
(0, ast_utils_1.createOrUpdate)(host, karmaPath, `// Karma configuration file, see link for more information
|
16
|
-
// https://karma-runner.github.io/1.0/config/configuration-file.html
|
17
|
-
|
18
|
-
const { join } = require('path');
|
19
|
-
const getBaseKarmaConfig = require('${(0, devkit_1.offsetFromRoot)(projectRoot)}karma.conf');
|
20
|
-
|
21
|
-
module.exports = function(config) {
|
22
|
-
const baseConfig = getBaseKarmaConfig();
|
23
|
-
config.set({
|
24
|
-
...baseConfig,
|
25
|
-
coverageIstanbulReporter: {
|
26
|
-
...baseConfig.coverageIstanbulReporter,
|
27
|
-
dir: join(__dirname, '${(0, devkit_1.offsetFromRoot)(projectRoot)}coverage/${projectRoot}')
|
28
|
-
}
|
29
|
-
});
|
30
|
-
};
|
31
|
-
`);
|
32
|
-
return host;
|
33
|
-
};
|
34
|
-
}
|
35
|
-
exports.updateKarmaConf = updateKarmaConf;
|
36
|
-
//# sourceMappingURL=update-karma-conf.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"update-karma-conf.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/update-karma-conf.ts"],"names":[],"mappings":";;;AACA,4CAAgE;AAChE,yCAA8C;AAE9C;;;GAGG;AACH,SAAgB,eAAe,CAAC,OAAgC;IAC9D,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,OAAO,GAAG,IAAA,4BAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;QAE7D,IAAA,0BAAc,EACZ,IAAI,EACJ,SAAS,EACT;;;;sCAIgC,IAAA,uBAAc,EAAC,WAAW,CAAC;;;;;;;;8BAQnC,IAAA,uBAAc,EACpC,WAAW,CACZ,YAAY,WAAW;;;;CAI7B,CACI,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AA/BD,0CA+BC"}
|
@@ -1,80 +0,0 @@
|
|
1
|
-
import { ProjectGraph, ProjectGraphDependency, ProjectGraphProjectNode, ProjectGraphExternalNode } from '@nrwl/devkit';
|
2
|
-
import { TargetProjectLocator } from 'nx/src/utils/target-project-locator';
|
3
|
-
export declare type MappedProjectGraph<T = any> = ProjectGraph<T> & {
|
4
|
-
allFiles: Record<string, string>;
|
5
|
-
};
|
6
|
-
export declare type Deps = {
|
7
|
-
[projectName: string]: ProjectGraphDependency[];
|
8
|
-
};
|
9
|
-
export declare type DepConstraint = {
|
10
|
-
sourceTag: string;
|
11
|
-
onlyDependOnLibsWithTags?: string[];
|
12
|
-
notDependOnLibsWithTags?: string[];
|
13
|
-
bannedExternalImports?: string[];
|
14
|
-
};
|
15
|
-
export declare function stringifyTags(tags: string[]): string;
|
16
|
-
export declare function hasNoneOfTheseTags(proj: ProjectGraphProjectNode, tags: string[]): boolean;
|
17
|
-
/**
|
18
|
-
* Check if any of the given tags is included in the project
|
19
|
-
* @param proj ProjectGraphProjectNode
|
20
|
-
* @param tags
|
21
|
-
* @returns
|
22
|
-
*/
|
23
|
-
export declare function findDependenciesWithTags(targetProject: ProjectGraphProjectNode, tags: string[], graph: ProjectGraph): ProjectGraphProjectNode[][];
|
24
|
-
export declare function removeExt(file: string): string;
|
25
|
-
export declare function matchImportWithWildcard(allowableImport: string, extractedImport: string): boolean;
|
26
|
-
export declare function isRelative(s: string): boolean;
|
27
|
-
export declare function getTargetProjectBasedOnRelativeImport(imp: string, projectPath: string, projectGraph: MappedProjectGraph, sourceFilePath: string): ProjectGraphProjectNode<any> | undefined;
|
28
|
-
export declare function findProjectUsingFile<T>(projectGraph: MappedProjectGraph<T>, file: string): ProjectGraphProjectNode;
|
29
|
-
export declare function findSourceProject(projectGraph: MappedProjectGraph, sourceFilePath: string): ProjectGraphProjectNode<any>;
|
30
|
-
export declare function findTargetProject(projectGraph: MappedProjectGraph, targetFile: string): ProjectGraphProjectNode<any>;
|
31
|
-
export declare function isAbsoluteImportIntoAnotherProject(imp: string, workspaceLayout?: {
|
32
|
-
libsDir: string;
|
33
|
-
appsDir: string;
|
34
|
-
}): boolean;
|
35
|
-
export declare function findProjectUsingImport(projectGraph: MappedProjectGraph, targetProjectLocator: TargetProjectLocator, filePath: string, imp: string): ProjectGraphProjectNode | ProjectGraphExternalNode;
|
36
|
-
export declare function findConstraintsFor(depConstraints: DepConstraint[], sourceProject: ProjectGraphProjectNode): DepConstraint[];
|
37
|
-
export declare function onlyLoadChildren(graph: ProjectGraph, sourceProjectName: string, targetProjectName: string, visited: string[]): any;
|
38
|
-
export declare function getSourceFilePath(sourceFileName: string, projectPath: string): string;
|
39
|
-
export declare function hasBannedImport(source: ProjectGraphProjectNode, target: ProjectGraphExternalNode, depConstraints: DepConstraint[]): DepConstraint | undefined;
|
40
|
-
/**
|
41
|
-
* Find all unique (transitive) external dependencies of given project
|
42
|
-
* @param graph
|
43
|
-
* @param source
|
44
|
-
* @returns
|
45
|
-
*/
|
46
|
-
export declare function findTransitiveExternalDependencies(graph: ProjectGraph, source: ProjectGraphProjectNode): ProjectGraphDependency[];
|
47
|
-
/**
|
48
|
-
* Check if
|
49
|
-
* @param externalDependencies
|
50
|
-
* @param graph
|
51
|
-
* @param depConstraint
|
52
|
-
* @returns
|
53
|
-
*/
|
54
|
-
export declare function hasBannedDependencies(externalDependencies: ProjectGraphDependency[], graph: ProjectGraph, depConstraint: DepConstraint): Array<[ProjectGraphExternalNode, ProjectGraphProjectNode, DepConstraint]> | undefined;
|
55
|
-
export declare function isDirectDependency(target: ProjectGraphExternalNode): boolean;
|
56
|
-
/**
|
57
|
-
* Verifies whether the given node has an architect builder attached
|
58
|
-
* @param projectGraph the node to verify
|
59
|
-
*/
|
60
|
-
export declare function hasBuildExecutor(projectGraph: ProjectGraphProjectNode): boolean;
|
61
|
-
export declare function mapProjectGraphFiles<T>(projectGraph: ProjectGraph<T>): MappedProjectGraph | null;
|
62
|
-
export declare function isTerminalRun(): boolean;
|
63
|
-
/**
|
64
|
-
* Takes an array of imports and tries to group them, so rather than having
|
65
|
-
* `import { A } from './some-location'` and `import { B } from './some-location'` you get
|
66
|
-
* `import { A, B } from './some-location'`
|
67
|
-
* @param importsToRemap
|
68
|
-
* @returns
|
69
|
-
*/
|
70
|
-
export declare function groupImports(importsToRemap: {
|
71
|
-
member: string;
|
72
|
-
importPath: string;
|
73
|
-
}[]): string;
|
74
|
-
/**
|
75
|
-
* Checks if import points to a secondary entry point in Angular project
|
76
|
-
* @param targetProjectLocator
|
77
|
-
* @param importExpr
|
78
|
-
* @returns
|
79
|
-
*/
|
80
|
-
export declare function isAngularSecondaryEntrypoint(targetProjectLocator: TargetProjectLocator, importExpr: string): boolean;
|
@@ -1,307 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.isAngularSecondaryEntrypoint = exports.groupImports = exports.isTerminalRun = exports.mapProjectGraphFiles = exports.hasBuildExecutor = exports.isDirectDependency = exports.hasBannedDependencies = exports.findTransitiveExternalDependencies = exports.hasBannedImport = exports.getSourceFilePath = exports.onlyLoadChildren = exports.findConstraintsFor = exports.findProjectUsingImport = exports.isAbsoluteImportIntoAnotherProject = exports.findTargetProject = exports.findSourceProject = exports.findProjectUsingFile = exports.getTargetProjectBasedOnRelativeImport = exports.isRelative = exports.matchImportWithWildcard = exports.removeExt = exports.findDependenciesWithTags = exports.hasNoneOfTheseTags = exports.stringifyTags = void 0;
|
4
|
-
const path = require("path");
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
6
|
-
const path_1 = require("path");
|
7
|
-
const app_root_1 = require("./app-root");
|
8
|
-
const graph_utils_1 = require("./graph-utils");
|
9
|
-
const fs_1 = require("fs");
|
10
|
-
const file_utils_1 = require("nx/src/project-graph/file-utils");
|
11
|
-
function stringifyTags(tags) {
|
12
|
-
return tags.map((t) => `"${t}"`).join(', ');
|
13
|
-
}
|
14
|
-
exports.stringifyTags = stringifyTags;
|
15
|
-
function hasNoneOfTheseTags(proj, tags) {
|
16
|
-
return tags.filter((tag) => hasTag(proj, tag)).length === 0;
|
17
|
-
}
|
18
|
-
exports.hasNoneOfTheseTags = hasNoneOfTheseTags;
|
19
|
-
/**
|
20
|
-
* Check if any of the given tags is included in the project
|
21
|
-
* @param proj ProjectGraphProjectNode
|
22
|
-
* @param tags
|
23
|
-
* @returns
|
24
|
-
*/
|
25
|
-
function findDependenciesWithTags(targetProject, tags, graph) {
|
26
|
-
// find all reachable projects that have one of the tags and
|
27
|
-
// are reacheable from the targetProject (including self)
|
28
|
-
const allReachableProjects = Object.keys(graph.nodes).filter((projectName) => (0, graph_utils_1.pathExists)(graph, targetProject.name, projectName) &&
|
29
|
-
tags.some((tag) => hasTag(graph.nodes[projectName], tag)));
|
30
|
-
// return path from targetProject to reachable project
|
31
|
-
return allReachableProjects.map((project) => targetProject.name === project
|
32
|
-
? [targetProject]
|
33
|
-
: (0, graph_utils_1.getPath)(graph, targetProject.name, project));
|
34
|
-
}
|
35
|
-
exports.findDependenciesWithTags = findDependenciesWithTags;
|
36
|
-
function hasTag(proj, tag) {
|
37
|
-
return tag === '*' || (proj.data.tags || []).indexOf(tag) > -1;
|
38
|
-
}
|
39
|
-
function removeExt(file) {
|
40
|
-
return file.replace(/(?<!(^|\/))\.[^/.]+$/, '');
|
41
|
-
}
|
42
|
-
exports.removeExt = removeExt;
|
43
|
-
function matchImportWithWildcard(
|
44
|
-
// This may or may not contain wildcards ("*")
|
45
|
-
allowableImport, extractedImport) {
|
46
|
-
if (allowableImport.endsWith('/**')) {
|
47
|
-
const prefix = allowableImport.substring(0, allowableImport.length - 2);
|
48
|
-
return extractedImport.startsWith(prefix);
|
49
|
-
}
|
50
|
-
else if (allowableImport.endsWith('/*')) {
|
51
|
-
const prefix = allowableImport.substring(0, allowableImport.length - 1);
|
52
|
-
if (!extractedImport.startsWith(prefix))
|
53
|
-
return false;
|
54
|
-
return extractedImport.substring(prefix.length).indexOf('/') === -1;
|
55
|
-
}
|
56
|
-
else if (allowableImport.indexOf('/**/') > -1) {
|
57
|
-
const [prefix, suffix] = allowableImport.split('/**/');
|
58
|
-
return (extractedImport.startsWith(prefix) && extractedImport.endsWith(suffix));
|
59
|
-
}
|
60
|
-
else {
|
61
|
-
return new RegExp(allowableImport).test(extractedImport);
|
62
|
-
}
|
63
|
-
}
|
64
|
-
exports.matchImportWithWildcard = matchImportWithWildcard;
|
65
|
-
function isRelative(s) {
|
66
|
-
return s.startsWith('.');
|
67
|
-
}
|
68
|
-
exports.isRelative = isRelative;
|
69
|
-
function getTargetProjectBasedOnRelativeImport(imp, projectPath, projectGraph, sourceFilePath) {
|
70
|
-
if (!isRelative(imp)) {
|
71
|
-
return undefined;
|
72
|
-
}
|
73
|
-
const sourceDir = path.join(projectPath, path.dirname(sourceFilePath));
|
74
|
-
const targetFile = (0, devkit_1.normalizePath)(path.resolve(sourceDir, imp)).substring(projectPath.length + 1);
|
75
|
-
return findTargetProject(projectGraph, targetFile);
|
76
|
-
}
|
77
|
-
exports.getTargetProjectBasedOnRelativeImport = getTargetProjectBasedOnRelativeImport;
|
78
|
-
function findProjectUsingFile(projectGraph, file) {
|
79
|
-
return projectGraph.nodes[projectGraph.allFiles[file]];
|
80
|
-
}
|
81
|
-
exports.findProjectUsingFile = findProjectUsingFile;
|
82
|
-
function findSourceProject(projectGraph, sourceFilePath) {
|
83
|
-
const targetFile = removeExt(sourceFilePath);
|
84
|
-
return findProjectUsingFile(projectGraph, targetFile);
|
85
|
-
}
|
86
|
-
exports.findSourceProject = findSourceProject;
|
87
|
-
function findTargetProject(projectGraph, targetFile) {
|
88
|
-
let targetProject = findProjectUsingFile(projectGraph, targetFile);
|
89
|
-
if (!targetProject) {
|
90
|
-
targetProject = findProjectUsingFile(projectGraph, (0, devkit_1.normalizePath)(path.join(targetFile, 'index')));
|
91
|
-
}
|
92
|
-
if (!targetProject) {
|
93
|
-
targetProject = findProjectUsingFile(projectGraph, (0, devkit_1.normalizePath)(path.join(targetFile, 'src', 'index')));
|
94
|
-
}
|
95
|
-
return targetProject;
|
96
|
-
}
|
97
|
-
exports.findTargetProject = findTargetProject;
|
98
|
-
function isAbsoluteImportIntoAnotherProject(imp, workspaceLayout = { libsDir: 'libs', appsDir: 'apps' }) {
|
99
|
-
return (imp.startsWith(`${workspaceLayout.libsDir}/`) ||
|
100
|
-
imp.startsWith(`/${workspaceLayout.libsDir}/`) ||
|
101
|
-
imp.startsWith(`${workspaceLayout.appsDir}/`) ||
|
102
|
-
imp.startsWith(`/${workspaceLayout.appsDir}/`));
|
103
|
-
}
|
104
|
-
exports.isAbsoluteImportIntoAnotherProject = isAbsoluteImportIntoAnotherProject;
|
105
|
-
function findProjectUsingImport(projectGraph, targetProjectLocator, filePath, imp) {
|
106
|
-
var _a;
|
107
|
-
const target = targetProjectLocator.findProjectWithImport(imp, filePath);
|
108
|
-
return projectGraph.nodes[target] || ((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[target]);
|
109
|
-
}
|
110
|
-
exports.findProjectUsingImport = findProjectUsingImport;
|
111
|
-
function findConstraintsFor(depConstraints, sourceProject) {
|
112
|
-
return depConstraints.filter((f) => hasTag(sourceProject, f.sourceTag));
|
113
|
-
}
|
114
|
-
exports.findConstraintsFor = findConstraintsFor;
|
115
|
-
function onlyLoadChildren(graph, sourceProjectName, targetProjectName, visited) {
|
116
|
-
if (visited.indexOf(sourceProjectName) > -1)
|
117
|
-
return false;
|
118
|
-
return ((graph.dependencies[sourceProjectName] || []).filter((d) => {
|
119
|
-
if (d.type !== devkit_1.DependencyType.dynamic)
|
120
|
-
return false;
|
121
|
-
if (d.target === targetProjectName)
|
122
|
-
return true;
|
123
|
-
return onlyLoadChildren(graph, d.target, targetProjectName, [
|
124
|
-
...visited,
|
125
|
-
sourceProjectName,
|
126
|
-
]);
|
127
|
-
}).length > 0);
|
128
|
-
}
|
129
|
-
exports.onlyLoadChildren = onlyLoadChildren;
|
130
|
-
function getSourceFilePath(sourceFileName, projectPath) {
|
131
|
-
const relativePath = sourceFileName.slice(projectPath.length + 1);
|
132
|
-
return (0, devkit_1.normalizePath)(relativePath);
|
133
|
-
}
|
134
|
-
exports.getSourceFilePath = getSourceFilePath;
|
135
|
-
/**
|
136
|
-
* Find constraint (if any) that explicitly banns the given target npm project
|
137
|
-
* @param externalProject
|
138
|
-
* @param depConstraints
|
139
|
-
* @returns
|
140
|
-
*/
|
141
|
-
function isConstraintBanningProject(externalProject, constraint) {
|
142
|
-
return constraint.bannedExternalImports.some((importDefinition) => parseImportWildcards(importDefinition).test(externalProject.data.packageName));
|
143
|
-
}
|
144
|
-
function hasBannedImport(source, target, depConstraints) {
|
145
|
-
// return those constraints that match source project and have `bannedExternalImports` defined
|
146
|
-
depConstraints = depConstraints.filter((c) => (source.data.tags || []).includes(c.sourceTag) &&
|
147
|
-
c.bannedExternalImports &&
|
148
|
-
c.bannedExternalImports.length);
|
149
|
-
return depConstraints.find((constraint) => isConstraintBanningProject(target, constraint));
|
150
|
-
}
|
151
|
-
exports.hasBannedImport = hasBannedImport;
|
152
|
-
/**
|
153
|
-
* Find all unique (transitive) external dependencies of given project
|
154
|
-
* @param graph
|
155
|
-
* @param source
|
156
|
-
* @returns
|
157
|
-
*/
|
158
|
-
function findTransitiveExternalDependencies(graph, source) {
|
159
|
-
if (!graph.externalNodes) {
|
160
|
-
return [];
|
161
|
-
}
|
162
|
-
const allReachableProjects = [];
|
163
|
-
const allProjects = Object.keys(graph.nodes);
|
164
|
-
for (let i = 0; i < allProjects.length; i++) {
|
165
|
-
if ((0, graph_utils_1.pathExists)(graph, source.name, allProjects[i])) {
|
166
|
-
allReachableProjects.push(allProjects[i]);
|
167
|
-
}
|
168
|
-
}
|
169
|
-
const externalDependencies = [];
|
170
|
-
for (let i = 0; i < allReachableProjects.length; i++) {
|
171
|
-
const dependencies = graph.dependencies[allReachableProjects[i]];
|
172
|
-
if (dependencies) {
|
173
|
-
for (let d = 0; d < dependencies.length; d++) {
|
174
|
-
const dependency = dependencies[d];
|
175
|
-
if (graph.externalNodes[dependency.target]) {
|
176
|
-
externalDependencies.push(dependency);
|
177
|
-
}
|
178
|
-
}
|
179
|
-
}
|
180
|
-
}
|
181
|
-
return externalDependencies;
|
182
|
-
}
|
183
|
-
exports.findTransitiveExternalDependencies = findTransitiveExternalDependencies;
|
184
|
-
/**
|
185
|
-
* Check if
|
186
|
-
* @param externalDependencies
|
187
|
-
* @param graph
|
188
|
-
* @param depConstraint
|
189
|
-
* @returns
|
190
|
-
*/
|
191
|
-
function hasBannedDependencies(externalDependencies, graph, depConstraint) {
|
192
|
-
return externalDependencies
|
193
|
-
.filter((dependency) => isConstraintBanningProject(graph.externalNodes[dependency.target], depConstraint))
|
194
|
-
.map((dep) => [
|
195
|
-
graph.externalNodes[dep.target],
|
196
|
-
graph.nodes[dep.source],
|
197
|
-
depConstraint,
|
198
|
-
]);
|
199
|
-
}
|
200
|
-
exports.hasBannedDependencies = hasBannedDependencies;
|
201
|
-
function isDirectDependency(target) {
|
202
|
-
const fileName = 'package.json';
|
203
|
-
const content = (0, file_utils_1.readFileIfExisting)((0, path_1.join)(app_root_1.workspaceRoot, fileName));
|
204
|
-
if (content) {
|
205
|
-
const { dependencies, devDependencies, peerDependencies } = (0, devkit_1.parseJson)(content);
|
206
|
-
if (dependencies && dependencies[target.data.packageName]) {
|
207
|
-
return true;
|
208
|
-
}
|
209
|
-
if (peerDependencies && peerDependencies[target.data.packageName]) {
|
210
|
-
return true;
|
211
|
-
}
|
212
|
-
if (devDependencies && devDependencies[target.data.packageName]) {
|
213
|
-
return true;
|
214
|
-
}
|
215
|
-
return false;
|
216
|
-
}
|
217
|
-
return true;
|
218
|
-
}
|
219
|
-
exports.isDirectDependency = isDirectDependency;
|
220
|
-
/**
|
221
|
-
* Maps import with wildcards to regex pattern
|
222
|
-
* @param importDefinition
|
223
|
-
* @returns
|
224
|
-
*/
|
225
|
-
function parseImportWildcards(importDefinition) {
|
226
|
-
const mappedWildcards = importDefinition.split('*').join('.*');
|
227
|
-
return new RegExp(`^${new RegExp(mappedWildcards).source}$`);
|
228
|
-
}
|
229
|
-
/**
|
230
|
-
* Verifies whether the given node has an architect builder attached
|
231
|
-
* @param projectGraph the node to verify
|
232
|
-
*/
|
233
|
-
function hasBuildExecutor(projectGraph) {
|
234
|
-
return (
|
235
|
-
// can the architect not be defined? real use case?
|
236
|
-
projectGraph.data.targets &&
|
237
|
-
projectGraph.data.targets.build &&
|
238
|
-
projectGraph.data.targets.build.executor !== '');
|
239
|
-
}
|
240
|
-
exports.hasBuildExecutor = hasBuildExecutor;
|
241
|
-
function mapProjectGraphFiles(projectGraph) {
|
242
|
-
if (!projectGraph) {
|
243
|
-
return null;
|
244
|
-
}
|
245
|
-
const allFiles = {};
|
246
|
-
Object.entries(projectGraph.nodes).forEach(([name, node]) => {
|
247
|
-
node.data.files.forEach(({ file }) => {
|
248
|
-
const fileName = removeExt(file);
|
249
|
-
allFiles[fileName] = name;
|
250
|
-
});
|
251
|
-
});
|
252
|
-
return Object.assign(Object.assign({}, projectGraph), { allFiles });
|
253
|
-
}
|
254
|
-
exports.mapProjectGraphFiles = mapProjectGraphFiles;
|
255
|
-
const ESLINT_REGEX = /node_modules.*[\/\\]eslint$/;
|
256
|
-
const NRWL_CLI_REGEX = /nx[\/\\]bin[\/\\]run-executor\.js$/;
|
257
|
-
function isTerminalRun() {
|
258
|
-
return (process.argv.length > 1 &&
|
259
|
-
(!!process.argv[1].match(NRWL_CLI_REGEX) ||
|
260
|
-
!!process.argv[1].match(ESLINT_REGEX)));
|
261
|
-
}
|
262
|
-
exports.isTerminalRun = isTerminalRun;
|
263
|
-
/**
|
264
|
-
* Takes an array of imports and tries to group them, so rather than having
|
265
|
-
* `import { A } from './some-location'` and `import { B } from './some-location'` you get
|
266
|
-
* `import { A, B } from './some-location'`
|
267
|
-
* @param importsToRemap
|
268
|
-
* @returns
|
269
|
-
*/
|
270
|
-
function groupImports(importsToRemap) {
|
271
|
-
const importsToRemapGrouped = importsToRemap.reduce((acc, curr) => {
|
272
|
-
const existing = acc.find((i) => i.importPath === curr.importPath && i.member !== curr.member);
|
273
|
-
if (existing) {
|
274
|
-
if (existing.member) {
|
275
|
-
existing.member += `, ${curr.member}`;
|
276
|
-
}
|
277
|
-
}
|
278
|
-
else {
|
279
|
-
acc.push({
|
280
|
-
importPath: curr.importPath,
|
281
|
-
member: curr.member,
|
282
|
-
});
|
283
|
-
}
|
284
|
-
return acc;
|
285
|
-
}, []);
|
286
|
-
return importsToRemapGrouped
|
287
|
-
.map((entry) => `import { ${entry.member} } from '${entry.importPath}';`)
|
288
|
-
.join('\n');
|
289
|
-
}
|
290
|
-
exports.groupImports = groupImports;
|
291
|
-
/**
|
292
|
-
* Checks if import points to a secondary entry point in Angular project
|
293
|
-
* @param targetProjectLocator
|
294
|
-
* @param importExpr
|
295
|
-
* @returns
|
296
|
-
*/
|
297
|
-
function isAngularSecondaryEntrypoint(targetProjectLocator, importExpr) {
|
298
|
-
const targetFiles = targetProjectLocator.findPaths(importExpr);
|
299
|
-
return (targetFiles &&
|
300
|
-
targetFiles.some((file) =>
|
301
|
-
// The `ng-packagr` defaults to the `src/public_api.ts` entry file to
|
302
|
-
// the public API if the `lib.entryFile` is not specified explicitly.
|
303
|
-
(file.endsWith('src/public_api.ts') || file.endsWith('src/index.ts')) &&
|
304
|
-
(0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(file, '../../', 'ng-package.json'))));
|
305
|
-
}
|
306
|
-
exports.isAngularSecondaryEntrypoint = isAngularSecondaryEntrypoint;
|
307
|
-
//# sourceMappingURL=runtime-lint-utils.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"runtime-lint-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/runtime-lint-utils.ts"],"names":[],"mappings":"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"}
|
@@ -1,56 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.updatePackagesInPackageJson = void 0;
|
4
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
5
|
-
const ast_utils_1 = require("./ast-utils");
|
6
|
-
const fs_1 = require("fs");
|
7
|
-
const version_utils_1 = require("./version-utils");
|
8
|
-
const semver_1 = require("semver");
|
9
|
-
const add_install_task_1 = require("./rules/add-install-task");
|
10
|
-
function updatePackagesInPackageJson(migrationFilePath, versionName, options = { skipInstall: false }) {
|
11
|
-
const migrations = JSON.parse((0, fs_1.readFileSync)(migrationFilePath).toString());
|
12
|
-
const packageJsonUpdates = migrations.packageJsonUpdates[versionName];
|
13
|
-
// should never happen
|
14
|
-
if (!packageJsonUpdates) {
|
15
|
-
throw new Error(`Cannot find ${versionName} in migrations.json`);
|
16
|
-
}
|
17
|
-
const updatedPackages = packageJsonUpdates.packages;
|
18
|
-
let needsInstall = false;
|
19
|
-
return (0, schematics_1.chain)([
|
20
|
-
(0, ast_utils_1.updateJsonInTree)('package.json', (json) => {
|
21
|
-
Object.keys(updatedPackages).forEach((p) => {
|
22
|
-
/**
|
23
|
-
* Check the updated version against semver
|
24
|
-
*/
|
25
|
-
const cleanUpdatedVersion = (0, version_utils_1.checkAndCleanWithSemver)(p, updatedPackages[p].version);
|
26
|
-
if (json.devDependencies && json.devDependencies[p]) {
|
27
|
-
const cleanDevVersion = (0, version_utils_1.checkAndCleanWithSemver)(p, json.devDependencies[p]);
|
28
|
-
if ((0, semver_1.lt)(cleanDevVersion, cleanUpdatedVersion)) {
|
29
|
-
json.devDependencies[p] = updatedPackages[p].version;
|
30
|
-
needsInstall = true;
|
31
|
-
}
|
32
|
-
}
|
33
|
-
else if (json.dependencies && json.dependencies[p]) {
|
34
|
-
const cleanVersion = (0, version_utils_1.checkAndCleanWithSemver)(p, json.dependencies[p]);
|
35
|
-
if ((0, semver_1.lt)(cleanVersion, cleanUpdatedVersion)) {
|
36
|
-
json.dependencies[p] = updatedPackages[p].version;
|
37
|
-
needsInstall = true;
|
38
|
-
}
|
39
|
-
}
|
40
|
-
else if (updatedPackages[p].alwaysAddToPackageJson) {
|
41
|
-
const cleanVersion = (0, version_utils_1.checkAndCleanWithSemver)(p, json.dependencies[p]);
|
42
|
-
if ((0, semver_1.lt)(cleanVersion, cleanUpdatedVersion)) {
|
43
|
-
if (!json.dependencies)
|
44
|
-
json.dependencies = {};
|
45
|
-
json.dependencies[p] = updatedPackages[p].version;
|
46
|
-
needsInstall = true;
|
47
|
-
}
|
48
|
-
}
|
49
|
-
});
|
50
|
-
return json;
|
51
|
-
}),
|
52
|
-
needsInstall ? (0, add_install_task_1.addInstallTask)(options) : (0, schematics_1.noop)(),
|
53
|
-
]);
|
54
|
-
}
|
55
|
-
exports.updatePackagesInPackageJson = updatePackagesInPackageJson;
|
56
|
-
//# sourceMappingURL=update-packages-in-package-json.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"update-packages-in-package-json.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/update-packages-in-package-json.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AACzD,2CAA+C;AAC/C,2BAAkC;AAClC,mDAA0D;AAC1D,mCAA4B;AAC5B,+DAA0D;AAE1D,SAAgB,2BAA2B,CACzC,iBAAyB,EACzB,WAAmB,EACnB,UAAoC,EAAE,WAAW,EAAE,KAAK,EAAE;IAE1D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1E,MAAM,kBAAkB,GAAG,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAEtE,sBAAsB;IACtB,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,qBAAqB,CAAC,CAAC;KAClE;IAED,MAAM,eAAe,GAAG,kBAAkB,CAAC,QAAQ,CAAC;IACpD,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4BAAgB,EAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACzC;;mBAEG;gBACH,MAAM,mBAAmB,GAAG,IAAA,uCAAuB,EACjD,CAAC,EACD,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3B,CAAC;gBAEF,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE;oBACnD,MAAM,eAAe,GAAG,IAAA,uCAAuB,EAC7C,CAAC,EACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CACxB,CAAC;oBAEF,IAAI,IAAA,WAAE,EAAC,eAAe,EAAE,mBAAmB,CAAC,EAAE;wBAC5C,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;wBACrD,YAAY,GAAG,IAAI,CAAC;qBACrB;iBACF;qBAAM,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;oBACpD,MAAM,YAAY,GAAG,IAAA,uCAAuB,EAAC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEtE,IAAI,IAAA,WAAE,EAAC,YAAY,EAAE,mBAAmB,CAAC,EAAE;wBACzC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;wBAClD,YAAY,GAAG,IAAI,CAAC;qBACrB;iBACF;qBAAM,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC,sBAAsB,EAAE;oBACpD,MAAM,YAAY,GAAG,IAAA,uCAAuB,EAAC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEtE,IAAI,IAAA,WAAE,EAAC,YAAY,EAAE,mBAAmB,CAAC,EAAE;wBACzC,IAAI,CAAC,IAAI,CAAC,YAAY;4BAAE,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;wBAC/C,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;wBAClD,YAAY,GAAG,IAAI,CAAC;qBACrB;iBACF;YACH,CAAC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,YAAY,CAAC,CAAC,CAAC,IAAA,iCAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;KAChD,CAAC,CAAC;AACL,CAAC;AAzDD,kEAyDC"}
|