@dword-design/base 8.5.10 → 8.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/config.js +18 -12
  2. package/package.json +3 -3
package/dist/config.js CHANGED
@@ -29,9 +29,7 @@ var _rawConfig = _interopRequireDefault(require("./raw-config"));
29
29
 
30
30
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
31
31
 
32
- const inheritedConfig = _importCwd.default.silent(_rawConfig.default.name) || require(_rawConfig.default.name);
33
-
34
- var _default = _deepmerge.default.all([{
32
+ const defaultConfig = {
35
33
  allowedMatches: [],
36
34
  commands: {},
37
35
  coverageFileExtensions: [],
@@ -53,19 +51,27 @@ var _default = _deepmerge.default.all([{
53
51
  preDeploySteps: [],
54
52
  prepare: _identity.default,
55
53
  readmeInstallString: (0, _endent.default)`
56
- ## Install
54
+ ## Install
57
55
 
58
- \`\`\`bash
59
- # npm
60
- $ npm install ${_rawConfig.default.global ? '-g ' : ''}${_packageConfig.default.name}
56
+ \`\`\`bash
57
+ # npm
58
+ $ npm install ${_rawConfig.default.global ? '-g ' : ''}${_packageConfig.default.name}
61
59
 
62
- # Yarn
63
- $ yarn ${_rawConfig.default.global ? 'global ' : ''}add ${_packageConfig.default.name}
64
- \`\`\`
65
- `,
60
+ # Yarn
61
+ $ yarn ${_rawConfig.default.global ? 'global ' : ''}add ${_packageConfig.default.name}
62
+ \`\`\`
63
+ `,
66
64
  seeAlso: [],
67
65
  syncKeywords: true
68
- }, inheritedConfig, _rawConfig.default]);
66
+ };
67
+
68
+ let inheritedConfig = _importCwd.default.silent(_rawConfig.default.name) || require(_rawConfig.default.name);
69
+
70
+ if (typeof inheritedConfig === 'function') {
71
+ inheritedConfig = inheritedConfig(_deepmerge.default.all([defaultConfig, _rawConfig.default]));
72
+ }
73
+
74
+ var _default = _deepmerge.default.all([defaultConfig, inheritedConfig, _rawConfig.default]);
69
75
 
70
76
  exports.default = _default;
71
77
  module.exports = exports.default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dword-design/base",
3
- "version": "8.5.10",
3
+ "version": "8.6.3",
4
4
  "description": "Base package for projects.",
5
5
  "repository": "dword-design/base",
6
6
  "funding": "https://github.com/sponsors/dword-design",
@@ -71,7 +71,7 @@
71
71
  "safe-readfile": "^1.0.2",
72
72
  "semantic-release": "^17.0.3",
73
73
  "sort-keys": "^4.2.0",
74
- "sort-package-json": "~1.50.0",
74
+ "sort-package-json": "~1.52.0",
75
75
  "spdx-expression-parse": "^3.0.0",
76
76
  "spdx-license-list": "^6.1.0",
77
77
  "std-env": "^2.3.0",
@@ -86,7 +86,7 @@
86
86
  "is-docker": "^2.1.1",
87
87
  "p-event": "^4.2.0",
88
88
  "rimraf": "^3.0.0",
89
- "sharp": "^0.28.0",
89
+ "sharp": "^0.29.0",
90
90
  "stealthy-require-no-leak": "^1.0.0",
91
91
  "unify-mocha-output": "^2.0.0",
92
92
  "with-local-tmp-dir": "^4.0.0",