@rxap/plugin-library 19.2.0-dev.5 → 19.2.0-dev.7
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/CHANGELOG.md +16 -0
- package/package.json +6 -6
- package/src/executors/update-package-group/executor.js +16 -6
- package/src/executors/update-package-group/executor.js.map +1 -1
- package/src/executors/update-package-group/schema.d.ts +1 -0
- package/src/executors/update-package-group/schema.json +5 -0
- package/src/generators/fix-dependencies/generator.js +9 -0
- package/src/generators/fix-dependencies/generator.js.map +1 -1
- package/src/generators/init-plugin/update-package-json.js +1 -1
- package/src/generators/init-plugin/update-package-json.js.map +1 -1
- package/src/generators/init-plugin/update-project-targets.js +0 -13
- package/src/generators/init-plugin/update-project-targets.js.map +1 -1
- package/src/generators/init-publishable/init-project.js +8 -0
- package/src/generators/init-publishable/init-project.js.map +1 -1
- package/src/generators/init-publishable/update-project-targets.js +6 -7
- package/src/generators/init-publishable/update-project-targets.js.map +1 -1
- package/src/generators/init-schematic/update-package-json.js +1 -1
- package/src/generators/init-schematic/update-package-json.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,22 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [19.2.0-dev.7](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.6...@rxap/plugin-library@19.2.0-dev.7) (2024-06-17)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- ensure all new publishable libraries are added to the rxap project ([ee25608](https://gitlab.com/rxap/packages/commit/ee25608ffbd869a187739ac31b31a216308e5e91))
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
- add include dependencies option ([c5fcf7c](https://gitlab.com/rxap/packages/commit/c5fcf7cf8ed4d3f72c6e45496b9cd849208fa5ba))
|
|
15
|
+
|
|
16
|
+
# [19.2.0-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.5...@rxap/plugin-library@19.2.0-dev.6) (2024-06-17)
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
- ensure the package version is only updated if required ([b1a9cd3](https://gitlab.com/rxap/packages/commit/b1a9cd33ba603401361dacc100ef6ff14317a6f1))
|
|
21
|
+
|
|
6
22
|
# [19.2.0-dev.5](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.4...@rxap/plugin-library@19.2.0-dev.5) (2024-06-17)
|
|
7
23
|
|
|
8
24
|
### Bug Fixes
|
package/package.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "19.2.0-dev.
|
|
2
|
+
"version": "19.2.0-dev.7",
|
|
3
3
|
"name": "@rxap/plugin-library",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@apidevtools/json-schema-ref-parser": "9.0.9",
|
|
7
7
|
"@nx/devkit": "19.1.1",
|
|
8
8
|
"@nx/plugin": "19.1.1",
|
|
9
|
-
"@rxap/generator-ts-morph": "^1.0.8-dev.
|
|
9
|
+
"@rxap/generator-ts-morph": "^1.0.8-dev.2",
|
|
10
10
|
"@rxap/node-utilities": "^1.2.3-dev.0",
|
|
11
|
-
"@rxap/plugin-utilities": "^19.0.3-dev.
|
|
12
|
-
"@rxap/ts-morph": "^1.4.0-dev.
|
|
11
|
+
"@rxap/plugin-utilities": "^19.0.3-dev.3",
|
|
12
|
+
"@rxap/ts-morph": "^1.4.0-dev.3",
|
|
13
13
|
"@rxap/utilities": "^16.2.3-dev.0",
|
|
14
|
-
"@rxap/workspace-utilities": "^19.2.0-dev.
|
|
14
|
+
"@rxap/workspace-utilities": "^19.2.0-dev.7",
|
|
15
15
|
"colors": "1.4.0",
|
|
16
16
|
"handlebars": "4.7.8",
|
|
17
17
|
"nx": "19.1.1",
|
|
@@ -48,6 +48,6 @@
|
|
|
48
48
|
},
|
|
49
49
|
"schematics": "./generators.json",
|
|
50
50
|
"type": "commonjs",
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "001599809ab7285b851fbed29df7f4f3eb6c5a19",
|
|
52
52
|
"main": "./src/index.js"
|
|
53
53
|
}
|
|
@@ -16,6 +16,12 @@ function convertToPackageGroup(input, packageGroupRegex) {
|
|
|
16
16
|
version: normalizePackageVersion(version),
|
|
17
17
|
}));
|
|
18
18
|
}
|
|
19
|
+
function getPackageGroupFromDependencies(context, packageGroupRegex) {
|
|
20
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
const directPackageDependencies = yield (0, plugin_utilities_1.GetAllPackageDependenciesForProjectWihRetry)(context);
|
|
22
|
+
return convertToPackageGroup(directPackageDependencies, packageGroupRegex);
|
|
23
|
+
});
|
|
24
|
+
}
|
|
19
25
|
function loadPackageJsonForPackage(packageName) {
|
|
20
26
|
try {
|
|
21
27
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
@@ -82,13 +88,17 @@ function getPackageGroupFromRootDependencies(context, include) {
|
|
|
82
88
|
const includes = Object.assign(Object.assign({}, includeDependencies), includePeerDependencies);
|
|
83
89
|
return convertToPackageGroup(includes, [/.*/]);
|
|
84
90
|
}
|
|
85
|
-
function getPackageGroup(
|
|
86
|
-
return tslib_1.__awaiter(this,
|
|
87
|
-
|
|
91
|
+
function getPackageGroup(context, packageGroupRegex, include, includeDependnecies) {
|
|
92
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
93
|
+
let packageGroupArray = mergePackageGroup(
|
|
88
94
|
// load package defined as peer dependencies
|
|
89
95
|
yield getPackageGroupFromPeerDependencies(context, packageGroupRegex),
|
|
90
96
|
// load package defined by the include option from the root package.json
|
|
91
97
|
getPackageGroupFromRootDependencies(context, include));
|
|
98
|
+
if (includeDependnecies) {
|
|
99
|
+
packageGroupArray = mergePackageGroup(packageGroupArray, yield getPackageGroupFromDependencies(context, packageGroupRegex));
|
|
100
|
+
}
|
|
101
|
+
return packageGroupArray;
|
|
92
102
|
});
|
|
93
103
|
}
|
|
94
104
|
function mergePackageGroup(original, updated) {
|
|
@@ -99,7 +109,7 @@ function mergePackageGroup(original, updated) {
|
|
|
99
109
|
}
|
|
100
110
|
function runExecutor(options, context) {
|
|
101
111
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
102
|
-
var _a, _b;
|
|
112
|
+
var _a, _b, _c, _d;
|
|
103
113
|
console.log('Executor ran for update-package-group', options);
|
|
104
114
|
const packageJson = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context);
|
|
105
115
|
// ensure the property "ng-migrations" exists
|
|
@@ -116,8 +126,8 @@ function runExecutor(options, context) {
|
|
|
116
126
|
const packageGroupRegex = options.packageGroupRegex.map(regex => new RegExp(regex));
|
|
117
127
|
console.log(`Update package group for project ${context.projectName} with the following package group regex:`, packageGroupRegex.map(regex => regex.toString()));
|
|
118
128
|
yield (0, plugin_utilities_1.LoadProjectToPackageMappingWithRetry)(context);
|
|
119
|
-
let packageGroup = yield getPackageGroup(context, packageGroupRegex, options.include);
|
|
120
|
-
(
|
|
129
|
+
let packageGroup = yield getPackageGroup(context, packageGroupRegex, (_b = options.include) !== null && _b !== void 0 ? _b : [], (_c = options.includeDependencies) !== null && _c !== void 0 ? _c : false);
|
|
130
|
+
(_d = nxMigrations.packageGroup) !== null && _d !== void 0 ? _d : (nxMigrations.packageGroup = []);
|
|
121
131
|
if (options.merge) {
|
|
122
132
|
console.log('Merge the package group');
|
|
123
133
|
packageGroup = mergePackageGroup(nxMigrations.packageGroup, packageGroup);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,11 @@
|
|
|
29
29
|
"type": "string"
|
|
30
30
|
},
|
|
31
31
|
"description": "List of package names that should be added to the package group"
|
|
32
|
+
},
|
|
33
|
+
"includeDependencies": {
|
|
34
|
+
"type": "boolean",
|
|
35
|
+
"default": false,
|
|
36
|
+
"description": "If true, the dependencies of the included packages will be added to the package group"
|
|
32
37
|
}
|
|
33
38
|
},
|
|
34
39
|
"required": []
|
|
@@ -144,6 +144,7 @@ const PACKAGE_ADD_BLACK_LIST = [
|
|
|
144
144
|
'axios',
|
|
145
145
|
];
|
|
146
146
|
const PACKAGE_PEER_DEPENDENCIES_BLACK_LIST = ['tslib'];
|
|
147
|
+
const PACKAGE_FORCED_PEER_DEPENDENCIES = ['rxjs', /@angular\//, /@nestjs\//, /@storybook\//, /@types\//];
|
|
147
148
|
function addDependedProjects(projectGraph, tree, packageName, projectRoot, dependencies) {
|
|
148
149
|
const projectName = (0, workspace_utilities_1.PackageNameToProjectName)(packageName);
|
|
149
150
|
const dependedProjectList = resolveProjectDependencies(projectGraph, projectName);
|
|
@@ -503,6 +504,14 @@ function fixDependenciesGenerator(tree, options) {
|
|
|
503
504
|
for (const [packageName, version] of Object.entries(packageJson.dependencies)) {
|
|
504
505
|
packageJson.dependencies[packageName] = (_h = (_f = (_e = rootPackageJson.dependencies) === null || _e === void 0 ? void 0 : _e[packageName]) !== null && _f !== void 0 ? _f : (_g = rootPackageJson.devDependencies) === null || _g === void 0 ? void 0 : _g[packageName]) !== null && _h !== void 0 ? _h : version;
|
|
505
506
|
}
|
|
507
|
+
for (const forcedPeerDependency of PACKAGE_FORCED_PEER_DEPENDENCIES) {
|
|
508
|
+
for (const [packageName, version] of Object.entries(packageJson.dependencies)) {
|
|
509
|
+
if (forcedPeerDependency instanceof RegExp ? forcedPeerDependency.test(packageName) : forcedPeerDependency === packageName) {
|
|
510
|
+
packageJson.peerDependencies[packageName] = version;
|
|
511
|
+
delete packageJson.dependencies[packageName];
|
|
512
|
+
}
|
|
513
|
+
}
|
|
514
|
+
}
|
|
506
515
|
console.log(`==================== Report for project ${projectName}`);
|
|
507
516
|
console.log('========== Peer dependencies:');
|
|
508
517
|
printReport(peerReport);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/fix-dependencies/generator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/fix-dependencies/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AACpB,iEAAkD;AAClD,yDAA+D;AAE/D,6CAA+C;AAC/C,mEAYmC;AACnC,+BAA4B;AAI5B,SAAS,0BAA0B,CACjC,YAA0B,EAC1B,OAAe,EACf,WAAqB,EAAE;IAEvB,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,mBAAmB,GAAG,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/D,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE,CAAC;QAC7C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1C,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACrC,YAAY,CAAC,IAAI,CAAC,GAAG,0BAA0B,CAC7C,YAAY,EACZ,UAAU,CAAC,MAAM,EACjB,CAAE,GAAG,QAAQ,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAE,CAC5C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,6BAA6B,CAAC,OAAgB;IACrD,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,OAAO,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC5C,UAAU,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YAC7D,MAAM,eAAe,GAAG,iBAAiB,CAAC,uBAAuB,EAAE,CAAC;YAEpE,IAAI,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpC,OAAO;YACT,CAAC;YAED,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,eAAe,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAC1G,IAAI,WAAmB,CAAC;YACxB,IAAI,KAAK,EAAE,CAAC;gBACV,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,WAAW,GAAG,eAAe,CAAC;YAChC,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBACvC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC9B,OAAO,CAAC,GAAG,CAAC,eAAgB,WAAY,qBAAsB,UAAU,CAAC,WAAW,EAAG,EAAE,CAAC,CAAC;YAC7F,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW;SACf,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC;SAC/D,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC;QACtG,aAAa,KAAK,WAAW,CAAC,CAAC;QAC/B,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,uBAAuB,GAAG;IAC9B,mBAAmB;IACnB,UAAU;IACV,cAAc;IACd,aAAa;IACb,eAAe;IACf,QAAQ;CACT,CAAC;AAEF,MAAM,eAAe,GAAG,CAAE,SAAS,EAAE,YAAY,CAAE,CAAC;AAEpD,MAAM,yBAAyB,GAAG,CAAE,OAAO,CAAE,CAAC;AAC9C,MAAM,sBAAsB,GAAG;IAC7B,WAAW;IACX,IAAI;IACJ,MAAM;IACN,eAAe;IACf,IAAI;IACJ,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,MAAM;IACN,OAAO;IACP,MAAM;IACN,KAAK;IACL,aAAa;IACb,UAAU;IACV,gBAAgB;IAChB,OAAO;IACP,YAAY;IACZ,gBAAgB;IAChB,IAAI;IACJ,IAAI;IACJ,aAAa;IACb,WAAW;IACX,cAAc;IACd,SAAS;IACT,QAAQ;IACR,WAAW;IACX,IAAI;IACJ,QAAQ;IACR,UAAU;IACV,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,SAAS;IACT,OAAO;IACP,aAAa;IACb,YAAY;IACZ,UAAU;IACV,MAAM;IACN,gBAAgB;IAChB,cAAc;IACd,cAAc;IACd,KAAK;IACL,gBAAgB;IAChB,eAAe;IACf,QAAQ;IACR,aAAa;IACb,QAAQ;IACR,eAAe;IACf,SAAS;IACT,QAAQ;IACR,cAAc;IACd,QAAQ;IACR,QAAQ;IACR,IAAI;IACJ,MAAM;IACN,OAAO;IACP,OAAO;IACP,KAAK;IACL,IAAI;IACJ,MAAM;IACN,aAAa;IACb,QAAQ;IACR,QAAQ;IACR,KAAK;IACL,KAAK;IACL,KAAK;IACL,MAAM;IACN,IAAI;IACJ,IAAI;IACJ,MAAM;IACN,MAAM;IACN,UAAU;IACV,SAAS;IACT,OAAO;CACR,CAAC;AAEF,MAAM,oCAAoC,GAAG,CAAE,OAAO,CAAE,CAAC;AAEzD,MAAM,gCAAgC,GAA2B,CAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,CAAE,CAAC;AAEnI,SAAS,mBAAmB,CAC1B,YAA0B,EAC1B,IAAU,EACV,WAAmB,EACnB,WAAmB,EACnB,YAAoC;IAEpC,MAAM,WAAW,GAAG,IAAA,8CAAwB,EAAC,WAAW,CAAC,CAAC;IAC1D,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAClF,KAAK,MAAM,eAAe,IAAI,mBAAmB,EAAE,CAAC;QAClD,MAAM,mBAAmB,GAAG,IAAA,8CAAwB,EAAC,eAAe,CAAC,CAAC;QACtE,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACvC,YAAY,CAAC,mBAAmB,CAAC,GAAG,sBAAsB,CAAC,IAAI,EAAE,mBAAmB,EAAE,WAAW,CAAC,CAAC;QACrG,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,qCAAqC,CAC5C,YAA0B,EAC1B,IAAU,EACV,WAAmB,EACnB,WAA+B;;IAG/B,MAAM,OAAO,GAAG,IAAA,wBAAa,GAAE,CAAC;IAEhC,IAAA,2BAAM,EACJ,IAAI,EACJ,WAAW,EACX,OAAO,EACP,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;QAChD,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;QACxB,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/F,CAAC,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAC/D,CAAC;IAEF,MAAM,WAAW,GAAa,6BAA6B,CAAC,OAAO,CAAC,CAAC;IAErE,MAAM,gBAAgB,GAAa,EAAE,CAAC;IACtC,MAAM,kBAAkB,GAAa,EAAE,CAAC;IACxC,MAAM,kBAAkB,GAAa,EAAE,CAAC;IACxC,MAAM,kBAAkB,GAAa,EAAE,CAAC;IAExC,MAAA,WAAW,CAAC,gBAAgB,oCAA5B,WAAW,CAAC,gBAAgB,GAAK,EAAE,EAAC;IACpC,MAAA,WAAW,CAAC,YAAY,oCAAxB,WAAW,CAAC,YAAY,GAAK,EAAE,EAAC;IAEhC,MAAM,EACJ,YAAY,EACZ,gBAAgB,GACjB,GAAG,WAAW,CAAC;IAEhB,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACxD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3F,kBAAkB,CAAC,IAAI,CAAC,GAAI,WAAY,IAAK,gBAAgB,CAAC,WAAW,CAAE,wBAAwB,CAAC,CAAC;YACrG,OAAO,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IACD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACpD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3F,kBAAkB,CAAC,IAAI,CAAC,GAAI,WAAY,IAAK,YAAY,CAAC,WAAW,CAAE,oBAAoB,CAAC,CAAC;YAC7F,OAAO,YAAY,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,KAAK,MAAM,WAAW,IAAI,WAAW,EAAE,CAAC;QACtC,IAAI,IAAA,+CAAyB,EAAC,WAAW,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,gBAAgB,CAAC,WAAW,CAAC,GAAG,MAAA,gBAAgB,CAAC,WAAW,CAAC,mCAAI,GAAG,CAAC;YACvE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,MAAM,OAAO,GAAG,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;gBACvE,IAAI,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;oBAClC,IAAI,gBAAgB,CAAC,WAAW,CAAC,KAAK,OAAO,EAAE,CAAC;wBAC9C,kBAAkB,CAAC,IAAI,CAAC,GAAI,WAAY,IAAK,gBAAgB,CAAC,WAAW,CAAE,OAAQ,OAAQ,EAAE,CAAC,CAAC;wBAC/F,gBAAgB,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;oBAC1C,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,gBAAgB,CAAC,IAAI,CAAC,GAAI,WAAY,IAAK,OAAQ,EAAE,CAAC,CAAC;oBACvD,gBAAgB,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;gBAC1C,CAAC;gBACD,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;oBACzB,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACvC,CAAC;gBACD,gBAAgB,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,gBAAgB;QAChB,kBAAkB;QAClB,kBAAkB;QAClB,kBAAkB;KACnB,CAAC;AAEJ,CAAC;AAED,SAAS,oCAAoC,CAC3C,YAA0B,EAC1B,IAAU,EACV,WAAmB,EACnB,WAA+B;;IAG/B,MAAM,OAAO,GAAG,IAAA,wBAAa,GAAE,CAAC;IAEhC,IAAA,2BAAM,EACJ,IAAI,EACJ,WAAW,EACX,OAAO,EACP,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;QAChD,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;QACxB,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/F,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAC9D,CAAC;IAEF,MAAM,WAAW,GAAa,6BAA6B,CAAC,OAAO,CAAC,CAAC;IAErE,MAAA,WAAW,CAAC,eAAe,oCAA3B,WAAW,CAAC,eAAe,GAAK,EAAE,EAAC;IAEnC,MAAM,EACJ,YAAY,EACZ,gBAAgB,EAChB,eAAe,GAChB,GAAG,WAAW,CAAC;IAEhB,MAAM,gBAAgB,GAAa,EAAE,CAAC;IACtC,MAAM,kBAAkB,GAAa,EAAE,CAAC;IACxC,MAAM,kBAAkB,GAAa,EAAE,CAAC;IACxC,MAAM,kBAAkB,GAAa,EAAE,CAAC;IAExC,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;QACvD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC;YACpC,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,WAAW,CAAC,CAAA;YAChC,CAAC,yBAAyB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACnD,kBAAkB,CAAC,IAAI,CAAC,GAAI,WAAY,IAAK,eAAe,CAAC,WAAW,CAAE,uBAAuB,CAAC,CAAC;YACnG,OAAO,eAAe,CAAC,WAAW,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,KAAK,MAAM,WAAW,IAAI,WAAW,EAAE,CAAC;QACtC,IAAI,IAAA,+CAAyB,EAAC,WAAW,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,WAAW,CAAC,CAAA,IAAI,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,WAAW,CAAC,CAAA,EAAE,CAAC;gBACrE,eAAe,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC;YACrC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,WAAW,CAAC,CAAA,IAAI,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,WAAW,CAAC,CAAA,EAAE,CAAC;gBACrE,MAAM,OAAO,GAAG,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;gBACvE,IAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,WAAW,CAAC,EAAE,CAAC;oBACnC,IAAI,eAAe,CAAC,WAAW,CAAC,KAAK,OAAO,EAAE,CAAC;wBAC7C,kBAAkB,CAAC,IAAI,CAAC,GAAI,WAAY,IAAK,eAAe,CAAC,WAAW,CAAE,OAAQ,OAAQ,EAAE,CAAC,CAAC;wBAC9F,eAAe,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;oBACzC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,gBAAgB,CAAC,IAAI,CAAC,GAAI,WAAY,IAAK,OAAQ,EAAE,CAAC,CAAC;oBACvD,eAAe,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;gBACzC,CAAC;gBACD,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;oBACzB,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACvC,CAAC;gBACD,eAAe,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;YACzC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,gBAAgB;QAChB,kBAAkB;QAClB,kBAAkB;QAClB,kBAAkB;KACnB,CAAC;AAEJ,CAAC;AAED,MAAM,mBAAmB,GAA2C,EAAE,CAAC;AAEvE,SAAe,aAAa;iEAA8B,IAAU,EAAE,IAAY,EAAE,OAAO,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI;QAC3G,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,kCAAmC,IAAK,YAAY,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,SAA4B,CAAC;QACjC,GAAG,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACnD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC7B,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,SAAS,GAAG,CAAC,CAAC;gBACd,UAAU,EAAE,CAAC;gBACb,IAAI,UAAU,GAAG,OAAO,EAAE,CAAC;oBACzB,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC;gBACxE,CAAC;YACH,CAAC;QACH,CAAC,QAAQ,UAAU,GAAG,OAAO,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,6BAA8B,IAAK,KAAM,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAQ,EAAE,CAAC,CAAC;IAClF,CAAC;CAAA;AAED,SAAe,2BAA2B,CAAC,IAAU,EAAE,WAAmB;;QACxE,mBAAmB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;QAEtC,SAAS,SAAS,CAAC,YAAgD;YACjE,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC,EAAE,CAAC;gBAC1E,IAAI,OAAO,KAAK,GAAG,IAAI,CAAC,IAAA,+CAAyB,EAAC,WAAW,CAAC,EAAE,CAAC;oBAC/D,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,CAAC;wBACtC,mBAAmB,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;oBAC1D,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,SAAS,wBAAwB,CAAC,UAAkC;YAClE,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAClE,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC5B,UAAU,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACtD,CAAC;gBACD,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC1B,UAAU,CAAC,WAAW,CAAC,GAAG,IAAK,OAAQ,EAAE,CAAC;gBAC5C,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,gBAAgB,GAAG,GAAG,GAAG,WAAW,CAAC;QACzC,IAAI,oBAAoB,GAAG,EAAE,CAAC;QAC9B,GAAG,CAAC;YACF,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;gBACxD,MAAM,WAAW,GAAuB,MAAM,aAAa,CAAC,IAAI,EAAE,IAAA,WAAI,EAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC,CAAC;gBAC1G,SAAS,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBACpC,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;gBACxC,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;gBACvC,SAAS,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;YAC9C,CAAC;YACD,oBAAoB,GAAG,gBAAgB,CAAC;YACxC,gBAAgB,GAAG,IAAA,WAAI,EAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAClD,CAAC,QAAQ,gBAAgB,KAAK,oBAAoB,EAAE;QAEpD,wBAAwB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC;IAC7D,CAAC;CAAA;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,WAAmB,EAAE,WAAmB;IAClF,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,mGAAmG,CAAC,CAAC;IACvH,CAAC;IACD,IAAI,mBAAmB,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;QAClD,OAAO,mBAAmB,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,WAAW,CAClB,EACE,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,GAMnB;IAED,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,mBAAoB,gBAAgB,CAAC,MAAO,EAAE,CAAC,CAAC;QAC5D,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,kBAAkB,CAAC,MAAM,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,qBAAsB,kBAAkB,CAAC,MAAO,EAAE,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,kBAAkB,CAAC,MAAM,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,qBAAsB,kBAAkB,CAAC,MAAO,EAAE,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,kBAAkB,CAAC,MAAM,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,qBAAsB,kBAAkB,CAAC,MAAO,EAAE,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAA2B,EAAE,OAA6B,EAAE,WAAmB;IAC9G,IAAI,IAAA,+CAAyB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,4BAA4B,GAA2B,EAAE,CAAC;AAEhE,SAAsB,2BAA2B,CAAC,WAAmB;;QACnE,IAAI,4BAA4B,CAAC,WAAW,CAAC,EAAE,CAAC;YAC9C,OAAO,4BAA4B,CAAC,WAAW,CAAC,CAAC;QACnD,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,IAAA,wCAAuB,EAAC,WAAW,CAAC,CAAC;QACjE,IAAI,aAAa,EAAE,CAAC;YAClB,4BAA4B,CAAC,WAAW,CAAC,GAAG,aAAa,CAAC;QAC5D,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CAAA;AATD,kEASC;AAED,SAAsB,qCAAqC,CAAC,IAAU,EAAE,WAAmB;;QACzF,OAAO,CAAC,GAAG,CAAC,8CAA+C,WAAY,EAAE,CAAC,CAAC;QAC3E,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,MAAM,aAAa,CAAqB,IAAI,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QACrG,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;QAC9C,MAAM,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;QACtD,MAAM,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC;QACpD,MAAM,oBAAoB,GAAG,WAAW,CAAC,oBAAoB,CAAC;QAE9D,SAAe,2BAA2B,CAAC,YAAgD;;gBACzF,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC,EAAE,CAAC;oBAC1E,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;wBACzB,MAAM,eAAe,GAAG,MAAM,2BAA2B,CAAC,WAAW,CAAC,CAAC;wBACvE,IAAI,eAAe,KAAK,QAAQ,IAAI,eAAe,EAAE,CAAC;4BACpD,YAAa,CAAC,WAAW,CAAC,GAAG,eAAe,CAAC;4BAC7C,OAAO,CAAC,GAAG,CAAC,6BAA8B,WAAY,SAAU,eAAgB,EAAE,CAAC,CAAC;wBACtF,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;SAAA;QAED,MAAM,2BAA2B,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;QACpD,MAAM,2BAA2B,CAAC,eAAe,CAAC,CAAC;QACnD,MAAM,2BAA2B,CAAC,oBAAoB,CAAC,CAAC;QAExD,IAAA,gCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC;IACzG,CAAC;CAAA;AA3BD,sFA2BC;AAED,SAAgB,6BAA6B,CAAC,WAAmB,EAAE,YAAoC;IACrG,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,WAAW,CAAC,EAAE,CAAC;QAChC,OAAO,YAAY,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;AACH,CAAC;AAJD,sEAIC;AAED,SAAgB,mCAAmC,CAAC,WAAmB,EAAE,EACvE,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,oBAAoB,GACD;IACnB,MAAM,WAAW,GAAG,IAAA,8CAAwB,EAAC,WAAW,CAAC,CAAC;IAC1D,6BAA6B,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACzD,6BAA6B,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAC7D,6BAA6B,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAC5D,6BAA6B,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;AACnE,CAAC;AAXD,kFAWC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAsB,wBAAwB,CAC5C,IAAU,EACV,OAAuC;;QAGvC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,gEAAgE;YAChE,OAAO,CAAC,KAAK,GAAG,GAAG,EAAE;YACrB,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACtC,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;gBACnE,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;gBACjC,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;oBACrD,SAAS;gBACX,CAAC;gBACD,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,GAAI,WAAY,eAAe,CAAC,CAAC;gBAC/E,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;oBACrB,WAAW,CAAC,YAAY,GAAG,EAAE,CAAC;gBAChC,CAAC;gBACD,WAAW,CAAC,gBAAgB,GAAG,EAAE,CAAC;gBAClC,WAAW,CAAC,eAAe,GAAG,EAAE,CAAC;gBACjC,WAAW,CAAC,oBAAoB,GAAG,EAAE,CAAC;gBACtC,IAAA,gCAAU,EAAC,IAAI,EAAE,GAAI,WAAY,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC;YACvG,CAAC;QACH,CAAC;QAED,MAAM,eAAe,GAAG,IAAA,wCAAkB,EAAC,IAAI,CAAC,CAAC;QAEjD,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;QACrD,IAAA,iDAA2B,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAEhD,MAAM,iBAAiB,GAA6B,EAAE,CAAC;QACvD,MAAM,kBAAkB,GAAG,MAAM,2BAA2B,CAAC,OAAO,CAAC,CAAC;QAEtE,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAEnE,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;YACjC,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;gBACrD,SAAS;YACX,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,gCAAiC,WAAY,EAAE,CAAC,CAAC;YAE7D,MAAM,2BAA2B,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAErD,IAAA,uCAAiB,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE;;gBAEpC,MAAA,WAAW,CAAC,YAAY,oCAAxB,WAAW,CAAC,YAAY,GAAK,EAAE,EAAC;gBAChC,MAAA,WAAW,CAAC,gBAAgB,oCAA5B,WAAW,CAAC,gBAAgB,GAAK,EAAE,EAAC;gBACpC,MAAA,WAAW,CAAC,eAAe,oCAA3B,WAAW,CAAC,eAAe,GAAK,EAAE,EAAC;gBACnC,MAAA,WAAW,CAAC,oBAAoB,oCAAhC,WAAW,CAAC,oBAAoB,GAAK,EAAE,EAAC;gBAExC,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC9D,IAAI,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;wBACvC,OAAO,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;oBACxC,CAAC;gBACH,CAAC;gBAED,IAAI,kBAAkB,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC7D,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC;gBACzD,CAAC;gBAED,MAAM,UAAU,GAAG,qCAAqC,CAAC,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;gBAEvG,mCAAmC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBAE9D,KAAK,MAAM,MAAM,IAAI,oCAAoC,EAAE,CAAC;oBAC1D,IAAI,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;wBACzC,OAAO,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;oBAC9C,CAAC;gBACH,CAAC;gBAED,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;oBAC7B,WAAW,CAAC,YAAY,mCACnB,WAAW,CAAC,YAAY,GACxB,WAAW,CAAC,gBAAgB,CAChC,CAAC;oBACF,WAAW,CAAC,gBAAgB,GAAG,EAAE,CAAC;gBACpC,CAAC;gBAED,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC9E,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,MAAA,MAAA,MAAA,eAAe,CAAC,YAAY,0CAAG,WAAW,CAAC,mCAAI,MAAA,eAAe,CAAC,eAAe,0CAAG,WAAW,CAAC,mCAAI,OAAO,CAAC;gBACnJ,CAAC;gBAED,KAAK,MAAM,oBAAoB,IAAI,gCAAgC,EAAE,CAAC;oBACpE,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;wBAC9E,IAAI,oBAAoB,YAAY,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,oBAAoB,KAAK,WAAW,EAAE,CAAC;4BAC3H,WAAW,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;4BACpD,OAAO,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;wBAC/C,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,OAAO,CAAC,GAAG,CAAC,4CAA6C,WAAY,EAAE,CAAC,CAAC;gBACzE,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;gBAC7C,WAAW,CAAC,UAAU,CAAC,CAAC;gBAExB,iBAAiB,CAAC,WAAW,CAAC,GAAG,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAC9G,WAAW,CAAC,KAAK,KAAK,CAAC,CAAC;YAE5B,CAAC,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;QAEhC,CAAC;QAED,MAAM,0BAA0B,GAA6B,EAAE,CAAC;QAEhE,KAAK,MAAM,CAAE,WAAW,EAAE,WAAW,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC7E,KAAK,MAAM,WAAW,IAAI,WAAW,EAAE,CAAC;gBACtC,IAAI,CAAC,0BAA0B,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC7C,0BAA0B,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;gBAC/C,CAAC;gBACD,0BAA0B,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,MAAM,EAAE,CAAC;YACnD,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;YAC5E,OAAO,CAAC,GAAG,CAAC,qBAAsB,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,MAAO,EAAE,CAAC,CAAC;YACrF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC;iBACnC,GAAG,CAAC,CAAC,CAAE,WAAW,EAAE,eAAe,CAAE,EAAE,EAAE,CAAC,GAAI,WAAY,KAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAE,EAAE,CAAC;iBAC9F,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;YAC5E,OAAO,CAAC,GAAG,CAAC,yFAAyF,CAAC,CAAC;YACvG,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,KAAK,MAAM,CAAE,WAAW,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAChE,MAAM,qCAAqC,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;IAEH,CAAC;CAAA;AAxID,4DAwIC;AAED,kBAAe,wBAAwB,CAAC"}
|
|
@@ -6,7 +6,7 @@ const semver_1 = require("semver");
|
|
|
6
6
|
function updatePackageJson(tree, projectName, project) {
|
|
7
7
|
(0, workspace_utilities_1.UpdateProjectPackageJson)(tree, packageJson => {
|
|
8
8
|
const majorNxVersion = (0, workspace_utilities_1.GetMajorNxVersion)(tree);
|
|
9
|
-
const version = `${majorNxVersion}.0.0`;
|
|
9
|
+
const version = `${majorNxVersion}.0.0-dev.0`;
|
|
10
10
|
if (!packageJson.version || (0, semver_1.gte)(version, packageJson.version)) {
|
|
11
11
|
packageJson.version = version;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-plugin/update-package-json.ts"],"names":[],"mappings":";;;AAIA,mEAGmC;AACnC,mCAA6B;AAE7B,SAAgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B;IAC9F,IAAA,8CAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE;QAC3C,MAAM,cAAc,GAAG,IAAA,uCAAiB,EAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,GAAI,cAAe,
|
|
1
|
+
{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-plugin/update-package-json.ts"],"names":[],"mappings":";;;AAIA,mEAGmC;AACnC,mCAA6B;AAE7B,SAAgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B;IAC9F,IAAA,8CAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE;QAC3C,MAAM,cAAc,GAAG,IAAA,uCAAiB,EAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,GAAI,cAAe,YAAY,CAAC;QAChD,IAAI,CAAC,WAAW,CAAC,OAAO,IAAI,IAAA,YAAG,EAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9D,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC;QAChC,CAAC;IACH,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;AACtB,CAAC;AARD,8CAQC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateProjectTargets = void 0;
|
|
4
4
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
5
5
|
function updateProjectTargets(tree, project, options) {
|
|
6
|
-
var _a;
|
|
7
6
|
(0, workspace_utilities_1.CoerceTarget)(project, 'check-version', {
|
|
8
7
|
executor: '@rxap/plugin-library:check-version',
|
|
9
8
|
options: {
|
|
@@ -16,18 +15,6 @@ function updateProjectTargets(tree, project, options) {
|
|
|
16
15
|
generator: '@rxap/plugin-library:expose-as-schematic',
|
|
17
16
|
},
|
|
18
17
|
});
|
|
19
|
-
if (((_a = options.targets) === null || _a === void 0 ? void 0 : _a.fixDependencies) === false) {
|
|
20
|
-
(0, workspace_utilities_1.RemoveTarget)(project, 'fix-dependencies');
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
(0, workspace_utilities_1.CoerceTarget)(project, 'fix-dependencies', {
|
|
24
|
-
options: {
|
|
25
|
-
options: {
|
|
26
|
-
onlyDependencies: true,
|
|
27
|
-
},
|
|
28
|
-
},
|
|
29
|
-
}, workspace_utilities_1.Strategy.OVERWRITE);
|
|
30
|
-
}
|
|
31
18
|
}
|
|
32
19
|
exports.updateProjectTargets = updateProjectTargets;
|
|
33
20
|
//# sourceMappingURL=update-project-targets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project-targets.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-plugin/update-project-targets.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"update-project-targets.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-plugin/update-project-targets.ts"],"names":[],"mappings":";;;AAIA,mEAAyD;AAGzD,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAA6B,EAAE,OAAkC;IAEhH,IAAA,kCAAY,EAAC,OAAO,EAAE,eAAe,EAAE;QACrC,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE;YACP,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IAEH,IAAA,kCAAY,EAAC,OAAO,EAAE,qBAAqB,EAAE;QAC3C,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE;YACP,SAAS,EAAE,0CAA0C;SACtD;KACF,CAAC,CAAC;AAEL,CAAC;AAhBD,oDAgBC"}
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.initProject = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const utilities_1 = require("@rxap/utilities");
|
|
5
6
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
6
7
|
const path_1 = require("path");
|
|
7
8
|
const update_project_package_json_1 = require("./update-project-package-json");
|
|
8
9
|
const update_project_targets_1 = require("./update-project-targets");
|
|
9
10
|
function initProject(tree, projectName, project, options) {
|
|
11
|
+
var _a;
|
|
10
12
|
console.log(`init publishable library project: ${projectName}`);
|
|
11
13
|
const rootPackageJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
12
14
|
(0, update_project_targets_1.updateProjectTargets)(project, options);
|
|
@@ -27,6 +29,12 @@ function initProject(tree, projectName, project, options) {
|
|
|
27
29
|
console.warn('no LICENSE file found in the workspace root');
|
|
28
30
|
}
|
|
29
31
|
(0, workspace_utilities_1.CoerceIgnorePattern)(tree, (0, path_1.join)(project.root, '.gitignore'), ['README.md']);
|
|
32
|
+
if ((0, workspace_utilities_1.IsRxapRepository)(tree)) {
|
|
33
|
+
const rxapProject = (0, workspace_utilities_1.GetProject)(tree, 'rxap');
|
|
34
|
+
(_a = rxapProject.implicitDependencies) !== null && _a !== void 0 ? _a : (rxapProject.implicitDependencies = []);
|
|
35
|
+
rxapProject.implicitDependencies.push(projectName);
|
|
36
|
+
rxapProject.implicitDependencies = rxapProject.implicitDependencies.filter((0, utilities_1.unique)());
|
|
37
|
+
}
|
|
30
38
|
}
|
|
31
39
|
exports.initProject = initProject;
|
|
32
40
|
//# sourceMappingURL=init-project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/init-project.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AAEpB,
|
|
1
|
+
{"version":3,"file":"init-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/init-project.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AAEpB,+CAAyC;AACzC,mEAMmC;AACnC,+BAA4B;AAE5B,+EAAyE;AACzE,qEAAgE;AAEhE,SAAgB,WAAW,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAAuC;;IACjI,OAAO,CAAC,GAAG,CAAC,qCAAsC,WAAY,EAAE,CAAC,CAAC;IAElE,MAAM,eAAe,GAAuB,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE3E,IAAA,6CAAoB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACvC,IAAA,sDAAwB,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;IACtE,IAAA,0CAAoB,EAAC,IAAI,EAAE;QACzB,SAAS,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC;QACnC,MAAM,EAAE,OAAO,CAAC,IAAI;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC,CAAC;IACH,IAAA,gCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;IACrD,IAAA,gCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;IACtD,IAAA,gCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IAClD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,IAAA,gCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAE,CAAC,CAAC;QAC1E,IAAA,gCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAE,CAAC,CAAC;IACzE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;IAC9D,CAAC;IACD,IAAA,yCAAmB,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,CAAE,WAAW,CAAE,CAAC,CAAC;IAE7E,IAAI,IAAA,sCAAgB,EAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,IAAA,gCAAU,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAA,WAAW,CAAC,oBAAoB,oCAAhC,WAAW,CAAC,oBAAoB,GAAK,EAAE,EAAC;QACxC,WAAW,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACnD,WAAW,CAAC,oBAAoB,GAAG,WAAW,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAA,kBAAM,GAAE,CAAC,CAAC;IACvF,CAAC;AAEH,CAAC;AA9BD,kCA8BC"}
|
|
@@ -11,20 +11,19 @@ function updateProjectTargets(project, options) {
|
|
|
11
11
|
(0, workspace_utilities_1.RemoveTarget)(project, 'fix-dependencies');
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
14
|
-
const options = {
|
|
15
|
-
strict: true,
|
|
16
|
-
onlyDependencies: true,
|
|
17
|
-
};
|
|
18
14
|
(0, workspace_utilities_1.CoerceTarget)(project, 'fix-dependencies', {
|
|
19
15
|
executor: '@rxap/plugin-library:run-generator',
|
|
20
16
|
outputs: [
|
|
21
|
-
'{
|
|
17
|
+
'{projectRoot}/package.json',
|
|
22
18
|
],
|
|
23
19
|
options: {
|
|
24
20
|
generator: '@rxap/plugin-library:fix-dependencies',
|
|
25
|
-
options
|
|
21
|
+
options: {
|
|
22
|
+
strict: true,
|
|
23
|
+
onlyDependencies: true,
|
|
24
|
+
}
|
|
26
25
|
},
|
|
27
|
-
});
|
|
26
|
+
}, workspace_utilities_1.Strategy.OVERWRITE);
|
|
28
27
|
}
|
|
29
28
|
(0, workspace_utilities_1.CoerceTarget)(project, 'linking', {});
|
|
30
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project-targets.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/update-project-targets.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"update-project-targets.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/update-project-targets.ts"],"names":[],"mappings":";;;AACA,mEAImC;AAGnC,SAAgB,oBAAoB,CAAC,OAA6B,EAAE,OAAuC;;IACzG,IAAA,kCAAY,EAAC,OAAO,EAAE,qBAAqB,EAAE,EAAE,QAAQ,EAAE,0CAA0C,EAAE,CAAC,CAAC;IACvG,IAAA,kCAAY,EAAC,OAAO,EAAE,sBAAsB,EAAE,EAAE,QAAQ,EAAE,2CAA2C,EAAE,CAAC,CAAC;IACzG,IAAA,kCAAY,EAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,6BAA6B,EAAE,CAAC,CAAC;IAC7E,IAAI,CAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,eAAe,MAAK,KAAK,EAAE,CAAC;QAC/C,IAAA,kCAAY,EAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAC5C,CAAC;SAAM,CAAC;QACN,IAAA,kCAAY,EAAC,OAAO,EAAE,kBAAkB,EAAE;YACxC,QAAQ,EAAE,oCAAoC;YAC9C,OAAO,EAAE;gBACP,4BAA4B;aAC7B;YACD,OAAO,EAAE;gBACP,SAAS,EAAE,uCAAuC;gBAClD,OAAO,EAAE;oBACP,MAAM,EAAE,IAAI;oBACZ,gBAAgB,EAAE,IAAI;iBACvB;aACF;SACF,EAAE,8BAAQ,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC;IACD,IAAA,kCAAY,EAAC,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;AACvC,CAAC;AAtBD,oDAsBC"}
|
|
@@ -6,7 +6,7 @@ const semver_1 = require("semver");
|
|
|
6
6
|
function updatePackageJson(tree, projectName, project) {
|
|
7
7
|
(0, workspace_utilities_1.UpdateProjectPackageJson)(tree, packageJson => {
|
|
8
8
|
const majorAngularVersion = (0, workspace_utilities_1.GetMajorAngularSchematicDevkitVersion)(tree);
|
|
9
|
-
const version = `${majorAngularVersion}.0.0`;
|
|
9
|
+
const version = `${majorAngularVersion}.0.0-dev.0`;
|
|
10
10
|
if (!packageJson.version || (0, semver_1.gte)(version, packageJson.version)) {
|
|
11
11
|
packageJson.version = version;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-schematic/update-package-json.ts"],"names":[],"mappings":";;;AAIA,mEAGmC;AACnC,mCAA6B;AAE7B,SAAgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B;IAC9F,IAAA,8CAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE;QAC3C,MAAM,mBAAmB,GAAG,IAAA,2DAAqC,EAAC,IAAI,CAAC,CAAC;QACxE,MAAM,OAAO,GAAG,GAAI,mBAAoB,
|
|
1
|
+
{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-schematic/update-package-json.ts"],"names":[],"mappings":";;;AAIA,mEAGmC;AACnC,mCAA6B;AAE7B,SAAgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B;IAC9F,IAAA,8CAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE;QAC3C,MAAM,mBAAmB,GAAG,IAAA,2DAAqC,EAAC,IAAI,CAAC,CAAC;QACxE,MAAM,OAAO,GAAG,GAAI,mBAAoB,YAAY,CAAC;QACrD,IAAI,CAAC,WAAW,CAAC,OAAO,IAAI,IAAA,YAAG,EAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9D,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC;QAChC,CAAC;IACH,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;AACtB,CAAC;AARD,8CAQC"}
|