@nrwl/workspace 15.6.3 → 15.7.0-alpha.1
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/README.md +1 -1
- package/generators.json +7 -24
- package/index.d.ts +0 -2
- package/index.js +1 -5
- package/index.js.map +1 -1
- package/migrations.json +6 -0
- package/package.json +30 -31
- package/src/generators/ci-workflow/schema.json +1 -1
- package/src/generators/convert-to-nx-project/convert-to-nx-project.d.ts +1 -2
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js +49 -28
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map +1 -1
- package/src/generators/convert-to-nx-project/schema.d.ts +2 -0
- package/src/generators/convert-to-nx-project/schema.json +7 -3
- package/src/generators/library/library.js +1 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +2 -1
- package/src/generators/move/lib/move-project-configuration.js +1 -2
- package/src/generators/move/lib/move-project-configuration.js.map +1 -1
- package/src/generators/move/lib/update-implicit-dependencies.d.ts +0 -2
- package/src/generators/move/lib/update-implicit-dependencies.js +0 -2
- package/src/generators/move/lib/update-implicit-dependencies.js.map +1 -1
- package/src/generators/new/generate-preset.js +1 -0
- package/src/generators/new/generate-preset.js.map +1 -1
- package/src/generators/new/new.d.ts +1 -0
- package/src/generators/new/new.js +0 -3
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/npm-package/npm-package.js +3 -6
- package/src/generators/npm-package/npm-package.js.map +1 -1
- package/src/generators/preset/preset.js +4 -12
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/preset/schema.d.ts +1 -0
- package/src/generators/preset/schema.json +8 -1
- package/src/generators/remove/lib/remove-project-references-in-config.d.ts +3 -0
- package/src/generators/remove/lib/{remove-project-config.js → remove-project-references-in-config.js} +4 -12
- package/src/generators/remove/lib/remove-project-references-in-config.js.map +1 -0
- package/src/generators/remove/remove.js +2 -2
- package/src/generators/remove/remove.js.map +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.js +1 -28
- package/src/migrations/update-13-0-0/config-locations/config-locations.js.map +1 -1
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.d.ts +3 -0
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.js +15 -0
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.js.map +1 -0
- package/src/utils/cli-config-utils.d.ts +3 -0
- package/src/utils/cli-config-utils.js +3 -0
- package/src/utils/cli-config-utils.js.map +1 -1
- package/src/utils/rules/format-files.js +0 -19
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.d.ts +0 -2
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.js +0 -9
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.js.map +0 -1
- package/src/generators/remove/lib/remove-project-config.d.ts +0 -8
- package/src/generators/remove/lib/remove-project-config.js.map +0 -1
- package/src/utils/rules/check-project-exists.d.ts +0 -10
- package/src/utils/rules/check-project-exists.js +0 -24
- package/src/utils/rules/check-project-exists.js.map +0 -1
- package/src/utils/rules/rename-npm-packages.d.ts +0 -10
- package/src/utils/rules/rename-npm-packages.js +0 -81
- package/src/utils/rules/rename-npm-packages.js.map +0 -1
- package/src/utils/rules/rename-package-imports.d.ts +0 -10
- package/src/utils/rules/rename-package-imports.js +0 -59
- package/src/utils/rules/rename-package-imports.js.map +0 -1
package/CHANGELOG.md
CHANGED
@@ -3,6 +3,6 @@
|
|
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
|
-
|
6
|
+
|
7
7
|
|
8
8
|
**Note:** Version bump only for package @nrwl/workspace
|
package/README.md
CHANGED
@@ -53,7 +53,7 @@ npx nx@latest init
|
|
53
53
|
|
54
54
|
- [Nx.Dev: Documentation, Guides, Tutorials](https://nx.dev)
|
55
55
|
- [Intro to Nx](https://nx.dev/getting-started/intro)
|
56
|
-
- [Official Nx YouTube Channel](https://www.youtube.com
|
56
|
+
- [Official Nx YouTube Channel](https://www.youtube.com/@NxDevtools)
|
57
57
|
- [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
|
58
58
|
|
59
59
|
<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg"
|
package/generators.json
CHANGED
@@ -8,42 +8,32 @@
|
|
8
8
|
"aliases": ["mv"],
|
9
9
|
"description": "Move an application or library to another folder."
|
10
10
|
},
|
11
|
-
|
12
11
|
"remove": {
|
13
12
|
"factory": "./src/generators/remove/remove#removeSchematic",
|
14
13
|
"schema": "./src/generators/remove/schema.json",
|
15
14
|
"aliases": ["rm"],
|
16
15
|
"description": "Remove an application or library."
|
17
16
|
},
|
18
|
-
|
19
17
|
"library": {
|
20
18
|
"factory": "./src/generators/library/library#librarySchematic",
|
21
19
|
"schema": "./src/generators/library/schema.json",
|
22
20
|
"aliases": ["lib"],
|
23
21
|
"x-type": "library",
|
24
|
-
"description": "Create a library."
|
22
|
+
"description": "Create a library.",
|
23
|
+
"x-deprecated": "Use @nrwl/js:lib instead. This will be removed in Nx v16"
|
25
24
|
},
|
26
|
-
|
27
25
|
"workspace-generator": {
|
28
26
|
"factory": "./src/generators/workspace-generator/workspace-generator",
|
29
27
|
"schema": "./src/generators/workspace-generator/schema.json",
|
30
28
|
"aliases": ["workspace-schematic"],
|
31
29
|
"description": "Generates a workspace generator."
|
32
30
|
},
|
33
|
-
|
34
31
|
"run-commands": {
|
35
32
|
"factory": "./src/generators/run-commands/run-commands#runCommandsSchematic",
|
36
33
|
"schema": "./src/generators/run-commands/schema.json",
|
37
34
|
"aliases": ["run-command", "target"],
|
38
35
|
"description": "Generates a target to run any command in the terminal."
|
39
36
|
},
|
40
|
-
|
41
|
-
"convert-to-nx-project": {
|
42
|
-
"factory": "./src/generators/convert-to-nx-project/convert-to-nx-project#convertToNxProjectSchematic",
|
43
|
-
"schema": "./src/generators/convert-to-nx-project/schema.json",
|
44
|
-
"description": "Moves a project's configuration outside of `workspace.json`."
|
45
|
-
},
|
46
|
-
|
47
37
|
"npm-package": {
|
48
38
|
"factory": "./src/generators/npm-package/npm-package#npmPackageSchematic",
|
49
39
|
"schema": "./src/generators/npm-package/schema.json",
|
@@ -58,63 +48,56 @@
|
|
58
48
|
"description": "Create application in an empty workspace.",
|
59
49
|
"hidden": true
|
60
50
|
},
|
61
|
-
|
62
51
|
"move": {
|
63
52
|
"factory": "./src/generators/move/move#moveGenerator",
|
64
53
|
"schema": "./src/generators/move/schema.json",
|
65
54
|
"aliases": ["mv"],
|
66
55
|
"description": "Move an application or library to another folder."
|
67
56
|
},
|
68
|
-
|
69
57
|
"remove": {
|
70
58
|
"factory": "./src/generators/remove/remove#removeGenerator",
|
71
59
|
"schema": "./src/generators/remove/schema.json",
|
72
60
|
"aliases": ["rm"],
|
73
61
|
"description": "Remove an application or library."
|
74
62
|
},
|
75
|
-
|
76
63
|
"new": {
|
77
64
|
"factory": "./src/generators/new/new#newGenerator",
|
78
65
|
"schema": "./src/generators/new/schema.json",
|
79
66
|
"description": "Create a workspace.",
|
80
67
|
"hidden": true
|
81
68
|
},
|
82
|
-
|
83
69
|
"library": {
|
84
70
|
"factory": "./src/generators/library/library#libraryGenerator",
|
85
71
|
"schema": "./src/generators/library/schema.json",
|
86
72
|
"aliases": ["lib"],
|
87
73
|
"x-type": "library",
|
88
|
-
"description": "Create a library."
|
74
|
+
"description": "Create a library.",
|
75
|
+
"x-deprecated": "Use @nrwl/js:lib instead. This will be removed in Nx v16."
|
89
76
|
},
|
90
|
-
|
91
77
|
"workspace-generator": {
|
92
78
|
"factory": "./src/generators/workspace-generator/workspace-generator",
|
93
79
|
"schema": "./src/generators/workspace-generator/schema.json",
|
94
80
|
"aliases": ["workspace-schematic"],
|
95
81
|
"description": "Generates a workspace generator."
|
96
82
|
},
|
97
|
-
|
98
83
|
"run-commands": {
|
99
84
|
"factory": "./src/generators/run-commands/run-commands#runCommandsGenerator",
|
100
85
|
"schema": "./src/generators/run-commands/schema.json",
|
101
86
|
"aliases": ["run-command", "target"],
|
102
87
|
"description": "Generates a target to run any command in the terminal."
|
103
88
|
},
|
104
|
-
|
105
|
-
"convert-to-nx-project": {
|
89
|
+
"fix-configuration": {
|
106
90
|
"factory": "./src/generators/convert-to-nx-project/convert-to-nx-project#convertToNxProjectGenerator",
|
107
91
|
"schema": "./src/generators/convert-to-nx-project/schema.json",
|
108
|
-
"
|
92
|
+
"aliases": ["convert-to-nx-project"],
|
93
|
+
"description": "Fixes projects configuration"
|
109
94
|
},
|
110
|
-
|
111
95
|
"npm-package": {
|
112
96
|
"factory": "./src/generators/npm-package/npm-package#npmPackageGenerator",
|
113
97
|
"schema": "./src/generators/npm-package/schema.json",
|
114
98
|
"description": "Create a minimal NPM package.",
|
115
99
|
"x-type": "library"
|
116
100
|
},
|
117
|
-
|
118
101
|
"ci-workflow": {
|
119
102
|
"factory": "./src/generators/ci-workflow/ci-workflow#ciWorkflowGenerator",
|
120
103
|
"schema": "./src/generators/ci-workflow/schema.json",
|
package/index.d.ts
CHANGED
@@ -18,8 +18,6 @@ export { deleteFile } from './src/utils/rules/deleteFile';
|
|
18
18
|
export * from './src/utils/rules/ng-add';
|
19
19
|
export { updateKarmaConf } from './src/utils/rules/update-karma-conf';
|
20
20
|
export { visitNotIgnoredFiles } from './src/utils/rules/visit-not-ignored-files';
|
21
|
-
export { renamePackageImports } from './src/utils/rules/rename-package-imports';
|
22
|
-
export { renameNpmPackages } from './src/utils/rules/rename-npm-packages';
|
23
21
|
import * as strings from './src/utils/strings';
|
24
22
|
export { checkAndCleanWithSemver } from './src/utils/version-utils';
|
25
23
|
export { updatePackagesInPackageJson } from './src/utils/update-packages-in-package-json';
|
package/index.js
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.updateKarmaConf = exports.deleteFile = exports.formatFiles = exports.addInstallTask = exports.generateProjectLint = exports.addLintFiles = exports.addUpdateTask = exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.replaceAppNameWithPath = exports.getWorkspacePath = exports.getNpmScope = exports.RemoveChange = exports.ReplaceChange = exports.InsertChange = exports.readNxJsonInTree = exports.updateNxJsonInTree = exports.renameDirSyncInTree = exports.renameSyncInTree = exports.readWorkspace = exports.updatePackageJsonDependencies = exports.findNodes = exports.createOrUpdate = exports.addParameterToConstructor = exports.getProjectConfig = exports.addGlobal = exports.addIncludeToTsConfig = exports.addMethod = exports.addDepsToPackageJson = exports.replaceNodeValue = exports.insert = exports.updateWorkspaceInTree = exports.updateJsonInTree = exports.readJsonInTree = exports.readPackageJson = exports.readWorkspaceConfig = exports.output = exports.resolveUserExistingPrettierConfig = exports.names = exports.createDirectory = exports.copyFile = exports.updateJsonFile = exports.renameSync = exports.projectRootDir = exports.ProjectType = exports.readTsConfig = void 0;
|
4
|
-
exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.updatePackagesInPackageJson = exports.checkAndCleanWithSemver = exports.
|
4
|
+
exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.updatePackagesInPackageJson = exports.checkAndCleanWithSemver = exports.visitNotIgnoredFiles = void 0;
|
5
5
|
const tslib_1 = require("tslib");
|
6
6
|
var typescript_1 = require("./src/utilities/typescript");
|
7
7
|
Object.defineProperty(exports, "readTsConfig", { enumerable: true, get: function () { return typescript_1.readTsConfig; } });
|
@@ -72,10 +72,6 @@ var update_karma_conf_1 = require("./src/utils/rules/update-karma-conf");
|
|
72
72
|
Object.defineProperty(exports, "updateKarmaConf", { enumerable: true, get: function () { return update_karma_conf_1.updateKarmaConf; } });
|
73
73
|
var visit_not_ignored_files_1 = require("./src/utils/rules/visit-not-ignored-files");
|
74
74
|
Object.defineProperty(exports, "visitNotIgnoredFiles", { enumerable: true, get: function () { return visit_not_ignored_files_1.visitNotIgnoredFiles; } });
|
75
|
-
var rename_package_imports_1 = require("./src/utils/rules/rename-package-imports");
|
76
|
-
Object.defineProperty(exports, "renamePackageImports", { enumerable: true, get: function () { return rename_package_imports_1.renamePackageImports; } });
|
77
|
-
var rename_npm_packages_1 = require("./src/utils/rules/rename-npm-packages");
|
78
|
-
Object.defineProperty(exports, "renameNpmPackages", { enumerable: true, get: function () { return rename_npm_packages_1.renameNpmPackages; } });
|
79
75
|
const strings = require("./src/utils/strings");
|
80
76
|
var version_utils_1 = require("./src/utils/version-utils");
|
81
77
|
Object.defineProperty(exports, "checkAndCleanWithSemver", { enumerable: true, get: function () { return version_utils_1.checkAndCleanWithSemver; } });
|
package/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":";;;;;AAAA,yDAA0D;AAAjD,0GAAA,YAAY,OAAA;AACrB,yDAAuE;AAA9D,2GAAA,WAAW,OAAA;AAAE,8GAAA,cAAc,OAAA;AACpC,uDAKmC;AAJjC,uGAAA,UAAU,OAAA;AACV,2GAAA,cAAc,OAAA;AACd,qGAAA,QAAQ,OAAA;AACR,4GAAA,eAAe,OAAA;AAGjB,uCAAqC;AAA5B,+FAAA,KAAK,OAAA;AAEd,qDAGkC;AADhC,6HAAA,iCAAiC,OAAA;AAGnC,iDAAgD;AAAvC,gGAAA,MAAM,OAAA;AAEf,8DAGyC;AAFvC,iHAAA,mBAAmB,OAAA;AACnB,6GAAA,eAAe,OAAA;AAGjB,mDAuB+B;AAtB7B,2GAAA,cAAc,OAAA;AACd,6GAAA,gBAAgB,OAAA;AAChB,kHAAA,qBAAqB,OAAA;AACrB,mGAAA,MAAM,OAAA;AACN,6GAAA,gBAAgB,OAAA;AAChB,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,6GAAA,gBAAgB,OAAA;AAChB,sHAAA,yBAAyB,OAAA;AACzB,2GAAA,cAAc,OAAA;AACd,sGAAA,SAAS,OAAA;AACT,0HAAA,6BAA6B,OAAA;AAC7B,0GAAA,aAAa,OAAA;AACb,6GAAA,gBAAgB,OAAA;AAChB,gHAAA,mBAAmB,OAAA;AACnB,+GAAA,kBAAkB,OAAA;AAClB,6GAAA,gBAAgB,OAAA;AAChB,yGAAA,YAAY,OAAA;AACZ,0GAAA,aAAa,OAAA;AACb,yGAAA,YAAY,OAAA;AAGd,iEAOsC;AANpC,+GAAA,WAAW,OAAA;AACX,oHAAA,gBAAgB,OAAA;AAChB,0HAAA,sBAAsB,OAAA;AACtB,8GAAA,UAAU,OAAA;AACV,+GAAA,WAAW,OAAA;AACX,mHAAA,eAAe,OAAA;AAGjB,mDAI+B;AAH7B,yGAAA,YAAY,OAAA;AACZ,4GAAA,eAAe,OAAA;AACf,gHAAA,mBAAmB,OAAA;AAErB,uDAAwD;AAA/C,4GAAA,aAAa,OAAA;AACtB,yCAA6E;AAApE,oGAAA,YAAY,OAAA;AAAE,2GAAA,mBAAmB,OAAA;AAE1C,uEAAoE;AAA3D,kHAAA,cAAc,OAAA;AACvB,+DAA6D;AAApD,2GAAA,WAAW,OAAA;AACpB,2DAA0D;AAAjD,wGAAA,UAAU,OAAA;AACnB,mEAAyC;AACzC,yEAAsE;AAA7D,oHAAA,eAAe,OAAA;AACxB,qFAAiF;AAAxE,+HAAA,oBAAoB,OAAA;AAC7B
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":";;;;;AAAA,yDAA0D;AAAjD,0GAAA,YAAY,OAAA;AACrB,yDAAuE;AAA9D,2GAAA,WAAW,OAAA;AAAE,8GAAA,cAAc,OAAA;AACpC,uDAKmC;AAJjC,uGAAA,UAAU,OAAA;AACV,2GAAA,cAAc,OAAA;AACd,qGAAA,QAAQ,OAAA;AACR,4GAAA,eAAe,OAAA;AAGjB,uCAAqC;AAA5B,+FAAA,KAAK,OAAA;AAEd,qDAGkC;AADhC,6HAAA,iCAAiC,OAAA;AAGnC,iDAAgD;AAAvC,gGAAA,MAAM,OAAA;AAEf,8DAGyC;AAFvC,iHAAA,mBAAmB,OAAA;AACnB,6GAAA,eAAe,OAAA;AAGjB,mDAuB+B;AAtB7B,2GAAA,cAAc,OAAA;AACd,6GAAA,gBAAgB,OAAA;AAChB,kHAAA,qBAAqB,OAAA;AACrB,mGAAA,MAAM,OAAA;AACN,6GAAA,gBAAgB,OAAA;AAChB,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,6GAAA,gBAAgB,OAAA;AAChB,sHAAA,yBAAyB,OAAA;AACzB,2GAAA,cAAc,OAAA;AACd,sGAAA,SAAS,OAAA;AACT,0HAAA,6BAA6B,OAAA;AAC7B,0GAAA,aAAa,OAAA;AACb,6GAAA,gBAAgB,OAAA;AAChB,gHAAA,mBAAmB,OAAA;AACnB,+GAAA,kBAAkB,OAAA;AAClB,6GAAA,gBAAgB,OAAA;AAChB,yGAAA,YAAY,OAAA;AACZ,0GAAA,aAAa,OAAA;AACb,yGAAA,YAAY,OAAA;AAGd,iEAOsC;AANpC,+GAAA,WAAW,OAAA;AACX,oHAAA,gBAAgB,OAAA;AAChB,0HAAA,sBAAsB,OAAA;AACtB,8GAAA,UAAU,OAAA;AACV,+GAAA,WAAW,OAAA;AACX,mHAAA,eAAe,OAAA;AAGjB,mDAI+B;AAH7B,yGAAA,YAAY,OAAA;AACZ,4GAAA,eAAe,OAAA;AACf,gHAAA,mBAAmB,OAAA;AAErB,uDAAwD;AAA/C,4GAAA,aAAa,OAAA;AACtB,yCAA6E;AAApE,oGAAA,YAAY,OAAA;AAAE,2GAAA,mBAAmB,OAAA;AAE1C,uEAAoE;AAA3D,kHAAA,cAAc,OAAA;AACvB,+DAA6D;AAApD,2GAAA,WAAW,OAAA;AACpB,2DAA0D;AAAjD,wGAAA,UAAU,OAAA;AACnB,mEAAyC;AACzC,yEAAsE;AAA7D,oHAAA,eAAe,OAAA;AACxB,qFAAiF;AAAxE,+HAAA,oBAAoB,OAAA;AAC7B,+CAA+C;AAC/C,2DAAoE;AAA3D,wHAAA,uBAAuB,OAAA;AAChC,+FAA0F;AAAjF,8IAAA,2BAA2B,OAAA;AAEpC,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yDAAiE;AAAxD,yGAAA,eAAe,OAAA;AACxB,2EAAkF;AAAzE,oHAAA,oBAAoB,OAAA;AAC7B,sGAGsE;AAFpE,oIAAA,2BAA2B,OAAA;AAC3B,oIAAA,2BAA2B,OAAA;AAGhB,QAAA,WAAW,GAAG,OAAO,CAAC"}
|
package/migrations.json
CHANGED
@@ -77,6 +77,12 @@
|
|
77
77
|
"description": "Migrates from @nrwl/workspace:run-commands to nx:run-commands",
|
78
78
|
"cli": "nx",
|
79
79
|
"implementation": "./src/migrations/update-14-8-0/change-run-commands-executor"
|
80
|
+
},
|
81
|
+
"15-7-0-split-configuration-into-project-json-files": {
|
82
|
+
"version": "15.7.0-beta.0",
|
83
|
+
"description": "Spilt global configuration files (e.g., workspace.json) into individual project.json files.",
|
84
|
+
"cli": "nx",
|
85
|
+
"implementation": "./src/migrations/update-15-7-0/split-configuration-into-project-json-files"
|
80
86
|
}
|
81
87
|
},
|
82
88
|
"packageJsonUpdates": {
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nrwl/workspace",
|
3
|
-
"version": "15.
|
3
|
+
"version": "15.7.0-alpha.1",
|
4
4
|
"private": false,
|
5
5
|
"description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
|
6
6
|
"repository": {
|
@@ -33,32 +33,32 @@
|
|
33
33
|
"requirements": {},
|
34
34
|
"migrations": "./migrations.json",
|
35
35
|
"packageGroup": {
|
36
|
-
"@nrwl/angular": "15.
|
37
|
-
"@nrwl/cli": "15.
|
38
|
-
"@nrwl/cypress": "15.
|
39
|
-
"@nrwl/detox": "15.
|
40
|
-
"@nrwl/devkit": "15.
|
41
|
-
"@nrwl/esbuild": "15.
|
42
|
-
"@nrwl/eslint-plugin-nx": "15.
|
43
|
-
"@nrwl/expo": "15.
|
44
|
-
"@nrwl/express": "15.
|
45
|
-
"@nrwl/jest": "15.
|
46
|
-
"@nrwl/js": "15.
|
47
|
-
"@nrwl/linter": "15.
|
48
|
-
"@nrwl/nest": "15.
|
49
|
-
"@nrwl/next": "15.
|
50
|
-
"@nrwl/node": "15.
|
36
|
+
"@nrwl/angular": "15.7.0-alpha.1",
|
37
|
+
"@nrwl/cli": "15.7.0-alpha.1",
|
38
|
+
"@nrwl/cypress": "15.7.0-alpha.1",
|
39
|
+
"@nrwl/detox": "15.7.0-alpha.1",
|
40
|
+
"@nrwl/devkit": "15.7.0-alpha.1",
|
41
|
+
"@nrwl/esbuild": "15.7.0-alpha.1",
|
42
|
+
"@nrwl/eslint-plugin-nx": "15.7.0-alpha.1",
|
43
|
+
"@nrwl/expo": "15.7.0-alpha.1",
|
44
|
+
"@nrwl/express": "15.7.0-alpha.1",
|
45
|
+
"@nrwl/jest": "15.7.0-alpha.1",
|
46
|
+
"@nrwl/js": "15.7.0-alpha.1",
|
47
|
+
"@nrwl/linter": "15.7.0-alpha.1",
|
48
|
+
"@nrwl/nest": "15.7.0-alpha.1",
|
49
|
+
"@nrwl/next": "15.7.0-alpha.1",
|
50
|
+
"@nrwl/node": "15.7.0-alpha.1",
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
52
|
-
"@nrwl/nx-plugin": "15.
|
53
|
-
"@nrwl/react-native": "15.
|
54
|
-
"@nrwl/react": "15.
|
55
|
-
"@nrwl/rollup": "15.
|
56
|
-
"@nrwl/storybook": "15.
|
57
|
-
"@nrwl/tao": "15.
|
58
|
-
"@nrwl/vite": "15.
|
59
|
-
"@nrwl/web": "15.
|
60
|
-
"@nrwl/webpack": "15.
|
61
|
-
"nx": "15.
|
52
|
+
"@nrwl/nx-plugin": "15.7.0-alpha.1",
|
53
|
+
"@nrwl/react-native": "15.7.0-alpha.1",
|
54
|
+
"@nrwl/react": "15.7.0-alpha.1",
|
55
|
+
"@nrwl/rollup": "15.7.0-alpha.1",
|
56
|
+
"@nrwl/storybook": "15.7.0-alpha.1",
|
57
|
+
"@nrwl/tao": "15.7.0-alpha.1",
|
58
|
+
"@nrwl/vite": "15.7.0-alpha.1",
|
59
|
+
"@nrwl/web": "15.7.0-alpha.1",
|
60
|
+
"@nrwl/webpack": "15.7.0-alpha.1",
|
61
|
+
"nx": "15.7.0-alpha.1"
|
62
62
|
}
|
63
63
|
},
|
64
64
|
"peerDependencies": {
|
@@ -70,15 +70,14 @@
|
|
70
70
|
}
|
71
71
|
},
|
72
72
|
"dependencies": {
|
73
|
-
"@nrwl/devkit": "15.
|
74
|
-
"@nrwl/linter": "15.
|
73
|
+
"@nrwl/devkit": "15.7.0-alpha.1",
|
74
|
+
"@nrwl/linter": "15.7.0-alpha.1",
|
75
75
|
"@parcel/watcher": "2.0.4",
|
76
76
|
"chalk": "^4.1.0",
|
77
77
|
"chokidar": "^3.5.1",
|
78
78
|
"cli-cursor": "3.1.0",
|
79
79
|
"cli-spinners": "2.6.1",
|
80
80
|
"dotenv": "~10.0.0",
|
81
|
-
"enquirer": "~2.3.6",
|
82
81
|
"figures": "3.2.0",
|
83
82
|
"flat": "^5.0.2",
|
84
83
|
"fs-extra": "^11.1.0",
|
@@ -87,7 +86,7 @@
|
|
87
86
|
"jsonc-parser": "3.2.0",
|
88
87
|
"minimatch": "3.0.5",
|
89
88
|
"npm-run-path": "^4.0.1",
|
90
|
-
"nx": "15.
|
89
|
+
"nx": "15.7.0-alpha.1",
|
91
90
|
"open": "^8.4.0",
|
92
91
|
"rxjs": "^6.5.4",
|
93
92
|
"semver": "7.3.4",
|
@@ -100,5 +99,5 @@
|
|
100
99
|
"access": "public"
|
101
100
|
},
|
102
101
|
"types": "./index.d.ts",
|
103
|
-
"gitHead": "
|
102
|
+
"gitHead": "42d38047ff854942cc8832dda035e5cc7d0a2dc0"
|
104
103
|
}
|
@@ -14,7 +14,7 @@
|
|
14
14
|
"message": "What is your target CI provider?",
|
15
15
|
"type": "list",
|
16
16
|
"items": [
|
17
|
-
{ "value": "github", "label": "
|
17
|
+
{ "value": "github", "label": "GitHub Actions" },
|
18
18
|
{ "value": "circleci", "label": "Circle CI" },
|
19
19
|
{ "value": "azure", "label": "Azure DevOps" },
|
20
20
|
{ "value": "bitbucket-pipelines", "label": "BitBucket Pipelines" },
|
@@ -1,7 +1,6 @@
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
2
2
|
import { Schema } from './schema';
|
3
|
-
export declare
|
4
|
-
export declare function validateSchema(schema: Schema): Promise<void>;
|
3
|
+
export declare function validateSchema(schema: Schema, configName: string): Promise<void>;
|
5
4
|
export declare function convertToNxProjectGenerator(host: Tree, schema: Schema): Promise<void>;
|
6
5
|
export default convertToNxProjectGenerator;
|
7
6
|
export declare const convertToNxProjectSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
|
@@ -1,51 +1,72 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.validateSchema =
|
3
|
+
exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.validateSchema = void 0;
|
4
4
|
const tslib_1 = require("tslib");
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
|
-
const enquirer_1 = require("enquirer");
|
7
|
-
const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
|
8
6
|
const path_1 = require("path");
|
9
|
-
const
|
10
|
-
|
11
|
-
function validateSchema(schema) {
|
7
|
+
const angular_json_1 = require("nx/src/adapter/angular-json");
|
8
|
+
const output_1 = require("../../utils/output");
|
9
|
+
function validateSchema(schema, configName) {
|
12
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
13
11
|
if (schema.project && schema.all) {
|
14
|
-
throw
|
12
|
+
throw new Error('--project and --all are mutually exclusive');
|
15
13
|
}
|
16
|
-
if (
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
14
|
+
if (schema.project && schema.reformat) {
|
15
|
+
throw new Error('--project and --reformat are mutually exclusive');
|
16
|
+
}
|
17
|
+
if (schema.all && schema.reformat) {
|
18
|
+
throw new Error('--all and --reformat are mutually exclusive');
|
19
|
+
}
|
20
|
+
if ((configName === 'workspace.json' && schema.project) ||
|
21
|
+
(configName === 'workspace.json' && schema.reformat)) {
|
22
|
+
throw new Error('workspace.json is no longer supported. Please pass --all to convert all projects and remove workspace.json.');
|
23
|
+
}
|
24
|
+
if (!schema.project && !schema.all && !schema.reformat) {
|
25
|
+
schema.all = true;
|
24
26
|
}
|
25
27
|
});
|
26
28
|
}
|
27
29
|
exports.validateSchema = validateSchema;
|
28
30
|
function convertToNxProjectGenerator(host, schema) {
|
29
31
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
32
|
+
const configName = host.exists('angular.json')
|
33
|
+
? 'angular.json'
|
34
|
+
: 'workspace.json';
|
35
|
+
if (!host.exists(configName))
|
36
|
+
return;
|
37
|
+
yield validateSchema(schema, configName);
|
38
|
+
const projects = (0, angular_json_1.toNewFormat)((0, devkit_1.readJson)(host, configName)).projects;
|
39
|
+
const leftOverProjects = {};
|
40
|
+
for (const projectName of Object.keys(projects)) {
|
41
|
+
const config = projects[projectName];
|
42
|
+
if (typeof config === 'string')
|
38
43
|
continue;
|
44
|
+
if ((!schema.project || schema.project === projectName) &&
|
45
|
+
!schema.reformat) {
|
46
|
+
const path = (0, path_1.join)(config.root, 'project.json');
|
47
|
+
if (!host.exists(path)) {
|
48
|
+
(0, devkit_1.addProjectConfiguration)(host, path, projects[projectName]);
|
49
|
+
}
|
39
50
|
}
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
51
|
+
else {
|
52
|
+
leftOverProjects[projectName] = config;
|
53
|
+
}
|
54
|
+
}
|
55
|
+
if (Object.keys(leftOverProjects).length > 0) {
|
56
|
+
(0, devkit_1.writeJson)(host, 'angular.json', (0, angular_json_1.toOldFormat)({ version: 1, projects: leftOverProjects }));
|
57
|
+
}
|
58
|
+
else {
|
59
|
+
host.delete(configName);
|
45
60
|
}
|
46
61
|
if (!schema.skipFormat) {
|
47
62
|
yield (0, devkit_1.formatFiles)(host);
|
48
63
|
}
|
64
|
+
output_1.output.note({
|
65
|
+
title: 'Use "nx show projects" to read the list of projects.',
|
66
|
+
bodyLines: [
|
67
|
+
`If you read the list of projects from ${configName}, use "nx show projects" instead.`,
|
68
|
+
],
|
69
|
+
});
|
49
70
|
});
|
50
71
|
}
|
51
72
|
exports.convertToNxProjectGenerator = convertToNxProjectGenerator;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":"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"}
|
@@ -17,15 +17,19 @@
|
|
17
17
|
],
|
18
18
|
"properties": {
|
19
19
|
"project": {
|
20
|
-
"description": "
|
20
|
+
"description": "Convert a single project",
|
21
21
|
"type": "string"
|
22
22
|
},
|
23
23
|
"all": {
|
24
|
-
"description": "
|
24
|
+
"description": "Convert all projects",
|
25
|
+
"type": "boolean"
|
26
|
+
},
|
27
|
+
"reformat": {
|
28
|
+
"description": "Just reformats the configuration",
|
25
29
|
"type": "boolean"
|
26
30
|
},
|
27
31
|
"skipFormat": {
|
28
|
-
"description": "Skip formatting files
|
32
|
+
"description": "Skip formatting files",
|
29
33
|
"type": "boolean",
|
30
34
|
"default": false,
|
31
35
|
"x-priority": "internal"
|
@@ -31,7 +31,7 @@ function addProject(tree, options) {
|
|
31
31
|
},
|
32
32
|
};
|
33
33
|
}
|
34
|
-
(0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration
|
34
|
+
(0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration);
|
35
35
|
}
|
36
36
|
function addLint(tree, options) {
|
37
37
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAiBsB;AACtB,4CAAkD;AAClD,+BAA4B;AAC5B,6EAAuE;AACvE,2DAGoC;AACpC,mDAAiD;AAajD,SAAS,UAAU,CAAC,IAAU,EAAE,OAAyB;IACvD,MAAM,oBAAoB,GAAyB;QACjD,IAAI,EAAE,OAAO,CAAC,WAAW;QACzB,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;QACzD,WAAW,EAAE,SAAS;QACtB,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,oBAAS,EAAE,CAAC,CAAC;QAClE,oBAAoB,CAAC,OAAO,CAAC,KAAK,GAAG;YACnC,QAAQ,EAAE,cAAc;YACxB,OAAO,EAAE,CAAC,sBAAsB,CAAC;YACjC,OAAO,EAAE;gBACP,UAAU,EACR,OAAO,CAAC,OAAO,IAAI,GAAG;oBACpB,CAAC,CAAC,QAAQ,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,gBAAgB,EAAE;oBACvD,CAAC,CAAC,QAAQ,OAAO,CAAC,gBAAgB,EAAE;gBACxC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,YAAY,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;gBACvE,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;gBACpD,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,OAAO,CAAC;aACxC;SACF,CAAC;KACH;IAED,IAAA,gCAAuB,
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
@@ -104,7 +104,8 @@
|
|
104
104
|
"standaloneConfig": {
|
105
105
|
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
106
106
|
"type": "boolean",
|
107
|
-
"
|
107
|
+
"default": true,
|
108
|
+
"x-deprecated": "Nx only supports standaloneConfig"
|
108
109
|
}
|
109
110
|
},
|
110
111
|
"required": ["name"]
|
@@ -6,7 +6,6 @@ function moveProjectConfiguration(tree, schema, projectConfig) {
|
|
6
6
|
if (projectConfig.name) {
|
7
7
|
projectConfig.name = schema.newProjectName;
|
8
8
|
}
|
9
|
-
const isStandalone = (0, devkit_1.isStandaloneProject)(tree, schema.projectName);
|
10
9
|
const projectString = JSON.stringify(projectConfig);
|
11
10
|
const newProjectString = projectString.replace(new RegExp(projectConfig.root, 'g'), schema.relativeToRootDestination);
|
12
11
|
// rename
|
@@ -14,7 +13,7 @@ function moveProjectConfiguration(tree, schema, projectConfig) {
|
|
14
13
|
// Delete the original project
|
15
14
|
(0, devkit_1.removeProjectConfiguration)(tree, schema.projectName);
|
16
15
|
// Create a new project with the root replaced
|
17
|
-
(0, devkit_1.addProjectConfiguration)(tree, schema.newProjectName, newProject
|
16
|
+
(0, devkit_1.addProjectConfiguration)(tree, schema.newProjectName, newProject);
|
18
17
|
}
|
19
18
|
exports.moveProjectConfiguration = moveProjectConfiguration;
|
20
19
|
//# sourceMappingURL=move-project-configuration.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"move-project-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/move-project-configuration.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"move-project-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/move-project-configuration.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAGtB,SAAgB,wBAAwB,CACtC,IAAU,EACV,MAAwB,EACxB,aAAmC;IAEnC,IAAI,aAAa,CAAC,IAAI,EAAE;QACtB,aAAa,CAAC,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC;KAC5C;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAC5C,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,EACnC,MAAM,CAAC,yBAAyB,CACjC,CAAC;IAEF,SAAS;IACT,MAAM,UAAU,GAAyB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEtE,8BAA8B;IAC9B,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAErD,8CAA8C;IAC9C,IAAA,gCAAuB,EAAC,IAAI,EAAE,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AACnE,CAAC;AAvBD,4DAuBC"}
|
@@ -1,8 +1,6 @@
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
2
2
|
import type { NormalizedSchema } from '../schema';
|
3
3
|
/**
|
4
|
-
* Updates the workspace.json file by renaming the project
|
5
|
-
*
|
6
4
|
* @param schema The options provided to the schematic
|
7
5
|
*/
|
8
6
|
export declare function updateImplicitDependencies(tree: Tree, schema: NormalizedSchema): void;
|
@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateImplicitDependencies = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
5
|
/**
|
6
|
-
* Updates the workspace.json file by renaming the project
|
7
|
-
*
|
8
6
|
* @param schema The options provided to the schematic
|
9
7
|
*/
|
10
8
|
function updateImplicitDependencies(tree, schema) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-implicit-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-implicit-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAAuE;AAGvE
|
1
|
+
{"version":3,"file":"update-implicit-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-implicit-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAAuE;AAGvE;;GAEG;AACH,SAAgB,0BAA0B,CACxC,IAAU,EACV,MAAwB;IAExB,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACtD,IAAI,OAAO,CAAC,oBAAoB,EAAE;YAChC,MAAM,KAAK,GAAG,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACvE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;gBAChB,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC;gBAC5D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aACxD;SACF;KACF;AACH,CAAC;AAbD,gEAaC"}
|
@@ -60,6 +60,7 @@ function generatePreset(host, opts) {
|
|
60
60
|
opts.preset ? `--preset=${opts.preset}` : null,
|
61
61
|
opts.bundler ? `--bundler=${opts.bundler}` : null,
|
62
62
|
opts.framework ? `--framework=${opts.framework}` : null,
|
63
|
+
opts.docker ? `--docker=${opts.docker}` : null,
|
63
64
|
opts.packageManager ? `--packageManager=${opts.packageManager}` : null,
|
64
65
|
parsedArgs.interactive ? '--interactive=true' : '--interactive=false',
|
65
66
|
].filter((e) => !!e);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AACtB,8CAA0C;AAC1C,mDAAiD;AACjD,8EAAwE;AAExE,+BAA4B;AAC5B,4CAA4C;AAC5C,iDAAoD;AAEpD,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IACzE,IACE,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,KAAK;QAC/B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,EAC7B;QACA,OAAO;KACR;IACD,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,qBAAqB,CACjD,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,aAAa,CACtB,CAAC;IACF,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,YAAY,EACZ,GAAG,EACH,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CACxC,CAAC;AACJ,CAAC;AAnBD,sDAmBC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,IAAsB;IAC/D,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE;QAC3C,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,OAAO,EAAE;YACP,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IACH,MAAM,YAAY,GAAiB;QACjC,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACrC,CAAC;IACF,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;IACvC,MAAM,UAAU,GAAG,GAAG,GAAG,CAAC,IAAI,KAAK,CAAC;IACpC,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAEjC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAA,qBAAK,EAAC,UAAU,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;YACjE,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,EAAE,CAAC;aACX;iBAAM;gBACL,MAAM,OAAO,GAAG,uCAAuC,CAAC;gBACxD,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,SAAS,aAAa,CAAC,OAAyB;QAC9C,oBAAoB;QACpB,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,SAAS,cAAc,CAAC,IAAsB;QAC5C,OAAO;YACL,GAAG;YACH,wBAAwB;YACxB,UAAU,IAAI,CAAC,OAAO,EAAE;YACxB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI;YAC3C,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;YAC9C,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,IAAI,EAAE;YACzE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;YAC9C,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI;YACjD,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI;YACvD,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;YAC9C,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI;YACtE,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,qBAAqB;SACtE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;AACH,CAAC;AAhDD,wCAgDC;AAED,SAAS,qBAAqB,CAAC,MAAc,EAAE,OAAgB;IAC7D,QAAQ,MAAM,EAAE;QACd,KAAK,gBAAM,CAAC,EAAE;YACZ,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,oBAAS,EAAE,EAAE,CAAC;QAE9D,KAAK,gBAAM,CAAC,eAAe,CAAC;QAC5B,KAAK,gBAAM,CAAC,iBAAiB;YAC3B,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,EAAE,oBAAS,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAEnE,KAAK,gBAAM,CAAC,OAAO;YACjB,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,eAAe,EAAE,oBAAS,EAAE,EAAE,CAAC;QAEnE,KAAK,gBAAM,CAAC,IAAI;YACd,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,YAAY,EAAE,oBAAS,EAAE,EAAE,CAAC;QAEhE,KAAK,gBAAM,CAAC,MAAM;YAChB,OAAO,EAAE,YAAY,EAAE,EAAE,YAAY,EAAE,oBAAS,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAEhE,KAAK,gBAAM,CAAC,aAAa;YACvB,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,aAAa,EAAE,oBAAS,EAAE,EAAE,CAAC;QAEjE,KAAK,gBAAM,CAAC,eAAe;YACzB,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,aAAa,EAAE,oBAAS,EAAE,EAAE,CAAC;QAEjE,KAAK,gBAAM,CAAC,WAAW;YACrB,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,oBAAoB,EAAE,oBAAS,EAAE,EAAE,CAAC;QAExE,KAAK,gBAAM,CAAC,IAAI;YACd,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,YAAY,EAAE,oBAAS,EAAE,EAAE,CAAC;QAEhE,KAAK,gBAAM,CAAC,aAAa;YACvB,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,WAAW,EAAE,oBAAS,EAAE,EAAE,CAAC;QAE/D,KAAK,gBAAM,CAAC,UAAU;YACpB,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,YAAY,EAAE,oBAAS,EAAE,EAAE,CAAC;QAEhE,OAAO,CAAC,CAAC;YACP,OAAO;gBACL,GAAG,EAAE,EAAE;gBACP,YAAY,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAA,8CAAoB,EAAC,MAAM,CAAC,EAAE;aACpE,CAAC;SACH;KACF;AACH,CAAC"}
|