@o3r/stylelint-plugin 12.2.5 → 12.2.7

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.2.5",
3
+ "version": "12.2.7",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -28,11 +28,12 @@
28
28
  },
29
29
  "peerDependencies": {
30
30
  "@angular-devkit/schematics": "^19.0.0",
31
- "@o3r/schematics": "^12.2.5",
31
+ "@o3r/schematics": "^12.2.7",
32
32
  "@schematics/angular": "^19.0.0",
33
33
  "postcss": "^8.4.5",
34
34
  "postcss-scss": "^4.0.9",
35
- "stylelint": "^16.0.2"
35
+ "stylelint": "^16.0.2",
36
+ "type-fest": "^4.30.1"
36
37
  },
37
38
  "peerDependenciesMeta": {
38
39
  "@angular-devkit/schematics": {
@@ -43,6 +44,9 @@
43
44
  },
44
45
  "@schematics/angular": {
45
46
  "optional": true
47
+ },
48
+ "type-fest": {
49
+ "optional": true
46
50
  }
47
51
  },
48
52
  "devDependencies": {
@@ -56,11 +60,11 @@
56
60
  "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
57
61
  "@nx/eslint-plugin": "~20.6.0",
58
62
  "@nx/jest": "~20.6.0",
59
- "@o3r/build-helpers": "^12.2.5",
60
- "@o3r/eslint-config": "^12.2.5",
61
- "@o3r/eslint-plugin": "^12.2.5",
62
- "@o3r/schematics": "^12.2.5",
63
- "@o3r/test-helpers": "^12.2.5",
63
+ "@o3r/build-helpers": "^12.2.7",
64
+ "@o3r/eslint-config": "^12.2.7",
65
+ "@o3r/eslint-plugin": "^12.2.7",
66
+ "@o3r/schematics": "^12.2.7",
67
+ "@o3r/test-helpers": "^12.2.7",
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;AACpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA2DlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAKtD,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;AAIpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA0ElB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAKtD,CAAC"}
@@ -3,7 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ngAdd = void 0;
4
4
  const path = require("node:path");
5
5
  const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
6
- const dependenciesToInstall = [
6
+ /**
7
+ * List of external dependencies to be added to the project as peer dependencies
8
+ */
9
+ const dependenciesToInstall = [];
10
+ /**
11
+ * List of external dependencies to be added to the project as dev dependencies
12
+ */
13
+ const devDependenciesToInstall = [
7
14
  'postcss',
8
15
  'postcss-scss',
9
16
  'stylelint'
@@ -21,10 +28,11 @@ Otherwise, use the error message as guidance.`);
21
28
  function ngAddFn(options) {
22
29
  /* ng add rules */
23
30
  return async (tree, context) => {
24
- const { getExternalDependenciesVersionRange, getPackageInstallConfig, getProjectNewDependenciesTypes, getO3rPeerDeps, getWorkspaceConfig, setupDependencies } = await Promise.resolve().then(() => require('@o3r/schematics'));
25
- const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
31
+ const { getExternalDependenciesInfo, getPackageInstallConfig, getProjectNewDependenciesTypes, getO3rPeerDeps, getWorkspaceConfig, setupDependencies } = await Promise.resolve().then(() => require('@o3r/schematics'));
26
32
  const depsInfo = getO3rPeerDeps(packageJsonPath);
27
33
  const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
34
+ const projectDirectory = workspaceProject?.root || '.';
35
+ const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
28
36
  const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
29
37
  acc[dep] = {
30
38
  inManifest: [{
@@ -34,17 +42,19 @@ function ngAddFn(options) {
34
42
  };
35
43
  return acc;
36
44
  }, getPackageInstallConfig(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
37
- Object.entries(getExternalDependenciesVersionRange(dependenciesToInstall, packageJsonPath, context.logger)).forEach(([dep, range]) => {
38
- dependencies[dep] = {
39
- inManifest: [{
40
- range,
41
- types: [NodeDependencyType.Dev]
42
- }]
43
- };
44
- });
45
+ const externalDependenciesInfo = getExternalDependenciesInfo({
46
+ devDependenciesToInstall,
47
+ dependenciesToInstall,
48
+ projectPackageJson,
49
+ o3rPackageJsonPath: packageJsonPath,
50
+ projectType: workspaceProject?.projectType
51
+ }, context.logger);
45
52
  return setupDependencies({
46
53
  projectName: options.projectName,
47
- dependencies
54
+ dependencies: {
55
+ ...dependencies,
56
+ ...externalDependenciesInfo
57
+ }
48
58
  });
49
59
  };
50
60
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAQlC,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,MAAM,0BAA0B,GAAG,CAAC,MAA2C,EAAE,EAAE,CAAC,CAAC,MAAW,EAAE,EAAE;IAClG,MAAM,CAAC,KAAK,CAAC;;8CAE+B,CAAC,CAAC;IAC9C,MAAM,MAAM,CAAC;AACf,CAAC,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,kBAAkB;IAClB,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,EACJ,mCAAmC,EACnC,uBAAuB,EACvB,8BAA8B,EAC9B,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EAClB,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QAEpC,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAAa,0CAA0C,EAAC,CAAC;QACxF,MAAM,QAAQ,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;QACjD,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,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,8BAA8B,CAAC,gBAAgB,CAAC;qBACxD,CAAC;aACH,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,uBAAuB,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QACzG,MAAM,CAAC,OAAO,CAAC,mCAAmC,CAAC,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,iBAAiB,CAAC;YACvB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,YAAY;SACb,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IACrF,MAAM,EACJ,oBAAoB,EACrB,GAAG,MAAM,qCAAO,iBAAiB,GAAE,KAAK,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,OAAO,oBAAoB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAChD,CAAC,CAAC;AALW,QAAA,KAAK,SAKhB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAWlC,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,MAAM,0BAA0B,GAAG,CAAC,MAA2C,EAAE,EAAE,CAAC,CAAC,MAAW,EAAE,EAAE;IAClG,MAAM,CAAC,KAAK,CAAC;;8CAE+B,CAAC,CAAC;IAC9C,MAAM,MAAM,CAAC;AACf,CAAC,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,kBAAkB;IAClB,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,EACJ,2BAA2B,EAC3B,uBAAuB,EACvB,8BAA8B,EAC9B,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EAClB,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QAEpC,MAAM,QAAQ,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;QACjD,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,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,8BAA8B,CAAC,gBAAgB,CAAC;qBACxD,CAAC;aACH,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,uBAAuB,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QACzG,MAAM,wBAAwB,GAAG,2BAA2B,CAAC;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,iBAAiB,CAAC;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,EAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IACrF,MAAM,EACJ,oBAAoB,EACrB,GAAG,MAAM,qCAAO,iBAAiB,GAAE,KAAK,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,OAAO,oBAAoB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAChD,CAAC,CAAC;AALW,QAAA,KAAK,SAKhB"}