@o3r/workspace 11.1.0-prerelease.3 → 11.1.0-prerelease.30
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 +14 -13
- package/schematics/ng-add/helpers/npm-workspace.d.ts +10 -0
- package/schematics/ng-add/helpers/npm-workspace.d.ts.map +1 -1
- package/schematics/ng-add/helpers/npm-workspace.js +39 -1
- package/schematics/ng-add/helpers/npm-workspace.js.map +1 -1
- package/schematics/ng-add/project-setup.d.ts.map +1 -1
- package/schematics/ng-add/project-setup.js +2 -1
- package/schematics/ng-add/project-setup.js.map +1 -1
- package/schematics/ng-add/schema.d.ts +4 -1
- package/schematics/ng-add/schema.d.ts.map +1 -1
- package/schematics/ng-add/schema.json +9 -0
- package/schematics/sdk/rules/update-ts-paths.rule.js +1 -1
- package/schematics/sdk/rules/update-ts-paths.rule.js.map +1 -1
- package/src/cli/set-version.cjs +1 -1
- package/src/cli/set-version.cjs.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "11.1.0-prerelease.
|
|
3
|
+
"version": "11.1.0-prerelease.30",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@o3r/schematics": "^11.1.0-prerelease.
|
|
41
|
+
"@o3r/schematics": "^11.1.0-prerelease.30",
|
|
42
42
|
"commander": "^12.0.0",
|
|
43
43
|
"globby": "^11.1.0",
|
|
44
44
|
"semver": "^7.5.2",
|
|
@@ -69,11 +69,11 @@
|
|
|
69
69
|
"@nx/eslint-plugin": "~19.3.0",
|
|
70
70
|
"@nx/jest": "~19.3.0",
|
|
71
71
|
"@nx/js": "~19.3.0",
|
|
72
|
-
"@o3r/build-helpers": "^11.1.0-prerelease.
|
|
73
|
-
"@o3r/core": "^11.1.0-prerelease.
|
|
74
|
-
"@o3r/eslint-plugin": "^11.1.0-prerelease.
|
|
75
|
-
"@o3r/schematics": "^11.1.0-prerelease.
|
|
76
|
-
"@o3r/test-helpers": "^11.1.0-prerelease.
|
|
72
|
+
"@o3r/build-helpers": "^11.1.0-prerelease.30",
|
|
73
|
+
"@o3r/core": "^11.1.0-prerelease.30",
|
|
74
|
+
"@o3r/eslint-plugin": "^11.1.0-prerelease.30",
|
|
75
|
+
"@o3r/schematics": "^11.1.0-prerelease.30",
|
|
76
|
+
"@o3r/test-helpers": "^11.1.0-prerelease.30",
|
|
77
77
|
"@schematics/angular": "~18.0.0",
|
|
78
78
|
"@stylistic/eslint-plugin-ts": "^2.0.0",
|
|
79
79
|
"@types/jest": "~29.5.2",
|
|
@@ -82,14 +82,14 @@
|
|
|
82
82
|
"@types/pid-from-port": "^1.1.0",
|
|
83
83
|
"@types/semver": "^7.3.13",
|
|
84
84
|
"@types/uuid": "^9.0.0",
|
|
85
|
-
"@typescript-eslint/eslint-plugin": "^7.
|
|
86
|
-
"@typescript-eslint/parser": "^7.
|
|
87
|
-
"@typescript-eslint/utils": "
|
|
85
|
+
"@typescript-eslint/eslint-plugin": "^7.14.1",
|
|
86
|
+
"@typescript-eslint/parser": "^7.14.1",
|
|
87
|
+
"@typescript-eslint/utils": "^7.14.1",
|
|
88
88
|
"cpy-cli": "^5.0.0",
|
|
89
89
|
"eslint": "^8.57.0",
|
|
90
90
|
"eslint-import-resolver-node": "^0.3.9",
|
|
91
91
|
"eslint-plugin-jest": "~28.6.0",
|
|
92
|
-
"eslint-plugin-jsdoc": "~48.
|
|
92
|
+
"eslint-plugin-jsdoc": "~48.7.0",
|
|
93
93
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
94
94
|
"eslint-plugin-unicorn": "^54.0.0",
|
|
95
95
|
"jest": "~29.7.0",
|
|
@@ -100,7 +100,7 @@
|
|
|
100
100
|
"nx": "~19.3.0",
|
|
101
101
|
"pid-from-port": "^1.1.3",
|
|
102
102
|
"rxjs": "^7.8.1",
|
|
103
|
-
"ts-jest": "~29.
|
|
103
|
+
"ts-jest": "~29.2.0",
|
|
104
104
|
"ts-node": "~10.9.2",
|
|
105
105
|
"type-fest": "^4.10.2",
|
|
106
106
|
"typescript": "~5.4.2",
|
|
@@ -110,7 +110,8 @@
|
|
|
110
110
|
"@angular/material": "~18.0.0",
|
|
111
111
|
"@ngrx/router-store": "~18.0.0",
|
|
112
112
|
"@ngrx/effects": "~18.0.0",
|
|
113
|
-
"@ngrx/store-devtools": "~18.0.0"
|
|
113
|
+
"@ngrx/store-devtools": "~18.0.0",
|
|
114
|
+
"lerna": "^8.1.7"
|
|
114
115
|
},
|
|
115
116
|
"engines": {
|
|
116
117
|
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
|
|
2
|
+
import type { PackageJson } from 'type-fest';
|
|
2
3
|
import { WorkspaceLayout } from '@o3r/schematics';
|
|
4
|
+
import type { MonorepoManager } from '../schema';
|
|
3
5
|
/**
|
|
4
6
|
* Update root package.json to include workspaces
|
|
5
7
|
* if ng context Update angular.json to include the workspaces definitions into schematics default params
|
|
@@ -13,4 +15,12 @@ export declare function addWorkspacesToProject(directories?: WorkspaceLayout): R
|
|
|
13
15
|
* @param _context
|
|
14
16
|
*/
|
|
15
17
|
export declare function filterPackageJsonScripts(tree: Tree, _context: SchematicContext): import("@angular-devkit/schematics/src/tree/interface").Tree;
|
|
18
|
+
/**
|
|
19
|
+
* Add a monorepo manager at the root of the project
|
|
20
|
+
* @param o3rWorkspacePackageJson the @o3r/workspace package.json
|
|
21
|
+
* @param manager the monorepo manager
|
|
22
|
+
*/
|
|
23
|
+
export declare function addMonorepoManager(o3rWorkspacePackageJson: PackageJson & {
|
|
24
|
+
generatorDependencies: Record<string, string>;
|
|
25
|
+
}, manager: MonorepoManager): Rule;
|
|
16
26
|
//# sourceMappingURL=npm-workspace.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-workspace.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"npm-workspace.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAE/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAyF,eAAe,EAAuB,MAAM,iBAAiB,CAAC;AAC9J,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEjD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,GAAE,eAAsC,GAAG,IAAI,CAqChG;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,gEAoB9E;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,uBAAuB,EAAE,WAAW,GAAG;IAAE,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAAE,OAAO,EAAE,eAAe,GAAG,IAAI,CAiC3J"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.filterPackageJsonScripts = exports.addWorkspacesToProject = void 0;
|
|
3
|
+
exports.addMonorepoManager = exports.filterPackageJsonScripts = exports.addWorkspacesToProject = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const schematics_2 = require("@angular-devkit/schematics");
|
|
6
6
|
const schematics_3 = require("@o3r/schematics");
|
|
@@ -17,6 +17,7 @@ function addWorkspacesToProject(directories = schematics_3.DEFAULT_ROOT_FOLDERS)
|
|
|
17
17
|
throw new schematics_2.SchematicsException('Root package.json does not exist');
|
|
18
18
|
}
|
|
19
19
|
const rootPackageJsonObject = tree.readJson(rootPackageJsonPath);
|
|
20
|
+
rootPackageJsonObject.version = '0.0.0-placeholder';
|
|
20
21
|
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
21
22
|
rootPackageJsonObject.workspaces = [...new Set(Object.values(directories).map(d => `${d}/*`).concat(rootPackageJsonObject.workspaces || []))];
|
|
22
23
|
tree.overwrite(rootPackageJsonPath, JSON.stringify(rootPackageJsonObject, null, 2));
|
|
@@ -62,4 +63,41 @@ function filterPackageJsonScripts(tree, _context) {
|
|
|
62
63
|
return tree;
|
|
63
64
|
}
|
|
64
65
|
exports.filterPackageJsonScripts = filterPackageJsonScripts;
|
|
66
|
+
/**
|
|
67
|
+
* Add a monorepo manager at the root of the project
|
|
68
|
+
* @param o3rWorkspacePackageJson the @o3r/workspace package.json
|
|
69
|
+
* @param manager the monorepo manager
|
|
70
|
+
*/
|
|
71
|
+
function addMonorepoManager(o3rWorkspacePackageJson, manager) {
|
|
72
|
+
return (tree, _context) => {
|
|
73
|
+
if (manager === 'lerna') {
|
|
74
|
+
const rootPackageJsonPath = '/package.json';
|
|
75
|
+
if (!tree.exists(rootPackageJsonPath)) {
|
|
76
|
+
throw new schematics_2.SchematicsException('Root package.json does not exist');
|
|
77
|
+
}
|
|
78
|
+
const rootPackageJsonObject = tree.readJson(rootPackageJsonPath);
|
|
79
|
+
rootPackageJsonObject.devDependencies = {
|
|
80
|
+
...rootPackageJsonObject.devDependencies,
|
|
81
|
+
'lerna': o3rWorkspacePackageJson.generatorDependencies.lerna
|
|
82
|
+
};
|
|
83
|
+
rootPackageJsonObject.scripts = {
|
|
84
|
+
...rootPackageJsonObject.scripts,
|
|
85
|
+
'build': 'lerna run build',
|
|
86
|
+
'test': 'lerna run test',
|
|
87
|
+
'lint': 'lerna run lint'
|
|
88
|
+
};
|
|
89
|
+
const lernaJson = {
|
|
90
|
+
'$schema': 'https://github.com/lerna/lerna/blob/main/packages/lerna/schemas/lerna-schema.json',
|
|
91
|
+
'version': rootPackageJsonObject.version || '0.0.0-placeholder'
|
|
92
|
+
};
|
|
93
|
+
if ((0, schematics_3.getPackageManager)() === 'yarn') {
|
|
94
|
+
lernaJson.npmClient = 'yarn';
|
|
95
|
+
}
|
|
96
|
+
tree.create('/lerna.json', JSON.stringify(lernaJson, null, 2));
|
|
97
|
+
tree.overwrite(rootPackageJsonPath, JSON.stringify(rootPackageJsonObject, null, 2));
|
|
98
|
+
}
|
|
99
|
+
return tree;
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
exports.addMonorepoManager = addMonorepoManager;
|
|
65
103
|
//# sourceMappingURL=npm-workspace.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-workspace.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":";;;AAAA,2DAAmD;AAEnD,2DAAiE;AAEjE,
|
|
1
|
+
{"version":3,"file":"npm-workspace.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAc/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAc/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAKtD;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,IAyD/D,CAAC"}
|
|
@@ -63,7 +63,8 @@ const prepareProject = (options) => {
|
|
|
63
63
|
ngAddToRun: internalPackagesToInstallWithNgAdd
|
|
64
64
|
}),
|
|
65
65
|
!options.skipLinter && installOtterLinter ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)(),
|
|
66
|
-
(0, npm_workspace_1.addWorkspacesToProject)()
|
|
66
|
+
(0, npm_workspace_1.addWorkspacesToProject)(),
|
|
67
|
+
(0, npm_workspace_1.addMonorepoManager)(ownPackageJsonContent, options.monorepoManager)
|
|
67
68
|
])(tree, context);
|
|
68
69
|
};
|
|
69
70
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":";;;AAAA,2DAA+D;AAC/D,gDAMyB;AAEzB,2EAA8E;AAC9E,8BAA8B;AAC9B,kCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { SchematicOptionObject } from '@o3r/schematics';
|
|
2
|
-
|
|
2
|
+
/** Monorepo manager to use */
|
|
3
|
+
export type MonorepoManager = 'lerna' | 'none';
|
|
3
4
|
export interface NgAddSchematicsSchema extends SchematicOptionObject {
|
|
4
5
|
/** Skip the linter process */
|
|
5
6
|
skipLinter: boolean;
|
|
@@ -14,5 +15,7 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
|
|
|
14
15
|
skipGit: boolean;
|
|
15
16
|
/** Use a pinned version for otter packages */
|
|
16
17
|
exactO3rVersion?: boolean;
|
|
18
|
+
/** Monorepo manager to use */
|
|
19
|
+
monorepoManager: MonorepoManager;
|
|
17
20
|
}
|
|
18
21
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,8BAA8B;AAC9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,EAAE,OAAO,CAAC;IAErB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,8BAA8B;IAC9B,eAAe,EAAE,eAAe,CAAC;CAClC"}
|
|
@@ -50,6 +50,15 @@
|
|
|
50
50
|
"type": "boolean",
|
|
51
51
|
"description": "Use a pinned version for otter packages",
|
|
52
52
|
"default": false
|
|
53
|
+
},
|
|
54
|
+
"monorepoManager": {
|
|
55
|
+
"description": "Which monorepo manager to use",
|
|
56
|
+
"type": "string",
|
|
57
|
+
"default": "lerna",
|
|
58
|
+
"enum": [
|
|
59
|
+
"lerna",
|
|
60
|
+
"none"
|
|
61
|
+
]
|
|
53
62
|
}
|
|
54
63
|
},
|
|
55
64
|
"additionalProperties": true,
|
|
@@ -25,8 +25,8 @@ function updateTsConfig(targetPath, projectName, scope) {
|
|
|
25
25
|
context.logger.warn('No tsconfig found, the path mapping will not be updated');
|
|
26
26
|
return tree;
|
|
27
27
|
}
|
|
28
|
-
configWithPath.content.baseUrl ||= '.';
|
|
29
28
|
configWithPath.content.compilerOptions ||= {};
|
|
29
|
+
configWithPath.content.compilerOptions.baseUrl ||= '.';
|
|
30
30
|
configWithPath.content.compilerOptions.paths ||= {};
|
|
31
31
|
configWithPath.content.compilerOptions.paths[`${scope ? `@${scope}/` : ''}${projectName}`] = [
|
|
32
32
|
`${relativeTargetPath}/dist`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC;;;;;;GAMG;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,
|
|
1
|
+
{"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC;;;;;;GAMG;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,kBAAkB,OAAO;YAC5B,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,kBAAkB,SAAS;YAC9B,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;AAtCD,wCAsCC"}
|
package/src/cli/set-version.cjs
CHANGED
|
@@ -7,7 +7,7 @@ const fs = require("node:fs");
|
|
|
7
7
|
const path = require("node:path");
|
|
8
8
|
const winston = require("winston");
|
|
9
9
|
const semver_1 = require("semver");
|
|
10
|
-
const defaultIncludedFiles = ['**/package.json', '!/**/templates/**/package.json', '!**/node_modules/**/package.json'];
|
|
10
|
+
const defaultIncludedFiles = ['**/package.json', '!/**/templates/**/package.json', '!**/node_modules/**/package.json', '**/lerna.json'];
|
|
11
11
|
const collect = (pattern, patterns) => {
|
|
12
12
|
if (patterns === defaultIncludedFiles && pattern) {
|
|
13
13
|
patterns = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-version.cjs","sourceRoot":"","sources":["../../../src/cli/set-version.cts"],"names":[],"mappings":";;;AAEA,yCAAoC;AACpC,mCAA4C;AAC5C,8BAA8B;AAC9B,kCAAkC;AAClC,mCAAmC;AACnC,mCAA+B;AAE/B,MAAM,oBAAoB,GAAG,CAAC,iBAAiB,EAAE,gCAAgC,EAAE,kCAAkC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"set-version.cjs","sourceRoot":"","sources":["../../../src/cli/set-version.cts"],"names":[],"mappings":"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"}
|