chore: use pnpm & renovate, update lint packages (#319)

* chore: use pnpm * update test infra * add packageManager field * bump lint deps, use prettier standalone * update prettier-ification * fixup lint * fix install in test * fix lint
html-next · Nov 1, 2024 · 6e454e1 · 6e454e1
1 parent f5264ec
commit 6e454e1
Show file tree

Hide file tree

Showing 149 changed files with 19,252 additions and 15,399 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -4,15 +4,15 @@ engines:
     enabled: true
     config:
       languages:
-      - javascript
+        - javascript
   eslint:
     enabled: true
   fixme:
     enabled: true
 ratings:
   paths:
-  - "**.js"
+    - "**.js"
 exclude_paths:
-- config/
-- tests/
-- vendor/
+  - config/
+  - tests/
+  - vendor/
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -38,28 +38,15 @@ module.exports = {
     ecmaVersion: 2018,
     sourceType: 'module',
     babelOptions: {
-      plugins: [
-        [
-          require.resolve('@babel/plugin-proposal-decorators'),
-          { legacy: true },
-        ],
-      ],
+      plugins: [[require.resolve('@babel/plugin-proposal-decorators'), { legacy: true }]],
     },
     requireConfigFile: false,
   },
-  plugins: [
-    'ember',
-    'qunit',
-    'simple-import-sort',
-    'import',
-    'unused-imports',
-    'unicorn',
-    'no-useless-assign',
-  ],
+  plugins: ['ember', 'qunit', 'simple-import-sort', 'import', 'unused-imports', 'unicorn', 'no-useless-assign'],
   extends: [
     'eslint:recommended',
+    'prettier/prettier',
     'plugin:ember/recommended',
-    'plugin:prettier/recommended',
     'plugin:qunit/recommended',
     'plugin:unicorn/recommended',
   ],
@@ -102,10 +89,7 @@ module.exports = {
     ],
     */
     complexity: ['error', { max: 20 }],
-    'no-magic-numbers': [
-      'error',
-      { ignore: [0, 1, -1], ignoreArrayIndexes: true },
-    ],
+    'no-magic-numbers': ['error', { ignore: [0, 1, -1], ignoreArrayIndexes: true }],
 
     'object-shorthand': ['error', 'always'],
     'no-restricted-imports': [
@@ -158,7 +142,7 @@ module.exports = {
     'ember/no-deeply-nested-dependent-keys-with-each': 'error',
     'ember/jquery-ember-run': 'error',
     'qunit/no-assert-equal-boolean': 'error',
-    'qunit/require-expect': 'error',
+    'qunit/require-expect': 'off',
     'qunit/no-compare-relation-boolean': 'error',
     'no-restricted-globals': [
       'error',
@@ -211,6 +195,9 @@ module.exports = {
     // unicorn
     'unicorn/prefer-module': 'off',
     'unicorn/filename-case': 'off',
+    'unicorn/no-negated-condition': 'off',
+    'unicorn/prefer-structured-clone': 'off',
+    'unicorn/switch-case-braces': 'off',
     'unicorn/no-array-for-each': 'off', // this might be nice someday? better if it would do regular for loops for arrays
     'unicorn/number-literal-case': 'off', // conflicts with prettier
     'unicorn/no-nested-ternary': 'off', // conflicts with prettier
@@ -219,7 +206,8 @@ module.exports = {
     'unicorn/prefer-spread': 'off', // possibly nice if we had native arrays
     'unicorn/no-for-loop': 'off', // if for...of was good maybe we'd use this
     'unicorn/better-regex': 'off', // would be awesome but has bugs https://github.com/sindresorhus/eslint-plugin-unicorn/issues?q=is%3Aissue+is%3Aopen+better-regex
-
+    'unicorn/no-anonymous-default-export': 'off',
+    'unicorn/prefer-node-protocol': 'off',
     'unicorn/prefer-add-event-listener': 'error',
     'unicorn/prefer-includes': 'error',
     'unicorn/prefer-default-parameters': 'error',
@@ -301,12 +289,12 @@ module.exports = {
         browser: false,
         node: true,
       },
-      plugins: ['node'],
-      extends: ['plugin:node/recommended'],
+      plugins: ['n'],
+      extends: ['plugin:n/recommended'],
       rules: {
         // this can be removed once the following is fixed
         // https://github.com/mysticatea/eslint-plugin-node/issues/77
-        'node/no-unpublished-require': 'off',
+        'n/no-unpublished-require': 'off',
       },
     },
   ],

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base"],
+  "labels": [":dependabot:", ":label: dependencies"],
+  "packageRules": [
+    {
+      "matchManagers": ["github-actions"],
+      "groupName": "github-actions"
+    }
+  ],
+  "npm": {
+    "stabilityDays": 3
+  },
+  "rangeStrategy": "bump",
+  "prHourlyLimit": 10,
+  "vulnerabilityAlerts": {
+    "labels": [":label: security"],
+    "automerge": false,
+    "assignees": ["@runspired"],
+    "enabled": true
+  },
+  "ignorePaths": ["node_modules/**", "**/node_modules/**"]
+}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,12 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
       - main
-      - beta
-      - release
-      - 'release-*'
-      - 'lts-*'
     tags:
       - '*'
 
@@ -22,26 +17,32 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
+      - uses: actions/setup-node@v4
         with:
-          node-version: "16"
-          cache: "yarn"
-      - name: Yarn install
-        run: yarn --frozen-lockfile
-      - name: Lint js
-        run: yarn lint:js
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: 'package.json'
+          node-version: "18"
+          cache: "pnpm"
+      - name: Pnpm install
+        run: pnpm install
+      - name: Lint
+        run: pnpm lint
 
   basic-tests:
     name: Basic Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
+      - uses: actions/setup-node@v4
         with:
-          node-version: "16"
-          cache: "yarn"
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: 'package.json'
+          node-version: "18"
+          cache: "pnpm"
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install
       - name: Basic Development Tests
-        run: yarn test:development
+        run: pnpm test:development
diff --git a/.gitignore b/.gitignore
@@ -14,13 +14,11 @@
 .eslintcache
 /DEBUG
 /packages/*/DEBUG
-/.github/
 /.sass-cache
 /connect.lock
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
-yarn-error.log
 testem.log
 
 # ember-try

diff --git a/.prettier-cache b/.prettier-cache
diff --git a/.prettierignore b/.prettierignore
@@ -14,6 +14,7 @@
 /coverage/
 !.*
 .eslintcache
+pnpm-lock.yaml
 /DEBUG
 /packages/*/DEBUG
 /.github/

diff --git a/.prettierrc b/.prettierrc
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,36 @@
+module.exports = {
+  trailingComma: 'es5',
+  printWidth: 120,
+  plugins: ['prettier-plugin-ember-template-tag'],
+  overrides: [
+    {
+      files: '*.{js,ts,cjs,cts,mjs,mts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+    {
+      files: '*.scss',
+      options: {
+        parser: 'scss',
+        trailingComma: 'none',
+        singleQuote: false,
+      },
+    },
+    {
+      files: ['*.hbs'],
+      options: {
+        singleQuote: false,
+      },
+    },
+    {
+      files: ['*.gjs', '*.gts'],
+      options: {
+        parser: 'ember-template-tag',
+        singleQuote: true,
+        templateSingleQuote: false,
+        trailingComma: 'es5',
+      },
+    },
+  ],
+};
diff --git a/README.md b/README.md
@@ -22,10 +22,10 @@ Join the [Ember community on Discord](https://discord.gg/zT3asNS)
 
 ## Contributing
 
- - Open an Issue for discussion first if you're unsure a feature/fix is wanted.
- - Branch off of `main` (default branch)
- - Use descriptive branch names (e.g. `<type>/<short-description>`)
- - PR against `main` (default branch).
+- Open an Issue for discussion first if you're unsure a feature/fix is wanted.
+- Branch off of `main` (default branch)
+- Use descriptive branch names (e.g. `<type>/<short-description>`)
+- PR against `main` (default branch).
 
 ## Thanks
 

diff --git a/jsconfig.json b/jsconfig.json
@@ -10,6 +10,6 @@
     "packages/*/dist",
     "packages/*/tmp",
     "packages/*/vendor",
-    ".git",
+    ".git"
   ]
 }
diff --git a/lerna.json b/lerna.json
@@ -1,16 +1,11 @@
 {
-    "npmClient": "yarn",
-    "useWorkspaces": true,
-    "packages": [
-        "packages/*"
-    ],
-    "version": "3.0.0-alpha.0",
-    "command": {
-        "version": {
-            "allowBranch": [
-                "main",
-                "release"
-            ]
-        }
+  "npmClient": "pnpm",
+  "useWorkspaces": true,
+  "packages": ["packages/*"],
+  "version": "3.0.0-alpha.0",
+  "command": {
+    "version": {
+      "allowBranch": ["main", "release"]
     }
+  }
 }
diff --git a/package.json b/package.json
@@ -24,31 +24,38 @@
     }
   ],
   "scripts": {
+    "lint": "pnpm run lint:prettier && pnpm run lint:js",
     "lint:js": "eslint --cache --ext=js,ts .",
+    "lint:prettier": "prettier --check --cache --cache-location=.prettier-cache --log-level=warn .",
+    "lint:prettier:fix": "prettier --write --cache --cache-location=.prettier-cache --log-level=warn .",
     "test:development": "lerna run --stream --parallel --no-private test:development"
   },
+  "packageManager": "[email protected]",
   "volta": {
-    "node": "14.17.0",
-    "yarn": "1.22.4"
+    "node": "23.1.0",
+    "pnpm": "9.12.3"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": "18.* || 20.* || >= 22",
+    "npm": "use pnpm",
+    "yarn": "use pnpm"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.17.0",
-    "@babel/plugin-proposal-decorators": "^7.17.2",
-    "eslint": "^8.10.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-ember": "^10.5.9",
-    "eslint-plugin-import": "^2.25.4",
+    "@babel/eslint-parser": "^7.25.9",
+    "@babel/plugin-proposal-decorators": "^7.25.9",
+    "eslint": "^8.57.1",
+    "prettier-plugin-ember-template-tag": "2.0.2",
+    "ember-template-tag": "2.3.16",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-ember": "^12.3.1",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-no-useless-assign": "^1.0.3",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-qunit": "^7.2.0",
-    "eslint-plugin-simple-import-sort": "^7.0.0",
-    "eslint-plugin-unicorn": "^39.0.0",
-    "eslint-plugin-unused-imports": "^2.0.0",
+    "eslint-plugin-n": "^17.12.0",
+    "eslint-plugin-qunit": "^8.1.2",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "eslint-plugin-unicorn": "56.0.0",
+    "eslint-plugin-unused-imports": "^4.1.4",
     "lerna": "^4.0.0",
-    "prettier": "^2.5.1"
+    "prettier": "^3.3.3"
   }
 }
diff --git a/packages/flexi-config/.npmignore b/packages/flexi-config/.npmignore
@@ -21,7 +21,7 @@
 /ember-cli-build.js
 /testem.js
 /tests/
-/yarn.lock
+/pnpm-lock.yaml
 .gitkeep
 
 # ember-try