@dword-design/base 8.7.0 → 8.7.2

package/dist/config.js

@@ -68,11 +68,15 @@ const defaultConfig = {
 
 let inheritedConfig = _importCwd.default.silent(_rawConfig.default.name) || require(_rawConfig.default.name);
 
+const mergeOptions = {
+  customMerge: key => key === 'supportedNodeVersions' ? (a, b) => b : undefined
+};
+
 if (typeof inheritedConfig === 'function') {
-  inheritedConfig = inheritedConfig(_deepmerge.default.all([defaultConfig, _rawConfig.default]));
+  inheritedConfig = inheritedConfig((0, _deepmerge.default)(defaultConfig, _rawConfig.default, mergeOptions));
 }
 
-var _default = _deepmerge.default.all([defaultConfig, inheritedConfig, _rawConfig.default]);
+var _default = _deepmerge.default.all([defaultConfig, inheritedConfig, _rawConfig.default], mergeOptions);
 
 exports.default = _default;
 module.exports = exports.default;

package/dist/generated-files/github-workflow/__snapshots__/index.spec.js.snap

@@ -231,6 +231,293 @@ Object {
 }
 `;
 
+exports[`index package.json same path as .env.schema.json 1`] = `
+Object {
+  "jobs": Object {
+    "cancel-existing": Object {
+      "if": "!contains(github.event.head_commit.message, '[skip ci]')",
+      "runs-on": "ubuntu-latest",
+      "steps": Array [
+        Object {
+          "env": Object {
+            "GITHUB_TOKEN": "\${{ secrets.GITHUB_TOKEN }}",
+          },
+          "uses": "rokroskar/workflow-run-cleanup-action@v0.3.3",
+        },
+      ],
+    },
+    "release": Object {
+      "needs": "test",
+      "runs-on": "ubuntu-latest",
+      "steps": Array [
+        Object {
+          "uses": "actions/checkout@v3",
+          "with": Object {
+            "lfs": true,
+            "ref": "\${{ github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.head.ref || '' }}",
+          },
+        },
+        Object {
+          "uses": "actions/setup-node@v3",
+          "with": Object {
+            "node-version": 14,
+          },
+        },
+        Object {
+          "run": "git config --global user.email \\"actions@github.com\\"",
+        },
+        Object {
+          "run": "git config --global user.name \\"GitHub Actions\\"",
+        },
+        Object {
+          "run": "yarn --frozen-lockfile",
+        },
+        Object {
+          "run": "yarn checkUnknownFiles",
+        },
+        Object {
+          "run": "yarn lint",
+        },
+        Object {
+          "env": Object {
+            "GITHUB_REPOSITORY": "\${{ secrets.GITHUB_REPOSITORY }}",
+            "GITHUB_TOKEN": "\${{ secrets.GITHUB_TOKEN }}",
+          },
+          "name": "Push changed files",
+          "run": "yarn dw-ci push-changed-files",
+        },
+        Object {
+          "env": Object {
+            "GITHUB_TOKEN": "\${{ secrets.GITHUB_TOKEN }}",
+            "NPM_TOKEN": "\${{ secrets.NPM_TOKEN }}",
+          },
+          "if": "github.ref == 'refs/heads/master'",
+          "name": "Release",
+          "run": "yarn semantic-release",
+        },
+      ],
+    },
+    "test": Object {
+      "needs": "cancel-existing",
+      "runs-on": "\${{ matrix.os }}",
+      "steps": Array [
+        Object {
+          "uses": "actions/checkout@v3",
+          "with": Object {
+            "fetch-depth": 0,
+            "lfs": true,
+          },
+        },
+        Object {
+          "uses": "actions/setup-node@v3",
+          "with": Object {
+            "node-version": "\${{ matrix.node }}",
+          },
+        },
+        Object {
+          "run": "yarn --frozen-lockfile",
+        },
+        Object {
+          "env": Object {
+            "TEST_FOO": "\${{ secrets.TEST_FOO }}",
+          },
+          "run": "yarn test",
+        },
+        Object {
+          "if": "failure()",
+          "uses": "actions/upload-artifact@v3",
+          "with": Object {
+            "name": "Image Snapshot Diffs",
+            "path": "**/__image_snapshots__/__diff_output__",
+          },
+        },
+        Object {
+          "if": "matrix.os == 'ubuntu-latest' && matrix.node == 14",
+          "uses": "codecov/codecov-action@v2",
+          "with": Object {
+            "fail_ci_if_error": true,
+            "token": "\${{ secrets.CODECOV_TOKEN }}",
+          },
+        },
+      ],
+      "strategy": Object {
+        "matrix": Object {
+          "include": Array [
+            Object {
+              "node": 12,
+              "os": "ubuntu-latest",
+            },
+            Object {
+              "node": 14,
+              "os": "ubuntu-latest",
+            },
+            Object {
+              "os": "macos-latest",
+              "version": 14,
+            },
+            Object {
+              "os": "windows-latest",
+              "version": 14,
+            },
+          ],
+        },
+      },
+    },
+  },
+  "name": "build",
+  "on": Object {
+    "pull_request": Object {},
+    "push": Object {
+      "branches": Array [
+        "master",
+      ],
+    },
+  },
+}
+`;
+
+exports[`index subdir 1`] = `
+Object {
+  "jobs": Object {
+    "cancel-existing": Object {
+      "if": "!contains(github.event.head_commit.message, '[skip ci]')",
+      "runs-on": "ubuntu-latest",
+      "steps": Array [
+        Object {
+          "env": Object {
+            "GITHUB_TOKEN": "\${{ secrets.GITHUB_TOKEN }}",
+          },
+          "uses": "rokroskar/workflow-run-cleanup-action@v0.3.3",
+        },
+      ],
+    },
+    "release": Object {
+      "needs": "test",
+      "runs-on": "ubuntu-latest",
+      "steps": Array [
+        Object {
+          "uses": "actions/checkout@v3",
+          "with": Object {
+            "lfs": true,
+            "ref": "\${{ github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.head.ref || '' }}",
+          },
+        },
+        Object {
+          "uses": "actions/setup-node@v3",
+          "with": Object {
+            "node-version": 14,
+          },
+        },
+        Object {
+          "run": "git config --global user.email \\"actions@github.com\\"",
+        },
+        Object {
+          "run": "git config --global user.name \\"GitHub Actions\\"",
+        },
+        Object {
+          "run": "yarn --frozen-lockfile",
+        },
+        Object {
+          "run": "yarn checkUnknownFiles",
+        },
+        Object {
+          "run": "yarn lint",
+        },
+        Object {
+          "env": Object {
+            "GITHUB_REPOSITORY": "\${{ secrets.GITHUB_REPOSITORY }}",
+            "GITHUB_TOKEN": "\${{ secrets.GITHUB_TOKEN }}",
+          },
+          "name": "Push changed files",
+          "run": "yarn dw-ci push-changed-files",
+        },
+        Object {
+          "env": Object {
+            "GITHUB_TOKEN": "\${{ secrets.GITHUB_TOKEN }}",
+            "NPM_TOKEN": "\${{ secrets.NPM_TOKEN }}",
+          },
+          "if": "github.ref == 'refs/heads/master'",
+          "name": "Release",
+          "run": "yarn semantic-release",
+        },
+      ],
+    },
+    "test": Object {
+      "needs": "cancel-existing",
+      "runs-on": "\${{ matrix.os }}",
+      "steps": Array [
+        Object {
+          "uses": "actions/checkout@v3",
+          "with": Object {
+            "fetch-depth": 0,
+            "lfs": true,
+          },
+        },
+        Object {
+          "uses": "actions/setup-node@v3",
+          "with": Object {
+            "node-version": "\${{ matrix.node }}",
+          },
+        },
+        Object {
+          "run": "yarn --frozen-lockfile",
+        },
+        Object {
+          "run": "yarn test",
+        },
+        Object {
+          "if": "failure()",
+          "uses": "actions/upload-artifact@v3",
+          "with": Object {
+            "name": "Image Snapshot Diffs",
+            "path": "**/__image_snapshots__/__diff_output__",
+          },
+        },
+        Object {
+          "if": "matrix.os == 'ubuntu-latest' && matrix.node == 14",
+          "uses": "codecov/codecov-action@v2",
+          "with": Object {
+            "fail_ci_if_error": true,
+            "token": "\${{ secrets.CODECOV_TOKEN }}",
+          },
+        },
+      ],
+      "strategy": Object {
+        "matrix": Object {
+          "include": Array [
+            Object {
+              "node": 12,
+              "os": "ubuntu-latest",
+            },
+            Object {
+              "node": 14,
+              "os": "ubuntu-latest",
+            },
+            Object {
+              "os": "macos-latest",
+              "version": 14,
+            },
+            Object {
+              "os": "windows-latest",
+              "version": 14,
+            },
+          ],
+        },
+      },
+    },
+  },
+  "name": "build",
+  "on": Object {
+    "pull_request": Object {},
+    "push": Object {
+      "branches": Array [
+        "master",
+      ],
+    },
+  },
+}
+`;
+
 exports[`index test environment variables 1`] = `
 Object {
   "jobs": Object {

package/dist/generated-files/github-workflow/steps/test.js

@@ -15,11 +15,25 @@ var _constantCase = require("constant-case");
 
 var _findUp = _interopRequireDefault(require("find-up"));
 
+var _fsExtra = require("fs-extra");
+
+var _path = _interopRequireDefault(require("path"));
+
 var _ref, _ref2, _ref3, _envVariableNames;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const envSchemaPath = _findUp.default.sync('.env.schema.json');
+const envSchemaPath = _findUp.default.sync(path => {
+  if ((0, _fsExtra.existsSync)('.env.schema.json')) {
+    return '.env.schema.json';
+  }
+
+  if ((0, _fsExtra.existsSync)(_path.default.join(path, 'package.json'))) {
+    return _findUp.default.stop;
+  }
+
+  return undefined;
+});
 
 const envVariableNames = (_ref = (_ref2 = envSchemaPath ? require(envSchemaPath) : {}, (0, _keys.default)(_ref2)), (0, _map.default)(name => {
   var _name;

package/package.json

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