skuba 8.0.0-update-eslint-config-skuba-20240323071344 → 8.0.1-dive-migration-20240325114906

package/lib/api/jest/index.d.ts

@@ -12,136 +12,4 @@ type DefaultOptions = 'collectCoverage' | 'collectCoverageFrom' | 'coveragePathI
  *
  * This concatenates array options like `testPathIgnorePatterns`.
  */
-export declare const mergePreset: <AdditionalOptions extends "filter" | "json" | "silent" | "transform" | "cache" | "runtime" | "watch" | "runner" | "projects" | "id" | "automock" | "cacheDirectory" | "clearMocks" | "collectCoverageFrom" | "coverageDirectory" | "coveragePathIgnorePatterns" | "dependencyExtractor" | "detectLeaks" | "detectOpenHandles" | "displayName" | "errorOnDeprecated" | "extensionsToTreatAsEsm" | "fakeTimers" | "forceCoverageMatch" | "globalSetup" | "globalTeardown" | "globals" | "haste" | "injectGlobals" | "moduleDirectories" | "moduleFileExtensions" | "moduleNameMapper" | "modulePathIgnorePatterns" | "modulePaths" | "openHandlesTimeout" | "preset" | "prettierPath" | "resetMocks" | "resetModules" | "resolver" | "restoreMocks" | "rootDir" | "roots" | "sandboxInjectedGlobals" | "setupFiles" | "setupFilesAfterEnv" | "skipFilter" | "skipNodeResolution" | "slowTestThreshold" | "snapshotResolver" | "snapshotSerializers" | "snapshotFormat" | "testEnvironment" | "testEnvironmentOptions" | "testMatch" | "testLocationInResults" | "testPathIgnorePatterns" | "testRegex" | "testRunner" | "transformIgnorePatterns" | "watchPathIgnorePatterns" | "unmockedModulePathPatterns" | "workerIdleMemoryLimit" | "bail" | "ci" | "changedFilesWithAncestor" | "changedSince" | "collectCoverage" | "coverageProvider" | "coverageReporters" | "coverageThreshold" | "expand" | "findRelatedTests" | "forceExit" | "reporters" | "logHeapUsage" | "lastCommit" | "listTests" | "maxConcurrency" | "maxWorkers" | "noStackTrace" | "notify" | "notifyMode" | "onlyChanged" | "onlyFailures" | "outputFile" | "passWithNoTests" | "randomize" | "replname" | "runTestsByPath" | "showSeed" | "testFailureExitCode" | "testNamePattern" | "testResultsProcessor" | "testSequencer" | "testTimeout" | "updateSnapshot" | "useStderr" | "verbose" | "watchAll" | "watchman" | "watchPlugins" | "workerThreads">({ projects, ...options }: Pick<Partial<{
-    automock: boolean;
-    bail: number | boolean;
-    cache: boolean;
-    cacheDirectory: string;
-    ci: boolean;
-    clearMocks: boolean;
-    changedFilesWithAncestor: boolean;
-    changedSince: string;
-    collectCoverage: boolean;
-    collectCoverageFrom: string[];
-    coverageDirectory: string;
-    coveragePathIgnorePatterns: string[];
-    coverageProvider: "v8" | "babel";
-    coverageReporters: Config.CoverageReporters;
-    coverageThreshold: {
-        [path: string]: Config.CoverageThresholdValue;
-        global: Config.CoverageThresholdValue;
-    };
-    dependencyExtractor: string;
-    detectLeaks: boolean;
-    detectOpenHandles: boolean;
-    displayName: string | Config.DisplayName;
-    expand: boolean;
-    extensionsToTreatAsEsm: string[];
-    fakeTimers: Config.GlobalFakeTimersConfig & ((Config.FakeTimersConfig & {
-        now?: number | undefined;
-    }) | Config.LegacyFakeTimersConfig);
-    filter: string;
-    findRelatedTests: boolean;
-    forceCoverageMatch: string[];
-    forceExit: boolean;
-    json: boolean;
-    globals: Config.ConfigGlobals;
-    globalSetup: string | null | undefined;
-    globalTeardown: string | null | undefined;
-    haste: Config.HasteConfig;
-    id: string;
-    injectGlobals: boolean;
-    reporters: (string | Config.ReporterConfig)[];
-    logHeapUsage: boolean;
-    lastCommit: boolean;
-    listTests: boolean;
-    maxConcurrency: number;
-    maxWorkers: string | number;
-    moduleDirectories: string[];
-    moduleFileExtensions: string[];
-    moduleNameMapper: {
-        [key: string]: string | string[];
-    };
-    modulePathIgnorePatterns: string[];
-    modulePaths: string[];
-    noStackTrace: boolean;
-    notify: boolean;
-    notifyMode: string;
-    onlyChanged: boolean;
-    onlyFailures: boolean;
-    openHandlesTimeout: number;
-    outputFile: string;
-    passWithNoTests: boolean;
-    preset: string | null | undefined;
-    prettierPath: string | null | undefined;
-    projects: (string | Config.InitialProjectOptions)[];
-    randomize: boolean;
-    replname: string | null | undefined;
-    resetMocks: boolean;
-    resetModules: boolean;
-    resolver: string | null | undefined;
-    restoreMocks: boolean;
-    rootDir: string;
-    roots: string[];
-    runner: string;
-    runTestsByPath: boolean;
-    runtime: string;
-    sandboxInjectedGlobals: string[];
-    setupFiles: string[];
-    setupFilesAfterEnv: string[];
-    showSeed: boolean;
-    silent: boolean;
-    skipFilter: boolean;
-    skipNodeResolution: boolean;
-    slowTestThreshold: number;
-    snapshotResolver: string;
-    snapshotSerializers: string[];
-    snapshotFormat: {
-        readonly min?: boolean | undefined;
-        readonly callToJSON?: boolean | undefined;
-        readonly compareKeys?: null | undefined;
-        readonly escapeRegex?: boolean | undefined;
-        readonly escapeString?: boolean | undefined;
-        readonly highlight?: boolean | undefined;
-        readonly indent?: number | undefined;
-        readonly maxDepth?: number | undefined;
-        readonly maxWidth?: number | undefined;
-        readonly printBasicPrototype?: boolean | undefined;
-        readonly printFunctionName?: boolean | undefined;
-        readonly theme?: {
-            readonly value?: string | undefined;
-            readonly tag?: string | undefined;
-            readonly content?: string | undefined;
-            readonly comment?: string | undefined;
-            readonly prop?: string | undefined;
-        } | undefined;
-    };
-    errorOnDeprecated: boolean;
-    testEnvironment: string;
-    testEnvironmentOptions: Record<string, unknown>;
-    testFailureExitCode: string | number;
-    testLocationInResults: boolean;
-    testMatch: string[];
-    testNamePattern: string;
-    testPathIgnorePatterns: string[];
-    testRegex: string | string[];
-    testResultsProcessor: string;
-    testRunner: string;
-    testSequencer: string;
-    testTimeout: number;
-    transform: {
-        [regex: string]: string | Config.TransformerConfig;
-    };
-    transformIgnorePatterns: string[];
-    watchPathIgnorePatterns: string[];
-    unmockedModulePathPatterns: string[];
-    updateSnapshot: boolean;
-    useStderr: boolean;
-    verbose?: boolean | undefined;
-    watch: boolean;
-    watchAll: boolean;
-    watchman: boolean;
-    watchPlugins: (string | [string, Record<string, unknown>])[];
-    workerIdleMemoryLimit: string | number;
-    workerThreads: boolean;
-}>, DefaultOptions | AdditionalOptions>) => Config.InitialOptions;
+export declare const mergePreset: <AdditionalOptions extends "filter" | "json" | "silent" | "transform" | "cache" | "runtime" | "watch" | "runner" | "projects" | "id" | "automock" | "cacheDirectory" | "clearMocks" | "collectCoverageFrom" | "coverageDirectory" | "coveragePathIgnorePatterns" | "dependencyExtractor" | "detectLeaks" | "detectOpenHandles" | "displayName" | "errorOnDeprecated" | "extensionsToTreatAsEsm" | "fakeTimers" | "forceCoverageMatch" | "globalSetup" | "globalTeardown" | "globals" | "haste" | "injectGlobals" | "moduleDirectories" | "moduleFileExtensions" | "moduleNameMapper" | "modulePathIgnorePatterns" | "modulePaths" | "openHandlesTimeout" | "preset" | "prettierPath" | "resetMocks" | "resetModules" | "resolver" | "restoreMocks" | "rootDir" | "roots" | "sandboxInjectedGlobals" | "setupFiles" | "setupFilesAfterEnv" | "skipFilter" | "skipNodeResolution" | "slowTestThreshold" | "snapshotResolver" | "snapshotSerializers" | "snapshotFormat" | "testEnvironment" | "testEnvironmentOptions" | "testMatch" | "testLocationInResults" | "testPathIgnorePatterns" | "testRegex" | "testRunner" | "transformIgnorePatterns" | "watchPathIgnorePatterns" | "unmockedModulePathPatterns" | "workerIdleMemoryLimit" | "bail" | "ci" | "changedFilesWithAncestor" | "changedSince" | "collectCoverage" | "coverageProvider" | "coverageReporters" | "coverageThreshold" | "expand" | "findRelatedTests" | "forceExit" | "reporters" | "logHeapUsage" | "lastCommit" | "listTests" | "maxConcurrency" | "maxWorkers" | "noStackTrace" | "notify" | "notifyMode" | "onlyChanged" | "onlyFailures" | "outputFile" | "passWithNoTests" | "randomize" | "replname" | "runTestsByPath" | "showSeed" | "testFailureExitCode" | "testNamePattern" | "testResultsProcessor" | "testSequencer" | "testTimeout" | "updateSnapshot" | "useStderr" | "verbose" | "watchAll" | "watchman" | "watchPlugins" | "workerThreads">({ projects, ...options }: Pick<Config.InitialOptions, AdditionalOptions | DefaultOptions>) => Config.InitialOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "8.0.0-update-eslint-config-skuba-20240323071344",
+  "version": "8.0.1-dive-migration-20240325114906",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -87,7 +87,7 @@
     "prettier": "~3.2.5",
     "prettier-plugin-packagejson": "^2.4.10",
     "read-pkg-up": "^7.0.1",
