@o3r/workspace 11.7.0-prerelease.4 → 11.7.0-prerelease.41

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 (49) hide show
  1. package/package.json +25 -18
  2. package/schematics/library/rules/rules.ng.d.ts.map +1 -1
  3. package/schematics/library/rules/rules.ng.js +99 -22
  4. package/schematics/library/rules/rules.ng.js.map +1 -1
  5. package/schematics/library/rules/rules.nx.d.ts.map +1 -1
  6. package/schematics/library/rules/rules.nx.js +11 -2
  7. package/schematics/library/rules/rules.nx.js.map +1 -1
  8. package/schematics/library/rules/shared.d.ts +3 -1
  9. package/schematics/library/rules/shared.d.ts.map +1 -1
  10. package/schematics/library/rules/shared.js +12 -13
  11. package/schematics/library/rules/shared.js.map +1 -1
  12. package/schematics/library/templates/{ng → jest}/jest.config.js.template +1 -1
  13. package/schematics/library/templates/ng/common/tsconfig.lib.prod.json.template +3 -0
  14. package/schematics/library/templates/ng/jest/tsconfig.build.composite.json.template +6 -0
  15. package/schematics/library/templates/ng/{tsconfig.spec.json.template → jest/tsconfig.spec.json.template} +1 -1
  16. package/schematics/library/templates/nx/project.json.template +2 -2
  17. package/schematics/ng-add/helpers/commit-hooks/index.d.ts +19 -0
  18. package/schematics/ng-add/helpers/commit-hooks/index.d.ts.map +1 -0
  19. package/schematics/ng-add/helpers/commit-hooks/index.js +70 -0
  20. package/schematics/ng-add/helpers/commit-hooks/index.js.map +1 -0
  21. package/schematics/ng-add/helpers/commit-hooks/templates/__empty__.husky/commit-msg.template +1 -0
  22. package/schematics/ng-add/helpers/commit-hooks/templates/commitlint.config.cts.template +10 -0
  23. package/schematics/ng-add/helpers/index.d.ts +0 -1
  24. package/schematics/ng-add/helpers/index.d.ts.map +1 -1
  25. package/schematics/ng-add/helpers/index.js +0 -1
  26. package/schematics/ng-add/helpers/index.js.map +1 -1
  27. package/schematics/ng-add/project-setup.d.ts.map +1 -1
  28. package/schematics/ng-add/project-setup.js +35 -4
  29. package/schematics/ng-add/project-setup.js.map +1 -1
  30. package/schematics/ng-add/schema.d.ts +2 -0
  31. package/schematics/ng-add/schema.d.ts.map +1 -1
  32. package/schematics/ng-add/schema.json +5 -0
  33. package/schematics/rule-factories/index.d.ts +1 -0
  34. package/schematics/rule-factories/index.d.ts.map +1 -1
  35. package/schematics/rule-factories/index.js +1 -0
  36. package/schematics/rule-factories/index.js.map +1 -1
  37. package/schematics/rule-factories/linter.d.ts.map +1 -0
  38. package/schematics/rule-factories/linter.js.map +1 -0
  39. package/schematics/library/templates/nx/jest.config.js.template +0 -38
  40. package/schematics/library/templates/nx/testing/setup-jest.ts.template +0 -2
  41. package/schematics/ng-add/helpers/linter.d.ts.map +0 -1
  42. package/schematics/ng-add/helpers/linter.js.map +0 -1
  43. /package/schematics/library/templates/{ng → jest}/testing/setup-jest.ts.template +0 -0
  44. /package/schematics/library/templates/ng/{.gitignore.template → common/.gitignore.template} +0 -0
  45. /package/schematics/library/templates/ng/{.npmignore.template → common/.npmignore.template} +0 -0
  46. /package/schematics/library/templates/ng/{tsconfig.builders.json.template → common/tsconfig.builders.json.template} +0 -0
  47. /package/schematics/library/templates/ng/{tsconfig.json.template → common/tsconfig.json.template} +0 -0
  48. /package/schematics/{ng-add/helpers → rule-factories}/linter.d.ts +0 -0
  49. /package/schematics/{ng-add/helpers → rule-factories}/linter.js +0 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/workspace",
3
- "version": "11.7.0-prerelease.4",
3
+ "version": "11.7.0-prerelease.41",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -15,7 +15,6 @@
15
15
  "build": "yarn nx build workspace",
16
16
  "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest",
17
17
  "build:source": "tsc -b tsconfig.build.json --pretty && yarn cpy ./package.json dist",
18
- "test": "yarn nx test workspace",
19
18
  "prepare:build:builders": "yarn cpy 'builders/**/*.json' dist/builders && yarn cpy 'schematics/**/*.json' 'schematics/**/templates/**' dist/schematics && yarn cpy '{builders,collection,migration}.json' dist",
20
19
  "prepare:publish": "prepare-publish ./dist",
21
20
  "postbuild": "patch-package-json-main"
@@ -30,7 +29,7 @@
30
29
  "@angular/common": "^18.2.0",
31
30
  "@angular/compiler-cli": "^18.2.0",
32
31
  "@angular/core": "^18.2.0",
33
- "@o3r/telemetry": "^11.7.0-prerelease.4",
32
+ "@o3r/telemetry": "^11.7.0-prerelease.41",
34
33
  "@schematics/angular": "^18.2.0",
35
34
  "type-fest": "^4.10.2",
36
35
  "typescript": "^5.5.4"
@@ -47,7 +46,7 @@
47
46
  }
48
47
  },
