@rxap/plugin-library 16.0.0-dev.30 → 16.0.0-dev.32

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 CHANGED
@@ -3,6 +3,19 @@
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
+ # [16.0.0-dev.32](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.0.0-dev.31...@rxap/plugin-library@16.0.0-dev.32) (2023-10-03)
7
+
8
+ ### Bug Fixes
9
+
10
+ - ensure all required cacheable operations are defined ([49a9199](https://gitlab.com/rxap/packages/commit/49a9199cd2592cf8550650dc17f9995e4f6727f8))
11
+
12
+ # [16.0.0-dev.31](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.0.0-dev.30...@rxap/plugin-library@16.0.0-dev.31) (2023-10-02)
13
+
14
+ ### Bug Fixes
15
+
16
+ - cleanup target version ([06558eb](https://gitlab.com/rxap/packages/commit/06558eb200e620dfb6ea217885520c6561cd1c25))
17
+ - coerce the index-export default target options ([1de131c](https://gitlab.com/rxap/packages/commit/1de131c42dfa133dc448d0d1a300d49e1ae9b7cc))
18
+
6
19
  # [16.0.0-dev.30](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.0.0-dev.29...@rxap/plugin-library@16.0.0-dev.30) (2023-10-02)
7
20
 
8
21
  ### Bug Fixes
package/README.md CHANGED
@@ -19,7 +19,7 @@ yarn add @rxap/plugin-library
19
19
  ```
20
20
  **Install peer dependencies:**
21
21
  ```bash
22
- yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.1-dev.12 @rxap/generator-utilities@^1.1.0-dev.16 @rxap/node-utilities@^1.1.0-dev.13 @rxap/plugin-angular@^16.1.0-dev.46 @rxap/plugin-nestjs@^16.1.0-dev.36 @rxap/plugin-utilities@^16.1.0-dev.18 @rxap/utilities@^16.0.0-dev.19 @rxap/workspace-utilities@^0.1.0-dev.19 handlebars@^4.7.7 nx@^16.5.0 semver@^7.3.5 ts-morph@^18.0.0 tslib@2.6.2
22
+ yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.1-dev.12 @rxap/generator-utilities@^1.1.0-dev.17 @rxap/node-utilities@^1.1.0-dev.13 @rxap/plugin-angular@^16.1.0-dev.47 @rxap/plugin-nestjs@^16.1.0-dev.37 @rxap/plugin-utilities@^16.1.0-dev.18 @rxap/utilities@^16.0.0-dev.19 @rxap/workspace-utilities@^0.1.0-dev.20 handlebars@^4.7.7 nx@^16.5.0 semver@^7.3.5 ts-morph@^18.0.0 tslib@2.6.2
23
23
  ```
24
24
  **Execute the init generator:**
25
25
  ```bash
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "16.0.0-dev.30",
2
+ "version": "16.0.0-dev.32",
3
3
  "name": "@rxap/plugin-library",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -12,13 +12,13 @@
12
12
  "peerDependencies": {
13
13
  "@nx/devkit": "^16.5.0",
14
14
  "@rxap/generator-ts-morph": "^1.0.1-dev.12",
15
- "@rxap/generator-utilities": "^1.1.0-dev.16",
15
+ "@rxap/generator-utilities": "^1.1.0-dev.17",
16
16
  "@rxap/node-utilities": "^1.1.0-dev.13",
17
- "@rxap/plugin-angular": "^16.1.0-dev.46",
18
- "@rxap/plugin-nestjs": "^16.1.0-dev.36",
17
+ "@rxap/plugin-angular": "^16.1.0-dev.47",
18
+ "@rxap/plugin-nestjs": "^16.1.0-dev.37",
19
19
  "@rxap/plugin-utilities": "^16.1.0-dev.18",
20
20
  "@rxap/utilities": "^16.0.0-dev.19",
21
- "@rxap/workspace-utilities": "^0.1.0-dev.19",
21
+ "@rxap/workspace-utilities": "^0.1.0-dev.20",
22
22
  "handlebars": "^4.7.7",
23
23
  "nx": "^16.5.0",
24
24
  "semver": "^7.3.5",
@@ -54,7 +54,7 @@
54
54
  },
55
55
  {
56
56
  "package": "@rxap/generator-utilities",
57
- "version": "1.1.0-dev.16"
57
+ "version": "1.1.0-dev.17"
58
58
  },
59
59
  {
60
60
  "package": "@rxap/node-utilities",
@@ -62,11 +62,11 @@
62
62
  },
63
63
  {
64
64
  "package": "@rxap/plugin-angular",
65
- "version": "16.1.0-dev.46"
65
+ "version": "16.1.0-dev.47"
66
66
  },
67
67
  {
68
68
  "package": "@rxap/plugin-nestjs",
69
- "version": "16.1.0-dev.36"
69
+ "version": "16.1.0-dev.37"
70
70
  },
71
71
  {
72
72
  "package": "@rxap/plugin-utilities",
@@ -82,7 +82,7 @@
82
82
  },
83
83
  {
84
84
  "package": "@rxap/workspace-utilities",
85
- "version": "0.1.0-dev.19"
85
+ "version": "0.1.0-dev.20"
86
86
  }
87
87
  ]
88
88
  },
@@ -97,7 +97,7 @@
97
97
  },
98
98
  "schematics": "./generators.json",
99
99
  "type": "commonjs",
100
- "gitHead": "c7b46326beb6e27752ac60aa1cf79fa048cc1e2d",
100
+ "gitHead": "b3cd887dab21a78b2c156ffd0424bae942cb30fb",
101
101
  "main": "./src/index.js",
102
102
  "types": "./src/index.d.ts"
103
103
  }
@@ -9,13 +9,14 @@ function runExecutor(options, context) {
9
9
  console.log('Executor ran for CheckVersion', options);
10
10
  const projectJson = (0, plugin_utilities_1.readPackageJsonForProject)(context);
11
11
  const rootPackageJson = (0, plugin_utilities_1.readPackageJsonForProject)(context, 'workspace');
12
- const targetVersion = (_a = rootPackageJson.devDependencies[options.packageName]) !== null && _a !== void 0 ? _a : rootPackageJson.dependencies[options.packageName];
12
+ let targetVersion = (_a = rootPackageJson.devDependencies[options.packageName]) !== null && _a !== void 0 ? _a : rootPackageJson.dependencies[options.packageName];
13
13
  if (!targetVersion) {
14
14
  console.error(`The package ${options.packageName} is not installed in the root package.json`);
15
15
  return {
16
16
  success: false,
17
17
  };
18
18
  }
19
+ targetVersion = targetVersion.replace(/^[~^]/, '');
19
20
  console.log(`Current '${options.packageName}' version: ${targetVersion}`);
20
21
  console.log(`Project version: ${projectJson.version}`);
21
22
  const version = (0, semver_1.parse)(targetVersion);
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/check-version/executor.ts"],"names":[],"mappings":";;;AACA,6DAAmE;AACnE,mCAGgB;AAGhB,SAA8B,WAAW,CACvC,OAAmC,EACnC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,WAAW,GAAG,IAAA,4CAAyB,EAAC,OAAO,CAAC,CAAC;QACvD,MAAM,eAAe,GAAG,IAAA,4CAAyB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAExE,MAAM,aAAa,GAAG,MAAA,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,mCACxE,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEpD,IAAI,CAAC,aAAa,EAAE;YAClB,OAAO,CAAC,KAAK,CAAC,eAAgB,OAAO,CAAC,WAAY,4CAA4C,CAAC,CAAC;YAChG,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;SACH;QAED,OAAO,CAAC,GAAG,CAAC,YAAa,OAAO,CAAC,WAAY,cAAe,aAAc,EAAE,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,oBAAqB,WAAW,CAAC,OAAQ,EAAE,CAAC,CAAC;QAEzD,MAAM,OAAO,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC;QAErC,MAAM,YAAY,GAAG,KAAM,OAAO,CAAC,KAAM,EAAE,CAAC;QAE5C,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,IAAA,kBAAS,EAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE;YAC/C,OAAO,CAAC,KAAK,CAAC,wBAAyB,WAAW,CAAC,OAAQ,iBAAkB,iBAAkB,iCAAkC,OAAO,CAAC,WAAY,cAAe,aAAc,qBAAsB,YAAa,GAAG,CAAC,CAAC;YAC1N,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;SACH;QAED,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AAtCD,8BAsCC"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/check-version/executor.ts"],"names":[],"mappings":";;;AACA,6DAAmE;AACnE,mCAGgB;AAGhB,SAA8B,WAAW,CACvC,OAAmC,EACnC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,WAAW,GAAG,IAAA,4CAAyB,EAAC,OAAO,CAAC,CAAC;QACvD,MAAM,eAAe,GAAG,IAAA,4CAAyB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAExE,IAAI,aAAa,GAAG,MAAA,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,mCACtE,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEpD,IAAI,CAAC,aAAa,EAAE;YAClB,OAAO,CAAC,KAAK,CAAC,eAAgB,OAAO,CAAC,WAAY,4CAA4C,CAAC,CAAC;YAChG,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;SACH;QAED,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEnD,OAAO,CAAC,GAAG,CAAC,YAAa,OAAO,CAAC,WAAY,cAAe,aAAc,EAAE,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,oBAAqB,WAAW,CAAC,OAAQ,EAAE,CAAC,CAAC;QAEzD,MAAM,OAAO,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC;QAErC,MAAM,YAAY,GAAG,KAAM,OAAO,CAAC,KAAM,EAAE,CAAC;QAE5C,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,IAAA,kBAAS,EAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE;YAC/C,OAAO,CAAC,KAAK,CAAC,wBAAyB,WAAW,CAAC,OAAQ,iBAAkB,iBAAkB,iCAAkC,OAAO,CAAC,WAAY,cAAe,aAAc,qBAAsB,YAAa,GAAG,CAAC,CAAC;YAC1N,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;SACH;QAED,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AAxCD,8BAwCC"}
@@ -31,6 +31,22 @@ function updateProjectTargets(project) {
31
31
  (0, workspace_utilities_1.CoerceTarget)(project, 'index-export', {});
32
32
  }
33
33
  }
