@angular-eslint/schematics 18.0.0-alpha.10 → 18.0.0-alpha.11

package/dist/add-eslint-to-project/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/add-eslint-to-project/index.ts"],"names":[],"mappings":"AAQA,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAqBG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/add-eslint-to-project/index.ts"],"names":[],"mappings":"AAOA,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAqBG"}

package/dist/add-eslint-to-project/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
+const devkit_imports_1 = require("../devkit-imports");
 const utils_1 = require("../utils");
-exports.default = (0, devkit_1.convertNxGenerator)(async (tree, options) => {
+exports.default = (0, devkit_imports_1.convertNxGenerator)(async (tree, options) => {
     const projectName = (0, utils_1.determineTargetProjectName)(tree, options.project);
     if (!projectName) {
         throw new Error('\n' +

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application/index.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAMtF,UAAU,MAAO,SAAQ,aAAa;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAoBG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAWtF,UAAU,MAAO,SAAQ,aAAa;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAoBG"}

package/dist/application/index.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
+const devkit_imports_1 = require("../devkit-imports");
 const utils_1 = require("../utils");
-exports.default = (0, devkit_1.convertNxGenerator)(async (tree, options) => {
+exports.default = (0, devkit_imports_1.convertNxGenerator)(async (tree, options) => {
     // Remove angular-eslint specific options before passing to the Angular schematic
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { setParserOptionsProject, ...angularOptions } = options;
-    const applicationGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'application');
+    const applicationGenerator = (0, devkit_imports_1.wrapAngularDevkitSchematic)('@schematics/angular', 'application');
     await applicationGenerator(tree, angularOptions);
     // Update the lint builder and config in angular.json
     (0, utils_1.addESLintTargetToProject)(tree, options.name, 'lint');

package/dist/devkit-imports.d.ts

@@ -0,0 +1,4 @@
+export { convertNxGenerator, offsetFromRoot, readJson, writeJson, } from '@nx/devkit';
+export type { ProjectConfiguration, Tree } from '@nx/devkit';
+export { wrapAngularDevkitSchematic } from '@nx/devkit/ngcli-adapter';
+//# sourceMappingURL=devkit-imports.d.ts.map

package/dist/devkit-imports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"devkit-imports.d.ts","sourceRoot":"","sources":["../src/devkit-imports.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,QAAQ,EACR,SAAS,GACV,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/devkit-imports.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapAngularDevkitSchematic = exports.writeJson = exports.readJson = exports.offsetFromRoot = exports.convertNxGenerator = void 0;
+const node_path_1 = require("node:path");
+process.env.NX_PROJECT_GRAPH_CACHE_DIRECTORY = (0, node_path_1.join)(__dirname, '..', '.nx-cache');
+var devkit_1 = require("@nx/devkit");
+Object.defineProperty(exports, "convertNxGenerator", { enumerable: true, get: function () { return devkit_1.convertNxGenerator; } });
+Object.defineProperty(exports, "offsetFromRoot", { enumerable: true, get: function () { return devkit_1.offsetFromRoot; } });
+Object.defineProperty(exports, "readJson", { enumerable: true, get: function () { return devkit_1.readJson; } });
+Object.defineProperty(exports, "writeJson", { enumerable: true, get: function () { return devkit_1.writeJson; } });
+var ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
+Object.defineProperty(exports, "wrapAngularDevkitSchematic", { enumerable: true, get: function () { return ngcli_adapter_1.wrapAngularDevkitSchematic; } });

package/dist/library/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/library/index.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAMlF,UAAU,MAAO,SAAQ,aAAa;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAoBG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/library/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAWlF,UAAU,MAAO,SAAQ,aAAa;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAoBG"}

package/dist/library/index.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
+const devkit_imports_1 = require("../devkit-imports");
 const utils_1 = require("../utils");
-exports.default = (0, devkit_1.convertNxGenerator)(async (tree, options) => {
+exports.default = (0, devkit_imports_1.convertNxGenerator)(async (tree, options) => {
     // Remove angular-eslint specific options before passing to the Angular schematic
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { setParserOptionsProject, ...angularOptions } = options;
-    const libraryGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'library');
+    const libraryGenerator = (0, devkit_imports_1.wrapAngularDevkitSchematic)('@schematics/angular', 'library');
     await libraryGenerator(tree, angularOptions);
     // Update the lint builder and config in angular.json
     (0, utils_1.addESLintTargetToProject)(tree, options.name, 'lint');

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
 import type { Path } from '@angular-devkit/core';
 import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
-import type { Tree as NxTree } from '@nx/devkit';
+import { Tree as NxTree } from './devkit-imports';
 /**
  * This method is specifically for reading JSON files in a Tree
  * @param host The host tree

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAE/E,OAAO,KAAK,EAAE,IAAI,IAAI,MAAM,EAAwB,MAAM,YAAY,CAAC;AASvE;;;;;GAKG;AAEH,wBAAgB,cAAc,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAcnE;AAED;;;;;GAKG;AAEH,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,EAC7C,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,gBAAgB,KAAK,CAAC,GAClD,IAAI,CAYN;AAED,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAE3E,wBAAgB,2BAA2B,CACzC,aAAa,EAAE;IAAE,SAAS,CAAC,EAAE,aAAa,CAAA;CAAE,GAAG;IAAE,OAAO,CAAC,EAAE,aAAa,CAAA;CAAE,GACzE,aAAa,GAAG,IAAI,CAYtB;AAqBD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,QAAQ,GAAG,MAAM,QA2B9B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,EAC3E,GAAG,GAAE,IAAoB,GACxB,IAAI,CA8BN;AA0BD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;EAyC3D;AAGD,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,MAAM,CA4CR;AAiGD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,OAAO,QA8EjC;AAgBD,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,GAAG,IAAI,CAUf;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,uBAS1E;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,iBAAiB,EAAE,MAAM,EACzB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAUvC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAM/E,OAAO,EACL,IAAI,IAAI,MAAM,EAKf,MAAM,kBAAkB,CAAC;AAI1B;;;;;GAKG;AAEH,wBAAgB,cAAc,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAcnE;AAED;;;;;GAKG;AAEH,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,EAC7C,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,gBAAgB,KAAK,CAAC,GAClD,IAAI,CAYN;AAED,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAE3E,wBAAgB,2BAA2B,CACzC,aAAa,EAAE;IAAE,SAAS,CAAC,EAAE,aAAa,CAAA;CAAE,GAAG;IAAE,OAAO,CAAC,EAAE,aAAa,CAAA;CAAE,GACzE,aAAa,GAAG,IAAI,CAYtB;AAqBD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,QAAQ,GAAG,MAAM,QAkC9B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,EAC3E,GAAG,GAAE,IAAoB,GACxB,IAAI,CA8BN;AA0BD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;EAyC3D;AAGD,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,MAAM,CA4CR;AAiGD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,OAAO,QA8EjC;AAgBD,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,GAAG,IAAI,CAUf;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,uBAS1E;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,iBAAiB,EAAE,MAAM,EACzB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAUvC"}

package/dist/utils.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSchematicDefaults = exports.updateSchematicCollections = exports.determineTargetProjectName = exports.sortObjectByKeys = exports.createESLintConfigForProject = exports.createStringifiedRootESLintConfig = exports.createRootESLintConfig = exports.visitNotIgnoredFiles = exports.addESLintTargetToProject = exports.getTargetsConfigFromProject = exports.updateJsonInTree = exports.readJsonInTree = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const devkit_1 = require("@nx/devkit");
 const ignore_1 = __importDefault(require("ignore"));
 const semver_1 = __importDefault(require("semver"));
 const strip_json_comments_1 = __importDefault(require("strip-json-comments"));
+const devkit_imports_1 = require("./devkit-imports");
 const DEFAULT_PREFIX = 'app';
 /**
  * This method is specifically for reading JSON files in a Tree
@@ -67,13 +67,13 @@ function serializeJson(json) {
     return `${JSON.stringify(json, null, 2)}\n`;
 }
 function readProjectConfiguration(tree, projectName) {
-    const angularJSON = (0, devkit_1.readJson)(tree, 'angular.json');
+    const angularJSON = (0, devkit_imports_1.readJson)(tree, 'angular.json');
     return angularJSON.projects[projectName];
 }
 function updateProjectConfiguration(tree, projectName, projectConfig) {
-    const angularJSON = (0, devkit_1.readJson)(tree, 'angular.json');
+    const angularJSON = (0, devkit_imports_1.readJson)(tree, 'angular.json');
     angularJSON.projects[projectName] = projectConfig;
-    (0, devkit_1.writeJson)(tree, 'angular.json', angularJSON);
+    (0, devkit_imports_1.writeJson)(tree, 'angular.json', angularJSON);
 }
 function addESLintTargetToProject(tree, projectName, targetName) {
     const existingProjectConfig = readProjectConfiguration(tree, projectName);
@@ -94,6 +94,11 @@ function addESLintTargetToProject(tree, projectName, targetName) {
             ],
         },
     };
+    let eslintConfig;
+    if (existingProjectConfig.root !== '') {
+        eslintConfig = (0, core_1.join)(existingProjectConfig.root, 'eslint.config.js');
+    }
+    eslintTargetConfig.options.eslintConfig = eslintConfig;
     existingProjectConfig.architect = existingProjectConfig.architect || {};
     existingProjectConfig.architect[targetName] = eslintTargetConfig;
     updateProjectConfiguration(tree, projectName, existingProjectConfig);
@@ -239,7 +244,7 @@ module.exports = tseslint.config(
 exports.createStringifiedRootESLintConfig = createStringifiedRootESLintConfig;
 function createProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e) {
     return {
-        extends: `${(0, devkit_1.offsetFromRoot)(projectRoot)}.eslintrc.json`,
+        extends: `${(0, devkit_imports_1.offsetFromRoot)(projectRoot)}.eslintrc.json`,
         ignorePatterns: ['!**/*'],
         overrides: [
             {
@@ -272,7 +277,7 @@ function createProjectESLintConfig(projectRoot, projectType, prefix, setParserOp
 function createStringifiedProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e) {
     return `// @ts-check
 const tseslint = require("typescript-eslint");
-const rootConfig = require("${(0, devkit_1.offsetFromRoot)(projectRoot)}eslint.config.js");
+const rootConfig = require("${(0, devkit_imports_1.offsetFromRoot)(projectRoot)}eslint.config.js");
 
 module.exports = tseslint.config(
   ...rootConfig,
@@ -360,7 +365,7 @@ function createESLintConfigForProject(tree, projectName, setParserOptionsProject
         tree.write((0, core_1.join)((0, core_1.normalize)(projectRoot), 'eslint.config.js'), createStringifiedProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e));
     }
     else {
-        (0, devkit_1.writeJson)(tree, (0, core_1.join)((0, core_1.normalize)(projectRoot), '.eslintrc.json'), createProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e));
+        (0, devkit_imports_1.writeJson)(tree, (0, core_1.join)((0, core_1.normalize)(projectRoot), '.eslintrc.json'), createProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e));
     }
 }
 exports.createESLintConfigForProject = createESLintConfigForProject;
@@ -368,7 +373,7 @@ function createRootESLintConfigFile(tree, prefix, useFlatConfig) {
     if (useFlatConfig) {
         return tree.write('eslint.config.js', createStringifiedRootESLintConfig(prefix));
     }
-    return (0, devkit_1.writeJson)(tree, '.eslintrc.json', createRootESLintConfig(prefix));
+    return (0, devkit_imports_1.writeJson)(tree, '.eslintrc.json', createRootESLintConfig(prefix));
 }
 function sortObjectByKeys(obj) {
     return Object.keys(obj)
@@ -389,7 +394,7 @@ function determineTargetProjectName(tree, maybeProject) {
     if (maybeProject) {
         return maybeProject;
     }
-    const workspaceJson = (0, devkit_1.readJson)(tree, 'angular.json');
+    const workspaceJson = (0, devkit_imports_1.readJson)(tree, 'angular.json');
     const projects = Object.keys(workspaceJson.projects);
     if (projects.length === 1) {
         return projects[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/schematics",
-  "version": "18.0.0-alpha.10",
+  "version": "18.0.0-alpha.11",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -34,8 +34,8 @@
     "save": false
   },
   "dependencies": {
-    "@angular-eslint/eslint-plugin": "18.0.0-alpha.10",
-    "@angular-eslint/eslint-plugin-template": "18.0.0-alpha.10",
+    "@angular-eslint/eslint-plugin": "18.0.0-alpha.11",
+    "@angular-eslint/eslint-plugin-template": "18.0.0-alpha.11",
     "@nx/devkit": "^19.0.6",
     "ignore": "5.3.1",
     "nx": "^19.0.6",