@dword-design/base 16.2.5 → 16.2.6

package/dist/get-generated-files/get-github-workflow/index.js

@@ -1,12 +1,22 @@
 import jobMatrixStrategy from "./strategies/job-matrix.js";
 import simpleStrategy from "./strategies/simple.js";
 export default function () {
+  const environments = [...this.config.supportedNodeVersions.map(version => ({
+    node: version,
+    os: "ubuntu-latest"
+  })), ...(this.config.macos ? [{
+    node: this.config.nodeVersion,
+    os: "macos-latest"
+  }] : []), ...(this.config.windows ? [{
+    node: this.config.nodeVersion,
+    os: "windows-latest"
+  }] : [])];
   return {
     concurrency: {
       "cancel-in-progress": true,
       group: "${{ github.workflow }}-${{ github.ref }}"
     },
-    jobs: (this.config.useJobMatrix && !this.config.testInContainer ? jobMatrixStrategy : simpleStrategy).call(this),
+    jobs: environments.length > 1 && !this.config.testInContainer ? jobMatrixStrategy.call(this, environments) : simpleStrategy.call(this),
     name: "build",
     on: {
       pull_request: {},

package/dist/get-generated-files/get-github-workflow/strategies/job-matrix.d.ts

@@ -1,4 +1,7 @@
-export default function (): {
+export default function (environments: Array<{
+    node: string;
+    os: string;
+}>): {
     release: {
         needs: string;
         'runs-on': string;
@@ -9,7 +12,10 @@ export default function (): {
         steps: any[];
         strategy: {
             matrix: {
-                include: any[];
+                include: {
+                    node: string;
+                    os: string;
+                }[];
             };
         };
     };

package/dist/get-generated-files/get-github-workflow/strategies/job-matrix.js

@@ -7,7 +7,7 @@ import gitHubAction from "tagged-template-noop";
 import coverageSteps from "../steps/coverage.js";
 import getReleaseSteps from "../steps/get-release.js";
 import getTestSteps from "../steps/get-test.js";
-export default function () {
+export default function (environments) {
   const envSchemaPath = findUpSync(path => {
     if (fs.existsSync(pathLib.join(path, ".env.schema.json"))) {
       return ".env.schema.json";
@@ -79,21 +79,12 @@ export default function () {
       }, {
         run: "pnpm install --frozen-lockfile"
       }, ...getTestSteps.call(this), ...coverageSteps.map(step => ({
-        if: `matrix.os == 'ubuntu-latest' && matrix.node == ${this.config.nodeVersion}`,
+        if: `matrix.os == 'ubuntu-latest'${this.config.supportedNodeVersions.length > 1 ? ` && matrix.node == ${this.config.nodeVersion}` : ""}`,
         ...step
       }))],
       strategy: {
         matrix: {
-          include: [...this.config.supportedNodeVersions.map(version => ({
-            node: version,
-            os: "ubuntu-latest"
-          })), ...(this.config.macos ? [{
-            node: this.config.nodeVersion,
-            os: "macos-latest"
-          }] : []), ...(this.config.windows ? [{
-            node: this.config.nodeVersion,
-            os: "windows-latest"
-          }] : [])]
+          include: environments
         }
       }
     }

package/dist/index.d.ts

@@ -49,7 +49,6 @@ type Config = {
     windows: boolean;
     testInContainer: boolean;
     eslintConfig: string;
-    useJobMatrix: boolean;
     packageConfig: PackageJson;
     renovateConfig: RenovateConfig;
     isLockFileFixCommitType: boolean;

package/dist/index.js

@@ -205,12 +205,11 @@ class Base {
       `,
       renovateConfig: {},
       seeAlso: [],
-      supportedNodeVersions: [22, 24],
+      supportedNodeVersions: [22],
       syncKeywords: true,
       testInContainer: false,
       typecheck: () => {},
       typescriptConfig: {},
-      useJobMatrix: true,
       windows: true
     };
     const inheritedConfigPath = config.name && config.name === this.packageConfig.name ? pathLib.resolve(this.cwd, "src", "index.ts") : config.name;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dword-design/base",
-  "version": "16.2.5",
+  "version": "16.2.6",
   "description": "Base package for projects.",
   "repository": "dword-design/base",
   "funding": "https://github.com/sponsors/dword-design",