49
48
  "dependencies": {
50
- "@o3r/schematics": "^11.7.0-prerelease.4",
49
+ "@o3r/schematics": "^11.7.0-prerelease.41",
51
50
  "commander": "^12.0.0",
52
51
  "globby": "^11.1.0",
53
52
  "semver": "^7.5.2",
@@ -72,19 +71,19 @@
72
71
  "@babel/core": "~7.26.0",
73
72
  "@babel/preset-typescript": "~7.26.0",
74
73
  "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
75
- "@ngrx/entity": "~18.0.0",
76
- "@ngrx/store": "~18.0.0",
74
+ "@ngrx/entity": "~18.1.0",
75
+ "@ngrx/store": "~18.1.0",
77
76
  "@nx/angular": "~19.8.0",
78
77
  "@nx/eslint": "~19.8.0",
79
78
  "@nx/eslint-plugin": "~19.8.0",
80
79
  "@nx/jest": "~19.8.0",
81
80
  "@nx/js": "~19.8.0",
82
81
  "@nx/workspace": "~19.8.0",
83
- "@o3r/build-helpers": "^11.7.0-prerelease.4",
84
- "@o3r/core": "^11.7.0-prerelease.4",
85
- "@o3r/eslint-plugin": "^11.7.0-prerelease.4",
86
- "@o3r/schematics": "^11.7.0-prerelease.4",
87
- "@o3r/test-helpers": "^11.7.0-prerelease.4",
82
+ "@o3r/build-helpers": "^11.7.0-prerelease.41",
83
+ "@o3r/core": "^11.7.0-prerelease.41",
84
+ "@o3r/eslint-plugin": "^11.7.0-prerelease.41",
85
+ "@o3r/schematics": "^11.7.0-prerelease.41",
86
+ "@o3r/test-helpers": "^11.7.0-prerelease.41",
88
87
  "@schematics/angular": "~18.2.0",
89
88
  "@stylistic/eslint-plugin": "~2.7.0",
90
89
  "@types/jest": "~29.5.2",
@@ -93,7 +92,7 @@
93
92
  "@types/pid-from-port": "^1.1.0",
94
93
  "@types/semver": "^7.3.13",
95
94
  "@types/uuid": "^9.0.0",
96
- "@typescript-eslint/parser": "~8.19.0",
95
+ "@typescript-eslint/parser": "~8.21.0",
97
96
  "angular-eslint": "~18.4.0",
98
97
  "cpy-cli": "^5.0.0",
99
98
  "eslint": "~9.14.0",
@@ -110,7 +109,7 @@
110
109
  "jest": "~29.7.0",
111
110
  "jest-environment-jsdom": "~29.7.0",
112
111
  "jest-junit": "~16.0.0",
113
- "jest-preset-angular": "~14.2.0",
112
+ "jest-preset-angular": "~14.5.0",
114
113
  "jsonc-eslint-parser": "~2.4.0",
115
114
  "minimist": "^1.2.6",
116
115
  "nx": "~19.8.0",
@@ -120,15 +119,23 @@
120
119
  "ts-node": "~10.9.2",
121
120
  "type-fest": "^4.10.2",
122
121
  "typescript": "~5.5.4",
123
- "typescript-eslint": "~8.19.0",
122
+ "typescript-eslint": "~8.21.0",
124
123
  "zone.js": "~0.14.2"
125
124
  },
126
125
  "generatorDependencies": {
126
+ "@angular-builders/jest": "~18.0.0",
127
127
  "@angular/material": "~18.2.0",
128
- "@ngrx/router-store": "~18.0.0",
129
- "@ngrx/effects": "~18.0.0",
130
- "@ngrx/store-devtools": "~18.0.0",
131
- "lerna": "^8.1.7"
128
+ "@commitlint/cli": "^19.0.0",
129
+ "@commitlint/config-angular": "^19.0.0",
130
+ "@commitlint/config-conventional": "^19.0.0",
131
+ "@commitlint/types": "^19.0.0",
132
+ "@ngrx/router-store": "~18.1.0",
133
+ "@ngrx/effects": "~18.1.0",
134
+ "@ngrx/store-devtools": "~18.1.0",
135
+ "editorconfig-checker": "^5.1.8",
136
+ "husky": "~9.1.0",
137
+ "lerna": "^8.1.7",
138
+ "lint-staged": "^15.0.0"
132
139
  },
