@rxap/plugin-nestjs 16.2.0-dev.4 → 16.2.0-dev.6

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.
Files changed (7) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/README.md +1 -1
  3. package/package.json +14 -14
  4. package/src/executors/package-json/executor.js +3 -1
  5. package/src/executors/package-json/executor.js.map +1 -1
  6. package/src/executors/swagger-generate/executor.js +1 -0
  7. package/src/executors/swagger-generate/executor.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,18 @@
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.2.0-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@16.2.0-dev.5...@rxap/plugin-nestjs@16.2.0-dev.6) (2024-03-26)
7
+
8
+ ### Bug Fixes
9
+
10
+ - improve logging ([153ba91](https://gitlab.com/rxap/packages/commit/153ba91f959394c53451aa3dbb1991cac5c5e8a7))
11
+
12
+ # [16.2.0-dev.5](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@16.2.0-dev.4...@rxap/plugin-nestjs@16.2.0-dev.5) (2024-03-23)
13
+
14
+ ### Bug Fixes
15
+
16
+ - only include projects in linking target if project has linking target ([c583aa7](https://gitlab.com/rxap/packages/commit/c583aa78d3d39e96a89d4fc9e60463cedc017157))
17
+
6
18
  # [16.2.0-dev.4](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@16.2.0-dev.3...@rxap/plugin-nestjs@16.2.0-dev.4) (2024-03-23)
7
19
 
8
20
  ### Bug Fixes
package/README.md CHANGED
@@ -19,7 +19,7 @@ yarn add @rxap/plugin-nestjs
19
19
  ```
20
20
  **Install peer dependencies:**
21
21
  ```bash
22
- yarn add @nx/devkit@^16.5.0 @nx/js@^16.5.0 @nx/nest@^16.5.0 @rxap/generator-utilities@^1.1.1-dev.1 @rxap/node-utilities@^1.2.0-dev.0 @rxap/plugin-application@^16.1.1-dev.3 @rxap/plugin-docker@^16.1.0-dev.4 @rxap/plugin-library@^16.1.0-dev.6 @rxap/plugin-utilities@^16.1.1-dev.3 @rxap/ts-morph@^1.1.0-dev.19 @rxap/utilities@^16.1.0-dev.7 @rxap/workspace-ts-morph@^16.0.2-dev.2 @rxap/workspace-utilities@^16.1.0-dev.3 ts-morph@^18.0.0 tslib@2.6.2
22
+ yarn add @nx/devkit@^16.5.0 @nx/js@^16.5.0 @nx/nest@^16.5.0 @rxap/generator-utilities@^1.1.1-dev.1 @rxap/node-utilities@^1.2.0-dev.0 @rxap/plugin-application@^16.2.0-dev.0 @rxap/plugin-docker@^16.1.0-dev.6 @rxap/plugin-library@^16.1.0-dev.8 @rxap/plugin-utilities@^16.1.1-dev.3 @rxap/ts-morph@^1.1.0-dev.21 @rxap/utilities@^16.1.0-dev.8 @rxap/workspace-ts-morph@^16.0.2-dev.2 @rxap/workspace-utilities@^16.1.0-dev.4 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.2.0-dev.4",
2
+ "version": "16.2.0-dev.6",
3
3
  "name": "@rxap/plugin-nestjs",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -20,14 +20,14 @@
20
20
  "@nx/nest": "^16.5.0",
21
21
  "@rxap/generator-utilities": "^1.1.1-dev.1",
22
22
  "@rxap/node-utilities": "^1.2.0-dev.0",
23
- "@rxap/plugin-application": "^16.1.1-dev.3",
24
- "@rxap/plugin-docker": "^16.1.0-dev.4",
25
- "@rxap/plugin-library": "^16.1.0-dev.6",
23
+ "@rxap/plugin-application": "^16.2.0-dev.0",
24
+ "@rxap/plugin-docker": "^16.1.0-dev.6",
25
+ "@rxap/plugin-library": "^16.1.0-dev.8",
26
26
  "@rxap/plugin-utilities": "^16.1.1-dev.3",
27
- "@rxap/ts-morph": "^1.1.0-dev.19",
28
- "@rxap/utilities": "^16.1.0-dev.7",
27
+ "@rxap/ts-morph": "^1.1.0-dev.21",
28
+ "@rxap/utilities": "^16.1.0-dev.8",
29
29
  "@rxap/workspace-ts-morph": "^16.0.2-dev.2",
30
- "@rxap/workspace-utilities": "^16.1.0-dev.3",
30
+ "@rxap/workspace-utilities": "^16.1.0-dev.4",
31
31
  "ts-morph": "^18.0.0",
32
32
  "tslib": "2.6.2",
33
33
  "@rxap/generator-ts-morph": "1.0.2-dev.0"
@@ -64,15 +64,15 @@
64
64
  },
65
65
  {
66
66
  "package": "@rxap/plugin-application",
67
- "version": "16.1.1-dev.3"
67
+ "version": "16.2.0-dev.0"
68
68
  },
69
69
  {
70
70
  "package": "@rxap/plugin-docker",
71
- "version": "16.1.0-dev.4"
71
+ "version": "16.1.0-dev.6"
72
72
  },
73
73
  {
74
74
  "package": "@rxap/plugin-library",
75
- "version": "16.1.0-dev.6"
75
+ "version": "16.1.0-dev.8"
76
76
  },
77
77
  {
78
78
  "package": "@rxap/plugin-utilities",
@@ -80,11 +80,11 @@
80
80
  },
81
81
  {
82
82
  "package": "@rxap/ts-morph",
83
- "version": "1.1.0-dev.19"
83
+ "version": "1.1.0-dev.21"
84
84
  },
85
85
  {
86
86
  "package": "@rxap/utilities",
87
- "version": "16.1.0-dev.7"
87
+ "version": "16.1.0-dev.8"
88
88
  },
89
89
  {
90
90
  "package": "@rxap/workspace-ts-morph",
@@ -92,7 +92,7 @@
92
92
  },
93
93
  {
94
94
  "package": "@rxap/workspace-utilities",
95
- "version": "16.1.0-dev.3"
95
+ "version": "16.1.0-dev.4"
96
96
  }
97
97
  ]
98
98
  },
@@ -107,7 +107,7 @@
107
107
  },
