Separate lint and test scripts (#2232)

Author: fisker

.eslintrc.yml

@@ -37,7 +37,7 @@ rules:
     - never
     - exceptRange: true
 
-  import/extensions: 
+  import/extensions:
     - error
     - ignorePackages
   import/no-extraneous-dependencies:

.github/workflows/nodejs.yml

@@ -20,6 +20,7 @@ jobs:
       - name: yarn install, build, and test
         run: |
           yarn
+          yarn lint
           yarn test
           yarn codecov
         env:

.prettierignore

@@ -0,0 +1,2 @@
+tests/**/*
+!tests/**/jsfmt.spec.js

README.md

@@ -234,7 +234,7 @@ You may also need to declare php as the parser in your prettier config file:
 ```json
 {
   "parser": "php",
-  "plugins": ["@prettier/plugin-php"],
+  "plugins": ["@prettier/plugin-php"]
 }
 ```
 

jest.config.js

@@ -8,40 +8,15 @@ export default {
     "!<rootDir>/node_modules/",
     "!<rootDir>/tests_config/",
   ],
-  projects: [
-    RUN_STANDALONE_TESTS
-      ? {
-          displayName: "test-standalone",
-          setupFiles: ["<rootDir>/tests_config/run_spec.js"],
-          testRegex: "jsfmt\\.spec\\.js$|__tests__/.*\\.js$",
-          snapshotSerializers: ["jest-snapshot-serializer-raw"],
-          testEnvironment: "jsdom",
-          globals: {
-            STANDALONE: true,
-          },
-          runner: "jest-light-runner",
-          transform: {},
-        }
-      : {
-          displayName: "test-node",
-          setupFiles: ["<rootDir>/tests_config/run_spec.js"],
-          testRegex: "jsfmt\\.spec\\.js$|__tests__/.*\\.js$",
-          snapshotSerializers: ["jest-snapshot-serializer-raw"],
-          testEnvironment: "node",
-          globals: {
-            STANDALONE: false,
-          },
-          runner: "jest-light-runner",
-          transform: {},
-        },
-    {
-      runner: "jest-runner-eslint",
-      displayName: "lint",
-      testMatch: ["<rootDir>/**/*.js"],
-      testPathIgnorePatterns: [
-        "<rootDir>/node_modules/",
-        "<rootDir>/coverage/",
-      ],
-    },
-  ],
+  runner: "jest-light-runner",
+  transform: {},
+  setupFiles: ["<rootDir>/tests_config/run_spec.js"],
+  testRegex: "jsfmt\\.spec\\.js$|__tests__/.*\\.js$",
+  snapshotSerializers: ["jest-snapshot-serializer-raw"],
+  globals: {
+    STANDALONE: RUN_STANDALONE_TESTS,
+  },
+  ...(RUN_STANDALONE_TESTS
+    ? { displayName: "test-standalone", testEnvironment: "jsdom" }
+    : { displayName: "test-node", testEnvironment: "node" }),
 };

package.json

@@ -40,7 +40,6 @@
     "jest": "29.6.2",
     "jest-environment-jsdom": "29.6.2",
     "jest-light-runner": "^0.5.0",
-    "jest-runner-eslint": "2.1.0",
     "jest-snapshot-serializer-raw": "^1.1.0",
     "prettier": "^3.0.1",
     "rollup": "^2.75.7",
@@ -56,6 +55,12 @@
     "prettier": "^3.0.0"
   },
   "scripts": {
+    "lint": "yarn lint:eslint && yarn lint:prettier",
+    "lint:eslint": "eslint .",
+    "lint:prettier": "prettier . --check",
+    "fix": "yarn fix:eslint && yarn fix:prettier",
+    "fix:eslint": "eslint . --fix",
+    "fix:prettier": "prettier . --write",
     "test": "yarn test:node && yarn test:standalone",
     "test:node": "jest",
     "test:standalone": "yarn run build-standalone && cross-env RUN_STANDALONE_TESTS=true yarn jest",

src/linguist-languages.cjs

@@ -1,4 +1,4 @@
-"use strict";
-
-module.exports.LINGUIST_LANGUAGES_PHP = require("linguist-languages/data/PHP");
-module.exports.LINGUIST_LANGUAGES_HTML_PHP = require("linguist-languages/data/HTML+PHP");
+"use strict";
+
+module.exports.LINGUIST_LANGUAGES_PHP = require("linguist-languages/data/PHP");
+module.exports.LINGUIST_LANGUAGES_HTML_PHP = require("linguist-languages/data/HTML+PHP");

yarn.lock

@@ -1899,11 +1899,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz#a8ddf6e0c2341718d74ee3dc413a13a042c45a0c"
   integrity sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw==
 
-"@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
-
 "@types/resolve@1.20.2":
   version "1.20.2"
   resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975"
@@ -2414,7 +2409,7 @@ chalk@^2.0.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
+chalk@^4.0.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2532,26 +2527,6 @@ core-js-compat@^3.31.0:
   dependencies:
     browserslist "^4.21.9"
 
-cosmiconfig@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
-  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
-create-jest-runner@^0.11.2:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/create-jest-runner/-/create-jest-runner-0.11.2.tgz#4b4f62ccef1e4de12e80f81c2cf8211fa392a962"
-  integrity sha512-6lwspphs4M1PLKV9baBNxHQtWVBPZuDU8kAP4MyrVWa6aEpEcpi2HZeeA6WncwaqgsGNXpP0N2STS7XNM/nHKQ==
-  dependencies:
-    chalk "^4.1.0"
-    jest-worker "^28.0.2"
-    throat "^6.0.1"
-
 cross-env@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
@@ -2710,13 +2685,6 @@ domexception@^4.0.0:
   dependencies:
     webidl-conversions "^7.0.0"
 
-dot-prop@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
-  integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==
-  dependencies:
-    is-obj "^2.0.0"
-
 electron-to-chromium@^1.4.202:
   version "1.4.284"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
@@ -3827,11 +3795,6 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
-  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
-
 is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
@@ -4217,16 +4180,6 @@ jest-resolve@^29.6.2:
     resolve.exports "^2.0.0"
     slash "^3.0.0"
 
-jest-runner-eslint@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/jest-runner-eslint/-/jest-runner-eslint-2.1.0.tgz#49f6372c2ee091f61e2bd9ad8a17c9538b5f5073"
-  integrity sha512-5gQOLej+HLDNzxrqOxg+l/ZY6hAHYhzO7gs3eOR+PQz14wpDuLDIivn+xJ8uwHW2tYM/37NGskqwBe5RbbJPEw==
-  dependencies:
-    chalk "^4.0.0"
-    cosmiconfig "^7.0.0"
-    create-jest-runner "^0.11.2"
-    dot-prop "^6.0.1"
-
 jest-runner@^29.6.2:
   version "29.6.2"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.6.2.tgz#89e8e32a8fef24781a7c4c49cd1cb6358ac7fc01"
@@ -4360,15 +4313,6 @@ jest-worker@^26.2.1:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest-worker@^28.0.2:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98"
-  integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
 jest-worker@^29.6.2:
   version "29.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.6.2.tgz#682fbc4b6856ad0aa122a5403c6d048b83f3fb44"
@@ -4902,7 +4846,7 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-json@^5.0.0, parse-json@^5.2.0:
+parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
@@ -5615,11 +5559,6 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-throat@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.2.tgz#51a3fbb5e11ae72e2cf74861ed5c8020f89f29fe"
-  integrity sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==
-
 titleize@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53"
@@ -6021,11 +5960,6 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
 yargs-parser@^21.0.0:
   version "21.0.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"