@o3r/stylelint-plugin 12.3.7 → 12.3.9

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/stylelint-plugin",
3
- "version": "12.3.7",
3
+ "version": "12.3.9",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -23,17 +23,18 @@
23
23
  "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest"
24
24
  },
25
25
  "dependencies": {
26
- "@o3r/schematics": "^12.3.7",
26
+ "@o3r/schematics": "^12.3.9",
27
27
  "ts-node": "~10.9.2",
28
28
  "tslib": "^2.6.2"
29
29
  },
30
30
  "peerDependencies": {
31
31
  "@angular-devkit/schematics": "^19.0.0",
32
- "@o3r/schematics": "^12.3.7",
32
+ "@o3r/schematics": "^12.3.9",
33
33
  "@schematics/angular": "^19.0.0",
34
34
  "postcss": "^8.4.5",
35
35
  "postcss-scss": "^4.0.9",
36
- "stylelint": "^16.0.2"
36
+ "stylelint": "^16.0.2",
37
+ "type-fest": "^4.30.1"
37
38
  },
38
39
  "peerDependenciesMeta": {
39
40
  "@angular-devkit/schematics": {
@@ -44,6 +45,9 @@
44
45
  },
45
46
  "@schematics/angular": {
46
47
  "optional": true
48
+ },
49
+ "type-fest": {
50
+ "optional": true
47
51
  }
48
52
  },
49
53
  "devDependencies": {
@@ -57,10 +61,10 @@
57
61
  "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
58
62
  "@nx/eslint-plugin": "~20.8.0",
59
63
  "@nx/jest": "~20.8.0",
60
- "@o3r/build-helpers": "^12.3.7",
61
- "@o3r/eslint-config": "^12.3.7",
62
- "@o3r/eslint-plugin": "^12.3.7",
63
- "@o3r/test-helpers": "^12.3.7",
64
+ "@o3r/build-helpers": "^12.3.9",
65
+ "@o3r/eslint-config": "^12.3.9",
66
+ "@o3r/eslint-plugin": "^12.3.9",
67
+ "@o3r/test-helpers": "^12.3.9",
64
68
  "@schematics/angular": "~19.2.0",
65
69
  "@stylistic/eslint-plugin": "~3.1.0",
66
70
  "@types/css-tree": "~2.3.0",
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA2ClB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAapC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA0DlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
@@ -4,7 +4,14 @@ exports.ngAdd = void 0;
4
4
  const path = require("node:path");
5
5
  const schematics_1 = require("@o3r/schematics");
6
6
  const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
7
- const dependenciesToInstall = [
7
+ /**
8
+ * List of external dependencies to be added to the project as peer dependencies
9
+ */
10
+ const dependenciesToInstall = [];
11
+ /**
12
+ * List of external dependencies to be added to the project as dev dependencies
13
+ */
14
+ const devDependenciesToInstall = [
8
15
  'postcss',
9
16
  'postcss-scss',
10
17
  'stylelint'
@@ -15,10 +22,11 @@ const dependenciesToInstall = [
15
22
  */
16
23
  function ngAddFn(options) {
17
24
  /* ng add rules */
18
- return async (tree, context) => {
19
- const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
25
+ return (tree, context) => {
20
26
  const depsInfo = (0, schematics_1.getO3rPeerDeps)(packageJsonPath);
21
27
  const workspaceProject = options.projectName ? (0, schematics_1.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
28
+ const projectDirectory = workspaceProject?.root || '.';
29
+ const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
22
30
  const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
23
31
  acc[dep] = {
24
32
  inManifest: [{
@@ -28,17 +36,19 @@ function ngAddFn(options) {
28
36
  };
29
37
  return acc;
30
38
  }, (0, schematics_1.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
31
- Object.entries((0, schematics_1.getExternalDependenciesVersionRange)(dependenciesToInstall, packageJsonPath, context.logger)).forEach(([dep, range]) => {
32
- dependencies[dep] = {
33
- inManifest: [{
34
- range,
35
- types: [NodeDependencyType.Dev]
36
- }]
37
- };
38
- });
39
+ const externalDependenciesInfo = (0, schematics_1.getExternalDependenciesInfo)({
40
+ devDependenciesToInstall,
41
+ dependenciesToInstall,
42
+ projectPackageJson,
43
+ o3rPackageJsonPath: packageJsonPath,
44
+ projectType: workspaceProject?.projectType
45
+ }, context.logger);
39
46
  return (0, schematics_1.setupDependencies)({
40
47
  projectName: options.projectName,
41
- dependencies
48
+ dependencies: {
49
+ ...dependencies,
50
+ ...externalDependenciesInfo
51
+ }
42
52
  });
43
53
  };
44
54
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAIlC,gDAQyB;AAKzB,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AAC5E,MAAM,qBAAqB,GAAG;IAC5B,SAAS;IACT,cAAc;IACd,WAAW;CACZ,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,kBAAkB;IAClB,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAAa,0CAA0C,EAAC,CAAC;QACxF,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,eAAe,CAAC,CAAC;QACjD,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5D,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,IAAI,QAAQ,CAAC,cAAc,EAAE;wBACpC,KAAK,EAAE,IAAA,2CAA8B,EAAC,gBAAgB,CAAC;qBACxD,CAAC;aACH,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QACzG,MAAM,CAAC,OAAO,CAAC,IAAA,gDAAmC,EAAC,qBAAqB,EAAE,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACnI,YAAY,CAAC,GAAG,CAAC,GAAG;gBAClB,UAAU,EAAE,CAAC;wBACX,KAAK;wBACL,KAAK,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC;qBAChC,CAAC;aACH,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,IAAA,8BAAiB,EAAC;YACvB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,YAAY;SACb,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAIlC,gDAQyB;AAQzB,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AAE5E;;GAEG;AACH,MAAM,qBAAqB,GAAa,EACvC,CAAC;AAEF;;GAEG;AACH,MAAM,wBAAwB,GAAG;IAC/B,SAAS;IACT,cAAc;IACd,WAAW;CACZ,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,kBAAkB;IAClB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,eAAe,CAAC,CAAC;QACjD,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,IAAI,IAAI,GAAG,CAAC;QACvD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAgB,CAAC;QAC3G,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5D,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,IAAI,QAAQ,CAAC,cAAc,EAAE;wBACpC,KAAK,EAAE,IAAA,2CAA8B,EAAC,gBAAgB,CAAC;qBACxD,CAAC;aACH,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QACzG,MAAM,wBAAwB,GAAG,IAAA,wCAA2B,EAAC;YAC3D,wBAAwB;YACxB,qBAAqB;YACrB,kBAAkB;YAClB,kBAAkB,EAAE,eAAe;YACnC,WAAW,EAAE,gBAAgB,EAAE,WAAW;SAC3C,EACD,OAAO,CAAC,MAAM,CACb,CAAC;QACF,OAAO,IAAA,8BAAiB,EAAC;YACvB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,YAAY,EAAE;gBACZ,GAAG,YAAY;gBACf,GAAG,wBAAwB;aAC5B;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}