@o3r/workspace 11.6.14 → 11.6.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +10 -10
- package/schematics/application/templates/package.json.template +13 -13
- package/schematics/ng-add/project-setup.d.ts.map +1 -1
- package/schematics/ng-add/project-setup.js +27 -3
- package/schematics/ng-add/project-setup.js.map +1 -1
- package/schematics/sdk/index.d.ts.map +1 -1
- package/schematics/sdk/index.js +49 -23
- package/schematics/sdk/index.js.map +1 -1
- package/schematics/sdk/rules/clean-standalone.rule.d.ts.map +1 -1
- package/schematics/sdk/rules/clean-standalone.rule.js +2 -1
- package/schematics/sdk/rules/clean-standalone.rule.js.map +1 -1
- package/schematics/sdk/rules/update-ts-paths.rule.d.ts.map +1 -1
- package/schematics/sdk/rules/update-ts-paths.rule.js +3 -2
- package/schematics/sdk/rules/update-ts-paths.rule.js.map +1 -1
- package/schematics/sdk/templates/testing/setup-jest.ts.template +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "11.6.
|
|
3
|
+
"version": "11.6.15",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
"@angular/common": "^18.2.0",
|
|
31
31
|
"@angular/compiler-cli": "^18.2.0",
|
|
32
32
|
"@angular/core": "^18.2.0",
|
|
33
|
-
"@o3r/telemetry": "^11.6.
|
|
33
|
+
"@o3r/telemetry": "^11.6.15",
|
|
34
34
|
"@schematics/angular": "^18.2.0",
|
|
35
|
-
"type-fest": "^4.
|
|
35
|
+
"type-fest": "^4.30.1",
|
|
36
36
|
"typescript": "^5.5.4"
|
|
37
37
|
},
|
|
38
38
|
"peerDependenciesMeta": {
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
}
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@o3r/schematics": "^11.6.
|
|
50
|
+
"@o3r/schematics": "^11.6.15",
|
|
51
51
|
"commander": "^12.0.0",
|
|
52
52
|
"globby": "^11.1.0",
|
|
53
53
|
"semver": "^7.5.2",
|
|
@@ -80,11 +80,11 @@
|
|
|
80
80
|
"@nx/jest": "~19.8.0",
|
|
81
81
|
"@nx/js": "~19.8.0",
|
|
82
82
|
"@nx/workspace": "~19.8.0",
|
|
83
|
-
"@o3r/build-helpers": "^11.6.
|
|
84
|
-
"@o3r/core": "^11.6.
|
|
85
|
-
"@o3r/eslint-plugin": "^11.6.
|
|
86
|
-
"@o3r/schematics": "^11.6.
|
|
87
|
-
"@o3r/test-helpers": "^11.6.
|
|
83
|
+
"@o3r/build-helpers": "^11.6.15",
|
|
84
|
+
"@o3r/core": "^11.6.15",
|
|
85
|
+
"@o3r/eslint-plugin": "^11.6.15",
|
|
86
|
+
"@o3r/schematics": "^11.6.15",
|
|
87
|
+
"@o3r/test-helpers": "^11.6.15",
|
|
88
88
|
"@schematics/angular": "~18.2.0",
|
|
89
89
|
"@stylistic/eslint-plugin": "~2.7.0",
|
|
90
90
|
"@types/jest": "~29.5.2",
|
|
@@ -118,7 +118,7 @@
|
|
|
118
118
|
"rxjs": "^7.8.1",
|
|
119
119
|
"ts-jest": "~29.2.0",
|
|
120
120
|
"ts-node": "~10.9.2",
|
|
121
|
-
"type-fest": "^4.
|
|
121
|
+
"type-fest": "^4.30.1",
|
|
122
122
|
"typescript": "~5.5.4",
|
|
123
123
|
"typescript-eslint": "~8.19.0",
|
|
124
124
|
"zone.js": "~0.14.2"
|
|
@@ -9,21 +9,21 @@
|
|
|
9
9
|
},
|
|
10
10
|
"private": true,
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@angular/animations": "<%=
|
|
13
|
-
"@angular/common": "<%=
|
|
14
|
-
"@angular/compiler": "<%=
|
|
15
|
-
"@angular/core": "<%=
|
|
16
|
-
"@angular/forms": "<%=
|
|
17
|
-
"@angular/platform-browser": "<%=
|
|
18
|
-
"@angular/platform-browser-dynamic": "<%=
|
|
19
|
-
"@angular/router": "<%=
|
|
20
|
-
"rxjs": "<%=
|
|
21
|
-
"tslib": "<%=
|
|
22
|
-
"zone.js": "<%=
|
|
12
|
+
"@angular/animations": "<%= rootDependencies['@angular/animations'] || rootDependencies['@angular/core'] || 'latest' %>",
|
|
13
|
+
"@angular/common": "<%= rootDependencies['@angular/common'] || rootDependencies['@angular/core'] || 'latest' %>",
|
|
14
|
+
"@angular/compiler": "<%= rootDependencies['@angular/compiler'] || rootDependencies['@angular/core'] || 'latest' %>",
|
|
15
|
+
"@angular/core": "<%= rootDependencies['@angular/core'] || 'latest' %>",
|
|
16
|
+
"@angular/forms": "<%= rootDependencies['@angular/forms'] || rootDependencies['@angular/core'] || 'latest' %>",
|
|
17
|
+
"@angular/platform-browser": "<%= rootDependencies['@angular/platform-browser'] || rootDependencies['@angular/core'] || 'latest' %>",
|
|
18
|
+
"@angular/platform-browser-dynamic": "<%= rootDependencies['@angular/platform-browser-dynamic'] || rootDependencies['@angular/core'] || 'latest' %>",
|
|
19
|
+
"@angular/router": "<%= rootDependencies['@angular/router'] || rootDependencies['@angular/core'] || 'latest' %>",
|
|
20
|
+
"rxjs": "<%= rootDependencies['rxjs'] || 'latest' %>",
|
|
21
|
+
"tslib": "<%= rootDependencies['tslib'] || 'latest' %>",
|
|
22
|
+
"zone.js": "<%= rootDependencies['zone.js'] || 'latest' %>"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@angular/cli": "<%=
|
|
26
|
-
"@angular/compiler-cli": "<%=
|
|
25
|
+
"@angular/cli": "<%= rootDependencies['@angular/cli'] || 'latest' %>",
|
|
26
|
+
"@angular/compiler-cli": "<%= rootDependencies['@angular/compiler-cli'] || rootDependencies['@angular/cli'] || 'latest' %>",
|
|
27
27
|
"typescript": "<%= enforceTildeRange(rootDependencies['typescript'] || 'latest') %>"
|
|
28
28
|
}
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAiCpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAclB;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,IAkF/D,CAAC"}
|
|
@@ -10,6 +10,16 @@ const linter_1 = require("../rule-factories/linter");
|
|
|
10
10
|
const gitignore_update_1 = require("./helpers/gitignore-update");
|
|
11
11
|
const npm_workspace_1 = require("./helpers/npm-workspace");
|
|
12
12
|
const renovate_1 = require("./helpers/renovate");
|
|
13
|
+
/**
|
|
14
|
+
* List of external dependencies to be added to the project as peer dependencies
|
|
15
|
+
* Enforce tilde range for all dependencies except Angular ones
|
|
16
|
+
*/
|
|
17
|
+
const dependenciesToInstall = [];
|
|
18
|
+
/**
|
|
19
|
+
* List of external dependencies to be added to the project as dev dependencies
|
|
20
|
+
* Enforce tilde range for all dependencies except Angular ones
|
|
21
|
+
*/
|
|
22
|
+
const devDependenciesToInstall = [];
|
|
13
23
|
/**
|
|
14
24
|
* Enable all the otter features requested by the user
|
|
15
25
|
* Install all the related dependencies and import the features inside the application
|
|
@@ -21,10 +31,13 @@ const prepareProject = (options) => {
|
|
|
21
31
|
'EditorConfig.EditorConfig',
|
|
22
32
|
'angular.ng-template'
|
|
23
33
|
];
|
|
24
|
-
const
|
|
34
|
+
const otterDependencies = [
|
|
25
35
|
'@ama-sdk/core',
|
|
26
36
|
'@ama-sdk/schematics'
|
|
27
37
|
];
|
|
38
|
+
if (!options.skipPreCommitChecks) {
|
|
39
|
+
devDependenciesToInstall.push('husky', 'lint-staged', 'editorconfig-checker', '@commitlint/cli', '@commitlint/config-angular', '@commitlint/config-conventional', '@commitlint/types');
|
|
40
|
+
}
|
|
28
41
|
const ownSchematicsFolder = path.resolve(__dirname, '..');
|
|
29
42
|
const ownPackageJsonPath = path.resolve(ownSchematicsFolder, '..', 'package.json');
|
|
30
43
|
const depsInfo = (0, schematics_2.getO3rPeerDeps)(ownPackageJsonPath);
|
|
@@ -38,7 +51,7 @@ const prepareProject = (options) => {
|
|
|
38
51
|
...(installOtterLinter ? [`@o3r/eslint-config${(0, linter_1.isUsingFlatConfig)(tree) ? '' : '-otter'}`] : []),
|
|
39
52
|
...depsInfo.o3rPeerDeps
|
|
40
53
|
]));
|
|
41
|
-
const dependencies = [...internalPackagesToInstallWithNgAdd, ...
|
|
54
|
+
const dependencies = [...internalPackagesToInstallWithNgAdd, ...otterDependencies].reduce((acc, dep) => {
|
|
42
55
|
acc[dep] = {
|
|
43
56
|
inManifest: [{
|
|
44
57
|
range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
|
|
@@ -52,13 +65,24 @@ const prepareProject = (options) => {
|
|
|
52
65
|
vsCodeExtensions.push('dbaeumer.vscode-eslint');
|
|
53
66
|
}
|
|
54
67
|
const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
|
|
68
|
+
const projectPackageJson = tree.readJson('package.json');
|
|
69
|
+
const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
|
|
70
|
+
devDependenciesToInstall,
|
|
71
|
+
dependenciesToInstall,
|
|
72
|
+
projectType: undefined,
|
|
73
|
+
o3rPackageJsonPath: ownPackageJsonPath,
|
|
74
|
+
projectPackageJson
|
|
75
|
+
}, context.logger, (name) => name === 'husky' && !options.skipPreCommitChecks);
|
|
55
76
|
return () => (0, schematics_1.chain)([
|
|
56
77
|
(0, renovate_1.generateRenovateConfig)(__dirname),
|
|
57
78
|
(0, schematics_2.addVsCodeRecommendations)(vsCodeExtensions),
|
|
58
79
|
(0, gitignore_update_1.updateGitIgnore)(workspaceConfig),
|
|
59
80
|
npm_workspace_1.filterPackageJsonScripts,
|
|
60
81
|
(0, schematics_2.setupDependencies)({
|
|
61
|
-
dependencies
|
|
82
|
+
dependencies: {
|
|
83
|
+
...dependencies,
|
|
84
|
+
...externalDependenciesInfo
|
|
85
|
+
},
|
|
62
86
|
skipInstall: options.skipInstall,
|
|
63
87
|
ngAddToRun: internalPackagesToInstallWithNgAdd
|
|
64
88
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAIoC;AACpC,
|
|
1
|
+
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAoCpC,OAAO,EACL,mBAAmB,EACpB,MAAM,UAAU,CAAC;AA8GlB;;;GAGG;AACH,eAAO,MAAM,WAAW,wCAAgG,CAAC"}
|
package/schematics/sdk/index.js
CHANGED
|
@@ -6,6 +6,7 @@ const path = require("node:path");
|
|
|
6
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
7
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
8
8
|
const schematics_2 = require("@o3r/schematics");
|
|
9
|
+
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
9
10
|
const clean_standalone_rule_1 = require("./rules/clean-standalone.rule");
|
|
10
11
|
const rules_ng_1 = require("./rules/rules.ng");
|
|
11
12
|
const rules_nx_1 = require("./rules/rules.nx");
|
|
@@ -19,6 +20,25 @@ function generateSdkFn(options) {
|
|
|
19
20
|
const scope = schematics_1.strings.dasherize(splitName.length > 1 ? splitName[0].replace(/^@/, '') : options.name);
|
|
20
21
|
const projectName = splitName?.length === 2 ? schematics_1.strings.dasherize(splitName[1]) : 'sdk';
|
|
21
22
|
const cleanName = schematics_1.strings.dasherize(options.name).replace(/^@/, '').replaceAll(/\//g, '-');
|
|
23
|
+
const ownPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf8' }));
|
|
24
|
+
const o3rDevPackageToInstall = [];
|
|
25
|
+
if ((0, schematics_2.isPackageInstalled)('@o3r/eslint-config')) {
|
|
26
|
+
o3rDevPackageToInstall.push('@o3r/eslint-config');
|
|
27
|
+
}
|
|
28
|
+
const dependencies = {
|
|
29
|
+
...o3rDevPackageToInstall.reduce((acc, dep) => {
|
|
30
|
+
acc[dep] = {
|
|
31
|
+
inManifest: [
|
|
32
|
+
{
|
|
33
|
+
range: `${options.exactO3rVersion ? '' : '~'}${ownPackageJsonContent.version}`,
|
|
34
|
+
types: [dependencies_1.NodeDependencyType.Dev]
|
|
35
|
+
}
|
|
36
|
+
],
|
|
37
|
+
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
38
|
+
};
|
|
39
|
+
return acc;
|
|
40
|
+
}, {})
|
|
41
|
+
};
|
|
22
42
|
return (tree, context) => {
|
|
23
43
|
const isNx = (0, schematics_2.isNxContext)(tree);
|
|
24
44
|
const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
|
|
@@ -46,6 +66,28 @@ function generateSdkFn(options) {
|
|
|
46
66
|
}
|
|
47
67
|
}
|
|
48
68
|
const specPath = options.specPackageName ? `openapi${specExtension}` : options.specPath;
|
|
69
|
+
const specUpgradeTask = [];
|
|
70
|
+
const sdkGenerationTasks = [];
|
|
71
|
+
if (specPath) {
|
|
72
|
+
const installTask = context.addTask(new tasks_1.NodePackageInstallTask());
|
|
73
|
+
if (options.specPackageName) {
|
|
74
|
+
specUpgradeTask.push(context.addTask(new schematics_2.NpmExecTask('amasdk-update-spec-from-npm', [
|
|
75
|
+
options.specPackageName,
|
|
76
|
+
...options.specPackagePath ? ['--package-path', options.specPackagePath] : [],
|
|
77
|
+
'--output', path.join(process.cwd(), targetPath, `openapi${specExtension}`)
|
|
78
|
+
], targetPath), [installTask]));
|
|
79
|
+
}
|
|
80
|
+
const generationTask = context.addTask(new tasks_1.RunSchematicTask('@ama-sdk/schematics', 'typescript-core', {
|
|
81
|
+
...options,
|
|
82
|
+
specPath,
|
|
83
|
+
directory: targetPath,
|
|
84
|
+
packageManager
|
|
85
|
+
}), [
|
|
86
|
+
installTask,
|
|
87
|
+
...specUpgradeTask
|
|
88
|
+
]);
|
|
89
|
+
sdkGenerationTasks.push(installTask, ...specUpgradeTask, generationTask);
|
|
90
|
+
}
|
|
49
91
|
return (0, schematics_1.chain)([
|
|
50
92
|
(0, schematics_1.externalSchematic)('@ama-sdk/schematics', 'typescript-shell', {
|
|
51
93
|
...options,
|
|
@@ -59,29 +101,13 @@ function generateSdkFn(options) {
|
|
|
59
101
|
(0, update_ts_paths_rule_1.updateTsConfig)(targetPath, projectName, scope),
|
|
60
102
|
(0, clean_standalone_rule_1.cleanStandaloneFiles)(targetPath),
|
|
61
103
|
addModuleSpecificFiles(),
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
...options.specPackagePath ? ['--package-path', options.specPackagePath] : [],
|
|
70
|
-
'--output', path.join(process.cwd(), targetPath, `openapi${specExtension}`)
|
|
71
|
-
], targetPath), [installTask])
|
|
72
|
-
]
|
|
73
|
-
: [];
|
|
74
|
-
c.addTask(new tasks_1.RunSchematicTask('@ama-sdk/schematics', 'typescript-core', {
|
|
75
|
-
...options,
|
|
76
|
-
specPath,
|
|
77
|
-
directory: targetPath,
|
|
78
|
-
packageManager
|
|
79
|
-
}), [
|
|
80
|
-
installTask,
|
|
81
|
-
...specUpgradeTask
|
|
82
|
-
]);
|
|
83
|
-
}
|
|
84
|
-
: schematics_1.noop
|
|
104
|
+
(0, schematics_2.setupDependencies)({
|
|
105
|
+
dependencies,
|
|
106
|
+
skipInstall: options.skipInstall,
|
|
107
|
+
ngAddToRun: Object.keys(dependencies),
|
|
108
|
+
projectName: cleanName,
|
|
109
|
+
runAfterTasks: sdkGenerationTasks
|
|
110
|
+
})
|
|
85
111
|
])(tree, context);
|
|
86
112
|
};
|
|
87
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean-standalone.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAepC;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"clean-standalone.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAepC;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CA4B7D"}
|
|
@@ -30,9 +30,10 @@ function cleanStandaloneFiles(targetPath) {
|
|
|
30
30
|
(tree) => {
|
|
31
31
|
const packageJson = tree.readJson(node_path_1.posix.join(targetPath, 'package.json'));
|
|
32
32
|
if (packageJson.scripts) {
|
|
33
|
-
const excludedScripts = ['postinstall', 'set:version'];
|
|
33
|
+
const excludedScripts = ['postinstall', 'set:version', 'tools:changelog'];
|
|
34
34
|
packageJson.scripts = Object.fromEntries(Object.entries(packageJson.scripts).filter(([scriptName]) => !excludedScripts.includes(scriptName)));
|
|
35
35
|
}
|
|
36
|
+
delete packageJson['lint-staged'];
|
|
36
37
|
if (packageJson.devDependencies) {
|
|
37
38
|
packageJson.devDependencies = Object.fromEntries(Object.entries(packageJson.devDependencies).filter(([depName]) => depName !== '@o3r/workspace'));
|
|
38
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean-standalone.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"clean-standalone.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":";;AAyBA,oDA4BC;AArDD,yCAEmB;AACnB,2DAGoC;AAKpC,MAAM,cAAc,GAAG,CAAC,KAAe,EAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IAClE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAI,2BAA2B,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,UAAkB;IACrD,OAAO,IAAA,kBAAK,EAAC;QACX,cAAc,CACZ;YACE,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC;YAC1C,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC;YAClD,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC;YACvC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC;YACzC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC;YAC5C,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC;SAC1C,CACF;QACD,CAAC,IAAI,EAAE,EAAE;YACP,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAgB,CAAC;YACzF,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBACxB,MAAM,eAAe,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;gBAC1E,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CACtC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CACpG,CAAC;YACJ,CAAC;YACD,OAAO,WAAW,CAAC,aAAa,CAAC,CAAC;YAClC,IAAI,WAAW,CAAC,eAAe,EAAE,CAAC;gBAChC,WAAW,CAAC,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,gBAAgB,CAAC,CAAC,CAAC;YACpJ,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC7F,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ts-paths.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update-ts-paths.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAGpC;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAsC3F"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateTsConfig = updateTsConfig;
|
|
4
|
+
const node_path_1 = require("node:path");
|
|
4
5
|
const ts = require("typescript");
|
|
5
6
|
/**
|
|
6
7
|
* Update workspace Tsconfig
|
|
@@ -28,14 +29,14 @@ function updateTsConfig(targetPath, projectName, scope) {
|
|
|
28
29
|
configWithPath.content.compilerOptions.baseUrl ||= '.';
|
|
29
30
|
configWithPath.content.compilerOptions.paths ||= {};
|
|
30
31
|
configWithPath.content.compilerOptions.paths[`${scope ? `@${scope}/` : ''}${projectName}`] = [
|
|
31
|
-
`${relativeTargetPath}/dist
|
|
32
|
+
...((0, node_path_1.basename)(configWithPath.tsconfig) === 'tsconfig.build.json' ? [`${relativeTargetPath}/dist`] : []),
|
|
32
33
|
`${relativeTargetPath}/src/index`
|
|
33
34
|
];
|
|
34
35
|
configWithPath.content.compilerOptions.paths[`${scope ? `@${scope}/` : ''}${projectName}/fixtures`] = [
|
|
35
36
|
`${relativeTargetPath}/src/fixtures/jest`
|
|
36
37
|
];
|
|
37
38
|
configWithPath.content.compilerOptions.paths[`${scope ? `@${scope}/` : ''}${projectName}/*`] = [
|
|
38
|
-
`${relativeTargetPath}/dist
|
|
39
|
+
...((0, node_path_1.basename)(configWithPath.tsconfig) === 'tsconfig.build.json' ? [`${relativeTargetPath}/dist/*`] : []),
|
|
39
40
|
`${relativeTargetPath}/src/*`
|
|
40
41
|
];
|
|
41
42
|
tree.overwrite(configWithPath.tsconfig, JSON.stringify(configWithPath.content, null, 2));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;AAcA,wCAsCC;AApDD,yCAEmB;AAInB,iCAAiC;AAEjC;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,UAAkB,EAAE,WAAmB,EAAE,KAAa;IACnF,MAAM,SAAS,GAAG,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,eAAe,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEzD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,OAAO,GAAG,SAAS;aACtB,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aAC3C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAClB,QAAQ;YACR,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;SAChF,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAEtC,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QAExG,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAC/E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,cAAc,CAAC,OAAO,CAAC,eAAe,KAAK,EAAE,CAAC;QAC9C,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,KAAK,GAAG,CAAC;QACvD,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,KAAK,EAAE,CAAC;QACpD,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC,GAAG;YAC3F,GAAG,CAAC,IAAA,oBAAQ,EAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,qBAAqB,CAAC,CAAC,CAAC,CAAC,GAAG,kBAAkB,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACtG,GAAG,kBAAkB,YAAY;SAClC,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,WAAW,CAAC,GAAG;YACpG,GAAG,kBAAkB,oBAAoB;SAC1C,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,IAAI,CAAC,GAAG;YAC7F,GAAG,CAAC,IAAA,oBAAQ,EAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,qBAAqB,CAAC,CAAC,CAAC,CAAC,GAAG,kBAAkB,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACxG,GAAG,kBAAkB,QAAQ;SAC9B,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACzF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
|
|
File without changes
|