@o3r/workspace 12.0.0-next.5 → 12.0.0-prerelease.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/workspace",
-  "version": "12.0.0-next.5",
+  "version": "12.0.0-prerelease.1",
   "publishConfig": {
     "access": "public"
   },
@@ -15,7 +15,6 @@
     "build": "yarn nx build workspace",
     "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest",
     "build:source": "tsc -b tsconfig.build.json --pretty && yarn cpy ./package.json dist",
-    "test": "yarn nx test workspace",
     "prepare:build:builders": "yarn cpy 'builders/**/*.json' dist/builders && yarn cpy 'schematics/**/*.json' 'schematics/**/templates/**' dist/schematics && yarn cpy '{builders,collection,migration}.json' dist",
     "prepare:publish": "prepare-publish ./dist",
     "postbuild": "patch-package-json-main"
@@ -23,15 +22,15 @@
   "main": "./src/public_api.js",
   "types": "./src/public_api.d.ts",
   "peerDependencies": {
-    "@angular-devkit/architect": "^0.1802.0",
-    "@angular-devkit/core": "^18.2.0",
-    "@angular-devkit/schematics": "^18.2.0",
-    "@angular/cli": "^18.2.0",
-    "@angular/common": "^18.2.0",
-    "@angular/compiler-cli": "^18.2.0",
-    "@angular/core": "^18.2.0",
-    "@o3r/telemetry": "^12.0.0-next.5",
-    "@schematics/angular": "^18.2.0",
+    "@angular-devkit/architect": "^0.1900.0",
+    "@angular-devkit/core": "^19.0.0",
+    "@angular-devkit/schematics": "^19.0.0",
+    "@angular/cli": "^19.0.0",
+    "@angular/common": "^19.0.0",
+    "@angular/compiler-cli": "^19.0.0",
+    "@angular/core": "^19.0.0",
+    "@o3r/telemetry": "^12.0.0-prerelease.1",
+    "@schematics/angular": "^19.0.0",
     "ts-node": "~10.9.2",
     "type-fest": "^4.10.2",
     "typescript": "^5.5.4"
@@ -48,54 +47,54 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^12.0.0-next.5",
-    "commander": "^12.0.0",
+    "@o3r/schematics": "^12.0.0-prerelease.1",
+    "commander": "^13.0.0",
     "globby": "^11.1.0",
     "semver": "^7.5.2",
     "tslib": "^2.6.2",
-    "uuid": "^10.0.0",
+    "uuid": "^11.0.5",
     "winston": "^3.8.2"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "~0.1802.0",
-    "@angular-devkit/build-angular": "~18.2.0",
-    "@angular-devkit/core": "~18.2.0",
-    "@angular-devkit/schematics": "~18.2.0",
-    "@angular/animations": "~18.2.0",
-    "@angular/cli": "~18.2.0",
-    "@angular/common": "~18.2.0",
-    "@angular/compiler": "~18.2.0",
-    "@angular/compiler-cli": "~18.2.0",
-    "@angular/core": "~18.2.0",
-    "@angular/platform-browser": "~18.2.0",
-    "@angular/platform-browser-dynamic": "~18.2.0",
-    "@angular/router": "~18.2.0",
+    "@angular-devkit/architect": "~0.1900.0",
+    "@angular-devkit/build-angular": "~19.0.0",
+    "@angular-devkit/core": "~19.0.0",
+    "@angular-devkit/schematics": "~19.0.0",
+    "@angular/animations": "~19.0.0",
+    "@angular/cli": "~19.0.0",
+    "@angular/common": "~19.0.0",
+    "@angular/compiler": "~19.0.0",
+    "@angular/compiler-cli": "~19.0.0",
+    "@angular/core": "~19.0.0",
+    "@angular/platform-browser": "~19.0.0",
+    "@angular/platform-browser-dynamic": "~19.0.0",
+    "@angular/router": "~19.0.0",
     "@babel/core": "~7.26.0",
     "@babel/preset-typescript": "~7.26.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@ngrx/entity": "~18.0.0",
-    "@ngrx/store": "~18.0.0",
-    "@nx/angular": "~19.8.0",
-    "@nx/eslint": "~19.8.0",
-    "@nx/eslint-plugin": "~19.8.0",
-    "@nx/jest": "~19.8.0",
-    "@nx/js": "~19.8.0",
-    "@nx/workspace": "~19.8.0",
-    "@o3r/build-helpers": "^12.0.0-next.5",
-    "@o3r/core": "^12.0.0-next.5",
-    "@o3r/eslint-plugin": "^12.0.0-next.5",
-    "@o3r/schematics": "^12.0.0-next.5",
-    "@o3r/test-helpers": "^12.0.0-next.5",
-    "@schematics/angular": "~18.2.0",
-    "@stylistic/eslint-plugin": "~2.7.0",
+    "@ngrx/entity": "~19.0.0",
+    "@ngrx/store": "~19.0.0",
+    "@nx/angular": "~20.2.0",
+    "@nx/eslint": "~20.2.0",
+    "@nx/eslint-plugin": "~20.2.0",
+    "@nx/jest": "~20.2.0",
+    "@nx/js": "~20.2.0",
+    "@nx/workspace": "~20.2.0",
+    "@o3r/build-helpers": "^12.0.0-prerelease.1",
+    "@o3r/core": "^12.0.0-prerelease.1",
+    "@o3r/eslint-plugin": "^12.0.0-prerelease.1",
+    "@o3r/schematics": "^12.0.0-prerelease.1",
+    "@o3r/test-helpers": "^12.0.0-prerelease.1",
+    "@schematics/angular": "~19.0.0",
+    "@stylistic/eslint-plugin": "~3.0.0",
     "@types/jest": "~29.5.2",
     "@types/minimist": "^1.2.2",
     "@types/node": "^20.0.0",
     "@types/pid-from-port": "^1.1.0",
     "@types/semver": "^7.3.13",
-    "@types/uuid": "^9.0.0",
-    "@typescript-eslint/parser": "~8.18.0",
-    "angular-eslint": "~18.4.0",
+    "@types/uuid": "^10.0.0",
+    "@typescript-eslint/parser": "~8.21.0",
+    "angular-eslint": "~19.0.0",
     "cpy-cli": "^5.0.0",
     "eslint": "~9.17.0",
     "eslint-import-resolver-node": "^0.3.9",
@@ -111,25 +110,33 @@
     "jest": "~29.7.0",
     "jest-environment-jsdom": "~29.7.0",
     "jest-junit": "~16.0.0",
-    "jest-preset-angular": "~14.2.0",
+    "jest-preset-angular": "~14.5.0",
     "jsonc-eslint-parser": "~2.4.0",
     "minimist": "^1.2.6",
-    "nx": "~19.8.0",
+    "nx": "~20.2.0",
     "pid-from-port": "^1.1.3",
     "rxjs": "^7.8.1",
-    "ts-jest": "~29.2.0",
+    "ts-jest": "~29.2.5",
     "ts-node": "~10.9.2",
-    "type-fest": "^4.10.2",
-    "typescript": "~5.5.4",
-    "typescript-eslint": "~8.18.0",
-    "zone.js": "~0.14.2"
+    "type-fest": "^4.30.1",
+    "typescript": "~5.6.2",
+    "typescript-eslint": "~8.21.0",
+    "zone.js": "~0.15.0"
   },
   "generatorDependencies": {
-    "@angular/material": "~18.2.0",
-    "@ngrx/router-store": "~18.0.0",
-    "@ngrx/effects": "~18.0.0",
-    "@ngrx/store-devtools": "~18.0.0",
-    "lerna": "^8.1.7"
+    "@angular-builders/jest": "~19.0.0",
+    "@angular/material": "~19.0.0",
+    "@commitlint/cli": "^19.0.0",
+    "@commitlint/config-angular": "^19.0.0",
+    "@commitlint/config-conventional": "^19.0.0",
+    "@commitlint/types": "^19.0.0",
+    "@ngrx/router-store": "~19.0.0",
+    "@ngrx/effects": "~19.0.0",
+    "@ngrx/store-devtools": "~19.0.0",
+    "editorconfig-checker": "^6.0.1",
+    "husky": "~9.1.0",
+    "lerna": "^8.1.7",
+    "lint-staged": "^15.0.0"
   },
   "engines": {
     "node": "^18.19.1 || ^20.11.1 || >=22.0.0"

package/schematics/application/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAyBpC,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AAyFlB;;;GAGG;AACH,eAAO,MAAM,mBAAmB,gDAA+D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAyBpC,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AA4GlB;;;GAGG;AACH,eAAO,MAAM,mBAAmB,gDAA+D,CAAC"}

package/schematics/application/index.js

@@ -8,6 +8,20 @@ const schematics_2 = require("@o3r/schematics");
 const schema_1 = require("@schematics/angular/application/schema");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const index_1 = require("../rule-factories/index");
+/**
+ * Find the relative path to a configuration file at the monorepo root
+ * Note: This function is a duplicate of {@link import('@o3r/schematics').findConfigFileRelativePath} required due to TS Import issue
+ * @param tree
+ * @param files List of files to look for, the first of the list will be used
+ * @param originPath Path from where to calculate the relative path
+ */
+function findConfigFileRelativePath(tree, files, originPath) {
+    const foundFile = files.find((file) => tree.exists(`/${file}`));
+    if (foundFile === undefined) {
+        return '';
+    }
+    return path.posix.relative(originPath, `/${foundFile}`);
+}
 /**
  * Add an Otter application to a monorepo
  * @param options Schematic options
@@ -16,10 +30,11 @@ function generateApplicationFn(options) {
     const ownPackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf8' }));
     const packageJsonName = schematics_1.strings.dasherize(options.name);
     const cleanName = packageJsonName.replace(/^@/, '').replaceAll(/\//g, '-');
-    const addProjectSpecificFiles = (targetPath, rootDependencies) => {
+    const addProjectSpecificFiles = (targetPath, rootDependencies, tsconfigBasePath) => {
         return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
             (0, schematics_1.template)({
                 ...options,
+                tsconfigBasePath,
                 enforceTildeRange: schematics_2.enforceTildeRange,
                 name: packageJsonName,
                 rootDependencies
@@ -64,6 +79,7 @@ function generateApplicationFn(options) {
                 ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
             }
         };
+        const tsconfigBasePath = findConfigFileRelativePath(tree, ['tsconfig.base.json', 'tsconfig.json'], targetPath);
         return (0, schematics_1.chain)([
             (0, schematics_1.externalSchematic)('@schematics/angular', 'application', {
                 ...Object.entries(extendedOptions).reduce((acc, [key, value]) => (angularOptions.includes(key) ? { ...acc, [key]: value } : acc), {}),
@@ -71,7 +87,7 @@ function generateApplicationFn(options) {
                 projectRoot,
                 style: schema_1.Style.Scss
             }),
-            addProjectSpecificFiles(targetPath, rootDependencies),
+            addProjectSpecificFiles(targetPath, rootDependencies, tsconfigBasePath),
             (0, index_1.updateProjectTsConfig)(targetPath, 'tsconfig.app.json', { updateInputFiles: true }),
             (0, schematics_2.setupDependencies)({
                 dependencies,

package/schematics/application/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}

package/schematics/application/templates/tsconfig.json.template

@@ -0,0 +1,8 @@
+/* For IDE usage only */
+{
+  "extends": "<%= tsconfigBasePath %>",
+  "references": [
+    {"path": "./tsconfig.app.json"},
+    {"path": "./tsconfig.spec.json"}
+  ]
+}

package/schematics/library/rules/rules.ng.d.ts.map

@@ -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"}
+{"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"}

package/schematics/library/rules/rules.ng.js

@@ -7,6 +7,41 @@ const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const index_1 = require("../../rule-factories/index");
 const shared_1 = require("./shared");
+/**
+ * Set jest files and script in the generated library.
+ * @param options
+ */
+function setUpAngularTestPackageJson(options) {
+    return (tree) => {
+        const packageJsonPath = path.join(options.targetPath, 'package.json');
+        const packageJsonContent = tree.readJson(packageJsonPath);
+        packageJsonContent.scripts ||= {};
+        packageJsonContent.scripts.test ||= `ng test ${options.name}`;
+        tree.overwrite(packageJsonPath, JSON.stringify(packageJsonContent, null, 2));
+        return tree;
+    };
+}
+/**
+ * Set jest files and script in the generated library.
+ * @param options
+ */
+function setUpJestForAngularJson(options) {
+    return (tree) => {
+        const angularFile = tree.readJson('/angular.json');
+        const project = angularFile.projects[options.name];
+        project.architect ||= {};
+        project.architect.test = {
+            builder: '@angular-builders/jest:run',
+            options: {
+                tsConfig: `tsconfig.spec.json`,
+                configPath: `jest.config.js`,
+                setupFilesAfterEnv: './testing/setup-jest.ts'
+            }
+        };
+        tree.overwrite('/angular.json', JSON.stringify(angularFile, null, 2));
+        return tree;
+    };
+}
 /**
  * generate the rules to adapt the library generated by ng cli
  * @param options Schematic options
@@ -23,19 +58,47 @@ function ngGenerateModule(options) {
         const o3rCorePackageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
         const o3rCorePackageJson = JSON.parse((0, node_fs_1.readFileSync)(o3rCorePackageJsonPath).toString());
         const otterVersion = o3rCorePackageJson.dependencies['@o3r/schematics'];
-        const templateNg = (0, schematics_1.apply)((0, schematics_1.url)('./templates/ng'), [
+        const templateNg = (0, schematics_1.apply)((0, schematics_1.url)('./templates/ng/common'), [
             (0, schematics_1.template)({
                 ...options,
-                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),
                 tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath),
                 tsconfigBuildPath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.build.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath)
             }),
             (0, schematics_1.renameTemplateFiles)(),
             (0, schematics_1.move)(options.targetPath)
         ]);
+        const templateCommonJest = (0, schematics_1.apply)((0, schematics_1.url)('./templates/jest'), [
+            (0, schematics_1.template)({
+                ...options,
+                tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath)
+            }),
+            (0, schematics_1.renameTemplateFiles)(),
+            (0, schematics_1.move)(options.targetPath)
+        ]);
+        const templateNgJest = (0, schematics_1.apply)((0, schematics_1.url)('./templates/ng/jest'), [
+            (0, schematics_1.template)({
+                ...options,
+                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),
+                tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath)
+            }),
+            (0, schematics_1.renameTemplateFiles)(),
+            (0, schematics_1.move)(options.targetPath)
+        ]);
+        const packageJsonContent = tree.readText('/package.json');
+        const hasJestInstalled = options.testingFramework === 'jest' || packageJsonContent.match('"jest"');
         return (0, schematics_1.chain)([
             (0, schematics_1.mergeWith)(templateNg, schematics_1.MergeStrategy.Overwrite),
-            (0, shared_1.updatePackageDependenciesFactory)(options.targetPath, otterVersion, o3rCorePackageJson, options),
+            ...hasJestInstalled
+                ? [
+                    (0, schematics_1.mergeWith)(templateCommonJest, schematics_1.MergeStrategy.Overwrite),
+                    (0, schematics_1.mergeWith)(templateNgJest, schematics_1.MergeStrategy.Overwrite),
+                    setUpJestForAngularJson(options),
+                    setUpAngularTestPackageJson({ ...options })
+                ]
+                : [
+                    setUpAngularTestPackageJson(options)
+                ],
+            (0, shared_1.updatePackageDependenciesFactory)(options.targetPath, otterVersion, o3rCorePackageJson, { ...options, useJest: !!hasJestInstalled }),
             (0, shared_1.updateNgPackagrFactory)(options.targetPath),
             (t) => {
                 const genPackageJsonPath = path.posix.join(options.targetPath, 'package.json');
@@ -55,27 +118,41 @@ function ngGenerateModule(options) {
      */
     const updateTsConfigFiles = (tree, context) => {
         const tsconfigBase = (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], '/');
-        const tsconfigBuild = (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.build.json'], '/');
-        [tsconfigBase, tsconfigBuild].forEach((tsconfigPath) => {
-            if (tsconfigPath) {
-                const configFile = tree.readJson(tsconfigPath);
-                if (configFile?.compilerOptions?.paths) {
-                    configFile.compilerOptions.baseUrl = '.';
-                    configFile.compilerOptions.paths = Object.fromEntries(Object.entries(configFile.compilerOptions.paths).filter(([pathName, _]) => pathName !== options.name));
-                    configFile.compilerOptions.paths[options.packageJsonName] = [
-                        path.posix.join(relativeTargetPath, 'dist'),
-                        path.posix.join(relativeTargetPath, 'src', 'public-api')
-                    ];
-                    tree.overwrite(tsconfigPath, JSON.stringify(configFile, null, 2));
-                }
-                else {
-                    context.logger.warn(`${tsconfigPath} does not contain path mapping, the edition will be skipped`);
+        let tsconfigBuild = (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.build.json'], '/');
+        if (!tsconfigBase) {
+            context.logger.error('No TSConfig found in the workspace to register the library.');
+            return;
+        }
+        // create tsconfig.build.json if it does not exist
+        if (!tsconfigBuild || !tree.exists(tsconfigBuild)) {
+            const content = {
+                extends: tsconfigBase.replace(/^\/?/, './'),
+                compilerOptions: {
+                    declarationMap: false
+                },
+                angularCompilerOptions: {
+                    compilationMode: 'partial'
                 }
-            }
-            else {
-                context.logger.warn(`No TsConfig file found at ${tsconfigPath}`);
-            }
+            };
+            tsconfigBuild ||= 'tsconfig.build.json';
+            tree.create(tsconfigBuild, JSON.stringify(content, null, 2));
+        }
+        [tsconfigBase, tsconfigBuild].forEach((tsconfigPath) => {
+            const configFile = tree.readJson(tsconfigPath);
+            configFile.compilerOptions ||= {};
+            configFile.compilerOptions.paths ||= {};
+            configFile.compilerOptions.baseUrl ||= '.';
+            configFile.compilerOptions.paths = Object.fromEntries(Object.entries(configFile.compilerOptions.paths).filter(([pathName, _]) => pathName !== options.name));
+            configFile.compilerOptions.paths[options.packageJsonName] = [
+                path.posix.join(relativeTargetPath, 'src', 'public-api')
+            ];
+            tree.overwrite(tsconfigPath, JSON.stringify(configFile, null, 2));
         });
+        if (tsconfigBuild && tree.exists(tsconfigBuild)) {
+            const configFile = tree.readJson(tsconfigBuild);
+            configFile.compilerOptions.paths[options.packageJsonName].unshift(path.posix.join(relativeTargetPath, 'dist'));
+            tree.overwrite(tsconfigBuild, JSON.stringify(configFile, null, 2));
+        }
     };
     const ngCliUpdate = (tree, context) => {
         return (0, schematics_1.chain)([

package/schematics/library/rules/rules.ng.js.map

@@ -1 +1 @@
-{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"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"}

package/schematics/library/rules/rules.nx.d.ts.map

@@ -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"}
+{"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"}

package/schematics/library/rules/rules.nx.js

@@ -79,7 +79,7 @@ function nxGenerateModule(options) {
             (0, schematics_1.template)({
                 ...options,
                 path: targetPath,
-                projectRoot: path.posix.resolve(targetPath, options.name),
+                projectRoot: targetPath,
                 otterVersion,
                 tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], targetPath),
                 runner: (0, schematics_2.getPackageManagerRunner)((0, schematics_2.getWorkspaceConfig)(tree))
@@ -87,11 +87,20 @@ function nxGenerateModule(options) {
             (0, schematics_1.renameTemplateFiles)(),
             (0, schematics_1.move)(targetPath)
         ]);
+        const templateJest = (0, schematics_1.apply)((0, schematics_1.url)('./templates/jest'), [
+            (0, schematics_1.template)({
+                ...options,
+                tsconfigBasePath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], targetPath)
+            }),
+            (0, schematics_1.renameTemplateFiles)(),
+            (0, schematics_1.move)(targetPath)
+        ]);
         rules.push((0, schematics_1.mergeWith)(templateNx, schematics_1.MergeStrategy.Overwrite));
         return (0, schematics_1.chain)([
             ...rules,
-            (0, shared_1.updatePackageDependenciesFactory)(targetPath, otterVersion, o3rCorePackageJson, options),
+            (0, shared_1.updatePackageDependenciesFactory)(targetPath, otterVersion, o3rCorePackageJson, { ...options, useJest: true }),
             (0, shared_1.updateNgPackagrFactory)(targetPath),
+            (0, schematics_1.mergeWith)(templateJest, schematics_1.MergeStrategy.Overwrite),
             (t) => {
                 const packageJson = t.readJson(path.posix.join(targetPath, 'package.json'));
                 packageJson.name = options.packageJsonName;

package/schematics/library/rules/rules.nx.js.map

@@ -1 +1 @@
-{"version":3,"file":"rules.nx.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rules.nx.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":"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"}

package/schematics/library/rules/shared.d.ts

@@ -10,7 +10,9 @@ import { NgGenerateModuleSchema } from '../schema';
  */
 export declare function updatePackageDependenciesFactory(targetPath: string, otterVersion: string, o3rCorePackageJson: PackageJson & {
     generatorDependencies?: Record<string, string>;
-}, options: NgGenerateModuleSchema): Rule;
+}, options: NgGenerateModuleSchema & {
+    useJest?: boolean;
+}): Rule;
 /**
  * Generate rule to update generated ng-packagr.json file
  * @param targetPath Path of the generated files

package/schematics/library/rules/shared.d.ts.map

@@ -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"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAOpC,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,CAqDjE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ/D"}

package/schematics/library/rules/shared.js

@@ -15,10 +15,11 @@ function updatePackageDependenciesFactory(targetPath, otterVersion, o3rCorePacka
     return (tree) => {
         const packageJson = tree.readJson(path.posix.join(targetPath, 'package.json'));
         const runner = (0, schematics_1.getPackageManagerRunner)((0, schematics_1.getWorkspaceConfig)(tree));
+        const executor = (0, schematics_1.getPackageManagerExecutor)((0, schematics_1.getWorkspaceConfig)(tree));
         packageJson.description = options.description || packageJson.description;
         packageJson.scripts ||= {};
         packageJson.scripts.build = `${runner} ng build ${options.name}`;
-        packageJson.scripts['prepare:build:builders'] = `${runner} cpy 'collection.json' dist && ${runner} cpy 'schematics/**/*.json' dist/schematics`;
+        packageJson.scripts['prepare:build:builders'] = `${executor} cpy collection.json dist && ${executor} cpy 'schematics/**/*.json' dist/schematics`;
         packageJson.scripts['build:builders'] = 'tsc -b tsconfig.builders.json --pretty';
         packageJson.peerDependencies ||= {};
         packageJson.peerDependencies['@o3r/core'] = otterVersion;
@@ -41,20 +42,20 @@ function updatePackageDependenciesFactory(targetPath, otterVersion, o3rCorePacka
                 '@angular/platform-browser': packageJson.peerDependencies['@angular/common'],
                 '@angular/platform-browser-dynamic': packageJson.peerDependencies['@angular/common'],
                 '@schematics/angular': o3rCorePackageJson.peerDependencies['@schematics/angular'],
-                '@types/jest': o3rCorePackageJson.generatorDependencies['@types/jest'],
-                '@typescript-eslint/eslint-plugin': o3rCorePackageJson.generatorDependencies['@typescript-eslint/parser'],
-                '@typescript-eslint/parser': o3rCorePackageJson.generatorDependencies['@typescript-eslint/parser'],
                 'cpy-cli': o3rCorePackageJson.generatorDependencies['cpy-cli'],
-                eslint: o3rCorePackageJson.generatorDependencies.eslint,
-                'eslint-import-resolver-node': o3rCorePackageJson.generatorDependencies['eslint-import-resolver-node'],
-                'eslint-plugin-jest': o3rCorePackageJson.generatorDependencies['eslint-plugin-jest'],
-                'eslint-plugin-jsdoc': o3rCorePackageJson.generatorDependencies['eslint-plugin-jsdoc'],
-                'eslint-plugin-prefer-arrow': o3rCorePackageJson.generatorDependencies['eslint-plugin-prefer-arrow'],
-                'eslint-plugin-unicorn': o3rCorePackageJson.generatorDependencies['eslint-plugin-unicorn'],
-                jest: o3rCorePackageJson.generatorDependencies.jest,
-                'jest-environment-jsdom': o3rCorePackageJson.generatorDependencies.jest,
-                'jest-junit': o3rCorePackageJson.generatorDependencies['jest-junit'],
-                'jest-preset-angular': o3rCorePackageJson.generatorDependencies['jest-preset-angular'],
+                '@types/node': o3rCorePackageJson.devDependencies['@types/node'],
+                ...options.useJest
+                    ? {
+                        '@angular-builders/jest': o3rCorePackageJson.generatorDependencies['@angular-builders/jest'],
+                        '@angular-devkit/build-angular': o3rCorePackageJson.devDependencies['@angular-devkit/build-angular'],
+                        '@types/jest': o3rCorePackageJson.devDependencies['@types/jest'],
+                        jest: o3rCorePackageJson.devDependencies.jest,
+                        'jest-environment-jsdom': o3rCorePackageJson.devDependencies.jest,
+                        'jest-junit': o3rCorePackageJson.devDependencies['jest-junit'],
+                        'jest-preset-angular': o3rCorePackageJson.devDependencies['jest-preset-angular'],
+                        'ts-jest': o3rCorePackageJson.devDependencies['ts-jest']
+                    }
+                    : {},
                 rxjs: o3rCorePackageJson.peerDependencies.rxjs,
                 typescript: o3rCorePackageJson.peerDependencies.typescript,
                 'zone.js': o3rCorePackageJson.generatorDependencies['zone.js']

package/schematics/library/rules/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"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"}

package/schematics/library/templates/{ng → jest}/jest.config.js.template

@@ -10,7 +10,7 @@ module.exports = {
   displayName: require('./package.json').name,
   preset: 'jest-preset-angular',
   setupFilesAfterEnv: ['<rootDir>/testing/setup-jest.ts'],
-  rootDir: '.',
+  rootDir: __dirname,
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths),
   testPathIgnorePatterns: [
     '<rootDir>/dist',

package/schematics/library/templates/ng/common/tsconfig.lib.prod.json.template

@@ -0,0 +1,3 @@
+{
+  "extends": "<%= tsconfigBuildPath %>"
+}

package/schematics/library/templates/ng/jest/tsconfig.build.composite.json.template

@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "composite": true
+  }
+}

package/schematics/library/templates/ng/{tsconfig.spec.json.template → jest/tsconfig.spec.json.template}

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "test",
-    "rootDir": ".",
+    "rootDir": "."
   },
   "include": [
     "./src/**/*.spec.ts"

package/schematics/library/templates/nx/project.json.template

@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "configurations": {
         "ci": {
           "quiet": true,
@@ -49,7 +49,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "<%= projectRoot %>/jest.config.js",
         "silent": true

package/schematics/ng-add/helpers/commit-hooks/index.d.ts

@@ -0,0 +1,19 @@
+import { type Rule, type SchematicContext, type TaskId } from '@angular-devkit/schematics';
+/** Dev Dependencies to install to setup Commit hooks */
+export declare const commitHookDevDependencies: string[];
+/**
+ * Retrieve the task callback function to initialization the commit hooks
+ * @param context
+ */
+export declare function getCommitHookInitTask(context: SchematicContext): (taskIds?: TaskId[]) => void;
+/**
+ * Edit package.json to setup lint-staged config
+ * @param tree
+ * @param context
+ */
+export declare const editPackageJson: Rule;
+/**
+ * Add Commit Lint and husky configurations to Otter project
+ */
+export declare function generateCommitLintConfig(): Rule;
+//# sourceMappingURL=index.d.ts.map

package/schematics/ng-add/helpers/commit-hooks/index.d.ts.map

@@ -0,0 +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"}

package/schematics/ng-add/helpers/commit-hooks/index.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.editPackageJson = exports.commitHookDevDependencies = void 0;
+exports.getCommitHookInitTask = getCommitHookInitTask;
+exports.generateCommitLintConfig = generateCommitLintConfig;
+const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
+/** Dev Dependencies to install to setup Commit hooks */
+exports.commitHookDevDependencies = [
+    'husky',
+    'lint-staged',
+    'editorconfig-checker',
+    '@commitlint/cli',
+    '@commitlint/config-angular',
+    '@commitlint/config-conventional',
+    '@commitlint/types'
+];
+/**
+ * Retrieve the task callback function to initialization the commit hooks
+ * @param context
+ */
+function getCommitHookInitTask(context) {
+    return (taskIds) => {
+        const packageManager = (0, schematics_2.getPackageManager)();
+        const huskyTask = new schematics_2.NpmExecTask('husky init');
+        const taskId = context.addTask(huskyTask, taskIds);
+        const setupLintStage = new schematics_2.NodeRunScriptTask(`require('node:fs').writeFileSync('.husky/pre-commit', '${packageManager} exec lint-stage');`);
+        context.addTask(setupLintStage, [taskId]);
+    };
+}
+/**
+ * Edit package.json to setup lint-staged config
+ * @param tree
+ * @param context
+ */
+const editPackageJson = (tree, context) => {
+    const packageJson = tree.readJson('/package.json');
+    if (packageJson['lint-staged']) {
+        context.logger.debug('A Lint-stage configuration is already defined, the default value will not be applied');
+        return tree;
+    }
+    packageJson['lint-staged'] = {
+        '*': [
+            'editorconfig-checker --verbose'
+        ]
+    };
+    tree.overwrite('/package.json', JSON.stringify(packageJson));
+};
+exports.editPackageJson = editPackageJson;
+/**
+ * Add Commit Lint and husky configurations to Otter project
+ */
+function generateCommitLintConfig() {
+    return () => {
+        const packageManager = (0, schematics_2.getPackageManager)();
+        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./helpers/commit-hooks/templates'), [
+            (0, schematics_1.template)({
+                empty: '',
+                packageManager
+            }),
+            (0, schematics_1.renameTemplateFiles)()
+        ]);
+        const rule = (0, schematics_1.mergeWith)(templateSource, schematics_1.MergeStrategy.Overwrite);
+        return (0, schematics_1.chain)([
+            exports.editPackageJson,
+            rule
+        ]);
+    };
+}
+//# sourceMappingURL=index.js.map

package/schematics/ng-add/helpers/commit-hooks/index.js.map

@@ -0,0 +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"}

package/schematics/ng-add/helpers/commit-hooks/templates/__empty__.husky/commit-msg.template

@@ -0,0 +1 @@
+<%= packageManager %> exec commitlint <%= packageManager === 'npm' ? '-- ' : '' %>--edit $1

package/schematics/ng-add/helpers/commit-hooks/templates/commitlint.config.cts.template

@@ -0,0 +1,10 @@
+import type {
+  UserConfig,
+} from '@commitlint/types';
+
+export default {
+  extends: [
+    '@commitlint/config-conventional',
+    '@commitlint/config-angular'
+  ]
+} as const satisfies UserConfig;

package/schematics/ng-add/helpers/index.d.ts

@@ -1,5 +1,4 @@
 export * from './gitignore-update';
-export * from './linter';
 export * from './npm-workspace';
 export * from './renovate/index';
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-add/helpers/index.d.ts.map

@@ -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"}
+{"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"}

package/schematics/ng-add/helpers/index.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./gitignore-update"), exports);
-tslib_1.__exportStar(require("./linter"), exports);
 tslib_1.__exportStar(require("./npm-workspace"), exports);
 tslib_1.__exportStar(require("./renovate/index"), exports);
 //# sourceMappingURL=index.js.map

package/schematics/ng-add/helpers/index.js.map

@@ -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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,0DAAgC;AAChC,2DAAiC"}

package/schematics/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAgBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAuClB;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAgBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAwClB;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}

package/schematics/ng-add/index.js

@@ -30,11 +30,12 @@ function ngAddFn(options) {
             // Schematics advertising
             (t, c) => {
                 const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(t);
+                const executor = (0, schematics_2.getPackageManagerExecutor)(workspaceConfig);
                 c.logger.info('Your project is now ready, you can start to generate your first packages with one of the following commands:');
-                c.logger.info(`  ${(0, schematics_2.getPackageManagerExecutor)(workspaceConfig)} ng g application`);
-                c.logger.info(`  ${(0, schematics_2.getPackageManagerExecutor)(workspaceConfig)} ng g sdk`);
-                c.logger.info(`  ${(0, schematics_2.getPackageManagerExecutor)(workspaceConfig)} ng g library`);
-                c.logger.info(`... or discover the full list of commands with "${(0, schematics_2.getPackageManagerExecutor)(workspaceConfig)} ng g --help".`);
+                c.logger.info(`  ${executor} ng g application`);
+                c.logger.info(`  ${executor} ng g sdk`);
+                c.logger.info(`  ${executor} ng g library`);
+                c.logger.info(`... or discover the full list of commands with "${executor} ng g ${executor.startsWith('npm') ? '-- ' : ''}--help".`);
             }
         ])(tree, context);
     };

package/schematics/ng-add/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAKoC;AACpC,4DAE0C;AAC1C,gDAKyB;AAIzB,mDAEyB;AAKzB;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;QAEpJ,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;YACjB,sCAAsC;YACtC,IAAA,gDAAmC,EAAC,qBAAqB,CAAC;YAE1D,8BAA8B;YAC9B,IAAA,8BAAc,EAAC,OAAO,CAAC;YAEvB,qBAAqB;YACrB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;oBAC/D,MAAM,MAAM,GAAwD,OAAO,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC5H,MAAM,CAAC,OAAO,GAAG,0BAA0B,CAAC;oBAC5C,CAAC,CAAC,OAAO,CAAC,IAAI,iCAAyB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;YAED,yBAAyB;YACzB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,MAAM,eAAe,GAAG,IAAA,+BAAkB,EAAC,CAAC,CAAC,CAAC;gBAC9C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,8GAA8G,CAAC,CAAC;gBAC9H,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,IAAA,sCAAyB,EAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;gBAClF,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,IAAA,sCAAyB,EAAC,eAAe,CAAC,WAAW,CAAC,CAAC;gBAC1E,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,IAAA,sCAAyB,EAAC,eAAe,CAAC,eAAe,CAAC,CAAC;gBAC9E,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,IAAA,sCAAyB,EAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;YAC/H,CAAC;SACF,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACU,QAAA,KAAK,GAAG,IAAA,kDAAqC,EAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAKoC;AACpC,4DAE0C;AAC1C,gDAKyB;AAIzB,mDAEyB;AAKzB;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;QAEpJ,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;YACjB,sCAAsC;YACtC,IAAA,gDAAmC,EAAC,qBAAqB,CAAC;YAE1D,8BAA8B;YAC9B,IAAA,8BAAc,EAAC,OAAO,CAAC;YAEvB,qBAAqB;YACrB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;oBAC/D,MAAM,MAAM,GAAwD,OAAO,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC5H,MAAM,CAAC,OAAO,GAAG,0BAA0B,CAAC;oBAC5C,CAAC,CAAC,OAAO,CAAC,IAAI,iCAAyB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;YAED,yBAAyB;YACzB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACP,MAAM,eAAe,GAAG,IAAA,+BAAkB,EAAC,CAAC,CAAC,CAAC;gBAC9C,MAAM,QAAQ,GAAG,IAAA,sCAAyB,EAAC,eAAe,CAAC,CAAC;gBAC5D,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,8GAA8G,CAAC,CAAC;gBAC9H,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,mBAAmB,CAAC,CAAC;gBAChD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,WAAW,CAAC,CAAC;gBACxC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,eAAe,CAAC,CAAC;gBAC5C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,QAAQ,SAAS,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YACvI,CAAC;SACF,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACU,QAAA,KAAK,GAAG,IAAA,kDAAqC,EAAC,OAAO,CAAC,CAAC"}

package/schematics/ng-add/project-setup.d.ts.map

@@ -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"}
+{"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,IAiF/D,CAAC"}

package/schematics/ng-add/project-setup.js

@@ -6,10 +6,23 @@ const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const linter_1 = require("../rule-factories/linter");
+const commit_hooks_1 = require("./helpers/commit-hooks");
 const gitignore_update_1 = require("./helpers/gitignore-update");
-const linter_1 = require("./helpers/linter");
 const npm_workspace_1 = require("./helpers/npm-workspace");
 const renovate_1 = require("./helpers/renovate");
+const updateEditorConfig = (tree) => {
+    const editorconfigPath = '.editorconfig';
+    const editorconfig = tree.exists(editorconfigPath) ? tree.readText(editorconfigPath) : '';
+    if (editorconfig.includes('end_of_line')) {
+        return tree;
+    }
+    const newEditorconfig = /\[[*]\]/.test(editorconfig)
+        ? editorconfig.replace(/(\[[*]\])/, '$1\nend_of_line = lf')
+        : editorconfig.concat('[*]\nend_of_line = lf');
+    tree.overwrite(editorconfigPath, newEditorconfig);
+    return tree;
+};
 /**
  * Enable all the otter features requested by the user
  * Install all the related dependencies and import the features inside the application
@@ -21,10 +34,13 @@ const prepareProject = (options) => {
         'EditorConfig.EditorConfig',
         'angular.ng-template'
     ];
-    const dependenciesToInstall = [
+    const otterDependencies = [
         '@ama-sdk/core',
         '@ama-sdk/schematics'
     ];
+    const devDependenciesToInstall = [
+        ...(options.skipPreCommitChecks ? [] : commit_hooks_1.commitHookDevDependencies)
+    ];
     const ownSchematicsFolder = path.resolve(__dirname, '..');
     const ownPackageJsonPath = path.resolve(ownSchematicsFolder, '..', 'package.json');
     const depsInfo = (0, schematics_2.getO3rPeerDeps)(ownPackageJsonPath);
@@ -38,7 +54,7 @@ const prepareProject = (options) => {
             ...(installOtterLinter ? [`@o3r/eslint-config${(0, linter_1.isUsingFlatConfig)(tree) ? '' : '-otter'}`] : []),
             ...depsInfo.o3rPeerDeps
         ]));
-        const dependencies = [...internalPackagesToInstallWithNgAdd, ...dependenciesToInstall].reduce((acc, dep) => {
+        const dependencies = [...internalPackagesToInstallWithNgAdd, ...otterDependencies].reduce((acc, dep) => {
             acc[dep] = {
                 inManifest: [{
                         range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
@@ -48,19 +64,40 @@ const prepareProject = (options) => {
             };
             return acc;
         }, {});
+        devDependenciesToInstall.forEach((dep) => {
+            dependencies[dep] ||= {
+                inManifest: [{
+                        range: ownPackageJsonContent.devDependencies?.[dep] || ownPackageJsonContent.generatorDependencies?.[dep] || 'latest',
+                        types: [dependencies_1.NodeDependencyType.Dev]
+                    }],
+                requireInstall: !options.skipPreCommitChecks && dep === 'husky'
+            };
+        });
         if (installOtterLinter) {
             vsCodeExtensions.push('dbaeumer.vscode-eslint');
         }
         const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
         return () => (0, schematics_1.chain)([
             (0, renovate_1.generateRenovateConfig)(__dirname),
+            ...(options.skipPreCommitChecks ? [] : [(0, commit_hooks_1.generateCommitLintConfig)()]),
+            updateEditorConfig,
             (0, schematics_2.addVsCodeRecommendations)(vsCodeExtensions),
             (0, gitignore_update_1.updateGitIgnore)(workspaceConfig),
             npm_workspace_1.filterPackageJsonScripts,
             (0, schematics_2.setupDependencies)({
                 dependencies,
                 skipInstall: options.skipInstall,
-                ngAddToRun: internalPackagesToInstallWithNgAdd
+                ngAddToRun: internalPackagesToInstallWithNgAdd,
+                scheduleTaskCallback: (taskIds) => {
+                    if (!options.skipPreCommitChecks) {
+                        if (options.skipInstall) {
+                            context.logger.warn(`The pre-commit checks will not be setup because the installation has been skipped.`);
+                        }
+                        else {
+                            (0, commit_hooks_1.getCommitHookInitTask)(context)(taskIds);
+                        }
+                    }
+                }
             }),
             !options.skipLinter && installOtterLinter ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)(),
             (0, npm_workspace_1.addWorkspacesToProject)(),

package/schematics/ng-add/project-setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}

package/schematics/ng-add/schema.d.ts

@@ -5,7 +5,7 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
     /** Skip the linter process */
     skipLinter: boolean;
     /** Skip the install process */
-    skipInstall: boolean;
+    skipInstall?: boolean;
     /** Initial git repository commit information. */
     commit: boolean | {
         name: string;
@@ -13,6 +13,8 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
     };
     /** Do not initialize a git repository. */
     skipGit: boolean;
+    /** Skip the setup of CommitLint and Lint-Stage configurations and pre-commit checks */
+    skipPreCommitChecks: boolean;
     /** Use a pinned version for otter packages */
     exactO3rVersion?: boolean;
     /** Monorepo manager to use */

package/schematics/ng-add/schema.d.ts.map

@@ -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"}
+{"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,CAAC,EAAE,OAAO,CAAC;IAEtB,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"}

package/schematics/ng-add/schema.json

@@ -11,8 +11,7 @@
     },
     "skipInstall": {
       "type": "boolean",
-      "description": "Skip the install process",
-      "default": true
+      "description": "Skip the install process. If set to true, the pre-commit check setup will be skipped as well."
     },
     "commit": {
       "description": "Initial git repository commit information. (Available at workspace setup only)",
@@ -46,6 +45,11 @@
       "default": false,
       "alias": "g"
     },
+    "skipPreCommitChecks": {
+      "description": "Skip the setup of CommitLint and Lint-Stage configurations and pre-commit checks.",
+      "type": "boolean",
+      "default": false
+    },
     "exactO3rVersion": {
       "type": "boolean",
       "description": "Use a pinned version for otter packages",

package/schematics/rule-factories/index.d.ts

@@ -1,2 +1,3 @@
 export * from './project-configs';
+export * from './linter';
 //# sourceMappingURL=index.d.ts.map

package/schematics/rule-factories/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC"}

package/schematics/rule-factories/index.js

@@ -2,4 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./project-configs"), exports);
+tslib_1.__exportStar(require("./linter"), exports);
 //# sourceMappingURL=index.js.map

package/schematics/rule-factories/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,4DAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,4DAAkC;AAClC,mDAAyB"}

package/schematics/rule-factories/linter.d.ts.map

@@ -0,0 +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"}

package/schematics/rule-factories/linter.js.map

@@ -0,0 +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"}

package/schematics/library/templates/nx/jest.config.js.template

@@ -1,38 +0,0 @@
-const { pathsToModuleNameMapper } = require('ts-jest');
-const { compilerOptions } = require('<%= tsconfigBasePath %>');
-
-globalThis.ngJest = {
-  skipNgcc: true
-};
-
-/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
-module.exports = {
-  displayName: require('./package.json').name,
-  preset: 'jest-preset-angular',
-  setupFilesAfterEnv: ['<rootDir>/testing/setup-jest.ts'],
-  rootDir: '.',
-  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths),
-  testPathIgnorePatterns: [
-    '<rootDir>/dist',
-  ],
-  reporters: [
-    'default',
-    'github-actions'
-  ],
-  globalSetup: 'jest-preset-angular/global-setup',
-  transform: {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    '^.+\\.tsx?$': [
-      'jest-preset-angular',
-      {
-        tsconfig: '<rootDir>/tsconfig.spec.json',
-        stringifyContentPathRegex: '\\.html$'
-      }
-    ]
-  },
-  snapshotSerializers: [
-    'jest-preset-angular/build/serializers/no-ng-attributes',
-    'jest-preset-angular/build/serializers/ng-snapshot',
-    'jest-preset-angular/build/serializers/html-comment',
-  ]
-};

package/schematics/library/templates/nx/testing/setup-jest.ts.template

@@ -1,2 +0,0 @@
-import 'jest-preset-angular/setup-jest';
-

package/schematics/ng-add/helpers/linter.d.ts.map

@@ -1 +0,0 @@
-{"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"}

package/schematics/ng-add/helpers/linter.js.map

@@ -1 +0,0 @@
-{"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"}