Merge branch 'main' of github.com:patricklx/eslint-plugin-ember-template-lint

# Conflicts:
#	pnpm-lock.yaml
#	test-projects/configs/flat-js/eslint.config.mjs
#	test-projects/configs/flat-js/package.json
#	test-projects/gjs/.eslintrc.cjs
#	test-projects/gjs/package.json
#	test-projects/gjs/src/placeholer.gjs
#	test-projects/gts/.eslintrc.cjs
#	test-projects/gts/package.json

Author: patricklx

.eslintrc.js

@@ -3,7 +3,7 @@ module.exports = {
     'ecmaVersion': 'latest',
     sourceType: 'module',
   },
-  plugins: ['node', 'jest'],
+  plugins: ['n', 'jest'],
   'env': {
     'browser': true,
     'commonjs': true,
@@ -12,11 +12,11 @@ module.exports = {
   'extends': [
     'eslint:recommended',
     'plugin:jest/recommended',
-    'plugin:node/recommended',
+    'plugin:n/recommended',
   ],
   'rules': {
-    'node/no-unpublished-require': 'off',
-    'node/no-unsupported-features/es-syntax': 'off',
+    'n/no-unpublished-require': 'off',
+    'n/no-unsupported-features/es-syntax': 'off',
     'indent': [
       'error',
       2

.github/workflows/ci.yml

@@ -21,61 +21,60 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 'latest'
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
-        cache: 'npm'
+        cache: 'pnpm'
 
-    - run: npm install
+    - run: pnpm install
 
-    - run: npm run lint:js
+    - run: pnpm run lint:js
 
-    - run: npm run test -- --runInBand
+    - run: pnpm run test --runInBand
+
+    - run: pnpm --filter '*' test
 
   deploy:
     permissions:
       contents: write
       deployments: write
-      
+
     needs: [ test ]
     if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [ 16.x ]
+        node-version: [ 18.x ]
     steps:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 'latest'
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 16.x
-      - name: npm install, build,
+          node-version: 18.x
+      - name: pnpm install, build,
         run: |
           mkdir ~/.ssh
           ssh-keyscan github.com >> ~/.ssh/known_hosts
-          npm install --no-audit --legacy-peer-deps
-          version=$(cat package.json | jq -r '.version')
-          git fetch --unshallow
-          git fetch --all --tags
-          TAG=v$version
+          pnpm install
         env:
           CI: true
           DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
-      - name: deploy npm
+      - name: deploy pnpm
         if: github.ref == 'refs/heads/main'
         run: |
           version=$(cat package.json | jq -r '.version')
           TAG=v$version
-          if git rev-parse "$TAG" >/dev/null 2>&1; then
-            echo "tag exists";
-          else
-            echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
-            npm publish || echo "already published"
-          fi
+          echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
+          pnpm publish || echo "already published"
         env:
           NPM_TOKEN: "${{ secrets.NPM_TOKEN }}"
       - name: create tag
@@ -88,10 +87,12 @@ jobs:
           set -e
           version=$(cat package.json | jq -r '.version')
           TAG=v$version
+          git fetch --unshallow
+          git fetch --all --tags
           if git rev-parse "$TAG" >/dev/null 2>&1; then
             echo "tag exists";
           else
-            npm i -g lerna-changelog
+            pnpm i -g lerna-changelog
             export GITHUB_AUTH=$GITHUB_TOKEN
             export changelog=$(lerna-changelog --next-version=$version)
             echo -e "# Changelog\n\n$changelog\n$(tail --lines=+2 CHANGELOG.md)" > CHANGELOG.md

.npmrc

@@ -1,6 +1,17 @@
 # Changelog
 
 
+## 0.20.0 (2024-11-26)
+
+#### :bug: Bug Fix
+* [#142](https://github.com/patricklx/eslint-plugin-ember-template-lint/pull/142) add tests ([@patricklx](https://github.com/patricklx))
+
+#### Committers: 1
+- Patrick Pircher ([@patricklx](https://github.com/patricklx))
+
+
+
+
 
 
 

CHANGELOG.md

@@ -0,0 +1,7 @@
+module.exports = {
+  root: true,
+
+  plugins: ['ember-template-lint'],
+
+  rules: {}
+};

lib/config-legacy/base.js

@@ -0,0 +1,21 @@
+const info = require('../ember-template-lint/info');
+const base = require('./base');
+
+const configs = {};
+
+Object.entries(info.configs).forEach(([name, config]) => {
+  Object.entries(config.rules).forEach(([name, conf]) => {
+    if (typeof conf == 'boolean') {
+      config.rules[name] = [conf ? 'error' : 'off'];
+    }
+  });
+  configs[name] = {...base, rules: config.rules};
+});
+configs['config'] = {
+  ...base,
+  rules: info.configuredRules,
+  overrides: info.configuredOverrides,
+};
+
+module.exports = configs;
+

lib/config-legacy/index.js

@@ -1,20 +1,9 @@
 module.exports = {
   root: true,
 
-  plugins: ['ember-template-lint'],
+  plugins: {
+    'ember-template-lint': require('../index'),
+  },
 
-  rules: {},
-
-  overrides: [
-    {
-      files: ['**/*.hbs'],
-      parser: require.resolve('../parser/hbs-parser'),
-      processor: 'ember-template-lint/noop'
-    },
-    {
-      files: ['**/*.gts', '**/*.gjs'],
-      parser: 'ember-eslint-parser',
-      processor: 'ember-template-lint/noop'
-    },
-  ],
+  rules: {}
 };

lib/config/base.js

@@ -13,7 +13,8 @@ Object.entries(info.configs).forEach(([name, config]) => {
 });
 configs['config'] = {
   ...base,
-  rules: info.configuredRules
+  rules: info.configuredRules,
+  overrides: info.configuredOverrides,
 };
 
 module.exports = configs;

lib/config/index.js

@@ -1,18 +1,35 @@
 const templateLintConfig = {
   rules: {},
   plugins: [],
+  overrides: [],
 };
 
+let current = templateLintConfig;
+
 function registerRule(name, config) {
-  templateLintConfig.rules[name] = Array.isArray(config) ? config[0] : config;
+  current.rules[name] = Array.isArray(config) ? config[0] : config;
 }
 
 function registerPlugin(name) {
-  templateLintConfig.plugins.push(name);
+  current.plugins.push(name);
+}
+
+function startOverride(files) {
+  current = {
+    files,
+    rules: {}
+  };
+  templateLintConfig.overrides.push(current);
+}
+
+function finishOverride() {
+  current = templateLintConfig;
 }
 
 module.exports = {
   registerRule,
   registerPlugin,
+  startOverride,
+  finishOverride,
   templateLintConfig
-};
+};

lib/ember-template-lint/config.js

@@ -93,17 +93,34 @@ Object.values(configs).forEach((config) => {
 
 const configuredRules = {};
 Object.entries(lintConfigs.configuredRules).forEach(([name, conf]) => {
-  if (conf.severity) {
+  configuredRules['ember-template-lint/' + name] = configuredRules['ember-template-lint/' + name] || [];
+  configuredRules['ember-template-lint/' + name].push(conf.severity);
+  if (typeof conf.config !== 'boolean') {
+    configuredRules['ember-template-lint/' + name].push(conf.config);
+  }
+});
+
+const configuredOverrides = [];
+
+for (const configuredOverride of lintConfigs.configuredOverrides) {
+  const configuredRules = {};
+  Object.entries(configuredOverride.rules).forEach(([name, conf]) => {
     configuredRules['ember-template-lint/' + name] = configuredRules['ember-template-lint/' + name] || [];
     configuredRules['ember-template-lint/' + name].push(conf.severity);
     if (typeof conf.config !== 'boolean') {
       configuredRules['ember-template-lint/' + name].push(conf.config);
     }
-  }
-});
+  });
+  configuredOverrides.push({
+    files: configuredOverride.files,
+    rules: configuredRules
+  });
+}
+
 
 module.exports = {
   configs: configs,
   rules: createRules(rules),
-  configuredRules: configuredRules
+  configuredRules,
+  configuredOverrides
 };