@o3r/pipeline 12.3.0-prerelease.7 → 12.3.0-prerelease.70

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": "@o3r/pipeline",
3
- "version": "12.3.0-prerelease.7",
3
+ "version": "12.3.0-prerelease.70",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -33,13 +33,14 @@
33
33
  }
34
34
  },
35
35
  "dependencies": {
36
+ "@o3r/schematics": "^12.3.0-prerelease.70",
36
37
  "js-yaml": "^4.1.0",
37
38
  "tslib": "^2.6.2"
38
39
  },
39
40
  "peerDependencies": {
40
41
  "@angular-devkit/schematics": "^19.0.0",
41
- "@o3r/schematics": "^12.3.0-prerelease.7",
42
- "@o3r/telemetry": "^12.3.0-prerelease.7",
42
+ "@o3r/schematics": "^12.3.0-prerelease.70",
43
+ "@o3r/telemetry": "^12.3.0-prerelease.70",
43
44
  "type-fest": "^4.10.2"
44
45
  },
45
46
  "peerDependenciesMeta": {
@@ -62,26 +63,25 @@
62
63
  "@angular-devkit/schematics": "~19.2.0",
63
64
  "@compodoc/compodoc": "^1.1.19",
64
65
  "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
65
- "@nx/eslint-plugin": "~20.7.0",
66
- "@nx/jest": "~20.7.0",
67
- "@nx/js": "~20.7.0",
68
- "@o3r/build-helpers": "^12.3.0-prerelease.7",
69
- "@o3r/eslint-plugin": "^12.3.0-prerelease.7",
70
- "@o3r/schematics": "^12.3.0-prerelease.7",
71
- "@o3r/telemetry": "^12.3.0-prerelease.7",
72
- "@o3r/test-helpers": "^12.3.0-prerelease.7",
66
+ "@nx/eslint-plugin": "~20.8.0",
67
+ "@nx/jest": "~20.8.0",
68
+ "@nx/js": "~20.8.0",
69
+ "@o3r/build-helpers": "^12.3.0-prerelease.70",
70
+ "@o3r/eslint-plugin": "^12.3.0-prerelease.70",
71
+ "@o3r/telemetry": "^12.3.0-prerelease.70",
72
+ "@o3r/test-helpers": "^12.3.0-prerelease.70",
73
73
  "@schematics/angular": "~19.2.0",
74
74
  "@stylistic/eslint-plugin": "~3.1.0",
75
75
  "@stylistic/eslint-plugin-ts": "~3.1.0",
76
76
  "@types/jest": "~29.5.2",
77
77
  "@types/js-yaml": "^4.0.5",
78
78
  "@types/node": "^20.0.0",
79
- "@typescript-eslint/eslint-plugin": "~8.29.0",
80
- "@typescript-eslint/parser": "~8.29.0",
81
- "@typescript-eslint/utils": "~8.29.0",
82
- "angular-eslint": "~19.3.0",
79
+ "@typescript-eslint/eslint-plugin": "~8.32.0",
80
+ "@typescript-eslint/parser": "~8.32.0",
81
+ "@typescript-eslint/utils": "~8.32.0",
82
+ "angular-eslint": "~19.4.0",
83
83
  "cpy-cli": "^5.0.0",
84
- "eslint": "~9.23.0",
84
+ "eslint": "~9.26.0",
85
85
  "eslint-import-resolver-node": "~0.3.9",
86
86
  "eslint-import-resolver-typescript": "~3.10.0",
87
87
  "eslint-plugin-import": "~2.31.0",
@@ -95,14 +95,14 @@
95
95
  "jest": "~29.7.0",
96
96
  "jest-junit": "~16.0.0",
97
97
  "jsonc-eslint-parser": "~2.4.0",
98
- "nx": "~20.7.0",
98
+ "nx": "~20.8.0",
99
99
  "pid-from-port": "^1.1.3",
100
100
  "rxjs": "^7.8.1",
101
101
  "ts-jest": "~29.3.0",
102
102
  "ts-node": "~10.9.2",
103
103
  "type-fest": "^4.30.1",
104
104
  "typescript": "~5.8.2",
105
- "typescript-eslint": "~8.29.0"
105
+ "typescript-eslint": "~8.32.0"
106
106
  },
107
107
  "engines": {
108
108
  "node": "^20.11.1 || >=22.0.0"
@@ -116,7 +116,7 @@
116
116
  },
117
117
  "config": {
118
118
  "o3r": {
119
- "commitHash": "6187e8a81ef9d7bc0ed22ffa88f4021fc416635e"
119
+ "commitHash": "5e4e53fda570bd8a80864b91ced86b972fbc907b"
120
120
  }
121
121
  },
122
122
  "contributors": [
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAQpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAoFlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAQtD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAapC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAkFlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
@@ -4,6 +4,7 @@ exports.ngAdd = void 0;
4
4
  const fs = require("node:fs");
5
5
  const path = require("node:path");
6
6
  const schematics_1 = require("@angular-devkit/schematics");
7
+ const schematics_2 = require("@o3r/schematics");
7
8
  const js_yaml_1 = require("js-yaml");
8
9
  /**
9
10
  * Determines if the Yarn version is 2 or higher based on the contents of the .yarnrc.yml file.
@@ -22,7 +23,7 @@ function isYarn2(tree) {
22
23
  * @param options
23
24
  */
24
25
  function ngAddFn(options) {
25
- return async (tree, context) => {
26
+ return (tree, context) => {
26
27
  const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
27
28
  const ownPackageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
28
29
  const commitHash = ownPackageJson.config?.o3r?.commitHash;
@@ -30,8 +31,7 @@ function ngAddFn(options) {
30
31
  const actionVersionString = commitHash ? `${commitHash} # v${ownVersion}` : `v${ownVersion}`;
31
32
  let packageManager = 'npm';
32
33
  try {
33
- const schematics = await Promise.resolve().then(() => require('@o3r/schematics'));
34
- packageManager = schematics.getPackageManager({ workspaceConfig: schematics.getWorkspaceConfig(tree) });
34
+ packageManager = (0, schematics_2.getPackageManager)({ workspaceConfig: (0, schematics_2.getWorkspaceConfig)(tree) });
35
35
  }
36
36
  catch {
37
37
  packageManager = tree.exists('/yarn.lock') ? 'yarn' : 'npm';
@@ -90,11 +90,6 @@ function ngAddFn(options) {
90
90
  * Add an Otter CI pipeline to an Angular project
91
91
  * @param options
92
92
  */
93
- const ngAdd = (options) => async (_, { logger }) => {
94
- return await Promise.resolve().then(() => require('@o3r/schematics')).catch(() => {
95
- logger.warn(`You are trying to add '@o3r/pipeline' on a project that does not have '@o3r/schematics' as a dependency.
96
- Please run 'ng add @o3r/schematics' before for a more robust setup. Trying to guess the package manager.`);
97
- }).then((schematics) => schematics ? schematics.createOtterSchematic(ngAddFn)(options) : ngAddFn(options));
98
- };
93
+ const ngAdd = (options) => (0, schematics_2.createOtterSchematic)(ngAddFn)(options);
99
94
  exports.ngAdd = ngAdd;
100
95
  //# sourceMappingURL=index.js.map
@@ -4,7 +4,7 @@ description: Sets up Node.js and installs dependencies
4
4
  runs:
5
5
  using: "composite"
6
6
  steps:
7
- - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
7
+ - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
8
8
  with:
9
9
  node-version: 22<% if (packageManager !== 'yarn') { %>
10
10
  cache: <%= packageManager %><% } %>