@o3r/schematics 11.6.0-prerelease.4 → 11.6.0-prerelease.40
Sign up to get free protection for your applications and to get access to all the features.
- package/cli/environment.js +1 -0
- package/package.json +28 -20
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +2 -2
- package/schematics/ng-add/schema.d.ts.map +1 -1
- package/src/interfaces/angular-workspace.d.ts.map +1 -1
- package/src/interfaces/index.d.ts +1 -1
- package/src/interfaces/index.d.ts.map +1 -1
- package/src/interfaces/index.js +1 -1
- package/src/interfaces/index.js.map +1 -1
- package/src/interfaces/rule-factories.d.ts.map +1 -1
- package/src/interfaces/schematic-option.d.ts.map +1 -1
- package/src/modules/index.d.ts +1 -1
- package/src/modules/index.d.ts.map +1 -1
- package/src/modules/index.js +1 -1
- package/src/modules/index.js.map +1 -1
- package/src/modules/modules.constants.d.ts.map +1 -1
- package/src/modules/modules.constants.js.map +1 -1
- package/src/modules/modules.display.rule.d.ts.map +1 -1
- package/src/modules/modules.display.rule.js +1 -2
- package/src/modules/modules.display.rule.js.map +1 -1
- package/src/modules/modules.helpers.d.ts +1 -1
- package/src/modules/modules.helpers.d.ts.map +1 -1
- package/src/modules/modules.helpers.js +5 -6
- package/src/modules/modules.helpers.js.map +1 -1
- package/src/public_api.d.ts +1 -1
- package/src/public_api.d.ts.map +1 -1
- package/src/public_api.js +1 -1
- package/src/public_api.js.map +1 -1
- package/src/rule-factories/add-imports/index.d.ts.map +1 -1
- package/src/rule-factories/add-imports/index.js +9 -5
- package/src/rule-factories/add-imports/index.js.map +1 -1
- package/src/rule-factories/check-packages-peers/index.d.ts.map +1 -1
- package/src/rule-factories/check-packages-peers/index.js +13 -12
- package/src/rule-factories/check-packages-peers/index.js.map +1 -1
- package/src/rule-factories/dev-tools/devtools-registration.d.ts +1 -3
- package/src/rule-factories/dev-tools/devtools-registration.d.ts.map +1 -1
- package/src/rule-factories/dev-tools/devtools-registration.js +34 -19
- package/src/rule-factories/dev-tools/devtools-registration.js.map +1 -1
- package/src/rule-factories/eslint-fix/index.d.ts +1 -2
- package/src/rule-factories/eslint-fix/index.d.ts.map +1 -1
- package/src/rule-factories/eslint-fix/index.js +17 -18
- package/src/rule-factories/eslint-fix/index.js.map +1 -1
- package/src/rule-factories/get-test-frameworks/index.d.ts.map +1 -1
- package/src/rule-factories/get-test-frameworks/index.js +2 -2
- package/src/rule-factories/get-test-frameworks/index.js.map +1 -1
- package/src/rule-factories/index.d.ts +2 -3
- package/src/rule-factories/index.d.ts.map +1 -1
- package/src/rule-factories/index.js +2 -3
- package/src/rule-factories/index.js.map +1 -1
- package/src/rule-factories/ng-add/dependencies.d.ts +16 -1
- package/src/rule-factories/ng-add/dependencies.d.ts.map +1 -1
- package/src/rule-factories/ng-add/dependencies.js +32 -17
- package/src/rule-factories/ng-add/dependencies.js.map +1 -1
- package/src/rule-factories/ng-add/index.d.ts +1 -1
- package/src/rule-factories/ng-add/index.d.ts.map +1 -1
- package/src/rule-factories/ng-add/index.js +1 -1
- package/src/rule-factories/ng-add/index.js.map +1 -1
- package/src/rule-factories/ng-add/ng-add.helpers.d.ts +1 -1
- package/src/rule-factories/ng-add/ng-add.helpers.d.ts.map +1 -1
- package/src/rule-factories/ng-add/ng-add.helpers.js +22 -23
- package/src/rule-factories/ng-add/ng-add.helpers.js.map +1 -1
- package/src/rule-factories/ng-add/schematics-register.d.ts.map +1 -1
- package/src/rule-factories/ng-add/schematics-register.js +36 -28
- package/src/rule-factories/ng-add/schematics-register.js.map +1 -1
- package/src/rule-factories/remove-packages/index.d.ts.map +1 -1
- package/src/rule-factories/remove-packages/index.js +9 -9
- package/src/rule-factories/remove-packages/index.js.map +1 -1
- package/src/rule-factories/update-imports/list-of-vars.js.map +1 -1
- package/src/rule-factories/update-imports/update-imports-with-scope.d.ts.map +1 -1
- package/src/rule-factories/update-imports/update-imports-with-scope.js +3 -2
- package/src/rule-factories/update-imports/update-imports-with-scope.js.map +1 -1
- package/src/rule-factories/update-imports/update-ts-imports.d.ts.map +1 -1
- package/src/rule-factories/update-imports/update-ts-imports.js +3 -3
- package/src/rule-factories/update-imports/update-ts-imports.js.map +1 -1
- package/src/rule-factories/vscode-extensions/index.d.ts.map +1 -1
- package/src/rule-factories/vscode-extensions/index.js +5 -5
- package/src/rule-factories/vscode-extensions/index.js.map +1 -1
- package/src/tasks/eslint/index.d.ts +1 -1
- package/src/tasks/eslint/index.d.ts.map +1 -1
- package/src/tasks/eslint/index.js +2 -2
- package/src/tasks/eslint/index.js.map +1 -1
- package/src/tasks/link/index.d.ts.map +1 -1
- package/src/tasks/link/index.js.map +1 -1
- package/src/tasks/ng-add/index.d.ts.map +1 -1
- package/src/tasks/package-manager/interfaces.d.ts.map +1 -1
- package/src/tasks/package-manager/npm-exec.d.ts.map +1 -1
- package/src/tasks/package-manager/npm-exec.js.map +1 -1
- package/src/tasks/package-manager/npm-install.d.ts.map +1 -1
- package/src/tasks/package-manager/npm-install.js +1 -1
- package/src/tasks/package-manager/npm-install.js.map +1 -1
- package/src/tasks/package-manager/npm-run.d.ts.map +1 -1
- package/src/tasks/package-manager/npm-run.js.map +1 -1
- package/src/utility/ast.d.ts.map +1 -1
- package/src/utility/ast.js +12 -15
- package/src/utility/ast.js.map +1 -1
- package/src/utility/builder.d.ts.map +1 -1
- package/src/utility/builder.js.map +1 -1
- package/src/utility/collection.d.ts.map +1 -1
- package/src/utility/collection.js +2 -3
- package/src/utility/collection.js.map +1 -1
- package/src/utility/component.d.ts.map +1 -1
- package/src/utility/component.js +2 -2
- package/src/utility/component.js.map +1 -1
- package/src/utility/dependencies.d.ts +1 -1
- package/src/utility/dependencies.d.ts.map +1 -1
- package/src/utility/dependencies.js +4 -5
- package/src/utility/dependencies.js.map +1 -1
- package/src/utility/environment.d.ts.map +1 -1
- package/src/utility/environment.js.map +1 -1
- package/src/utility/error.d.ts.map +1 -1
- package/src/utility/error.js.map +1 -1
- package/src/utility/file-info.d.ts +1 -1
- package/src/utility/file-info.d.ts.map +1 -1
- package/src/utility/file-info.js +1 -1
- package/src/utility/file-info.js.map +1 -1
- package/src/utility/generation.d.ts +1 -1
- package/src/utility/generation.d.ts.map +1 -1
- package/src/utility/generation.js +2 -15
- package/src/utility/generation.js.map +1 -1
- package/src/utility/gitignore.d.ts.map +1 -1
- package/src/utility/gitignore.js +2 -2
- package/src/utility/gitignore.js.map +1 -1
- package/src/utility/index.d.ts +2 -2
- package/src/utility/index.d.ts.map +1 -1
- package/src/utility/index.js +2 -2
- package/src/utility/index.js.map +1 -1
- package/src/utility/loaders.d.ts +1 -1
- package/src/utility/loaders.d.ts.map +1 -1
- package/src/utility/loaders.js +6 -6
- package/src/utility/loaders.js.map +1 -1
- package/src/utility/logo.d.ts +1 -1
- package/src/utility/logo.d.ts.map +1 -1
- package/src/utility/logo.js.map +1 -1
- package/src/utility/matching-peers.d.ts +3 -1
- package/src/utility/matching-peers.d.ts.map +1 -1
- package/src/utility/matching-peers.js +8 -6
- package/src/utility/matching-peers.js.map +1 -1
- package/src/utility/migration/migration.d.ts.map +1 -1
- package/src/utility/migration/migration.js +3 -3
- package/src/utility/migration/migration.js.map +1 -1
- package/src/utility/modules.d.ts +1 -1
- package/src/utility/modules.d.ts.map +1 -1
- package/src/utility/modules.js +16 -16
- package/src/utility/modules.js.map +1 -1
- package/src/utility/monorepo.d.ts +9 -4
- package/src/utility/monorepo.d.ts.map +1 -1
- package/src/utility/monorepo.js +0 -2
- package/src/utility/monorepo.js.map +1 -1
- package/src/utility/package-manager-runner.d.ts +2 -3
- package/src/utility/package-manager-runner.d.ts.map +1 -1
- package/src/utility/package-manager-runner.js +1 -4
- package/src/utility/package-manager-runner.js.map +1 -1
- package/src/utility/package-version.d.ts +0 -1
- package/src/utility/package-version.d.ts.map +1 -1
- package/src/utility/package-version.js +3 -4
- package/src/utility/package-version.js.map +1 -1
- package/src/utility/question.d.ts.map +1 -1
- package/src/utility/question.js.map +1 -1
- package/src/utility/routes.d.ts.map +1 -1
- package/src/utility/routes.js +6 -6
- package/src/utility/routes.js.map +1 -1
- package/src/utility/sub-entry.d.ts.map +1 -1
- package/src/utility/sub-entry.js.map +1 -1
- package/src/utility/template-property.helper.d.ts.map +1 -1
- package/src/utility/template-property.helper.js +2 -2
- package/src/utility/template-property.helper.js.map +1 -1
- package/src/utility/update-imports.d.ts +1 -1
- package/src/utility/update-imports.d.ts.map +1 -1
- package/src/utility/update-imports.js +10 -14
- package/src/utility/update-imports.js.map +1 -1
- package/src/utility/update-pipes.d.ts.map +1 -1
- package/src/utility/update-pipes.js +5 -5
- package/src/utility/update-pipes.js.map +1 -1
- package/src/utility/wrapper.d.ts.map +1 -1
- package/src/utility/wrapper.js +12 -11
- package/src/utility/wrapper.js.map +1 -1
@@ -1,13 +1,27 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.ngAddPackages = ngAddPackages;
|
4
|
+
const node_fs_1 = require("node:fs");
|
5
|
+
const path = require("node:path");
|
4
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
5
7
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
6
8
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
7
|
-
const node_fs_1 = require("node:fs");
|
8
|
-
const path = require("node:path");
|
9
|
-
const rxjs_1 = require("rxjs");
|
10
9
|
const index_1 = require("../../utility/index");
|
10
|
+
const getNgAddSchema = (packageName, context) => {
|
11
|
+
try {
|
12
|
+
const collection = context.engine.createCollection(packageName);
|
13
|
+
return collection.createSchematic('ng-add');
|
14
|
+
}
|
15
|
+
catch {
|
16
|
+
context.logger.warn(`No ng-add found for ${packageName}`);
|
17
|
+
return undefined;
|
18
|
+
}
|
19
|
+
};
|
20
|
+
const sortDependencies = (packageJson, depType) => {
|
21
|
+
packageJson[depType] = packageJson[depType]
|
22
|
+
? Object.fromEntries(Object.entries(packageJson[depType] || {}).sort(([key1, _val1], [key2, _val2]) => key1.localeCompare(key2)))
|
23
|
+
: undefined;
|
24
|
+
};
|
11
25
|
/**
|
12
26
|
* Install via `ng add` a list of npm packages.
|
13
27
|
* @param packages List of packages to be installed via `ng add`
|
@@ -15,10 +29,10 @@ const index_1 = require("../../utility/index");
|
|
15
29
|
* @param packageJsonPath path of the package json of the project where they will be installed
|
16
30
|
*/
|
17
31
|
function ngAddPackages(packages, options, packageJsonPath = '/package.json') {
|
18
|
-
if (
|
32
|
+
if (packages.length === 0) {
|
19
33
|
return schematics_1.noop;
|
20
34
|
}
|
21
|
-
const cwd = process.cwd().replace(/[
|
35
|
+
const cwd = process.cwd().replace(/[/\\]+/g, '/');
|
22
36
|
// FileSystem working directory might be different from Tree working directory (when using `yarn workspace` for example)
|
23
37
|
const fsWorkingDirectory = (options?.workingDirectory && !cwd.endsWith(options.workingDirectory)) ? options.workingDirectory : '.';
|
24
38
|
const versions = Object.fromEntries(packages.map((packageName, index) => [packageName, typeof options?.version === 'object' ? options.version[index] : options?.version]));
|
@@ -46,22 +60,12 @@ function ngAddPackages(packages, options, packageJsonPath = '/package.json') {
|
|
46
60
|
}
|
47
61
|
versionFound = version;
|
48
62
|
}
|
49
|
-
catch
|
63
|
+
catch {
|
50
64
|
return;
|
51
65
|
}
|
52
66
|
}
|
53
67
|
return versionFound;
|
54
68
|
};
|
55
|
-
const getNgAddSchema = (packageName, context) => {
|
56
|
-
try {
|
57
|
-
const collection = context.engine.createCollection(packageName);
|
58
|
-
return collection.createSchematic('ng-add');
|
59
|
-
}
|
60
|
-
catch {
|
61
|
-
context.logger.warn(`No ng-add found for ${packageName}`);
|
62
|
-
return undefined;
|
63
|
-
}
|
64
|
-
};
|
65
69
|
const getOptions = (schema) => {
|
66
70
|
const schemaOptions = schema.description.schemaJson?.properties || {};
|
67
71
|
return Object.entries(options || {}).reduce((accOptions, [key, value]) => {
|
@@ -74,17 +78,12 @@ function ngAddPackages(packages, options, packageJsonPath = '/package.json') {
|
|
74
78
|
const installedVersions = packages.map((packageName) => getInstalledVersion(packageName));
|
75
79
|
const packageManager = (0, index_1.getPackageManager)();
|
76
80
|
const packagesToInstall = packages.filter((packageName, index) => !installedVersions[index] || installedVersions[index] !== versions[packageName]);
|
77
|
-
if (packagesToInstall.length
|
81
|
+
if (packagesToInstall.length === 0) {
|
78
82
|
return schematics_1.noop;
|
79
83
|
}
|
80
84
|
return (0, schematics_1.chain)([
|
81
85
|
// Update package.json in tree
|
82
86
|
(tree) => {
|
83
|
-
const sortDependencies = (packageJson, depType) => {
|
84
|
-
packageJson[depType] = packageJson[depType] ?
|
85
|
-
Object.fromEntries(Object.entries(packageJson[depType] || {}).sort(([key1, _val1], [key2, _val2]) => key1.localeCompare(key2))) :
|
86
|
-
undefined;
|
87
|
-
};
|
88
87
|
for (const filePath of new Set([packageJsonPath, './package.json'])) {
|
89
88
|
const packageJson = tree.readJson(filePath);
|
90
89
|
packages.forEach((packageName) => {
|
@@ -121,7 +120,7 @@ function ngAddPackages(packages, options, packageJsonPath = '/package.json') {
|
|
121
120
|
hideOutput: false,
|
122
121
|
quiet: false
|
123
122
|
}));
|
124
|
-
await (
|
123
|
+
await new Promise((resolve, reject) => context.engine.executePostTasks().subscribe({ next: () => { }, complete: () => resolve(), error: (errors) => reject(errors) }));
|
125
124
|
const ngAddsToApply = packagesToInstall
|
126
125
|
.map((packageName) => ({ packageName, ngAddCollection: getNgAddSchema(packageName, context) }))
|
127
126
|
.filter(({ packageName, ngAddCollection }) => {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ng-add.helpers.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/ng-add.helpers.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"ng-add.helpers.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/ng-add.helpers.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"schematics-register.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/schematics-register.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
1
|
+
{"version":3,"file":"schematics-register.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/schematics-register.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAOhC;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAY5G;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,IAAI,CAuCjK;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,EAAE,aAAa,UAAQ,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAoClK"}
|
@@ -37,26 +37,30 @@ function setupSchematicsParamsForProject(schematicsDefaultParams, projectName, o
|
|
37
37
|
}
|
38
38
|
Object.entries(schematicsDefaultParams).forEach(([schematicName, defaultParams]) => {
|
39
39
|
workspace.schematics ||= {};
|
40
|
-
workspace.schematics[schematicName] = overrideValue
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
40
|
+
workspace.schematics[schematicName] = overrideValue
|
41
|
+
? {
|
42
|
+
...workspace.schematics[schematicName],
|
43
|
+
...defaultParams
|
44
|
+
}
|
45
|
+
: {
|
46
|
+
...defaultParams,
|
47
|
+
...workspace.schematics[schematicName]
|
48
|
+
};
|
47
49
|
});
|
48
50
|
if (projectName && workspace.projects[projectName]) {
|
49
51
|
const project = workspace.projects[projectName];
|
50
52
|
Object.entries(schematicsDefaultParams).forEach(([schematicName, defaultParams]) => {
|
51
53
|
project.schematics ||= {};
|
52
54
|
if (project.schematics[schematicName]) {
|
53
|
-
project.schematics[schematicName] = overrideValue
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
55
|
+
project.schematics[schematicName] = overrideValue
|
56
|
+
? {
|
57
|
+
...project.schematics[schematicName],
|
58
|
+
...defaultParams
|
59
|
+
}
|
60
|
+
: {
|
61
|
+
...defaultParams,
|
62
|
+
...project.schematics[schematicName]
|
63
|
+
};
|
60
64
|
}
|
61
65
|
});
|
62
66
|
}
|
@@ -79,24 +83,28 @@ function setupSchematicsDefaultParams(schematicsDefaultParams, overrideValue = f
|
|
79
83
|
}
|
80
84
|
workspace.schematics ||= {};
|
81
85
|
Object.entries(schematicsDefaultParams).forEach(([schematicName, defaultParams]) => {
|
82
|
-
workspace.schematics[schematicName] = overrideValue
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
86
|
+
workspace.schematics[schematicName] = overrideValue
|
87
|
+
? {
|
88
|
+
...workspace.schematics[schematicName],
|
89
|
+
...defaultParams
|
90
|
+
}
|
91
|
+
: {
|
92
|
+
...defaultParams,
|
93
|
+
...workspace.schematics[schematicName]
|
94
|
+
};
|
89
95
|
});
|
90
96
|
Object.values(workspace.projects).forEach((project) => {
|
91
97
|
Object.entries(schematicsDefaultParams).forEach(([schematicName, defaultParams]) => {
|
92
98
|
if (project.schematics?.[schematicName]) {
|
93
|
-
project.schematics[schematicName] = overrideValue
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
99
|
+
project.schematics[schematicName] = overrideValue
|
100
|
+
? {
|
101
|
+
...project.schematics[schematicName],
|
102
|
+
...defaultParams
|
103
|
+
}
|
104
|
+
: {
|
105
|
+
...defaultParams,
|
106
|
+
...project.schematics[schematicName]
|
107
|
+
};
|
100
108
|
}
|
101
109
|
});
|
102
110
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"schematics-register.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/schematics-register.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"schematics-register.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/schematics-register.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/remove-packages/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/remove-packages/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,IAAI,EACL,MAAM,4BAA4B,CAAC;AAKpC;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,EAAE,eAAe,SAAkB,UAQ5E,IAAI,YAAY,gBAAgB,kEAa/C"}
|
@@ -7,18 +7,18 @@ exports.removePackages = removePackages;
|
|
7
7
|
* @param packageJsonPath The path of the package json file from which the deps will be removed
|
8
8
|
*/
|
9
9
|
function removePackages(packagesToRemove, packageJsonPath = '/package.json') {
|
10
|
+
const filterDeps = (acc = {}, [pName, pVersion]) => {
|
11
|
+
if (!packagesToRemove.includes(pName)) {
|
12
|
+
acc[pName] = pVersion;
|
13
|
+
}
|
14
|
+
return acc;
|
15
|
+
};
|
10
16
|
return (tree, _context) => {
|
11
|
-
const filterDeps = (acc = {}, [pName, pVersion]) => {
|
12
|
-
if (!packagesToRemove.includes(pName)) {
|
13
|
-
acc[pName] = pVersion;
|
14
|
-
}
|
15
|
-
return acc;
|
16
|
-
};
|
17
17
|
if (tree.exists(packageJsonPath)) {
|
18
18
|
const packageJson = JSON.parse(tree.read(packageJsonPath).toString());
|
19
|
-
packageJson.dependencies &&= Object.entries(packageJson.dependencies).reduce(filterDeps, {});
|
20
|
-
packageJson.devDependencies &&= Object.entries(packageJson.devDependencies).reduce(filterDeps, {});
|
21
|
-
packageJson.peerDependencies &&= Object.entries(packageJson.peerDependencies).reduce(filterDeps, {});
|
19
|
+
packageJson.dependencies &&= Object.entries(packageJson.dependencies).reduce((acc, dep) => filterDeps(acc, dep), {});
|
20
|
+
packageJson.devDependencies &&= Object.entries(packageJson.devDependencies).reduce((acc, dep) => filterDeps(acc, dep), {});
|
21
|
+
packageJson.peerDependencies &&= Object.entries(packageJson.peerDependencies).reduce((acc, dep) => filterDeps(acc, dep), {});
|
22
22
|
tree.overwrite(packageJsonPath, JSON.stringify(packageJson, null, 2));
|
23
23
|
}
|
24
24
|
return tree;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/remove-packages/index.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/remove-packages/index.ts"],"names":[],"mappings":";;AAaA,wCAqBC;AA1BD;;;;GAIG;AACH,SAAgB,cAAc,CAAC,gBAA0B,EAAE,eAAe,GAAG,eAAe;IAC1F,MAAM,UAAU,GAAG,CAAC,MAA0C,EAAE,EAAE,CAAC,KAAK,EAAE,QAAQ,CAA+B,EAAE,EAAE;QACnH,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,GAAG,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;QACxB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IAEF,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,MAAM,WAAW,GAAgB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEpF,WAAW,CAAC,YAAY,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YACrH,WAAW,CAAC,eAAe,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3H,WAAW,CAAC,gBAAgB,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAE7H,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"list-of-vars.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/list-of-vars.ts"],"names":[],"mappings":";;;AAYa,QAAA,qBAAqB,GAA+B;IAC/D,QAAQ;IACR,
|
1
|
+
{"version":3,"file":"list-of-vars.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/list-of-vars.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-imports-with-scope.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-imports-with-scope.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"update-imports-with-scope.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-imports-with-scope.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAEL,wBAAwB,EACzB,MAAM,gBAAgB,CAAC;AAIxB;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,SAAiB,EAAE,eAAe,GAAE,wBAAwB,EAA0B,EAAE,QAAQ,UAAQ,GAAG,IAAI,CAmB7K"}
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateSassImports = updateSassImports;
|
4
4
|
const index_1 = require("../../utility/index");
|
5
5
|
const list_of_vars_1 = require("./list-of-vars");
|
6
|
-
const imports = new RegExp(/^@import\s+['
|
6
|
+
const imports = new RegExp(/^@import\s+["']~?@(o3r|otter)\/styling.*\s*/, 'gm');
|
7
7
|
/**
|
8
8
|
* Update SASS imports to use a scoped dependency
|
9
9
|
* @param alias The name of the otter styling package
|
@@ -16,10 +16,11 @@ function updateSassImports(alias, dependencyName = '@o3r/styling', exposedElemen
|
|
16
16
|
const files = fromRoot ? (0, index_1.getFilesWithExtensionFromTree)(tree, 'scss') : (0, index_1.getFilesFromRootOfWorkspaceProjects)(tree, 'scss');
|
17
17
|
files.forEach((file) => {
|
18
18
|
let content = tree.read(file).toString();
|
19
|
+
// eslint-disable-next-line unicorn/prefer-regexp-test -- regexp with `g` flag should not use `RegExp.test` in a loop
|
19
20
|
if (content.match(imports)) {
|
20
21
|
const contentWithoutImports = content.replace(imports, '');
|
21
22
|
content = `@use '${dependencyName}' as ${alias};\n${contentWithoutImports}`;
|
22
|
-
exposedElements.forEach(elem => {
|
23
|
+
exposedElements.forEach((elem) => {
|
23
24
|
const elemRegex = new RegExp(`(?<![\\w\\d-]|o3r\\.)${elem.type === 'var' ? '\\' : ''}${elem.value}((?![\\w\\d-])(?!(\\s*\\:)))`, 'g');
|
24
25
|
content = content.replace(elemRegex, `${alias}.${(elem.replacement || elem.value)}`);
|
25
26
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-imports-with-scope.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-imports-with-scope.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"update-imports-with-scope.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-imports-with-scope.ts"],"names":[],"mappings":";;AAuBA,8CAmBC;AArCD,+CAG6B;AAC7B,iDAGwB;AAExB,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,6CAA6C,EAAE,IAAI,CAAC,CAAC;AAEhF;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,KAAa,EAAE,cAAc,GAAG,cAAc,EAAE,kBAA8C,oCAAqB,EAAE,QAAQ,GAAG,KAAK;IACrK,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,qCAA6B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,2CAAmC,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzH,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,QAAQ,EAAE,CAAC;YAC1C,qHAAqH;YACrH,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,MAAM,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC3D,OAAO,GAAG,SAAS,cAAc,QAAQ,KAAK,MAAM,qBAAqB,EAAE,CAAC;gBAC5E,eAAe,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBAC/B,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,wBAAwB,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,8BAA8B,EAAE,GAAG,CAAC,CAAC;oBACtI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACvF,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-ts-imports.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-ts-imports.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"update-ts-imports.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-ts-imports.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAGL,cAAc,EAEf,MAAM,qBAAqB,CAAC;AAI7B;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,UAAU,GAAE,cAAmB,EAAE,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EAAE,QAAQ,UAAQ,GAAG,IAAI,CA0BnI"}
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateImports = updateImports;
|
4
4
|
const ts = require("typescript");
|
5
5
|
const index_1 = require("../../utility/index");
|
6
|
+
const escapeRegExp = (str) => str.replace(/[$()*+./?[\\\]^{|}-]/g, '\\$&');
|
6
7
|
/**
|
7
8
|
* Update imports based on mapping
|
8
9
|
* @param mapImports Map of the import to replace
|
@@ -13,10 +14,9 @@ function updateImports(mapImports = {}, renamedPackages = {}, fromRoot = false)
|
|
13
14
|
return (tree, context) => {
|
14
15
|
const files = fromRoot ? (0, index_1.getFilesWithExtensionFromTree)(tree, 'ts') : (0, index_1.getSourceFilesFromWorkspaceProjects)(tree);
|
15
16
|
// exact match on import path
|
16
|
-
const
|
17
|
-
const importsRegexp = new RegExp(`^(${Object.keys(mapImports).map(escapeRegExp).join('|')})$`);
|
17
|
+
const importsRegexp = new RegExp(`^(${Object.keys(mapImports).map((str) => escapeRegExp(str)).join('|')})$`);
|
18
18
|
// match the import path starting with the package to be renamed
|
19
|
-
const renamePackagesRegexp = new RegExp(`^(${Object.keys(renamedPackages).map(escapeRegExp).join('|')})`);
|
19
|
+
const renamePackagesRegexp = new RegExp(`^(${Object.keys(renamedPackages).map((str) => escapeRegExp(str)).join('|')})`);
|
20
20
|
let nbOfUnResolvedImports = 0;
|
21
21
|
files.forEach((file) => {
|
22
22
|
const sourceFile = ts.createSourceFile(file, tree.readText(file), ts.ScriptTarget.ES2015, true);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-ts-imports.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-ts-imports.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"update-ts-imports.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-ts-imports.ts"],"names":[],"mappings":";;AAmBA,sCA0BC;AA1CD,iCAAiC;AACjC,+CAK6B;AAE7B,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;AAEnF;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,aAA6B,EAAE,EAAE,kBAA0C,EAAE,EAAE,QAAQ,GAAG,KAAK;IAC3H,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,qCAA6B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,2CAAmC,EAAC,IAAI,CAAC,CAAC;QAE/G,6BAA6B;QAC7B,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC7G,gEAAgE;QAChE,MAAM,oBAAoB,GAAG,IAAI,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxH,IAAI,qBAAqB,GAAG,CAAC,CAAC;QAE9B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,IAAI,EACJ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EACnB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;YACF,qBAAqB,IAAI,IAAA,2BAAmB,EAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,oBAAoB,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;QACnJ,CAAC,CAAC,CAAC;QAEH,IAAI,qBAAqB,GAAG,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,qBAAqB,yEAAyE,CAAC,CAAC;QACzK,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/vscode-extensions/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/vscode-extensions/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,wBAAwB,oBAAqB,MAAM,EAAE,KAAG,IAepE,CAAC"}
|
@@ -8,16 +8,16 @@ exports.addVsCodeRecommendations = void 0;
|
|
8
8
|
const addVsCodeRecommendations = (recommendations) => {
|
9
9
|
const extensionFile = '/.vscode/extensions.json';
|
10
10
|
return (tree, context) => {
|
11
|
-
if (
|
12
|
-
tree.create(extensionFile, JSON.stringify({ recommendations }, null, 2));
|
13
|
-
context.logger.debug(`Create ${extensionFile} with recommendations: ${recommendations.join(', ')}`);
|
14
|
-
}
|
15
|
-
else {
|
11
|
+
if (tree.exists(extensionFile)) {
|
16
12
|
const extensions = tree.readJson(extensionFile);
|
17
13
|
extensions.recommendations = Array.from(new Set([...(extensions.recommendations || []), ...recommendations]));
|
18
14
|
tree.overwrite(extensionFile, JSON.stringify(extensions, null, 2));
|
19
15
|
context.logger.debug(`Updated ${extensionFile} with recommendations: ${recommendations.join(', ')}`);
|
20
16
|
}
|
17
|
+
else {
|
18
|
+
tree.create(extensionFile, JSON.stringify({ recommendations }, null, 2));
|
19
|
+
context.logger.debug(`Create ${extensionFile} with recommendations: ${recommendations.join(', ')}`);
|
20
|
+
}
|
21
21
|
return tree;
|
22
22
|
};
|
23
23
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/vscode-extensions/index.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/vscode-extensions/index.ts"],"names":[],"mappings":";;;AAMA;;;GAGG;AACI,MAAM,wBAAwB,GAAG,CAAC,eAAyB,EAAQ,EAAE;IAC1E,MAAM,aAAa,GAAG,0BAA0B,CAAC;IAEjD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAkC,CAAC;YACjF,UAAU,CAAC,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,IAAI,EAAE,CAAC,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;YAC9G,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACnE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,aAAa,0BAA0B,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvG,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACzE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,aAAa,0BAA0B,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtG,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,wBAAwB,4BAenC"}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { TaskConfiguration, TaskConfigurationGenerator } from '@angular-devkit/schematics';
|
2
|
-
import { NodePackageTaskOptions } from '@angular-devkit/schematics/tasks/package-manager/options';
|
3
2
|
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
|
3
|
+
import { NodePackageTaskOptions } from '@angular-devkit/schematics/tasks/package-manager/options';
|
4
4
|
import type { WorkspaceSchema } from '../../interfaces';
|
5
5
|
/**
|
6
6
|
* Linter options
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,sBAAsB,EACvB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAEL,sBAAsB,EACvB,MAAM,0DAA0D,CAAC;AAClE,OAAO,KAAK,EACV,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAK1B;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,mCAAmC;IACnC,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,2BAA2B;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,qBAAa,aAAc,SAAQ,sBAAuB,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IAGlG,KAAK,EAAE,MAAM,EAAE;IAAS,gBAAgB,CAAC,EAAE,MAAM;IAAS,UAAU,CAAC,EAAE,MAAM;IAFzF,aAAa,EAAE,aAAa,CAAC;gBAEjB,KAAK,EAAE,MAAM,EAAE,EAAS,gBAAgB,CAAC,EAAE,MAAM,YAAA,EAAS,UAAU,CAAC,EAAE,MAAM,YAAA,EAAE,OAAO,CAAC,EAAE,aAAa;IAWzH,kBAAkB;IACX,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAqBpE"}
|
@@ -1,9 +1,9 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.EslintFixTask = void 0;
|
4
|
+
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
4
5
|
const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
|
5
6
|
const package_manager_runner_1 = require("../../utility/package-manager-runner");
|
6
|
-
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
7
7
|
class EslintFixTask extends tasks_1.NodePackageInstallTask {
|
8
8
|
constructor(files, workingDirectory, configFile, options) {
|
9
9
|
super({
|
@@ -30,7 +30,7 @@ class EslintFixTask extends tasks_1.NodePackageInstallTask {
|
|
30
30
|
'exec',
|
31
31
|
'eslint',
|
32
32
|
...this.files,
|
33
|
-
...(this.packageName
|
33
|
+
...(this.packageName === 'npm' ? ['--'] : []),
|
34
34
|
'--fix',
|
35
35
|
...(this.linterOptions?.hideWarnings ? ['--quiet'] : []),
|
36
36
|
...(this.configFile ? ['--config', this.configFile] : []),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":";;;AAIA,4DAE0C;AAC1C,sFAGkE;AAIlE,iFAE8C;AAwB9C,MAAa,aAAc,SAAQ,8BAAsB;IAGvD,YAAmB,KAAe,EAAS,gBAAyB,EAAS,UAAmB,EAAE,OAAuB;QACvH,KAAK,CAAC;YACJ,cAAc,EAAE,IAAA,0CAAiB,EAAC,OAAO,CAAC;SAC3C,CAAC,CAAC;QAHc,UAAK,GAAL,KAAK,CAAU;QAAS,qBAAgB,GAAhB,gBAAgB,CAAS;QAAS,eAAU,GAAV,UAAU,CAAS;QAI9F,IAAI,CAAC,aAAa,GAAG;YACnB,eAAe,EAAE,IAAI;YACrB,YAAY,EAAE,IAAI;YAClB,GAAG,OAAO;SACX,CAAC;IACJ,CAAC;IAED,kBAAkB;IACX,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,KAAK;gBACZ,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,WAAW,EAAE;oBACX,MAAM;oBACN,QAAQ;oBACR,GAAG,IAAI,CAAC,KAAK;oBACb,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC7C,OAAO;oBACP,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxD,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACzD,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC9D,CAAC,IAAI,CAAC,GAAG,CAAC;gBACX,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SACF,CAAC;IACJ,CAAC;CACF;AApCD,sCAoCC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/link/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/link/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,sBAAsB,EACvB,MAAM,0DAA0D,CAAC;AAKlE,qBAAa,mBAAoB,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IAGzE,WAAW,CAAC,EAAE,MAAM;IAAS,gBAAgB,CAAC,EAAE,MAAM;IAFlE,KAAK,UAAQ;gBAED,WAAW,CAAC,EAAE,MAAM,YAAA,EAAS,gBAAgB,CAAC,EAAE,MAAM,YAAA;IAElE,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAYpE"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/link/index.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/link/index.ts"],"names":[],"mappings":";;;AAIA,sFAGkE;AAClE,iFAE8C;AAE9C,MAAa,mBAAmB;IAG9B,YAAmB,WAAoB,EAAS,gBAAyB;QAAtD,gBAAW,GAAX,WAAW,CAAS;QAAS,qBAAgB,GAAhB,gBAAgB,CAAS;QAFlE,UAAK,GAAG,IAAI,CAAC;IAEwD,CAAC;IAEtE,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,WAAW,EAAE,QAAQ,IAAI,CAAC,WAAY,EAAE;gBACxC,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SAC2C,CAAC;IACjD,CAAC;CACF;AAjBD,kDAiBC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,yBAAyB;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,kBAAkB;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,gEAAgE;IAChE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B;;OAEG;IACH,cAAc,CAAC,EAAE,kBAAkB,CAAC;IAEpC,2GAA2G;IAC3G,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAEpC;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,WAAW;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,sBAAsB;IACtB,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,EAAE,CAAC;IACrC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gCAAgC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gDAAgD;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mBAAmB;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,wCAAwC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,oBAAoB;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"npm-exec.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-exec.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"npm-exec.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,sBAAsB,EACvB,MAAM,0DAA0D,CAAC;AAKlE;;;GAGG;AACH,qBAAa,WAAY,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IACxE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAiB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAAxF,MAAM,EAAE,MAAM,EAAmB,IAAI,GAAE,MAAM,EAAO,EAAmB,gBAAgB,CAAC,EAAE,MAAM,YAAA;IAEtH,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAYpE"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"npm-exec.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-exec.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"npm-exec.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-exec.ts"],"names":[],"mappings":";;;AAIA,sFAGkE;AAClE,iFAE8C;AAE9C;;;GAGG;AACH,MAAa,WAAW;IACtB,YAA6B,MAAc,EAAmB,OAAiB,EAAE,EAAmB,gBAAyB;QAAhG,WAAM,GAAN,MAAM,CAAQ;QAAmB,SAAI,GAAJ,IAAI,CAAe;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAS;IAAG,CAAC;IAE1H,eAAe;QACpB,MAAM,cAAc,GAAG,IAAA,0CAAiB,GAAE,CAAC;QAC3C,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM;gBACf,WAAW,EAAE,QAAQ,IAAI,CAAC,MAAM,IAAI,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAC1H,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,cAAc;aACf;SACF,CAAC;IACJ,CAAC;CACF;AAfD,kCAeC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"npm-install.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"npm-install.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACvB,MAAM,kCAAkC,CAAC;AAQ1C,OAAO,KAAK,EACV,6BAA6B,EAC9B,MAAM,cAAc,CAAC;AAEtB;;GAEG;AACH,qBAAa,UAAW,SAAQ,sBAAsB;IAC7C,KAAK,UAAS;IACd,KAAK,UAAS;gBAET,OAAO,CAAC,EAAE,6BAA6B;IASnD,kBAAkB;IACX,eAAe;;;;;;;;;;;;;CAavB"}
|
@@ -2,8 +2,8 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.NpmInstall = void 0;
|
4
4
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
5
|
-
const index_1 = require("../../utility/index");
|
6
5
|
const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
|
6
|
+
const index_1 = require("../../utility/index");
|
7
7
|
/**
|
8
8
|
* Run NPM Install
|
9
9
|
*/
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"npm-install.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"npm-install.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":";;;AAAA,4DAE0C;AAC1C,sFAEkE;AAClE,+CAG6B;AAK7B;;GAEG;AACH,MAAa,UAAW,SAAQ,8BAAsB;IAIpD,YAAY,OAAuC;QACjD,KAAK,CAAC,OAAc,CAAC,CAAC;QAJjB,UAAK,GAAG,KAAK,CAAC;QACd,UAAK,GAAG,KAAK,CAAC;QAInB,IAAI,CAAC,cAAc,GAAG,IAAA,yBAAiB,EAAC;YACtC,eAAe,EAAE,OAAO,EAAE,IAAI,IAAI,IAAA,0BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC;YAClE,kBAAkB,EAAE,OAAO,EAAE,WAAW;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC;IAChC,CAAC;IAED,kBAAkB;IACX,eAAe;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;QACvC,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,GAAG,MAAM,CAAC,OAAO;gBACjB,OAAO,EAAE,SAAS;gBAClB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,cAAc,EAAE,GAAG,IAAI,CAAC,cAAe,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE;aAC1G;SACF,CAAC;IACJ,CAAC;CACF;AA3BD,gCA2BC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"npm-run.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-run.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"npm-run.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-run.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,sBAAsB,EACvB,MAAM,0DAA0D,CAAC;AAKlE;;;GAGG;AACH,qBAAa,UAAW,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAAlD,MAAM,EAAE,MAAM,EAAmB,gBAAgB,CAAC,EAAE,MAAM,YAAA;IAEhF,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAWpE"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"npm-run.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-run.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"npm-run.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-run.ts"],"names":[],"mappings":";;;AAIA,sFAGkE;AAClE,iFAE8C;AAE9C;;;GAGG;AACH,MAAa,UAAU;IACrB,YAA6B,MAAc,EAAmB,gBAAyB;QAA1D,WAAM,GAAN,MAAM,CAAQ;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAS;IAAG,CAAC;IAEpF,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,KAAK;gBACd,WAAW,EAAE,OAAO,IAAI,CAAC,MAAM,EAAE;gBACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SACF,CAAC;IACJ,CAAC;CACF;AAdD,gCAcC"}
|
package/src/utility/ast.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/utility/ast.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/utility/ast.ts"],"names":[],"mappings":"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"}
|