@abgov/nx-adsp 7.0.0-beta.2 → 8.0.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abgov/nx-adsp",
3
- "version": "7.0.0-beta.2",
3
+ "version": "8.0.0-beta.1",
4
4
  "license": "Apache-2.0",
5
5
  "main": "./src/index.js",
6
6
  "description": "Government of Alberta - Nx plugin for ADSP apps.",
@@ -10,15 +10,16 @@
10
10
  "directory": "packages/nx-adsp"
11
11
  },
12
12
  "peerDependencies": {
13
- "@nx/angular": "^17.0.0",
14
- "@nx/express": "^17.0.0",
15
- "@nx/devkit": "^17.0.0",
16
- "@nx/react": "^17.0.0",
17
- "@nx/eslint": "^17.0.0",
13
+ "@abgov/nx-oc": "0.0.0",
14
+ "@nx-dotnet/core": "^2.0.0",
15
+ "@nx/angular": "^18.0.0",
16
+ "@nx/express": "^18.0.0",
17
+ "@nx/devkit": "^18.0.0",
18
+ "@nx/react": "^18.0.0",
19
+ "@nx/eslint": "^18.0.0",
18
20
  "tslib": "^2.0.0"
19
21
  },
20
22
  "dependencies": {
21
- "@abgov/nx-oc": "^6.0.0",
22
23
  "axios": "^1.6.0",
23
24
  "enquirer": "^2.3.6",
24
25
  "json-schema-to-typescript": "^13.0.1"
@@ -2,6 +2,8 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
4
  const nx_oc_1 = require("@abgov/nx-oc");
5
+ const generator_1 = require("@nx-dotnet/core/src/generators/app/generator");
6
+ const generator_2 = require("@nx-dotnet/core/src/generators/nuget-reference/generator");
5
7
  const devkit_1 = require("@nx/devkit");
6
8
  const path = require("path");
7
9
  function normalizeOptions(host, options) {
@@ -24,9 +26,7 @@ function default_1(host, options) {
24
26
  throw new Error('nx-dotnet/core is required to generate dotnet service');
25
27
  }
26
28
  const normalizedOptions = yield normalizeOptions(host, options);
27
- const { default: appGenerator } = yield Promise.resolve(`${`${'@nx-dotnet/core/src/generators/app/generator'}`}`).then(s => require(s));
28
- const { default: refGenerator } = yield Promise.resolve(`${`${'@nx-dotnet/core/src/generators/nuget-reference/generator'}`}`).then(s => require(s));
29
- yield appGenerator(host, {
29
+ yield (0, generator_1.default)(host, {
30
30
  name: normalizedOptions.projectName,
31
31
  template: 'webapi',
32
32
  language: 'C#',
@@ -35,7 +35,8 @@ function default_1(host, options) {
35
35
  skipSwaggerLib: true,
36
36
  pathScheme: 'nx',
37
37
  });
38
- yield refGenerator(host, {
38
+ yield (0, generator_2.default)(host, {
39
+ allowVersionMismatch: false,
39
40
  project: normalizedOptions.projectName,
40
41
  packageName: 'Adsp.Sdk',
41
42
  version: '2.*',
@@ -1 +1 @@
1
- {"version":3,"file":"dotnet-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/dotnet-service/dotnet-service.ts"],"names":[],"mappings":";;;AAAA,wCAIsB;AACtB,uCAMoB;AACpB,6BAA6B;AAG7B,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;QAEf,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QACjD,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;QAEzE,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,uCACK,OAAO,KACV,WAAW;YACX,WAAW;YACX,IAAI,IACJ;IACJ,CAAC;CAAA;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,IAAI,EAAE,EAAE,GACT,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,IAAI,CAAC,IAAA,qBAAa,EAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,yBAChC,GAAG,8CAA8C,EAAE,yBACpD,CAAC;QAEF,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,yBAChC,GAAG,0DAA0D,EAAE,yBAChE,CAAC;QAEF,MAAM,YAAY,CAAC,IAAI,EAAE;YACvB,IAAI,EAAE,iBAAiB,CAAC,WAAW;YACnC,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,MAAM;YACpB,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,IAAI;YACpB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,YAAY,CAAC,IAAI,EAAE;YACvB,OAAO,EAAE,iBAAiB,CAAC,WAAW;YACtC,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAElC,MAAM,IAAA,2BAAmB,EAAC,IAAI,kCACzB,iBAAiB,KACpB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,iBAAiB,CAAC,WAAW,IACtC,CAAC;QAEH,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AA1CD,4BA0CC"}
1
+ {"version":3,"file":"dotnet-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/dotnet-service/dotnet-service.ts"],"names":[],"mappings":";;;AAAA,wCAIsB;AACtB,4EAAuF;AACvF,wFAAmG;AACnG,uCAMoB;AACpB,6BAA6B;AAG7B,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;QAEf,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QACjD,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;QAEzE,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,uCACK,OAAO,KACV,WAAW;YACX,WAAW;YACX,IAAI,IACJ;IACJ,CAAC;CAAA;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,IAAI,EAAE,EAAE,GACT,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,IAAI,CAAC,IAAA,qBAAa,EAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,IAAA,mBAAY,EAAC,IAAI,EAAE;YACvB,IAAI,EAAE,iBAAiB,CAAC,WAAW;YACnC,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,MAAM;YACpB,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,IAAI;YACpB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,IAAA,mBAAY,EAAC,IAAI,EAAE;YACvB,oBAAoB,EAAE,KAAK;YAC3B,OAAO,EAAE,iBAAiB,CAAC,WAAW;YACtC,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAElC,MAAM,IAAA,2BAAmB,EAAC,IAAI,kCACzB,iBAAiB,KACpB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,iBAAiB,CAAC,WAAW,IACtC,CAAC;QAEH,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AAnCD,4BAmCC"}