Merge branch 'main' of github.com:seek-oss/skuba into upgrade-cdk-tem…

…plate
seek-oss · Jun 19, 2024 · fe58114 · fe58114
2 parents 2a2adfe + d88e3c5
commit fe58114
Show file tree

Hide file tree

Showing 21 changed files with 5,718 additions and 786 deletions.
diff --git a/.changeset/cuddly-roses-dance.md b/.changeset/cuddly-roses-dance.md
@@ -0,0 +1,5 @@
+---
+'eslint-config-skuba': minor
+---
+
+deps: eslint-plugin-tsdoc 0.3.0
diff --git a/.changeset/hip-mice-punch.md b/.changeset/hip-mice-punch.md
@@ -0,0 +1,5 @@
+---
+'skuba': patch
+---
+
+template/oss-npm-package: Skip excessive action runs
diff --git a/.changeset/wise-houses-cheer.md b/.changeset/wise-houses-cheer.md
@@ -0,0 +1,5 @@
+---
+'skuba': minor
+---
+
+deps: prettier 3.3
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -20,6 +20,7 @@ permissions: {}
 jobs:
   core:
     name: Lint & Test
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork
     permissions:
       checks: write
     runs-on: ubuntu-latest
@@ -76,6 +77,7 @@ jobs:
 
   package:
     name: Lint
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
@@ -111,6 +113,7 @@ jobs:
 
   template:
     name: Integrate
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:

diff --git a/jest.config.ts b/jest.config.ts
@@ -9,9 +9,11 @@ export default Jest.mergePreset({
     '<rootDir>/integration/format/',
     '<rootDir>/integration/lint/',
   ],
+  roots: ['src'],
   projects: [
     {
       displayName: 'unit',
+      roots: ['src'],
       setupFiles: ['<rootDir>/jest.setup.ts'],
       testPathIgnorePatterns: [
         '<rootDir>/template/',
@@ -21,6 +23,7 @@ export default Jest.mergePreset({
     },
     {
       displayName: 'integration',
+      roots: ['src'],
       setupFiles: ['<rootDir>/jest.setup.ts'],
       testMatch: ['**/*.int.test.ts'],
     },

diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
     "format": "pnpm --silent skuba format",
     "lint": "pnpm --silent skuba lint && pnpm --silent lint:md",
     "lint:md": "remark --frail --quiet .",
+    "prepack": "pnpm --filter './template/**' exec rm -rf node_modules",
     "release": "pnpm --silent build && changeset publish",
     "skuba": "pnpm --silent build && pnpm --silent skuba:exec",
     "skuba:exec": "node --experimental-vm-modules lib/skuba",
@@ -102,7 +103,7 @@
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^4.0.0",
-    "prettier": "~3.2.5",
+    "prettier": "~3.3.0",
     "prettier-plugin-packagejson": "^2.4.10",
     "read-pkg-up": "^7.0.1",
     "semantic-release": "^22.0.12",
@@ -135,13 +136,13 @@
     "@types/picomatch": "2.3.3",
     "@types/supertest": "6.0.2",
     "@types/validate-npm-package-name": "4.0.2",
-    "enhanced-resolve": "5.16.1",
+    "enhanced-resolve": "5.17.0",
     "express": "4.19.2",
-    "fastify": "4.27.0",
+    "fastify": "4.28.0",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
     "koa": "2.15.3",
-    "memfs": "4.9.2",
+    "memfs": "4.9.3",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.0",
     "semver": "7.6.2",

diff --git a/packages/eslint-config-skuba/package.json b/packages/eslint-config-skuba/package.json
@@ -31,7 +31,7 @@
     "@typescript-eslint/parser": "^7.2.0",
     "eslint-config-seek": "^13.0.0",
     "eslint-plugin-jest": "^28.0.0",
-    "eslint-plugin-tsdoc": "^0.2.14",
+    "eslint-plugin-tsdoc": "^0.3.0",
     "eslint-plugin-yml": "^1.5.0"
   },
   "devDependencies": {