From de3c71e097bc45be295a658aedcb6925dfbe2899 Mon Sep 17 00:00:00 2001 From: confused-Techie Date: Wed, 10 Jan 2024 16:47:45 -0800 Subject: [PATCH 1/4] Remove remnants of `api-docs` script --- .github/workflows/ci-standards.yml | 3 --- package-lock.json | 34 ------------------------------ package.json | 1 - 3 files changed, 38 deletions(-) diff --git a/.github/workflows/ci-standards.yml b/.github/workflows/ci-standards.yml index c2619b02..411c0a4a 100644 --- a/.github/workflows/ci-standards.yml +++ b/.github/workflows/ci-standards.yml @@ -33,9 +33,6 @@ jobs: - name: Lint Codebase run: npm run lint - - name: Generate Web API Docs - run: npm run api-docs - - name: Generate JSDocs run: npm run js-docs diff --git a/package-lock.json b/package-lock.json index d0b3d72e..62cdcafe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,6 @@ }, "devDependencies": { "@confused-techie/compactignore": "^2.0.3", - "@confused-techie/quick-webserver-docs": "^0.1.6", "@databases/pg-migrations": "^5.0.1", "@databases/pg-test": "^3.1.2", "all-contributors-cli": "^6.20.0", @@ -677,18 +676,6 @@ "compactignore": "bin/compactignore.js" } }, - "node_modules/@confused-techie/quick-webserver-docs": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@confused-techie/quick-webserver-docs/-/quick-webserver-docs-0.1.6.tgz", - "integrity": "sha512-YmQ8gA9pqEwE/KTXYN1gJHRGW9jEPiwoeSM8lcxS7GoC8rszCTXrH4QRE5kCAmS1qf37nI/bErU7ub2LO1umfw==", - "dev": true, - "dependencies": { - "readline": "^1.3.0" - }, - "bin": { - "quick-webserver-docs": "bin/index.js" - } - }, "node_modules/@databases/connection-pool": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@databases/connection-pool/-/connection-pool-1.1.0.tgz", @@ -7592,12 +7579,6 @@ "node": ">= 6" } }, - "node_modules/readline": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz", - "integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==", - "dev": true - }, "node_modules/reduce-extract": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/reduce-extract/-/reduce-extract-1.0.0.tgz", @@ -9563,15 +9544,6 @@ "integrity": "sha512-Kc1j0YHR/66aTzXd3fJTl/jcyAqh/NwS9YLJNTbKTIC+zFBiKooynSkJ2K8oJnehAALlM+c3GxR7/pOElcBmig==", "dev": true }, - "@confused-techie/quick-webserver-docs": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@confused-techie/quick-webserver-docs/-/quick-webserver-docs-0.1.6.tgz", - "integrity": "sha512-YmQ8gA9pqEwE/KTXYN1gJHRGW9jEPiwoeSM8lcxS7GoC8rszCTXrH4QRE5kCAmS1qf37nI/bErU7ub2LO1umfw==", - "dev": true, - "requires": { - "readline": "^1.3.0" - } - }, "@databases/connection-pool": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@databases/connection-pool/-/connection-pool-1.1.0.tgz", @@ -14775,12 +14747,6 @@ "util-deprecate": "^1.0.1" } }, - "readline": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz", - "integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==", - "dev": true - }, "reduce-extract": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/reduce-extract/-/reduce-extract-1.0.0.tgz", diff --git a/package.json b/package.json index 6af790a9..ceefec97 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ }, "devDependencies": { "@confused-techie/compactignore": "^2.0.3", - "@confused-techie/quick-webserver-docs": "^0.1.6", "@databases/pg-migrations": "^5.0.1", "@databases/pg-test": "^3.1.2", "all-contributors-cli": "^6.20.0", From 08e7632a46834a4bdff632c2dc32089017ba2dae Mon Sep 17 00:00:00 2001 From: confused-Techie Date: Wed, 10 Jan 2024 16:50:00 -0800 Subject: [PATCH 2/4] Combine all `eslintrc` configs into one --- .eslintrc.js | 3 +++ tests/.eslintrc.js | 5 ----- tests/models/.eslintrc.js | 8 -------- 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 tests/.eslintrc.js delete mode 100644 tests/models/.eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js index 1485d885..eabf3f8e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -23,6 +23,7 @@ module.exports = { complexity: ["error"], eqeqeq: ["error", "smart"], "max-depth": ["error", 4], + camelcase: "off", }, plugins: [], globals: { @@ -32,7 +33,9 @@ module.exports = { describe: "readonly", beforeAll: "readonly", afterEach: "readonly", + afterAll: "readonly", process: "writeable", Buffer: "readonly", + Joi: "readonly", }, }; diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js deleted file mode 100644 index 91b1f75f..00000000 --- a/tests/.eslintrc.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - globals: { - afterAll: true - } -}; diff --git a/tests/models/.eslintrc.js b/tests/models/.eslintrc.js deleted file mode 100644 index b21821d2..00000000 --- a/tests/models/.eslintrc.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - globals: { - Joi: true - }, - rules: { - camelcase: 'off' - } -}; From edb2f61e82161198ba09f0b49bc84f6e773e33d9 Mon Sep 17 00:00:00 2001 From: confused-Techie Date: Wed, 10 Jan 2024 16:52:00 -0800 Subject: [PATCH 3/4] Ensure to ignore deprecated tests --- codeql-config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/codeql-config.yml b/codeql-config.yml index dfec5e44..c8087f27 100644 --- a/codeql-config.yml +++ b/codeql-config.yml @@ -7,4 +7,5 @@ queries: paths-ignore: - ./test - ./tests + - ./scripts/deprecated/test # https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors From 5b1363c0aff31a6c0d87b7104b7fc8e345dff688 Mon Sep 17 00:00:00 2001 From: confused-Techie Date: Wed, 10 Jan 2024 16:52:27 -0800 Subject: [PATCH 4/4] Remove `Upstream` issue references, as with Atom down, there is no upstream to refer to anymore --- .github/ISSUE_TEMPLATE/bug-report.md | 5 ----- .github/ISSUE_TEMPLATE/feature-request.md | 4 ---- 2 files changed, 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index f5289da7..0a983b85 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -6,11 +6,6 @@ labels: bug assignees: '' --- -**Is this Bug Present in the upstream API Server?** -- [ ] Yes -- [ ] No -- [ ] Unsure - **What is the Bug** A clear and concise description of the problem at hand. diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md index 63b87960..fb808994 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.md +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -7,10 +7,6 @@ assignees: '' --- -**Is this feature Currently Implemented in any way with the upstream API Server** -- [ ] Yes -- [ ] No - **Is your feature request related to a problem? Please describe.** A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]