-    "semantic-release": "^21.0.0",
+    "semantic-release": "^22.0.12",
     "serialize-error": "^8.0.1",
     "simple-git": "^3.5.0",
     "strip-ansi": "^6.0.1",
@@ -97,10 +97,10 @@
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "2.0.0",
-    "typescript": "~5.3.0",
+    "typescript": "~5.4.0",
     "validate-npm-package-name": "^5.0.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "4.0.0-update-eslint-config-skuba-20240323071344"
+    "eslint-config-skuba": "4.0.1-dive-migration-20240325114906"
   },
   "devDependencies": {
     "@changesets/cli": "2.27.1",
@@ -132,7 +132,7 @@
     "type-fest": "2.19.0"
   },
   "peerDependencies": {
-    "skuba-dive": "1 || 2"
+    "skuba-dive": "2.0.1-dive-migration-20240325114906"
   },
   "peerDependenciesMeta": {
     "skuba-dive": {
@@ -160,7 +160,7 @@
     "format": "pnpm --silent skuba format",
     "lint": "pnpm --silent skuba lint && pnpm --silent lint:md",
     "lint:md": "remark --frail --quiet .",
-    "release": "pnpm --silent build && changeset publish",
+    "release": "changeset publish",
     "skuba": "pnpm --silent build && pnpm --silent skuba:exec",
     "skuba:exec": "node --env-file=.env lib/skuba",
     "stage": "changeset version && node ./.changeset/inject.js && pnpm format",

package/template/express-rest-api/.gantry/common.yml

@@ -9,7 +9,6 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  seek:env:prod: '{{values "isProduction"}}'
   seek:source:sha: '{{.CommitSHA}}'
   seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
   # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'

package/template/express-rest-api/.gantry/dev.yml

@@ -2,8 +2,6 @@ environment: dev
 env:
   SOME_ENVIRONMENT_VARIABLE: dev-value
 
-isProduction: false
-
 maxInstanceCount: 1
 minInstanceCount: 1
 

package/template/express-rest-api/.gantry/prod.yml

@@ -2,7 +2,5 @@ environment: prod
 env:
   SOME_ENVIRONMENT_VARIABLE: prod-value
 
-isProduction: true
-
 maxInstanceCount: 10
 minInstanceCount: 3

package/template/express-rest-api/package.json

@@ -24,7 +24,7 @@
     "skuba": "*",
     "supertest": "^6.1.6"
   },
-  "packageManager": "pnpm@8.15.4",
+  "packageManager": "pnpm@8.15.5",
   "engines": {
     "node": ">=20"
   }

package/template/greeter/package.json

@@ -18,7 +18,7 @@
     "@types/node": "^20.9.0",
     "skuba": "*"
   },
