Merge branch 'main' into renovate-major-npm-dev-dependencies

seek-oss · Jan 19, 2025 · 8bd34fe · 8bd34fe
2 parents 629cd01 + d0443bd
commit 8bd34fe
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 24 deletions.
diff --git a/.changeset/wet-owls-attack.md b/.changeset/wet-owls-attack.md
@@ -0,0 +1,10 @@
+---
+'eslint-config-skuba': minor
+---
+
+Revert to modern JavaScript language option defaults
+
+- `ecmaVersion: 5 => latest`
+- `sourceType: script => module`
+
+See [JavaScript language options](https://eslint.org/docs/latest/use/configure/language-options#specifying-javascript-options) for more information.
diff --git a/docs/deep-dives/pnpm.md b/docs/deep-dives/pnpm.md
@@ -109,7 +109,7 @@ This migration guide assumes that your project was scaffolded with a **skuba** t
 2. Add a `packageManager` key to `package.json`
 
    ```json
-   "packageManager": "[email protected].3",
+   "packageManager": "[email protected].4",
    ```
 
 3. Install pnpm

diff --git a/package.json b/package.json
@@ -159,7 +159,7 @@
       "optional": true
     }
   },
-  "packageManager": "[email protected].3",
+  "packageManager": "[email protected].4",
   "engines": {
     "node": ">=18.18.0"
   },

diff --git a/packages/eslint-config-skuba/index.js b/packages/eslint-config-skuba/index.js
@@ -100,15 +100,6 @@ module.exports = [
     name: 'skuba/typescript',
     files: [`**/*.{${tsExtensions}}`],
 
-    languageOptions: {
-      ecmaVersion: 5,
-      sourceType: 'script',
-
-      parserOptions: {
-        projectService: true,
-      },
-    },
-
     rules: {
       '@typescript-eslint/consistent-type-exports': 'error',
       '@typescript-eslint/no-floating-promises': 'error',

diff --git a/packages/eslint-config-skuba/package.json b/packages/eslint-config-skuba/package.json
@@ -38,7 +38,7 @@
     "eslint": ">=9.11.1",
     "typescript": ">=5.5.4"
   },
-  "packageManager": "[email protected].3",
+  "packageManager": "[email protected].4",
   "engines": {
     "node": ">=18.18.0"
   },

diff --git a/template/express-rest-api/.buildkite/pipeline.yml b/template/express-rest-api/.buildkite/pipeline.yml
@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

diff --git a/template/express-rest-api/package.json b/template/express-rest-api/package.json
@@ -28,7 +28,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "[email protected].3",
+  "packageManager": "[email protected].4",
   "engines": {
     "node": ">=20"
   }

diff --git a/template/greeter/.buildkite/pipeline.yml b/template/greeter/.buildkite/pipeline.yml
@@ -38,7 +38,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

diff --git a/template/greeter/package.json b/template/greeter/package.json
@@ -19,7 +19,7 @@
     "@types/node": "^20.9.0",
     "skuba": "*"
   },
-  "packageManager": "[email protected].3",
+  "packageManager": "[email protected].4",
   "engines": {
     "node": ">=20"
   }

diff --git a/template/koa-rest-api/.buildkite/pipeline.yml b/template/koa-rest-api/.buildkite/pipeline.yml
@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

diff --git a/template/koa-rest-api/package.json b/template/koa-rest-api/package.json
@@ -44,7 +44,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "[email protected].3",
+  "packageManager": "[email protected].4",
   "engines": {
     "node": ">=20"
   }

diff --git a/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml b/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml
@@ -33,7 +33,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.5.0:
+        - docker-compose#v5.6.0:
             dependencies: false
             run: app
             environment:
@@ -63,7 +63,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

diff --git a/template/lambda-sqs-worker-cdk/package.json b/template/lambda-sqs-worker-cdk/package.json
@@ -38,7 +38,7 @@
     "pino-pretty": "^13.0.0",
     "skuba": "*"
   },
-  "packageManager": "[email protected].3",
+  "packageManager": "[email protected].4",
   "engines": {
     "node": ">=20"
   }

diff --git a/template/lambda-sqs-worker/.buildkite/pipeline.yml b/template/lambda-sqs-worker/.buildkite/pipeline.yml
@@ -36,7 +36,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.5.0:
+        - docker-compose#v5.6.0:
             dependencies: false
             run: app
             propagate-environment: true
@@ -67,7 +67,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

diff --git a/template/lambda-sqs-worker/package.json b/template/lambda-sqs-worker/package.json
@@ -38,7 +38,7 @@
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
   },
-  "packageManager": "[email protected].3",
+  "packageManager": "[email protected].4",
   "engines": {
     "node": ">=20"
   }