34
+ function updateDefaultProjectTargets(tree) {
35
+ const nxJson = (0, devkit_1.readNxJson)(tree);
36
+ (0, workspace_utilities_1.CoerceTarget)(nxJson, 'index-export', {
37
+ 'executor': '@rxap/plugin-library:run-generator',
38
+ 'outputs': [
39
+ '{workspaceRoot}/{projectRoot}/src/index.ts',
40
+ ],
41
+ 'options': {
42
+ 'generator': '@rxap/plugin-library:index-export',
43
+ },
44
+ 'inputs': [
45
+ 'production',
46
+ ],
47
+ });
48
+ (0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'index-export');
49
+ }
34
50
  function skipProject(tree, options, project, projectName) {
35
51
  if ((0, generator_utilities_1.SkipNonLibraryProject)(tree, options, project, projectName)) {
36
52
  return true;
@@ -40,6 +56,7 @@ function skipProject(tree, options, project, projectName) {
40
56
  function initGenerator(tree, options) {
41
57
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
42
58
  console.log('library init generator:', options);
59
+ updateDefaultProjectTargets(tree);
43
60
  for (const [projectName, project] of (0, devkit_1.getProjects)(tree).entries()) {
44
61
  if (skipProject(tree, options, project, projectName)) {
45
62
  continue;
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AACpB,mEAKmC;AACnC,yDAA4D;AAC5D,uDAA0D;AAC1D,mEAQmC;AACnC,oFAAiE;AACjE,iFAA2D;AAC3D,sFAAqE;AAIrE,SAAS,iBAAiB,CAAC,OAA6B;IACtD,MAAM,IAAI,GAAa,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,mDAAmD;IACnF,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;QACzB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAClB;IACD,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE;QACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KACrB;IACD,IAAA,uCAAiB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjC,oDAAoD;IACpD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAC/B,+DAA+D;QAC/D,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC;KAChE;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,OAA6B;IAEzD,IAAI,CAAC,IAAA,qCAAe,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,wCAAkB,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,wCAAkB,EAAC,OAAO,CAAC,EAAE;QAC7F,IAAA,kCAAY,EAAC,OAAO,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;KAC3C;AAEH,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAU;IAC7C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAA,kCAAY,EAAC,MAAM,EAAE,cAAc,EAAE;QACnC,UAAU,EAAE,oCAAoC;QAChD,SAAS,EAAE;YACT,4CAA4C;SAC7C;QACD,SAAS,EAAE;YACT,WAAW,EAAE,mCAAmC;SACjD;QACD,QAAQ,EAAE;YACR,YAAY;SACb;KACF,CAAC,CAAC;IAEH,IAAA,oDAA8B,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AAEzD,CAAC;AAGD,SAAS,WAAW,CAClB,IAAU,EACV,OAA4B,EAC5B,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,2CAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QAEhD,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAElC,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;gBACpD,SAAS;aACV;YAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;gBACzB,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;gBAE9C,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBAE3B,oBAAoB,CAAC,OAAO,CAAC,CAAC;gBAE9B,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aACzD;YAED,IAAI,IAAA,iCAAW,EAAC,OAAO,CAAC,EAAE;gBACxB,MAAM,IAAA,mBAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aAC7C;YAED,IAAI,IAAA,mCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;gBAChC,MAAM,IAAA,mBAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aAC/C;YAED,IAAI,IAAA,sCAAgB,EAAC,OAAO,CAAC,EAAE;gBAC7B,MAAM,IAAA,qCAAoB,EAAC,IAAI,kCAExB,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;aACH;YAED,IAAI,IAAA,qCAAe,EAAC,OAAO,CAAC,EAAE;gBAC5B,MAAM,IAAA,mBAAmB,EACvB,IAAI,kCAEC,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;aACH;YAED,IAAI,IAAA,qCAAe,EAAC,OAAO,CAAC,EAAE;gBAC5B,MAAM,IAAA,mCAAmB,EACvB,IAAI,kCAEC,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;aACH;SAEF;IAEH,CAAC;CAAA;AA/DD,sCA+DC;AAED,kBAAe,aAAa,CAAC"}
@@ -33,8 +33,8 @@ function updateProjectTargets(tree, project) {
33
33
  }
34
34
  function setGeneralTargetDefaults(tree) {
35
35
  const nxJson = (0, devkit_1.readNxJson)(tree);
36
- (0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'build', 'check-version');
37
- (0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'build', 'expose-as-schematic');
36
+ (0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'build', 'check-version', 'expose-as-schematic');
37
+ (0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'check-version', 'expose-as-schematic');
38
38
  (0, devkit_1.updateNxJson)(tree, nxJson);
39
39
  }
40
40
  function initPluginGenerator(tree, options) {
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-plugin/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AACpB,mEAAkE;AAClE,6DAAuD;AACvD,mEAImC;AAGnC,SAAS,WAAW,CAClB,IAAU,EACV,OAAkC,EAClC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,2CAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,IAAI,CAAC,IAAA,qCAAe,EAAC,OAAO,CAAC,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAA6B;IAErE,IAAA,kCAAY,EAAC,OAAO,EAAE,eAAe,EAAE;QACrC,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE;YACP,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IAEH,IAAI,IAAA,gCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;QAChC,IAAA,kCAAY,EAAC,OAAO,EAAE,qBAAqB,EAAE;YAC3C,QAAQ,EAAE,oCAAoC;YAC9C,OAAO,EAAE;gBACP,SAAS,EAAE,0CAA0C;aACtD;SACF,CAAC,CAAC;KACJ;AAEH,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAU;IAC1C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAA,oDAA8B,EAAC,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IACjE,IAAA,oDAA8B,EAAC,MAAM,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAC;IAEvE,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;QAEvD,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YAEzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;gBAE9C,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAEpC,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aAEzD;SAEF;IAEH,CAAC;CAAA;AA1BD,kDA0BC;AAED,kBAAe,mBAAmB,CAAC"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-plugin/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AACpB,mEAAkE;AAClE,6DAAuD;AACvD,mEAKmC;AAGnC,SAAS,WAAW,CAClB,IAAU,EACV,OAAkC,EAClC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,2CAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,IAAI,CAAC,IAAA,qCAAe,EAAC,OAAO,CAAC,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAA6B;IAErE,IAAA,kCAAY,EAAC,OAAO,EAAE,eAAe,EAAE;QACrC,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE;YACP,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IAEH,IAAI,IAAA,gCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;QAChC,IAAA,kCAAY,EAAC,OAAO,EAAE,qBAAqB,EAAE;YAC3C,QAAQ,EAAE,oCAAoC;YAC9C,OAAO,EAAE;gBACP,SAAS,EAAE,0CAA0C;aACtD;SACF,CAAC,CAAC;KACJ;AAEH,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAU;IAC1C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAA,oDAA8B,EAAC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,qBAAqB,CAAC,CAAC;IAExF,IAAA,oDAA8B,EAAC,MAAM,EAAE,eAAe,EAAE,qBAAqB,CAAC,CAAC;IAE/E,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;QAEvD,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YAEzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;gBAE9C,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAEpC,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aAEzD;SAEF;IAEH,CAAC;CAAA;AA1BD,kDA0BC;AAED,kBAAe,mBAAmB,CAAC"}
@@ -12,6 +12,7 @@ function setGeneralTargetDefaults(tree) {
12
12
  (0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'fix-dependencies', '^fix-dependencies');
13
13
  (0, workspace_utilities_1.CoerceTargetDefaultsInput)(nxJson, 'readme', '{projectRoot}/README.md.handlebars', '{projectRoot}/GETSTARTED.md', '{projectRoot}/GUIDES.md', '{projectRoot}/package.json', '{projectRoot}/collection.json', '{projectRoot}/generators.json', '{projectRoot}/executors.json', '{projectRoot}/builders.json');
14
14
  (0, workspace_utilities_1.CoerceTargetDefaultsOutput)(nxJson, 'readme', '{projectRoot}/README.md');
15
+ (0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'update-dependencies', 'update-package-group', 'readme', 'fix-dependencies');
15
16
  (0, devkit_1.updateNxJson)(tree, nxJson);
16
17
  }
17
18
  function updateProjectPackageJson(tree, project, projectName, rootPackageJson) {
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/generator.ts"],"names":[],"mappings":"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"}