Merge pull request #274 from ember-cli/package-json-sorting-lint

Package json sorting lint
ember-cli · Dec 26, 2023 · 51a3468 · 51a3468
2 parents eed8a0d + 849058a
commit 51a3468
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 914 deletions.
diff --git a/addon/.eslintrc.js b/addon/.eslintrc.js
@@ -30,5 +30,21 @@ module.exports = {
       plugins: ['node'],
       extends: ['plugin:node/recommended'],
     },
+    {
+      files: ['package.json'],
+      plugins: ['jsonc'],
+      parser: 'jsonc-eslint-parser',
+      extends: ['plugin:jsonc/recommended-with-json', 'plugin:jsonc/prettier'],
+      rules: {
+        'jsonc/sort-keys': [
+          'error',
+          {
+            pathPattern:
+              '^(?:scripts|devDependencies|peerDependencies|optionalDependencies)$',
+            order: { type: 'asc' },
+          },
+        ],
+      },
+    },
   ],
 };
diff --git a/addon/package.json b/addon/package.json
@@ -30,8 +30,8 @@
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
-    "start": "rollup --config --watch",
-    "prepublishOnly": "rollup --config"
+    "prepublishOnly": "rollup --config",
+    "start": "rollup --config --watch"
   },
   "dependencies": {
     "@embroider/addon-shim": "^1.8.7"
@@ -52,6 +52,7 @@
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.12.0",
+    "eslint-plugin-jsonc": "^2.11.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^5.1.2",
     "npm-run-all": "^4.1.5",

diff --git a/docs/.eslintrc.js b/docs/.eslintrc.js
@@ -38,5 +38,21 @@ module.exports = {
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },
+    {
+      files: ['package.json'],
+      plugins: ['jsonc'],
+      parser: 'jsonc-eslint-parser',
+      extends: ['plugin:jsonc/recommended-with-json', 'plugin:jsonc/prettier'],
+      rules: {
+        'jsonc/sort-keys': [
+          'error',
+          {
+            pathPattern:
+              '^(?:scripts|devDependencies|peerDependencies|optionalDependencies)$',
+            order: { type: 'asc' },
+          },
+        ],
+      },
+    },
   ],
 };
diff --git a/docs/package.json b/docs/package.json
@@ -13,18 +13,18 @@
   "repository": "https://github.com/ember-cli/ember-page-title",
   "scripts": {
     "build": "ember build --environment=production",
+    "format:hbs": "prettier **/*.hbs --write --parser=glimmer",
+    "format:js": "prettier **/*.js --write",
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
+    "release": "standard-version",
     "start": "ember serve",
     "test": "npm-run-all lint test:*",
-    "test:ember": "ember test",
-    "format:hbs": "prettier **/*.hbs --write --parser=glimmer",
-    "format:js": "prettier **/*.js --write",
-    "release": "standard-version"
+    "test:ember": "ember test"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.23.3",
@@ -61,6 +61,7 @@
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.12.0",
+    "eslint-plugin-jsonc": "^2.11.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^5.1.2",
     "eslint-plugin-qunit": "^8.0.1",