Merge branch 'main' into next-major-release/v17

angular-eslint · Nov 7, 2023 · 6daffb2 · 6daffb2
2 parents 8e97d20 + f18e0d3
commit 6daffb2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -221,7 +221,7 @@ jobs:
           echo "::set-output name=node_version::$(node --version)"
 
       - name: Apply version resolved by volta to standard Node action make authenticated npm publish easier
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ steps.yarn-cache-dir-path.outputs.node_version }}
           registry-url: https://registry.npmjs.org/

diff --git a/packages/eslint-plugin-template/src/rules/prefer-self-closing-tags.ts b/packages/eslint-plugin-template/src/rules/prefer-self-closing-tags.ts
@@ -1,11 +1,12 @@
 import type {
+  TmplAstContent,
   TmplAstElement,
+  TmplAstTemplate,
   TmplAstText,
 } from '@angular-eslint/bundled-angular-compiler';
 import { getTemplateParserServices } from '@angular-eslint/utils';
 import { createESLintRule } from '../utils/create-eslint-rule';
 import { getDomElements } from '../utils/get-dom-elements';
-import type { TmplAstContent, TmplAstTemplate } from '@angular/compiler';
 
 export const MESSAGE_ID = 'preferSelfClosingTags';
 export const RULE_NAME = 'prefer-self-closing-tags';

diff --git a/packages/eslint-plugin-template/tsconfig.build.json b/packages/eslint-plugin-template/tsconfig.build.json
@@ -3,8 +3,9 @@
   "compilerOptions": {
     "outDir": "./dist",
     "resolveJsonModule": true,
-    "baseUrl": ".",
-    "module": "NodeNext"
+    "module": "NodeNext",
+    "declaration": true,
+    "baseUrl": "."
   },
   "include": ["src"]
 }
diff --git a/packages/eslint-plugin/tsconfig.build.json b/packages/eslint-plugin/tsconfig.build.json
@@ -4,7 +4,8 @@
     "outDir": "./dist",
     "resolveJsonModule": true,
     "baseUrl": ".",
-    "module": "NodeNext"
+    "module": "NodeNext",
+    "declaration": true
   },
   "include": ["src"]
 }
diff --git a/packages/schematics/tsconfig.build.json b/packages/schematics/tsconfig.build.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./dist",
+    "declaration": true,
     "baseUrl": ".",
     "module": "NodeNext",
     "paths": {

diff --git a/packages/template-parser/tsconfig.build.json b/packages/template-parser/tsconfig.build.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "./dist",
     "baseUrl": ".",
-    "module": "NodeNext"
+    "module": "NodeNext",
+    "declaration": true
   },
   "include": ["src"]
 }