@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
@@ -3,25 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.compileTypeScriptWatcher = exports.compileTypeScript = void 0;
|
4
4
|
const tslib_1 = require("tslib");
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
|
-
const
|
7
|
-
const
|
6
|
+
const fs_1 = require("fs");
|
7
|
+
const ts_config_1 = require("../ts-config");
|
8
8
|
const typescript_1 = require("../typescript");
|
9
|
+
let tsModule;
|
9
10
|
function compileTypeScript(options) {
|
10
11
|
const normalizedOptions = normalizeOptions(options);
|
11
12
|
const tsConfig = getNormalizedTsConfig(normalizedOptions);
|
12
13
|
if (normalizedOptions.deleteOutputPath) {
|
13
|
-
(0,
|
14
|
+
(0, fs_1.rmSync)(normalizedOptions.outputPath, { recursive: true, force: true });
|
14
15
|
}
|
15
16
|
return createProgram(tsConfig, normalizedOptions);
|
16
17
|
}
|
17
18
|
exports.compileTypeScript = compileTypeScript;
|
18
19
|
function compileTypeScriptWatcher(options, callback) {
|
20
|
+
if (!tsModule) {
|
21
|
+
tsModule = (0, typescript_1.ensureTypescript)();
|
22
|
+
}
|
19
23
|
const normalizedOptions = normalizeOptions(options);
|
20
24
|
const tsConfig = getNormalizedTsConfig(normalizedOptions);
|
21
25
|
if (normalizedOptions.deleteOutputPath) {
|
22
|
-
(0,
|
26
|
+
(0, fs_1.rmSync)(normalizedOptions.outputPath, { recursive: true, force: true });
|
23
27
|
}
|
24
|
-
const host =
|
28
|
+
const host = tsModule.createWatchCompilerHost(tsConfig.fileNames, tsConfig.options, tsModule.sys);
|
25
29
|
const originalAfterProgramCreate = host.afterProgramCreate;
|
26
30
|
host.afterProgramCreate = (builderProgram) => {
|
27
31
|
const originalProgramEmit = builderProgram.emit;
|
@@ -39,7 +43,7 @@ function compileTypeScriptWatcher(options, callback) {
|
|
39
43
|
originalOnWatchStatusChange === null || originalOnWatchStatusChange === void 0 ? void 0 : originalOnWatchStatusChange(a, b, c, d);
|
40
44
|
yield (callback === null || callback === void 0 ? void 0 : callback(a, b, c, d));
|
41
45
|
});
|
42
|
-
return
|
46
|
+
return tsModule.createWatchProgram(host);
|
43
47
|
}
|
44
48
|
exports.compileTypeScriptWatcher = compileTypeScriptWatcher;
|
45
49
|
function mergeCustomTransformers(originalCustomTransformers, consumerCustomTransformers) {
|
@@ -74,15 +78,21 @@ function mergeCustomTransformers(originalCustomTransformers, consumerCustomTrans
|
|
74
78
|
return mergedCustomTransformers;
|
75
79
|
}
|
76
80
|
function getNormalizedTsConfig(options) {
|
77
|
-
const tsConfig = (0,
|
81
|
+
const tsConfig = (0, ts_config_1.readTsConfig)(options.tsConfig);
|
78
82
|
tsConfig.options.outDir = options.outputPath;
|
79
83
|
tsConfig.options.noEmitOnError = true;
|
80
84
|
tsConfig.options.rootDir = options.rootDir;
|
85
|
+
if (tsConfig.options.incremental && !tsConfig.options.tsBuildInfoFile) {
|
86
|
+
tsConfig.options.tsBuildInfoFile = (0, devkit_1.joinPathFragments)(options.outputPath, 'tsconfig.tsbuildinfo');
|
87
|
+
}
|
81
88
|
return tsConfig;
|
82
89
|
}
|
83
90
|
function createProgram(tsconfig, { projectName, getCustomTransformers }) {
|
84
|
-
|
85
|
-
|
91
|
+
if (!tsModule) {
|
92
|
+
tsModule = (0, typescript_1.ensureTypescript)();
|
93
|
+
}
|
94
|
+
const host = tsModule.createCompilerHost(tsconfig.options);
|
95
|
+
const program = tsModule.createProgram({
|
86
96
|
rootNames: tsconfig.fileNames,
|
87
97
|
options: tsconfig.options,
|
88
98
|
host,
|
@@ -90,9 +100,9 @@ function createProgram(tsconfig, { projectName, getCustomTransformers }) {
|
|
90
100
|
devkit_1.logger.info(`Compiling TypeScript files for project "${projectName}"...`);
|
91
101
|
const results = program.emit(undefined, undefined, undefined, undefined, getCustomTransformers === null || getCustomTransformers === void 0 ? void 0 : getCustomTransformers(program));
|
92
102
|
if (results.emitSkipped) {
|
93
|
-
const diagnostics =
|
94
|
-
getCurrentDirectory: () =>
|
95
|
-
getNewLine: () =>
|
103
|
+
const diagnostics = tsModule.formatDiagnosticsWithColorAndContext(results.diagnostics, {
|
104
|
+
getCurrentDirectory: () => tsModule.sys.getCurrentDirectory(),
|
105
|
+
getNewLine: () => tsModule.sys.newLine,
|
96
106
|
getCanonicalFileName: (name) => name,
|
97
107
|
});
|
98
108
|
devkit_1.logger.error(diagnostics);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"compilation.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/compilation.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"compilation.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/compilation.ts"],"names":[],"mappings":"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"}
|
@@ -1,2 +1,5 @@
|
|
1
|
-
import
|
2
|
-
|
1
|
+
import type { Node, SyntaxKind } from 'typescript';
|
2
|
+
/**
|
3
|
+
* @deprecated This function is deprecated and no longer supported.
|
4
|
+
*/
|
5
|
+
export declare function findNodes(node: Node, kind: SyntaxKind | SyntaxKind[], max?: number): Node[];
|
@@ -1,32 +1,14 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.findNodes = void 0;
|
4
|
+
const typescript_1 = require("nx/src/utils/typescript");
|
5
|
+
// TODO(v16): This should be removed.
|
6
|
+
/**
|
7
|
+
* @deprecated This function is deprecated and no longer supported.
|
8
|
+
*/
|
4
9
|
function findNodes(node, kind, max = Infinity) {
|
5
|
-
|
6
|
-
|
7
|
-
}
|
8
|
-
const arr = [];
|
9
|
-
const hasMatch = Array.isArray(kind)
|
10
|
-
? kind.includes(node.kind)
|
11
|
-
: node.kind === kind;
|
12
|
-
if (hasMatch) {
|
13
|
-
arr.push(node);
|
14
|
-
max--;
|
15
|
-
}
|
16
|
-
if (max > 0) {
|
17
|
-
for (const child of node.getChildren()) {
|
18
|
-
findNodes(child, kind, max).forEach((node) => {
|
19
|
-
if (max > 0) {
|
20
|
-
arr.push(node);
|
21
|
-
}
|
22
|
-
max--;
|
23
|
-
});
|
24
|
-
if (max <= 0) {
|
25
|
-
break;
|
26
|
-
}
|
27
|
-
}
|
28
|
-
}
|
29
|
-
return arr;
|
10
|
+
console.warn('"findNodes" is deprecated and no longer supported.');
|
11
|
+
return (0, typescript_1.findNodes)(node, kind, max);
|
30
12
|
}
|
31
13
|
exports.findNodes = findNodes;
|
32
14
|
//# sourceMappingURL=find-nodes.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"find-nodes.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/find-nodes.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"find-nodes.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/find-nodes.ts"],"names":[],"mappings":";;;AAAA,wDAAkE;AAGlE,qCAAqC;AAErC;;GAEG;AACH,SAAgB,SAAS,CACvB,IAAU,EACV,IAA+B,EAC/B,GAAG,GAAG,QAAQ;IAEd,OAAO,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;IACnE,OAAO,IAAA,sBAAU,EAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;AACrC,CAAC;AAPD,8BAOC"}
|
@@ -1,2 +1,5 @@
|
|
1
|
-
import * as ts from 'typescript';
|
1
|
+
import type * as ts from 'typescript';
|
2
|
+
/**
|
3
|
+
* @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
|
4
|
+
*/
|
2
5
|
export declare function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[];
|
@@ -1,6 +1,9 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.getSourceNodes = void 0;
|
4
|
+
/**
|
5
|
+
* @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
|
6
|
+
*/
|
4
7
|
function getSourceNodes(sourceFile) {
|
5
8
|
const nodes = [sourceFile];
|
6
9
|
const result = [];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"get-source-nodes.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/get-source-nodes.ts"],"names":[],"mappings":";;;AAEA,SAAgB,cAAc,CAAC,UAAyB;IACtD,MAAM,KAAK,GAAc,CAAC,UAAU,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,IAAI,EAAE;YACR,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,IAAI,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBACvC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;aACtC;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,wCAgBC"}
|
1
|
+
{"version":3,"file":"get-source-nodes.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/get-source-nodes.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,SAAgB,cAAc,CAAC,UAAyB;IACtD,MAAM,KAAK,GAAc,CAAC,UAAU,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,IAAI,EAAE;YACR,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,IAAI,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBACvC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;aACtC;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,wCAgBC"}
|
@@ -4,7 +4,6 @@ export { compileTypeScript } from './typescript/compilation';
|
|
4
4
|
export type { TypeScriptCompilationOptions } from './typescript/compilation';
|
5
5
|
export { findNodes } from './typescript/find-nodes';
|
6
6
|
export { getSourceNodes } from './typescript/get-source-nodes';
|
7
|
-
export declare function readTsConfig(tsConfigPath: string): ts.ParsedCommandLine;
|
8
7
|
/**
|
9
8
|
* Find a module based on it's import
|
10
9
|
*
|
@@ -13,7 +12,12 @@ export declare function readTsConfig(tsConfigPath: string): ts.ParsedCommandLine
|
|
13
12
|
* @param tsConfigPath
|
14
13
|
*/
|
15
14
|
export declare function resolveModuleByImport(importExpr: string, filePath: string, tsConfigPath: string): string;
|
16
|
-
export declare function
|
15
|
+
export declare function ensureTypescript(): typeof ts;
|
16
|
+
/**
|
17
|
+
* @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
|
18
|
+
*/
|
17
19
|
export declare function getRelativePathToRootTsConfig(tree: Tree, targetPath: string): string;
|
18
|
-
|
19
|
-
|
20
|
+
/**
|
21
|
+
* @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
|
22
|
+
*/
|
23
|
+
export declare function getRootTsConfigPathInTree(tree: Tree): string;
|
@@ -1,34 +1,26 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.
|
3
|
+
exports.getRootTsConfigPathInTree = exports.getRelativePathToRootTsConfig = exports.ensureTypescript = exports.resolveModuleByImport = exports.getSourceNodes = exports.findNodes = exports.compileTypeScript = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
|
-
const devkit_2 = require("@nrwl/devkit");
|
6
|
-
const fs_1 = require("fs");
|
7
5
|
const path_1 = require("path");
|
6
|
+
const versions_1 = require("../utils/versions");
|
8
7
|
var compilation_1 = require("./typescript/compilation");
|
9
8
|
Object.defineProperty(exports, "compileTypeScript", { enumerable: true, get: function () { return compilation_1.compileTypeScript; } });
|
10
|
-
var find_nodes_1 = require("./typescript/find-nodes");
|
9
|
+
var find_nodes_1 = require("./typescript/find-nodes"); // TODO(v16): remove this
|
11
10
|
Object.defineProperty(exports, "findNodes", { enumerable: true, get: function () { return find_nodes_1.findNodes; } });
|
12
11
|
var get_source_nodes_1 = require("./typescript/get-source-nodes");
|
13
12
|
Object.defineProperty(exports, "getSourceNodes", { enumerable: true, get: function () { return get_source_nodes_1.getSourceNodes; } });
|
14
|
-
const normalizedAppRoot =
|
13
|
+
const normalizedAppRoot = devkit_1.workspaceRoot.replace(/\\/g, '/');
|
15
14
|
let tsModule;
|
16
|
-
function readTsConfig(tsConfigPath) {
|
17
|
-
if (!tsModule) {
|
18
|
-
tsModule = require('typescript');
|
19
|
-
}
|
20
|
-
const readResult = tsModule.readConfigFile(tsConfigPath, tsModule.sys.readFile);
|
21
|
-
return tsModule.parseJsonConfigFileContent(readResult.config, tsModule.sys, (0, path_1.dirname)(tsConfigPath));
|
22
|
-
}
|
23
|
-
exports.readTsConfig = readTsConfig;
|
24
15
|
function readTsConfigOptions(tsConfigPath) {
|
25
16
|
if (!tsModule) {
|
26
|
-
tsModule =
|
17
|
+
tsModule = ensureTypescript();
|
27
18
|
}
|
28
19
|
const readResult = tsModule.readConfigFile(tsConfigPath, tsModule.sys.readFile);
|
29
20
|
// we don't need to scan the files, we only care about options
|
30
21
|
const host = {
|
31
22
|
readDirectory: () => [],
|
23
|
+
readFile: () => '',
|
32
24
|
fileExists: tsModule.sys.fileExists,
|
33
25
|
};
|
34
26
|
return tsModule.parseJsonConfigFileContent(readResult.config, host, (0, path_1.dirname)(tsConfigPath)).options;
|
@@ -56,35 +48,26 @@ exports.resolveModuleByImport = resolveModuleByImport;
|
|
56
48
|
function getCompilerHost(tsConfigPath) {
|
57
49
|
const options = readTsConfigOptions(tsConfigPath);
|
58
50
|
const host = tsModule.createCompilerHost(options, true);
|
59
|
-
const moduleResolutionCache = tsModule.createModuleResolutionCache(
|
51
|
+
const moduleResolutionCache = tsModule.createModuleResolutionCache(devkit_1.workspaceRoot, host.getCanonicalFileName);
|
60
52
|
return { options, host, moduleResolutionCache };
|
61
53
|
}
|
62
|
-
function
|
63
|
-
|
64
|
-
if (tree.exists(path)) {
|
65
|
-
return path;
|
66
|
-
}
|
67
|
-
}
|
68
|
-
return 'tsconfig.base.json';
|
54
|
+
function ensureTypescript() {
|
55
|
+
return (0, devkit_1.ensurePackage)('typescript', versions_1.typescriptVersion);
|
69
56
|
}
|
70
|
-
exports.
|
57
|
+
exports.ensureTypescript = ensureTypescript;
|
58
|
+
const ts_config_1 = require("./ts-config");
|
59
|
+
/**
|
60
|
+
* @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
|
61
|
+
*/
|
71
62
|
function getRelativePathToRootTsConfig(tree, targetPath) {
|
72
|
-
return (0,
|
63
|
+
return (0, ts_config_1.getRelativePathToRootTsConfig)(tree, targetPath);
|
73
64
|
}
|
74
65
|
exports.getRelativePathToRootTsConfig = getRelativePathToRootTsConfig;
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
}
|
81
|
-
}
|
82
|
-
return null;
|
83
|
-
}
|
84
|
-
exports.getRootTsConfigFileName = getRootTsConfigFileName;
|
85
|
-
function getRootTsConfigPath() {
|
86
|
-
const tsConfigFileName = getRootTsConfigFileName();
|
87
|
-
return tsConfigFileName ? (0, path_1.join)(devkit_2.workspaceRoot, tsConfigFileName) : null;
|
66
|
+
/**
|
67
|
+
* @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
|
68
|
+
*/
|
69
|
+
function getRootTsConfigPathInTree(tree) {
|
70
|
+
return (0, ts_config_1.getRootTsConfigPathInTree)(tree);
|
88
71
|
}
|
89
|
-
exports.
|
72
|
+
exports.getRootTsConfigPathInTree = getRootTsConfigPathInTree;
|
90
73
|
//# sourceMappingURL=typescript.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,+BAA+B;AAE/B,gDAAsD;AACtD,wDAA6D;AAApD,gHAAA,iBAAiB,OAAA;AAE1B,sDAAoD,CAAC,yBAAyB;AAArE,uGAAA,SAAS,OAAA;AAClB,kEAA+D;AAAtD,kHAAA,cAAc,OAAA;AAEvB,MAAM,iBAAiB,GAAG,sBAAa,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAE5D,IAAI,QAAqC,CAAC;AAE1C,SAAS,mBAAmB,CAAC,YAAoB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,gBAAgB,EAAE,CAAC;KAC/B;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CACxC,YAAY,EACZ,QAAQ,CAAC,GAAG,CAAC,QAAQ,CACtB,CAAC;IAEF,8DAA8D;IAC9D,MAAM,IAAI,GAAgC;QACxC,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE;QACvB,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE;QAClB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,UAAU;KACpC,CAAC;IAEF,OAAO,QAAQ,CAAC,0BAA0B,CACxC,UAAU,CAAC,MAAM,EACjB,IAA0B,EAC1B,IAAA,cAAO,EAAC,YAAY,CAAC,CACtB,CAAC,OAAO,CAAC;AACZ,CAAC;AAED,IAAI,YAIH,CAAC;AAEF;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,UAAkB,EAClB,QAAgB,EAChB,YAAoB;IAEpB,YAAY,GAAG,YAAY,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC;IAC7D,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,YAAY,CAAC;IAE9D,MAAM,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC,iBAAiB,CACnD,UAAU,EACV,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,qBAAqB,CACtB,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO;KACR;SAAM;QACL,OAAO,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,EAAE,EAAE,CAAC,CAAC;KAC7E;AACH,CAAC;AArBD,sDAqBC;AAED,SAAS,eAAe,CAAC,YAAoB;IAC3C,MAAM,OAAO,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,QAAQ,CAAC,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACxD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,2BAA2B,CAChE,sBAAa,EACb,IAAI,CAAC,oBAAoB,CAC1B,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;AAClD,CAAC;AAED,SAAgB,gBAAgB;IAC9B,OAAO,IAAA,sBAAa,EAClB,YAAY,EACZ,4BAAiB,CAClB,CAAC;AACJ,CAAC;AALD,4CAKC;AAED,2CAGqB;AAErB;;GAEG;AACH,SAAgB,6BAA6B,CAAC,IAAU,EAAE,UAAkB;IAC1E,OAAO,IAAA,yCAA8B,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC1D,CAAC;AAFD,sEAEC;AAED;;GAEG;AACH,SAAgB,yBAAyB,CAAC,IAAU;IAClD,OAAO,IAAA,qCAA0B,EAAC,IAAI,CAAC,CAAC;AAC1C,CAAC;AAFD,8DAEC"}
|
@@ -1 +1,4 @@
|
|
1
|
+
/** @deprecated Use checkAndCleanWithSemver from @nrwl/devkit/src/utils/semver instead.
|
2
|
+
* TODO(v17): Remove this function from workspace. Keep it for now since there are projects that use it (e.g. https://github.com/gperdomor/nx-tools).
|
3
|
+
*/
|
1
4
|
export declare function checkAndCleanWithSemver(pkgName: string, version: string): string;
|
@@ -1,19 +1,14 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.checkAndCleanWithSemver = void 0;
|
4
|
-
const semver_1 = require("semver");
|
4
|
+
const semver_1 = require("@nrwl/devkit/src/utils/semver");
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
6
|
+
/** @deprecated Use checkAndCleanWithSemver from @nrwl/devkit/src/utils/semver instead.
|
7
|
+
* TODO(v17): Remove this function from workspace. Keep it for now since there are projects that use it (e.g. https://github.com/gperdomor/nx-tools).
|
8
|
+
*/
|
5
9
|
function checkAndCleanWithSemver(pkgName, version) {
|
6
|
-
|
7
|
-
|
8
|
-
return newVersion;
|
9
|
-
}
|
10
|
-
if (version.startsWith('~') || version.startsWith('^')) {
|
11
|
-
newVersion = version.substring(1);
|
12
|
-
}
|
13
|
-
if (!(0, semver_1.valid)(newVersion)) {
|
14
|
-
throw new Error(`The package.json lists a version of ${pkgName} that Nx is unable to validate - (${version})`);
|
15
|
-
}
|
16
|
-
return newVersion;
|
10
|
+
devkit_1.logger.warn(`checkAndCleanWithSemver has been moved to @nrwl/devkit/src/utils/semver`);
|
11
|
+
return (0, semver_1.checkAndCleanWithSemver)(pkgName, version);
|
17
12
|
}
|
18
13
|
exports.checkAndCleanWithSemver = checkAndCleanWithSemver;
|
19
14
|
//# sourceMappingURL=version-utils.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/version-utils.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/version-utils.ts"],"names":[],"mappings":";;;AAAA,0DAAoG;AACpG,yCAAsC;AAEtC;;GAEG;AACH,SAAgB,uBAAuB,CAAC,OAAe,EAAE,OAAe;IACtE,eAAM,CAAC,IAAI,CACT,yEAAyE,CAC1E,CAAC;IACF,OAAO,IAAA,gCAAwB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AALD,0DAKC"}
|
package/src/utils/ast-utils.d.ts
CHANGED
@@ -1,125 +1,2 @@
|
|
1
|
-
/**
|
2
|
-
* @license
|
3
|
-
* Copyright Google Inc. All Rights Reserved.
|
4
|
-
*
|
5
|
-
* Use of this source code is governed by an MIT- style license that can be
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
7
|
-
*/
|
8
|
-
import { Rule, SchematicContext, Source, Tree } from '@angular-devkit/schematics';
|
9
|
-
import * as ts from 'typescript';
|
10
|
-
import { FileData } from '@nrwl/devkit';
|
11
|
-
import { Path } from '@angular-devkit/core';
|
12
|
-
import type { NxJsonConfiguration } from '@nrwl/devkit';
|
13
|
-
export declare function sortObjectByKeys(obj: unknown): {};
|
14
1
|
export { findNodes } from '../utilities/typescript/find-nodes';
|
15
2
|
export { getSourceNodes } from '../utilities/typescript/get-source-nodes';
|
16
|
-
export interface Change {
|
17
|
-
apply(host: any): Promise<void>;
|
18
|
-
readonly type: string;
|
19
|
-
readonly path: string | null;
|
20
|
-
readonly order: number;
|
21
|
-
readonly description: string;
|
22
|
-
}
|
23
|
-
export declare class NoopChange implements Change {
|
24
|
-
type: string;
|
25
|
-
description: string;
|
26
|
-
order: number;
|
27
|
-
path: any;
|
28
|
-
apply(): Promise<void>;
|
29
|
-
}
|
30
|
-
export declare class InsertChange implements Change {
|
31
|
-
path: string;
|
32
|
-
pos: number;
|
33
|
-
toAdd: string;
|
34
|
-
type: string;
|
35
|
-
order: number;
|
36
|
-
description: string;
|
37
|
-
constructor(path: string, pos: number, toAdd: string);
|
38
|
-
apply(host: any): any;
|
39
|
-
}
|
40
|
-
export declare class RemoveChange implements Change {
|
41
|
-
path: string;
|
42
|
-
pos: number;
|
43
|
-
toRemove: string;
|
44
|
-
type: string;
|
45
|
-
order: number;
|
46
|
-
description: string;
|
47
|
-
constructor(path: string, pos: number, toRemove: string);
|
48
|
-
apply(host: any): Promise<void>;
|
49
|
-
}
|
50
|
-
export declare class ReplaceChange implements Change {
|
51
|
-
path: string;
|
52
|
-
pos: number;
|
53
|
-
oldText: string;
|
54
|
-
newText: string;
|
55
|
-
type: string;
|
56
|
-
order: number;
|
57
|
-
description: string;
|
58
|
-
constructor(path: string, pos: number, oldText: string, newText: string);
|
59
|
-
apply(host: any): Promise<void>;
|
60
|
-
}
|
61
|
-
export declare function addParameterToConstructor(source: ts.SourceFile, modulePath: string, opts: {
|
62
|
-
className: string;
|
63
|
-
param: string;
|
64
|
-
}): Change[];
|
65
|
-
export declare function addMethod(source: ts.SourceFile, modulePath: string, opts: {
|
66
|
-
className: string;
|
67
|
-
methodHeader: string;
|
68
|
-
body: string;
|
69
|
-
}): Change[];
|
70
|
-
export declare function findClass(source: ts.SourceFile, className: string, silent?: boolean): ts.ClassDeclaration;
|
71
|
-
export declare function offset(text: string, numberOfTabs: number, wrap: boolean): string;
|
72
|
-
export declare function addIncludeToTsConfig(tsConfigPath: string, source: ts.SourceFile, include: string): Change[];
|
73
|
-
export declare function getImport(source: ts.SourceFile, predicate: (a: any) => boolean): {
|
74
|
-
moduleSpec: string;
|
75
|
-
bindings: string[];
|
76
|
-
}[];
|
77
|
-
export declare function addGlobal(source: ts.SourceFile, modulePath: string, statement: string): Change[];
|
78
|
-
export declare function insert(host: Tree, modulePath: string, changes: Change[]): void;
|
79
|
-
/**
|
80
|
-
* This method is specifically for reading JSON files in a Tree
|
81
|
-
* @param host The host tree
|
82
|
-
* @param path The path to the JSON file
|
83
|
-
* @returns The JSON data in the file.
|
84
|
-
*/
|
85
|
-
export declare function readJsonInTree<T extends object = any>(host: Tree, path: string): T;
|
86
|
-
/**
|
87
|
-
* @deprecated This method is deprecated
|
88
|
-
*/
|
89
|
-
export declare function getFileDataInHost(host: Tree, path: Path): FileData;
|
90
|
-
export declare function allFilesInDirInHost(host: Tree, path: Path, options?: {
|
91
|
-
recursive: boolean;
|
92
|
-
}): Path[];
|
93
|
-
/**
|
94
|
-
* This method is specifically for updating JSON in a Tree
|
95
|
-
* @param path Path of JSON file in the Tree
|
96
|
-
* @param callback Manipulation of the JSON data
|
97
|
-
* @returns A rule which updates a JSON file file in a Tree
|
98
|
-
*/
|
99
|
-
export declare function updateJsonInTree<T extends object = any, O extends object = T>(path: string, callback: (json: T, context: SchematicContext) => O): Rule;
|
100
|
-
export declare function updateWorkspaceInTree<T extends object = any, O extends object = T>(callback: (json: T, context: SchematicContext, host: Tree) => O): Rule;
|
101
|
-
export declare function readNxJsonInTree(host: Tree): NxJsonConfiguration<string[] | "*">;
|
102
|
-
export declare function libsDir(host: Tree): string;
|
103
|
-
export declare function appsDir(host: Tree): string;
|
104
|
-
export declare function updateNxJsonInTree(callback: (json: NxJsonConfiguration, context: SchematicContext) => NxJsonConfiguration): Rule;
|
105
|
-
export declare function readWorkspace(host: Tree): any;
|
106
|
-
/**
|
107
|
-
* Updates the package.json given the passed deps and/or devDeps. Only updates
|
108
|
-
* if the packages are not yet present
|
109
|
-
*
|
110
|
-
* @param deps the package.json dependencies to add
|
111
|
-
* @param devDeps the package.json devDependencies to add
|
112
|
-
* @param addInstall default `true`; set to false to avoid installs
|
113
|
-
*/
|
114
|
-
export declare function addDepsToPackageJson(deps: any, devDeps: any, addInstall?: boolean): Rule;
|
115
|
-
export declare function updatePackageJsonDependencies(deps: any, devDeps: any, addInstall?: boolean): Rule;
|
116
|
-
export declare function getProjectConfig(host: Tree, name: string): any;
|
117
|
-
export declare function createOrUpdate(host: Tree, path: string, content: string): void;
|
118
|
-
export declare function insertImport(source: ts.SourceFile, fileToEdit: string, symbolName: string, fileName: string, isDefault?: boolean): Change;
|
119
|
-
export declare function replaceNodeValue(host: Tree, modulePath: string, node: ts.Node, content: string): void;
|
120
|
-
export declare function renameSyncInTree(tree: Tree, from: string, to: string, cb: (err: string) => void): void;
|
121
|
-
export declare function renameDirSyncInTree(tree: Tree, from: string, to: string, cb: (err: string) => void): void;
|
122
|
-
/**
|
123
|
-
* Applies a template merge but skips for already existing entries
|
124
|
-
*/
|
125
|
-
export declare function applyWithSkipExisting(source: Source, rules: Rule[]): Rule;
|