108
108
  "schematics": "./generators.json",
109
109
  "type": "commonjs",
110
- "gitHead": "c325cc61fc1c4180be0712a36ec43835a590af4f",
110
+ "gitHead": "4f547dc16bf9355ba0fe694be4983b103906d7ca",
111
111
  "main": "./src/index.js",
112
112
  "types": "./src/index.d.ts"
113
113
  }
package/src/executors/package-json/executor.js CHANGED
@@ -11,14 +11,16 @@ function runExecutor(options, context) {
11
11
  console.log('Executor ran for PackageJson', options);
12
12
  (0, plugin_utilities_1.LoadProjectToPackageMapping)(context);
13
13
  const dependencies = (0, plugin_utilities_1.GetAllPackageDependenciesForProject)(context);
14
+ console.log('resolved local published package dependencies', JSON.stringify(dependencies));
14
15
  if (options.dependencies) {
16
+ console.log('adding dependencies from options', options.dependencies.join(', '));
15
17
  const rootPackageJson = (0, node_utilities_1.jsonFile)((0, path_1.join)(context.root, 'package.json'));
16
18
  for (const dependency of options.dependencies) {
17
19
  dependencies[dependency] = (_d = (_b = (_a = rootPackageJson.dependencies) === null || _a === void 0 ? void 0 : _a[dependency]) !== null && _b !== void 0 ? _b : (_c = rootPackageJson.devDependencies) === null || _c === void 0 ? void 0 : _c[dependency]) !== null && _d !== void 0 ? _d : 'latest';
18
20
  }
19
21
  }
20
22
  const packageJson = { dependencies, name: context.projectName, private: true };
21
- console.log('dependencies', dependencies);
23
+ console.log('generated package.json', JSON.stringify(packageJson));
22
24
  (0, fs_1.writeFileSync)((0, path_1.join)((0, plugin_utilities_1.GetProjectRoot)(context), 'package.json'), JSON.stringify(packageJson, null, 2));
23
25
  return {
24
26
  success: true,
package/src/executors/package-json/executor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/executors/package-json/executor.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAChD,6DAIgC;AAEhC,2BAAmC;AACnC,+BAA4B;AAG5B,SAA8B,WAAW,CACvC,OAAkC,EAClC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;QAErD,IAAA,8CAA2B,EAAC,OAAO,CAAC,CAAC;QAErC,MAAM,YAAY,GAAG,IAAA,sDAAmC,EAAC,OAAO,CAAC,CAAC;QAElE,IAAI,OAAO,CAAC,YAAY,EAAE;YACxB,MAAM,eAAe,GAAgB,IAAA,yBAAQ,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;YAClF,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE;gBAC7C,YAAY,CAAC,UAAU,CAAC,GAAG,MAAA,MAAA,MAAA,eAAe,CAAC,YAAY,0CAAG,UAAU,CAAC,mCAC1C,MAAA,eAAe,CAAC,eAAe,0CAAG,UAAU,CAAC,mCAAI,QAAQ,CAAC;aACtF;SACF;QAED,MAAM,WAAW,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAE/E,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAE1C,IAAA,kBAAa,EAAC,IAAA,WAAI,EAAC,IAAA,iCAAc,EAAC,OAAO,CAAC,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEnG,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AA3BD,8BA2BC"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/executors/package-json/executor.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAChD,6DAIgC;AAEhC,2BAAmC;AACnC,+BAA4B;AAG5B,SAA8B,WAAW,CACvC,OAAkC,EAClC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;QAErD,IAAA,8CAA2B,EAAC,OAAO,CAAC,CAAC;QAErC,MAAM,YAAY,GAAG,IAAA,sDAAmC,EAAC,OAAO,CAAC,CAAC;QAElE,OAAO,CAAC,GAAG,CAAC,+CAA+C,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;QAE3F,IAAI,OAAO,CAAC,YAAY,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACjF,MAAM,eAAe,GAAgB,IAAA,yBAAQ,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;YAClF,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE;gBAC7C,YAAY,CAAC,UAAU,CAAC,GAAG,MAAA,MAAA,MAAA,eAAe,CAAC,YAAY,0CAAG,UAAU,CAAC,mCAC1C,MAAA,eAAe,CAAC,eAAe,0CAAG,UAAU,CAAC,mCAAI,QAAQ,CAAC;aACtF;SACF;QAED,MAAM,WAAW,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAE/E,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QAEnE,IAAA,kBAAa,EAAC,IAAA,WAAI,EAAC,IAAA,iCAAc,EAAC,OAAO,CAAC,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEnG,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AA9BD,8BA8BC"}
package/src/executors/swagger-generate/executor.js CHANGED
@@ -16,6 +16,7 @@ function checkIfOpenApiFileExists(context) {
16
16
  function linkLibrariesToDistNodeModules(context) {
17
17
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
18
18
  const dependentProjects = (0, plugin_utilities_1.GetDependentProjectsForProject)(context)
19
+ .filter(project => { var _a, _b, _c; return (_c = (_b = (_a = context.projectsConfigurations) === null || _a === void 0 ? void 0 : _a.projects[project]) === null || _b === void 0 ? void 0 : _b.targets) === null || _c === void 0 ? void 0 : _c['linking']; })
19
20
  .map(name => ({ project: name, target: 'linking' }));
20
21
  console.log('Dependent projects', dependentProjects);
21
22
  for (const target of dependentProjects) {
package/src/executors/swagger-generate/executor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/executors/swagger-generate/executor.ts"],"names":[],"mappings":";;;AAAA,uCAGoB;AACpB,mEAA+D;AAC/D,6DAGgC;AAChC,2BAAgC;AAChC,+BAA4B;AAG5B,SAAS,wBAAwB,CAAC,OAAwB;IACxD,MAAM,UAAU,GAAG,IAAA,6CAA0B,EAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;IAC9F,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE,QAAQ,CAAC,CAAC;IAC5D,OAAO,IAAA,eAAU,EAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC;AAED,SAAe,8BAA8B,CAAC,OAAwB;;QACpE,MAAM,iBAAiB,GAAG,IAAA,iDAA8B,EAAC,OAAO,CAAC;aAC9D,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QAEvD,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QAErD,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE;YACtC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YACpD,MAAM,IAAA,oBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;SACxC;IACH,CAAC;CAAA;AAED,SAA8B,WAAW,CACvC,OAAsC,EACtC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,OAAO,CAAC,CAAC;QAEzD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QAExC,MAAM,8BAA8B,CAAC,OAAO,CAAC,CAAC;QAE9C,uDAAuD;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;QAErD,MAAM,QAAQ,GAAG,IAAA,mBAAY,EAAC;YAC5B,KAAK,EAAE,KAAK;YACZ,WAAW,EAAE,GAAG,WAAW,gBAAgB;YAC3C,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,EAAE;YACf,IAAI,EAAE,EAAE;YACR,gBAAgB,EAAE,EAAE;YACpB,kBAAkB,EAAE,EAAE;YACtB,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,IAAI;SACX,EAAE,OAAO,CAAC,CAAC;;YAEZ,KAA0B,eAAA,aAAA,sBAAA,QAAQ,CAAA,cAAA,kFAAE;gBAAV,wBAAQ;gBAAR,WAAQ;gBAAvB,MAAM,KAAK,KAAA,CAAA;gBACpB,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;gBAC1C,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;oBAClB,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;oBACvD,OAAO;wBACL,OAAO,EAAE,KAAK;qBACf,CAAC;iBACH;aACF;;;;;;;;;QAED,IAAI,wBAAwB,CAAC,OAAO,CAAC,EAAE;YACrC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YACnC,OAAO;gBACL,OAAO,EAAE,IAAI;aACd,CAAC;SACH;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;SAC5C;QAED,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAC;;CACH;AA/CD,8BA+CC"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/executors/swagger-generate/executor.ts"],"names":[],"mappings":"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"}