133
140
  "engines": {
134
141
  "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
@@ -1 +1 @@
1
- {"version":3,"file":"rules.ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,KAAK,EACV,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAMnB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAoFxH"}
1
+ {"version":3,"file":"rules.ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EACV,sBAAsB,EACvB,MAAM,WAAW,CAAC;AA4CnB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAqIxH"}
@@ -7,6 +7,41 @@ const schematics_1 = require("@angular-devkit/schematics");
7
7
  const schematics_2 = require("@o3r/schematics");
8
8
  const index_1 = require("../../rule-factories/index");
9
9
  const shared_1 = require("./shared");
10
+ /**
11
+ * Set jest files and script in the generated library.
12
+ * @param options
13
+ */
14
+ function setUpAngularTestPackageJson(options) {
15
+ return (tree) => {
16
+ const packageJsonPath = path.join(options.targetPath, 'package.json');
17
+ const packageJsonContent = tree.readJson(packageJsonPath);
18
+ packageJsonContent.scripts ||= {};
19
+ packageJsonContent.scripts.test ||= `ng test ${options.name}`;
20
+ tree.overwrite(packageJsonPath, JSON.stringify(packageJsonContent, null, 2));
21
+ return tree;
22
+ };
23
+ }
24
+ /**
25
+ * Set jest files and script in the generated library.
26
+ * @param options
27
+ */
28
+ function setUpJestForAngularJson(options) {
29
+ return (tree) => {
30
+ const angularFile = tree.readJson('/angular.json');
31
+ const project = angularFile.projects[options.name];
32
+ project.architect ||= {};
33
+ project.architect.test = {
34
+ builder: '@angular-builders/jest:run',
35
+ options: {
36
+ tsConfig: `tsconfig.spec.json`,
37
+ configPath: `jest.config.js`,
38
+ setupFilesAfterEnv: './testing/setup-jest.ts'
39
+ }
40
+ };
41
+ tree.overwrite('/angular.json', JSON.stringify(angularFile, null, 2));
42
+ return tree;
43
+ };
44
+ }
10
45
  /**
11
46
  * generate the rules to adapt the library generated by ng cli
12
47
  * @param options Schematic options
@@ -23,19 +58,47 @@ function ngGenerateModule(options) {
23
58
  const o3rCorePackageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
24
59
  const o3rCorePackageJson = JSON.parse((0, node_fs_1.readFileSync)(o3rCorePackageJsonPath).toString());
25
60
  const otterVersion = o3rCorePackageJson.dependencies['@o3r/schematics'];
26
- const templateNg = (0, schematics_1.apply)((0, schematics_1.url)('./templates/ng'), [
61
+ const templateNg = (0, schematics_1.apply)((0, schematics_1.url)('./templates/ng/common'), [
27
62
  (0, schematics_1.template)({
28
63
  ...options,
29
- tsconfigSpecPath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.test.json', 'tsconfig.spec.json', 'tsconfig.jest.json', 'tsconfig.jasmine.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath),
30
64
  tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath),
31
65
  tsconfigBuildPath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.build.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath)
32
66
  }),
33
67
  (0, schematics_1.renameTemplateFiles)(),
34
68
  (0, schematics_1.move)(options.targetPath)
35
69
  ]);
70
+ const templateCommonJest = (0, schematics_1.apply)((0, schematics_1.url)('./templates/jest'), [
71
+ (0, schematics_1.template)({
72
+ ...options,
73
+ tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath)
74
+ }),
75
+ (0, schematics_1.renameTemplateFiles)(),
76
+ (0, schematics_1.move)(options.targetPath)
77
+ ]);
78
+ const templateNgJest = (0, schematics_1.apply)((0, schematics_1.url)('./templates/ng/jest'), [
79
+ (0, schematics_1.template)({
80
+ ...options,
81
+ tsconfigSpecPath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.test.json', 'tsconfig.spec.json', 'tsconfig.jest.json', 'tsconfig.jasmine.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath),
82
+ tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath)
83
+ }),
84
+ (0, schematics_1.renameTemplateFiles)(),
85
+ (0, schematics_1.move)(options.targetPath)
86
+ ]);
87
+ const packageJsonContent = tree.readText('/package.json');
88
+ const hasJestInstalled = options.testingFramework === 'jest' || packageJsonContent.match('"jest"');
36
89
  return (0, schematics_1.chain)([
37
90
  (0, schematics_1.mergeWith)(templateNg, schematics_1.MergeStrategy.Overwrite),
38
- (0, shared_1.updatePackageDependenciesFactory)(options.targetPath, otterVersion, o3rCorePackageJson, options),
91
+ ...hasJestInstalled
92
+ ? [
93
+ (0, schematics_1.mergeWith)(templateCommonJest, schematics_1.MergeStrategy.Overwrite),
94
+ (0, schematics_1.mergeWith)(templateNgJest, schematics_1.MergeStrategy.Overwrite),
95
+ setUpJestForAngularJson(options),
96
+ setUpAngularTestPackageJson({ ...options })
97
+ ]
98
+ : [
99
+ setUpAngularTestPackageJson(options)
100
+ ],
101
+ (0, shared_1.updatePackageDependenciesFactory)(options.targetPath, otterVersion, o3rCorePackageJson, { ...options, useJest: !!hasJestInstalled }),
39
102
  (0, shared_1.updateNgPackagrFactory)(options.targetPath),
40
103
  (t) => {
41
104
  const genPackageJsonPath = path.posix.join(options.targetPath, 'package.json');
@@ -55,27 +118,41 @@ function ngGenerateModule(options) {
55
118
  */
56
119
  const updateTsConfigFiles = (tree, context) => {
57
120
  const tsconfigBase = (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], '/');
58
- const tsconfigBuild = (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.build.json'], '/');
59
- [tsconfigBase, tsconfigBuild].forEach((tsconfigPath) => {
60
- if (tsconfigPath) {
61
- const configFile = tree.readJson(tsconfigPath);
62
- if (configFile?.compilerOptions?.paths) {
63
- configFile.compilerOptions.baseUrl = '.';
64
- configFile.compilerOptions.paths = Object.fromEntries(Object.entries(configFile.compilerOptions.paths).filter(([pathName, _]) => pathName !== options.name));
65
- configFile.compilerOptions.paths[options.packageJsonName] = [
66
- path.posix.join(relativeTargetPath, 'dist'),
67
- path.posix.join(relativeTargetPath, 'src', 'public-api')
68
- ];
69
- tree.overwrite(tsconfigPath, JSON.stringify(configFile, null, 2));
70
- }
71
- else {
72
- context.logger.warn(`${tsconfigPath} does not contain path mapping, the edition will be skipped`);
121
+ let tsconfigBuild = (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.build.json'], '/');
122
+ if (!tsconfigBase) {
123
+ context.logger.error('No TSConfig found in the workspace to register the library.');
124
+ return;
125
+ }
126
+ // create tsconfig.build.json if it does not exist
127
+ if (!tsconfigBuild || !tree.exists(tsconfigBuild)) {
128
+ const content = {
129
+ extends: tsconfigBase.replace(/^\/?/, './'),
130
+ compilerOptions: {
131
+ declarationMap: false
132
+ },
133
+ angularCompilerOptions: {
134
+ compilationMode: 'partial'
73
135
  }
74
- }
75
- else {
76
- context.logger.warn(`No TsConfig file found at ${tsconfigPath}`);
77
- }
136
+ };
137
+ tsconfigBuild ||= 'tsconfig.build.json';
138
+ tree.create(tsconfigBuild, JSON.stringify(content, null, 2));
139
+ }
140
+ [tsconfigBase, tsconfigBuild].forEach((tsconfigPath) => {
141
+ const configFile = tree.readJson(tsconfigPath);
142
+ configFile.compilerOptions ||= {};
143
+ configFile.compilerOptions.paths ||= {};
144
+ configFile.compilerOptions.baseUrl ||= '.';
145
+ configFile.compilerOptions.paths = Object.fromEntries(Object.entries(configFile.compilerOptions.paths).filter(([pathName, _]) => pathName !== options.name));
146
+ configFile.compilerOptions.paths[options.packageJsonName] = [
147
+ path.posix.join(relativeTargetPath, 'src', 'public-api')
148
+ ];
149
+ tree.overwrite(tsconfigPath, JSON.stringify(configFile, null, 2));
78
150
  });
151
+ if (tsconfigBuild && tree.exists(tsconfigBuild)) {
152
+ const configFile = tree.readJson(tsconfigBuild);
153
+ configFile.compilerOptions.paths[options.packageJsonName].unshift(path.posix.join(relativeTargetPath, 'dist'));
154
+ tree.overwrite(tsconfigBuild, JSON.stringify(configFile, null, 2));
155
+ }
79
156
  };
80
157
  const ngCliUpdate = (tree, context) => {
81
158
  return (0, schematics_1.chain)([
@@ -1 +1 @@
1
- {"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"rules.nx.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AASpC,OAAO,KAAK,EACV,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAiDnB;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAyEpG"}
1
+ {"version":3,"file":"rules.nx.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AASpC,OAAO,KAAK,EACV,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAiDnB;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAkFpG"}
@@ -79,7 +79,7 @@ function nxGenerateModule(options) {
79
79
  (0, schematics_1.template)({
80
80
  ...options,
81
81
  path: targetPath,
82
- projectRoot: path.posix.resolve(targetPath, options.name),
82
+ projectRoot: targetPath,
83
83
  otterVersion,
84
84
  tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], targetPath),
85
85
  runner: (0, schematics_2.getPackageManagerRunner)((0, schematics_2.getWorkspaceConfig)(tree))
@@ -87,11 +87,20 @@ function nxGenerateModule(options) {
87
87
  (0, schematics_1.renameTemplateFiles)(),
88
88
  (0, schematics_1.move)(targetPath)
89
89
  ]);
90
+ const templateJest = (0, schematics_1.apply)((0, schematics_1.url)('./templates/jest'), [
91
+ (0, schematics_1.template)({
92
+ ...options,
93
+ tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], targetPath)
94
+ }),
95
+ (0, schematics_1.renameTemplateFiles)(),
96
+ (0, schematics_1.move)(targetPath)
97
+ ]);
90
98
  rules.push((0, schematics_1.mergeWith)(templateNx, schematics_1.MergeStrategy.Overwrite));
91
99
  return (0, schematics_1.chain)([
92
100
  ...rules,
93
- (0, shared_1.updatePackageDependenciesFactory)(targetPath, otterVersion, o3rCorePackageJson, options),
101
+ (0, shared_1.updatePackageDependenciesFactory)(targetPath, otterVersion, o3rCorePackageJson, { ...options, useJest: true }),
94
102
  (0, shared_1.updateNgPackagrFactory)(targetPath),
103
+ (0, schematics_1.mergeWith)(templateJest, schematics_1.MergeStrategy.Overwrite),
95
104
  (t) => {
96
105
  const packageJson = t.readJson(path.posix.join(targetPath, 'package.json'));
97
106
  packageJson.name = options.packageJsonName;
@@ -1 +1 @@
1
- {"version":3,"file":"rules.nx.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rules.nx.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,9 @@ import { NgGenerateModuleSchema } from '../schema';
10
10
  */
11
11
  export declare function updatePackageDependenciesFactory(targetPath: string, otterVersion: string, o3rCorePackageJson: PackageJson & {
12
12
  generatorDependencies?: Record<string, string>;
13
- }, options: NgGenerateModuleSchema): Rule;
13
+ }, options: NgGenerateModuleSchema & {
14
+ useJest?: boolean;
15
+ }): Rule;
14
16
  /**
15
17
  * Generate rule to update generated ng-packagr.json file
16
18
  * @param targetPath Path of the generated files
@@ -1 +1 @@
1
- {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAMpC,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAEnB;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC5C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,WAAW,GAAG;IAAE,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EACpF,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAqDzC;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ/D"}
1
+ {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAMpC,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAEnB;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC5C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,WAAW,GAAG;IAAE,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EACpF,OAAO,EAAE,sBAAsB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAmDjE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ/D"}
@@ -41,20 +41,19 @@ function updatePackageDependenciesFactory(targetPath, otterVersion, o3rCorePacka
41
41
  '@angular/platform-browser': packageJson.peerDependencies['@angular/common'],
42
42
  '@angular/platform-browser-dynamic': packageJson.peerDependencies['@angular/common'],
43
43
  '@schematics/angular': o3rCorePackageJson.peerDependencies['@schematics/angular'],
44
- '@types/jest': o3rCorePackageJson.generatorDependencies['@types/jest'],
45
- '@typescript-eslint/eslint-plugin': o3rCorePackageJson.generatorDependencies['@typescript-eslint/parser'],
46
- '@typescript-eslint/parser': o3rCorePackageJson.generatorDependencies['@typescript-eslint/parser'],
47
44
  'cpy-cli': o3rCorePackageJson.generatorDependencies['cpy-cli'],
48
- eslint: o3rCorePackageJson.generatorDependencies.eslint,
49
- 'eslint-import-resolver-node': o3rCorePackageJson.generatorDependencies['eslint-import-resolver-node'],
50
- 'eslint-plugin-jest': o3rCorePackageJson.generatorDependencies['eslint-plugin-jest'],
51
- 'eslint-plugin-jsdoc': o3rCorePackageJson.generatorDependencies['eslint-plugin-jsdoc'],
52
- 'eslint-plugin-prefer-arrow': o3rCorePackageJson.generatorDependencies['eslint-plugin-prefer-arrow'],
53
- 'eslint-plugin-unicorn': o3rCorePackageJson.generatorDependencies['eslint-plugin-unicorn'],
54
- jest: o3rCorePackageJson.generatorDependencies.jest,
55
- 'jest-environment-jsdom': o3rCorePackageJson.generatorDependencies.jest,
56
- 'jest-junit': o3rCorePackageJson.generatorDependencies['jest-junit'],
57
- 'jest-preset-angular': o3rCorePackageJson.generatorDependencies['jest-preset-angular'],
45
+ ...options.useJest
46
+ ? {
47
+ '@angular-builders/jest': o3rCorePackageJson.generatorDependencies['@angular-builders/jest'],
48
+ '@angular-devkit/build-angular': o3rCorePackageJson.devDependencies['@angular-devkit/build-angular'],
49
+ '@types/jest': o3rCorePackageJson.devDependencies['@types/jest'],
50
+ jest: o3rCorePackageJson.devDependencies.jest,
51
+ 'jest-environment-jsdom': o3rCorePackageJson.devDependencies.jest,
52
+ 'jest-junit': o3rCorePackageJson.devDependencies['jest-junit'],
53
+ 'jest-preset-angular': o3rCorePackageJson.devDependencies['jest-preset-angular'],
54
+ 'ts-jest': o3rCorePackageJson.devDependencies['ts-jest']
55
+ }
56
+ : {},
58
57
  rxjs: o3rCorePackageJson.peerDependencies.rxjs,
59
58
  typescript: o3rCorePackageJson.peerDependencies.typescript,
60
59
  'zone.js': o3rCorePackageJson.generatorDependencies['zone.js']
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,7 @@ module.exports = {
10
10
  displayName: require('./package.json').name,
11
11
  preset: 'jest-preset-angular',
12
12
  setupFilesAfterEnv: ['<rootDir>/testing/setup-jest.ts'],
13
- rootDir: '.',
13
+ rootDir: __dirname,
14
14
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths),
15
15
  testPathIgnorePatterns: [
16
16
  '<rootDir>/dist',
@@ -0,0 +1,3 @@
1
+ {
2
+ "extends": "<%= tsconfigBuildPath %>"
3
+ }
@@ -0,0 +1,6 @@
1
+ {
2
+ "extends": "./tsconfig.lib.json",
3
+ "compilerOptions": {
4
+ "composite": true
5
+ }
6
+ }
@@ -3,7 +3,7 @@
3
3
  "compilerOptions": {
4
4
  "composite": true,
5
5
  "outDir": "test",
6
- "rootDir": ".",
6
+ "rootDir": "."
7
7
  },
8
8
  "include": [
9
9
  "./src/**/*.spec.ts"
@@ -34,7 +34,7 @@
34
34
  }
35
35
  },
36
36
  "lint": {
37
- "executor": "@nrwl/linter:eslint",
37
+ "executor": "@nx/eslint:lint",
38
38
  "configurations": {
39
39
  "ci": {
40
40
  "quiet": true,
@@ -49,7 +49,7 @@
49
49
  }
50
50
  },
51
51
  "test": {
52
- "executor": "@nrwl/jest:jest",
52
+ "executor": "@nx/jest:jest",
53
53
  "options": {
54
54
  "jestConfig": "<%= projectRoot %>/jest.config.js",
55
55
  "silent": true
@@ -0,0 +1,19 @@
1
+ import { type Rule, type SchematicContext, type TaskId } from '@angular-devkit/schematics';
2
+ /** Dev Dependencies to install to setup Commit hooks */
3
+ export declare const commitHookDevDependencies: string[];
4
+ /**
5
+ * Retrieve the task callback function to initialization the commit hooks
6
+ * @param context
7
+ */
8
+ export declare function getCommitHookInitTask(context: SchematicContext): (taskIds?: TaskId[]) => void;
9
+ /**
10
+ * Edit package.json to setup lint-staged config
11
+ * @param tree
12
+ * @param context
13
+ */
14
+ export declare const editPackageJson: Rule;
15
+ /**
16
+ * Add Commit Lint and husky configurations to Otter project
17
+ */
18
+ export declare function generateCommitLintConfig(): Rule;
19
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/commit-hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EACT,KAAK,gBAAgB,EACrB,KAAK,MAAM,EAGZ,MAAM,4BAA4B,CAAC;AAUpC,wDAAwD;AACxD,eAAO,MAAM,yBAAyB,UAQrC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,gBAAgB,cAC3C,MAAM,EAAE,UAO3B;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,EAAE,IAY7B,CAAC;AAEF;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAgB/C"}
@@ -0,0 +1,70 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.editPackageJson = exports.commitHookDevDependencies = void 0;
4
+ exports.getCommitHookInitTask = getCommitHookInitTask;
5
+ exports.generateCommitLintConfig = generateCommitLintConfig;
6
+ const schematics_1 = require("@angular-devkit/schematics");
7
+ const schematics_2 = require("@o3r/schematics");
8
+ /** Dev Dependencies to install to setup Commit hooks */
9
+ exports.commitHookDevDependencies = [
10
+ 'husky',
11
+ 'lint-staged',
12
+ 'editorconfig-checker',
13
+ '@commitlint/cli',
14
+ '@commitlint/config-angular',
15
+ '@commitlint/config-conventional',
16
+ '@commitlint/types'
17
+ ];
18
+ /**
19
+ * Retrieve the task callback function to initialization the commit hooks
20
+ * @param context
21
+ */
22
+ function getCommitHookInitTask(context) {
23
+ return (taskIds) => {
24
+ const packageManager = (0, schematics_2.getPackageManager)();
25
+ const huskyTask = new schematics_2.NpmExecTask('husky init');
26
+ const taskId = context.addTask(huskyTask, taskIds);
27
+ const setupLintStage = new schematics_2.NodeRunScriptTask(`require('node:fs').writeFileSync('.husky/pre-commit', '${packageManager} exec lint-stage');`);
28
+ context.addTask(setupLintStage, [taskId]);
29
+ };
30
+ }
31
+ /**
32
+ * Edit package.json to setup lint-staged config
33
+ * @param tree
34
+ * @param context
35
+ */
36
+ const editPackageJson = (tree, context) => {
37
+ const packageJson = tree.readJson('/package.json');
38
+ if (packageJson['lint-staged']) {
39
+ context.logger.debug('A Lint-stage configuration is already defined, the default value will not be applied');
40
+ return tree;
41
+ }
42
+ packageJson['lint-staged'] = {
43
+ '*': [
44
+ 'editorconfig-checker --verbose'
45
+ ]
46
+ };
47
+ tree.overwrite('/package.json', JSON.stringify(packageJson));
48
+ };
49
+ exports.editPackageJson = editPackageJson;
50
+ /**
51
+ * Add Commit Lint and husky configurations to Otter project
52
+ */
53
+ function generateCommitLintConfig() {
54
+ return () => {
55
+ const packageManager = (0, schematics_2.getPackageManager)();
56
+ const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./helpers/commit-hooks/templates'), [
57
+ (0, schematics_1.template)({
58
+ empty: '',
59
+ packageManager
60
+ }),
61
+ (0, schematics_1.renameTemplateFiles)()
62
+ ]);
63
+ const rule = (0, schematics_1.mergeWith)(templateSource, schematics_1.MergeStrategy.Overwrite);
64
+ return (0, schematics_1.chain)([
65
+ exports.editPackageJson,
66
+ rule
67
+ ]);
68
+ };
69
+ }
70
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/commit-hooks/index.ts"],"names":[],"mappings":";;;AAoCA,sDAQC;AAwBD,4DAgBC;AApFD,2DAWoC;AACpC,gDAIyB;AAKzB,wDAAwD;AAC3C,QAAA,yBAAyB,GAAG;IACvC,OAAO;IACP,aAAa;IACb,sBAAsB;IACtB,iBAAiB;IACjB,4BAA4B;IAC5B,iCAAiC;IACjC,mBAAmB;CACpB,CAAC;AAEF;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,OAAyB;IAC7D,OAAO,CAAC,OAAkB,EAAE,EAAE;QAC5B,MAAM,cAAc,GAAG,IAAA,8BAAiB,GAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,IAAI,wBAAW,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,cAAc,GAAG,IAAI,8BAAiB,CAAC,0DAA0D,cAAc,qBAAqB,CAAC,CAAC;QAC5I,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACI,MAAM,eAAe,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IACrD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAgB,CAAC;IAClE,IAAI,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sFAAsF,CAAC,CAAC;QAC7G,OAAO,IAAI,CAAC;IACd,CAAC;IACD,WAAW,CAAC,aAAa,CAAC,GAAG;QAC3B,GAAG,EAAE;YACH,gCAAgC;SACjC;KACF,CAAC;IACF,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;AAC/D,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B;AAEF;;GAEG;AACH,SAAgB,wBAAwB;IACtC,OAAO,GAAG,EAAE;QACV,MAAM,cAAc,GAAG,IAAA,8BAAiB,GAAE,CAAC;QAC3C,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,kCAAkC,CAAC,EAAE;YACpE,IAAA,qBAAQ,EAAC;gBACP,KAAK,EAAE,EAAE;gBACT,cAAc;aACf,CAAC;YACF,IAAA,gCAAmB,GAAE;SACtB,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAC,cAAc,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;QAChE,OAAO,IAAA,kBAAK,EAAC;YACX,uBAAe;YACf,IAAI;SACL,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
@@ -0,0 +1 @@
1
+ <%= packageManager %> exec commitlint <%= packageManager === 'npm' ? '-- ' : '' %>--edit $1
@@ -0,0 +1,10 @@
1
+ import type {
2
+ UserConfig,
3
+ } from '@commitlint/types';
4
+
5
+ export default {
6
+ extends: [
7
+ '@commitlint/config-conventional',
8
+ '@commitlint/config-angular'
9
+ ]
10
+ } as const satisfies UserConfig;
@@ -1,5 +1,4 @@
1
1
  export * from './gitignore-update';
2
- export * from './linter';
3
2
  export * from './npm-workspace';
4
3
  export * from './renovate/index';
5
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
4
  tslib_1.__exportStar(require("./gitignore-update"), exports);
5
- tslib_1.__exportStar(require("./linter"), exports);
6
5
  tslib_1.__exportStar(require("./npm-workspace"), exports);
7
6
  tslib_1.__exportStar(require("./renovate/index"), exports);
8
7
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,mDAAyB;AACzB,0DAAgC;AAChC,2DAAiC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,0DAAgC;AAChC,2DAAiC"}
@@ -1 +1 @@
1
- {"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAgCpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAElB;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,IAyD/D,CAAC"}
1
+ {"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAmCpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAelB;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,IA4E/D,CAAC"}
@@ -6,10 +6,23 @@ const path = require("node:path");
6
6
  const schematics_1 = require("@angular-devkit/schematics");
7
7
  const schematics_2 = require("@o3r/schematics");
8
8
  const dependencies_1 = require("@schematics/angular/utility/dependencies");
9
+ const linter_1 = require("../rule-factories/linter");
10
+ const commit_hooks_1 = require("./helpers/commit-hooks");
9
11
  const gitignore_update_1 = require("./helpers/gitignore-update");
10
- const linter_1 = require("./helpers/linter");
11
12
  const npm_workspace_1 = require("./helpers/npm-workspace");
12
13
  const renovate_1 = require("./helpers/renovate");
14
+ const updateEditorConfig = (tree) => {
15
+ const editorconfigPath = '.editorconfig';
16
+ const editorconfig = tree.exists(editorconfigPath) ? tree.readText(editorconfigPath) : '';
17
+ if (editorconfig.includes('end_of_line')) {
18
+ return tree;
19
+ }
20
+ const newEditorconfig = /\[[*]\]/.test(editorconfig)
21
+ ? editorconfig.replace(/(\[[*]\])/, '$1\nend_of_line = lf')
22
+ : editorconfig.concat('[*]\nend_of_line = lf');
23
+ tree.overwrite(editorconfigPath, newEditorconfig);
24
+ return tree;
25
+ };
13
26
  /**
14
27
  * Enable all the otter features requested by the user
15
28
  * Install all the related dependencies and import the features inside the application
@@ -21,10 +34,13 @@ const prepareProject = (options) => {
21
34
  'EditorConfig.EditorConfig',
22
35
  'angular.ng-template'
23
36
  ];
24
- const dependenciesToInstall = [
37
+ const otterDependencies = [
25
38
  '@ama-sdk/core',
26
39
  '@ama-sdk/schematics'
27
40
  ];
41
+ const devDependenciesToInstall = [
42
+ ...(options.skipPreCommitChecks ? [] : commit_hooks_1.commitHookDevDependencies)
43
+ ];
28
44
  const ownSchematicsFolder = path.resolve(__dirname, '..');
29
45
  const ownPackageJsonPath = path.resolve(ownSchematicsFolder, '..', 'package.json');
30
46
  const depsInfo = (0, schematics_2.getO3rPeerDeps)(ownPackageJsonPath);
@@ -38,7 +54,7 @@ const prepareProject = (options) => {
38
54
  ...(installOtterLinter ? [`@o3r/eslint-config${(0, linter_1.isUsingFlatConfig)(tree) ? '' : '-otter'}`] : []),
39
55
  ...depsInfo.o3rPeerDeps
40
56
  ]));
41
- const dependencies = [...internalPackagesToInstallWithNgAdd, ...dependenciesToInstall].reduce((acc, dep) => {
57
+ const dependencies = [...internalPackagesToInstallWithNgAdd, ...otterDependencies].reduce((acc, dep) => {
42
58
  acc[dep] = {
43
59
  inManifest: [{
44
60
  range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
@@ -48,19 +64,34 @@ const prepareProject = (options) => {
48
64
  };
49
65
  return acc;
50
66
  }, {});
67
+ devDependenciesToInstall.forEach((dep) => {
68
+ dependencies[dep] ||= {
69
+ inManifest: [{
70
+ range: ownPackageJsonContent.devDependencies?.[dep] || ownPackageJsonContent.generatorDependencies?.[dep] || 'latest',
71
+ types: [dependencies_1.NodeDependencyType.Dev]
72
+ }]
73
+ };
74
+ });
51
75
  if (installOtterLinter) {
52
76
  vsCodeExtensions.push('dbaeumer.vscode-eslint');
53
77
  }
54
78
  const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
55
79
  return () => (0, schematics_1.chain)([
56
80
  (0, renovate_1.generateRenovateConfig)(__dirname),
81
+ ...(options.skipPreCommitChecks ? [] : [(0, commit_hooks_1.generateCommitLintConfig)()]),
82
+ updateEditorConfig,
57
83
  (0, schematics_2.addVsCodeRecommendations)(vsCodeExtensions),
58
84
  (0, gitignore_update_1.updateGitIgnore)(workspaceConfig),
59
85
  npm_workspace_1.filterPackageJsonScripts,
60
86
  (0, schematics_2.setupDependencies)({
61
87
  dependencies,
62
88
  skipInstall: options.skipInstall,
63
- ngAddToRun: internalPackagesToInstallWithNgAdd
89
+ ngAddToRun: internalPackagesToInstallWithNgAdd,
90
+ scheduleTaskCallback: (taskIds) => {
91
+ if (!options.skipPreCommitChecks) {
92
+ (0, commit_hooks_1.getCommitHookInitTask)(context)(taskIds);
93
+ }
94
+ }
64
95
  }),
65
96
  !options.skipLinter && installOtterLinter ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)(),
66
97
  (0, npm_workspace_1.addWorkspacesToProject)(),
@@ -1 +1 @@
1
- {"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
@@ -13,6 +13,8 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
13
13
  };
14
14
  /** Do not initialize a git repository. */
15
15
  skipGit: boolean;
16
+ /** Skip the setup of CommitLint and Lint-Stage configurations and pre-commit checks */
17
+ skipPreCommitChecks: boolean;
16
18
  /** Use a pinned version for otter packages */
17
19
  exactO3rVersion?: boolean;
18
20
  /** Monorepo manager to use */
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,8BAA8B;AAC9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,EAAE,OAAO,CAAC;IAErB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,8BAA8B;IAC9B,eAAe,EAAE,eAAe,CAAC;CAClC"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,8BAA8B;AAC9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,EAAE,OAAO,CAAC;IAErB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,uFAAuF;IACvF,mBAAmB,EAAE,OAAO,CAAC;IAE7B,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,8BAA8B;IAC9B,eAAe,EAAE,eAAe,CAAC;CAClC"}
@@ -46,6 +46,11 @@
46
46
  "default": false,
47
47
  "alias": "g"
48
48
  },
49
+ "skipPreCommitChecks": {
50
+ "description": "Skip the setup of CommitLint and Lint-Stage configurations and pre-commit checks",
51
+ "type": "boolean",
52
+ "default": false
53
+ },
49
54
  "exactO3rVersion": {
50
55
  "type": "boolean",
51
56
  "description": "Use a pinned version for otter packages",
@@ -1,2 +1,3 @@
1
1
  export * from './project-configs';
2
+ export * from './linter';
2
3
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC"}
@@ -2,4 +2,5 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
4
  tslib_1.__exportStar(require("./project-configs"), exports);
5
+ tslib_1.__exportStar(require("./linter"), exports);
5
6
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,4DAAkC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,4DAAkC;AAClC,mDAAyB"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/linter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,gBAAgB,EAChB,IAAI,EACL,MAAM,4BAA4B,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,iBAAiB,SAAU,IAAI,4DAAgF,CAAC;AAE7H;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,YAAmB,gBAAgB,QAAQ,IAAI,KAAG,OAAO,CAAC,OAAO,CAezG,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"linter.js","sourceRoot":"","sources":["../../../schematics/rule-factories/linter.ts"],"names":[],"mappings":";;;AAAA,8DAE2C;AAM3C;;;GAGG;AACI,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAAhH,QAAA,iBAAiB,qBAA+F;AAE7H;;;;;GAKG;AACI,MAAM,4BAA4B,GAAG,KAAK,EAAE,OAAyB,EAAE,IAAU,EAAoB,EAAE;IAC5G,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,GAAG,iBAAiB,eAAe,CAAC,CAAC;QACrD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,cAAc,GAAG,MAAM,IAAA,wBAAe,EAAC;+EACkC,IAAA,yBAAiB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5H,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;uGAC+E,CAAC,CAAC;IACvG,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAfW,QAAA,4BAA4B,gCAevC"}
@@ -1,38 +0,0 @@
1
- const { pathsToModuleNameMapper } = require('ts-jest');
2
- const { compilerOptions } = require('<%= tsconfigBasePath %>');
3
-
4
- globalThis.ngJest = {
5
- skipNgcc: true
6
- };
7
-
8
- /** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
9
- module.exports = {
10
- displayName: require('./package.json').name,
11
- preset: 'jest-preset-angular',
12
- setupFilesAfterEnv: ['<rootDir>/testing/setup-jest.ts'],
13
- rootDir: '.',
14
- moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths),
15
- testPathIgnorePatterns: [
16
- '<rootDir>/dist',
17
- ],
18
- reporters: [
19
- 'default',
20
- 'github-actions'
21
- ],
22
- globalSetup: 'jest-preset-angular/global-setup',
23
- transform: {
24
- // eslint-disable-next-line @typescript-eslint/naming-convention
25
- '^.+\\.tsx?$': [
26
- 'jest-preset-angular',
27
- {
28
- tsconfig: '<rootDir>/tsconfig.spec.json',
29
- stringifyContentPathRegex: '\\.html$'
30
- }
31
- ]
32
- },
33
- snapshotSerializers: [
34
- 'jest-preset-angular/build/serializers/no-ng-attributes',
35
- 'jest-preset-angular/build/serializers/ng-snapshot',
36
- 'jest-preset-angular/build/serializers/html-comment',
37
- ]
38
- };
@@ -1,2 +0,0 @@
1
- import 'jest-preset-angular/setup-jest';
2
-
@@ -1 +0,0 @@
1
- {"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/linter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,gBAAgB,EAChB,IAAI,EACL,MAAM,4BAA4B,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,iBAAiB,SAAU,IAAI,4DAAgF,CAAC;AAE7H;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,YAAmB,gBAAgB,QAAQ,IAAI,KAAG,OAAO,CAAC,OAAO,CAezG,CAAC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"linter.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/linter.ts"],"names":[],"mappings":";;;AAAA,8DAE2C;AAM3C;;;GAGG;AACI,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAAhH,QAAA,iBAAiB,qBAA+F;AAE7H;;;;;GAKG;AACI,MAAM,4BAA4B,GAAG,KAAK,EAAE,OAAyB,EAAE,IAAU,EAAoB,EAAE;IAC5G,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,GAAG,iBAAiB,eAAe,CAAC,CAAC;QACrD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,cAAc,GAAG,MAAM,IAAA,wBAAe,EAAC;+EACkC,IAAA,yBAAiB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5H,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;uGAC+E,CAAC,CAAC;IACvG,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAfW,QAAA,4BAA4B,gCAevC"}