-  "packageManager": "pnpm@8.15.4",
+  "packageManager": "pnpm@8.15.5",
   "engines": {
     "node": ">=20"
   }

package/template/koa-rest-api/.gantry/common.yml

@@ -9,7 +9,6 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  seek:env:prod: '{{values "isProduction"}}'
   seek:source:sha: '{{.CommitSHA}}'
   seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
   # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'

package/template/koa-rest-api/.gantry/dev.yml

@@ -2,8 +2,6 @@ environment: dev
 env:
   SOME_ENVIRONMENT_VARIABLE: dev-value
 
-isProduction: false
-
 maxInstanceCount: 1
 minInstanceCount: 1
 
@@ -11,4 +9,5 @@ minInstanceCount: 1
 cloudwatchDashboardDisabled: true
 
 openTelemetry:
+  datadogEnvironmentName: development
   enabled: false

package/template/koa-rest-api/.gantry/prod.yml

@@ -2,10 +2,9 @@ environment: prod
 env:
   SOME_ENVIRONMENT_VARIABLE: prod-value
 
-isProduction: true
-
 maxInstanceCount: 10
 minInstanceCount: 3
 
 openTelemetry:
+  datadogEnvironmentName: production
   enabled: false

package/template/koa-rest-api/gantry.apply.yml

@@ -29,12 +29,8 @@ datadogSecretId: '{{values "datadogSecretId"}}'
 {{end}}
 
 openTelemetry:
-  enabled: {{.Values.openTelemetry.enabled | default false}}
-  {{if .Values.isProduction}}
-  datadogEnvironmentName: production
-  {{else}}
-  datadogEnvironmentName: development
-  {{end}}
+  datadogEnvironmentName: '{{values "openTelemetry.datadogEnvironmentName"}}'
+  enabled: {{values "openTelemetry.enabled"}}
 {{if .Values.pagerDutyEndpoint}}
 pagerDutyEndpoint: '{{values "pagerDutyEndpoint"}}'
 {{end}}

package/template/koa-rest-api/package.json

@@ -43,7 +43,7 @@
     "skuba": "*",
     "supertest": "^6.1.6"
   },
-  "packageManager": "pnpm@8.15.4",
+  "packageManager": "pnpm@8.15.5",
   "engines": {
     "node": ">=20"
   }

package/template/lambda-sqs-worker/package.json

@@ -37,7 +37,7 @@
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
   },
-  "packageManager": "pnpm@8.15.4",
+  "packageManager": "pnpm@8.15.5",
   "engines": {
     "node": ">=20"
   }

package/template/lambda-sqs-worker/serverless.yml

@@ -20,11 +20,9 @@ params:
     description: <%- description %>
   dev:
     deploymentBucket: 'TODO: deployment-bucket-name'
-    isProduction: false
     concurrency: 2
   prod:
     deploymentBucket: 'TODO: deployment-bucket-name'
-    isProduction: true
     concurrency: 20
 
 custom:
@@ -83,14 +81,10 @@ provider:
           Resource: !Ref DestinationTopic
   stackTags:
     seek:env:label: ${env:ENVIRONMENT}
-    seek:env:prod: ${param:isProduction}
-    # seek:owner:cost-centre: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
-    seek:owner:technical: '<%- teamName %>'
     seek:source:sha: ${env:BUILDKITE_COMMIT, 'na'}
     seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
     seek:system:deployed-by: CFN
     # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
-    # seek:system:org: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
 
 package:
   patterns:

package/template/lambda-sqs-worker-cdk/package.json

@@ -26,7 +26,7 @@
     "constructs": "^10.0.17",
     "skuba": "*"
   },
-  "packageManager": "pnpm@8.15.4",
+  "packageManager": "pnpm@8.15.5",
   "engines": {
     "node": ">=20"
   }