Skip to content

Commit

Permalink
Merge branch 'main' into upgrade-deps
Browse files Browse the repository at this point in the history 
* main:
  Do not overwrite ctx.emit method
  Bump tar from 6.2.0 to 6.2.1
  Bump the npm-minor-upgrades group with 13 updates
  Bump express from 4.18.2 to 4.19.2
  Bump webpack-dev-middleware from 7.0.0 to 7.1.1
  Bump follow-redirects from 1.15.5 to 1.15.6
  • Loading branch information
@jgerigmeyer
jgerigmeyer committed Apr 22, 2024
2 parents 4fdd5c6 + bf213a2 commit ea3dc74
Show file tree
Hide file tree
Showing 3 changed files with 186 additions and 12 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Herman Changelog

## 6.0.1: 2024-04-22

- 🐛 BUGFIX: Do not overwrite `ctx.emit` method -
[#423](https://github.com/oddbird/sassdoc-theme-herman/issues/423)

## 6.0.0: 2024-03-01

### 🚀 New Features
Expand Down
16 changes: 10 additions & 6 deletions lib/prepareContext.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,19 @@ module.exports = (ctx) => {

ctx.groups = ctx.groups || { undefined: 'General' };

// Apply default values for display.
// Apply default values.
ctx.display = Object.assign({}, def.display, ctx.display);

if (!ctx.description) {
def.descriptionPath = './README.md';
/* istanbul ignore else */
if (!ctx.sort) {
ctx.sort = def.sort;
}
if (!ctx.herman) {
ctx.herman = def.herman;
}
if (!ctx.description && !ctx.descriptionPath) {
ctx.descriptionPath = './README.md';
}

// Extend top-level context keys.
ctx = Object.assign({}, def, ctx); // eslint-disable-line no-param-reassign
/* istanbul ignore else */
if (!ctx.herman.sass?.sassOptions) {
ctx.herman.sass = {
Expand Down
177 changes: 171 additions & 6 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,30 @@ __metadata:
languageName: node
linkType: hard

"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.23.9, @babel/core@npm:^7.24.4, @babel/core@npm:^7.7.5":
"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.23.9, @babel/core@npm:^7.7.5":
version: 7.23.9
resolution: "@babel/core@npm:7.23.9"
dependencies:
"@ampproject/remapping": "npm:^2.2.0"
"@babel/code-frame": "npm:^7.23.5"
"@babel/generator": "npm:^7.23.6"
"@babel/helper-compilation-targets": "npm:^7.23.6"
"@babel/helper-module-transforms": "npm:^7.23.3"
"@babel/helpers": "npm:^7.23.9"
"@babel/parser": "npm:^7.23.9"
"@babel/template": "npm:^7.23.9"
"@babel/traverse": "npm:^7.23.9"
"@babel/types": "npm:^7.23.9"
convert-source-map: "npm:^2.0.0"
debug: "npm:^4.1.0"
gensync: "npm:^1.0.0-beta.2"
json5: "npm:^2.2.3"
semver: "npm:^6.3.1"
checksum: 10/268cdbb86bef1b8ea5b1300f2f325e56a1740a5051360cb228ffeaa0f80282b6674f3a2b4d6466adb0691183759b88d4c37b4a4f77232c84a49ed771c84cdc27
languageName: node
linkType: hard

"@babel/core@npm:^7.24.4":
version: 7.24.4
resolution: "@babel/core@npm:7.24.4"
dependencies:
Expand All @@ -69,6 +92,18 @@ __metadata:
languageName: node
linkType: hard

"@babel/generator@npm:^7.23.6":
version: 7.23.6
resolution: "@babel/generator@npm:7.23.6"
dependencies:
"@babel/types": "npm:^7.23.6"
"@jridgewell/gen-mapping": "npm:^0.3.2"
"@jridgewell/trace-mapping": "npm:^0.3.17"
jsesc: "npm:^2.5.1"
checksum: 10/864090d5122c0aa3074471fd7b79d8a880c1468480cbd28925020a3dcc7eb6e98bedcdb38983df299c12b44b166e30915b8085a7bc126e68fa7e2aadc7bd1ac5
languageName: node
linkType: hard

"@babel/generator@npm:^7.24.1, @babel/generator@npm:^7.24.4, @babel/generator@npm:^7.7.2":
version: 7.24.4
resolution: "@babel/generator@npm:7.24.4"
Expand Down Expand Up @@ -227,7 +262,14 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
version: 7.22.5
resolution: "@babel/helper-plugin-utils@npm:7.22.5"
checksum: 10/ab220db218089a2aadd0582f5833fd17fa300245999f5f8784b10f5a75267c4e808592284a29438a0da365e702f05acb369f99e1c915c02f9f9210ec60eab8ea
languageName: node
linkType: hard

"@babel/helper-plugin-utils@npm:^7.24.0":
version: 7.24.0
resolution: "@babel/helper-plugin-utils@npm:7.24.0"
checksum: 10/dc8c7af321baf7653d93315beffee1790eb2c464b4f529273a24c8743a3f3095bf3f2d11828cb2c52d56282ef43a4bdc67a79c9ab8dd845e35d01871f3f28a0e
Expand Down Expand Up @@ -319,6 +361,17 @@ __metadata:
languageName: node
linkType: hard

"@babel/helpers@npm:^7.23.9":
version: 7.23.9
resolution: "@babel/helpers@npm:7.23.9"
dependencies:
"@babel/template": "npm:^7.23.9"
"@babel/traverse": "npm:^7.23.9"
"@babel/types": "npm:^7.23.9"
checksum: 10/dd56daac8bbd7ed174bb00fd185926fd449e591d9a00edaceb7ac6edbdd7a8db57e2cb365b4fafda382201752789ced2f7ae010f667eab0f198a4571cda4d2c5
languageName: node
linkType: hard

"@babel/helpers@npm:^7.24.4":
version: 7.24.4
resolution: "@babel/helpers@npm:7.24.4"
Expand All @@ -342,7 +395,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1, @babel/parser@npm:^7.24.4":
"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.4":
version: 7.24.4
resolution: "@babel/parser@npm:7.24.4"
bin:
Expand All @@ -351,6 +404,24 @@ __metadata:
languageName: node
linkType: hard

"@babel/parser@npm:^7.24.0":
version: 7.24.0
resolution: "@babel/parser@npm:7.24.0"
bin:
parser: ./bin/babel-parser.js
checksum: 10/3e5ebb903a6f71629a9d0226743e37fe3d961e79911d2698b243637f66c4df7e3e0a42c07838bc0e7cc9fcd585d9be8f4134a145b9459ee4a459420fb0d1360b
languageName: node
linkType: hard

"@babel/parser@npm:^7.24.1":
version: 7.24.1
resolution: "@babel/parser@npm:7.24.1"
bin:
parser: ./bin/babel-parser.js
checksum: 10/561d9454091e07ecfec3828ce79204c0fc9d24e17763f36181c6984392be4ca6b79c8225f2224fdb7b1b3b70940e243368c8f83ac77ec2dc20f46d3d06bd6795
languageName: node
linkType: hard

"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.4":
version: 7.24.4
resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.4"
Expand Down Expand Up @@ -1350,6 +1421,35 @@ __metadata:
languageName: node
linkType: hard

"@babel/template@npm:^7.23.9":
version: 7.23.9
resolution: "@babel/template@npm:7.23.9"
dependencies:
"@babel/code-frame": "npm:^7.23.5"
"@babel/parser": "npm:^7.23.9"
"@babel/types": "npm:^7.23.9"
checksum: 10/1b011ba9354dc2e646561d54b6862e0df51760e6179faadd79be05825b0b6da04911e4e192df943f1766748da3037fd8493615b38707f7cadb0cf0c96601c170
languageName: node
linkType: hard

"@babel/traverse@npm:^7.23.9":
version: 7.23.9
resolution: "@babel/traverse@npm:7.23.9"
dependencies:
"@babel/code-frame": "npm:^7.23.5"
"@babel/generator": "npm:^7.23.6"
"@babel/helper-environment-visitor": "npm:^7.22.20"
"@babel/helper-function-name": "npm:^7.23.0"
"@babel/helper-hoist-variables": "npm:^7.22.5"
"@babel/helper-split-export-declaration": "npm:^7.22.6"
"@babel/parser": "npm:^7.23.9"
"@babel/types": "npm:^7.23.9"
debug: "npm:^4.3.1"
globals: "npm:^11.1.0"
checksum: 10/e2bb845f7f229feb7c338f7e150f5f1abc5395dcd3a6a47f63a25242ec3ec6b165f04a6df7d4849468547faee34eb3cf52487eb0bd867a7d3c42fec2a648266f
languageName: node
linkType: hard

"@babel/traverse@npm:^7.24.1":
version: 7.24.1
resolution: "@babel/traverse@npm:7.24.1"
Expand Down Expand Up @@ -1379,6 +1479,17 @@ __metadata:
languageName: node
linkType: hard

"@babel/types@npm:^7.23.6, @babel/types@npm:^7.23.9":
version: 7.23.9
resolution: "@babel/types@npm:7.23.9"
dependencies:
"@babel/helper-string-parser": "npm:^7.23.4"
"@babel/helper-validator-identifier": "npm:^7.22.20"
to-fast-properties: "npm:^2.0.0"
checksum: 10/bed9634e5fd0f9dc63c84cfa83316c4cb617192db9fedfea464fca743affe93736d7bf2ebf418ee8358751a9d388e303af87a0c050cb5d87d5870c1b0154f6cb
languageName: node
linkType: hard

"@bcoe/v8-coverage@npm:^0.2.3":
version: 0.2.3
resolution: "@bcoe/v8-coverage@npm:0.2.3"
Expand Down Expand Up @@ -1782,6 +1893,17 @@ __metadata:
languageName: node
linkType: hard

"@jridgewell/gen-mapping@npm:^0.3.2":
version: 0.3.3
resolution: "@jridgewell/gen-mapping@npm:0.3.3"
dependencies:
"@jridgewell/set-array": "npm:^1.0.1"
"@jridgewell/sourcemap-codec": "npm:^1.4.10"
"@jridgewell/trace-mapping": "npm:^0.3.9"
checksum: 10/072ace159c39ab85944bdabe017c3de15c5e046a4a4a772045b00ff05e2ebdcfa3840b88ae27e897d473eb4d4845b37be3c78e28910c779f5aeeeae2fb7f0cc2
languageName: node
linkType: hard

"@jridgewell/gen-mapping@npm:^0.3.5":
version: 0.3.5
resolution: "@jridgewell/gen-mapping@npm:0.3.5"
Expand All @@ -1800,6 +1922,13 @@ __metadata:
languageName: node
linkType: hard

"@jridgewell/set-array@npm:^1.0.1":
version: 1.1.2
resolution: "@jridgewell/set-array@npm:1.1.2"
checksum: 10/69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e
languageName: node
linkType: hard

"@jridgewell/set-array@npm:^1.2.1":
version: 1.2.1
resolution: "@jridgewell/set-array@npm:1.2.1"
Expand Down Expand Up @@ -1834,6 +1963,16 @@ __metadata:
languageName: node
linkType: hard

"@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9":
version: 0.3.22
resolution: "@jridgewell/trace-mapping@npm:0.3.22"
dependencies:
"@jridgewell/resolve-uri": "npm:^3.1.0"
"@jridgewell/sourcemap-codec": "npm:^1.4.14"
checksum: 10/48d3e3db00dbecb211613649a1849876ba5544a3f41cf5e6b99ea1130272d6cf18591b5b67389bce20f1c871b4ede5900c3b6446a7aab6d0a3b2fe806a834db7
languageName: node
linkType: hard

"@leichtgewicht/ip-codec@npm:^2.0.1":
version: 2.0.5
resolution: "@leichtgewicht/ip-codec@npm:2.0.5"
Expand Down Expand Up @@ -3691,13 +3830,20 @@ __metadata:
languageName: node
linkType: hard

"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001599":
"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587":
version: 1.0.30001612
resolution: "caniuse-lite@npm:1.0.30001612"
checksum: 10/8fb95102aade9147694541a9e576ec16d8d455f37e1456f497403af45f1ddd24465a62057d619d57c052e9634e090e5115e383ab066f8f9f9b87d14f738f81df
languageName: node
linkType: hard

"caniuse-lite@npm:^1.0.30001599":
version: 1.0.30001603
resolution: "caniuse-lite@npm:1.0.30001603"
checksum: 10/d400beff621d6824670f5e3fb1cb85c732a5e9d97b8714e51efbaeddbfa13bfd741b9d7a1541d34ef502734c2db18ddf9da921727b6296774ad59098a14fa58c
languageName: node
linkType: hard

"cdocparser@npm:^0.15.0":
version: 0.15.0
resolution: "cdocparser@npm:0.15.0"
Expand Down Expand Up @@ -4305,7 +4451,7 @@ __metadata:
languageName: node
linkType: hard

"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.1":
"core-js-compat@npm:^3.31.0":
version: 3.37.0
resolution: "core-js-compat@npm:3.37.0"
dependencies:
Expand All @@ -4314,6 +4460,15 @@ __metadata:
languageName: node
linkType: hard

"core-js-compat@npm:^3.36.1":
version: 3.36.1
resolution: "core-js-compat@npm:3.36.1"
dependencies:
browserslist: "npm:^4.23.0"
checksum: 10/d86b46805de7f5ba3675ed21532ecc64b6c1f123be7286b9efa7941ec087cd8d2446cb555f03a407dbbbeb6e881d1baf92eaffb7f051b11d9103f39c8731fa62
languageName: node
linkType: hard

"core-js@npm:^2.4.0":
version: 2.6.12
resolution: "core-js@npm:2.6.12"
Expand Down Expand Up @@ -10855,7 +11010,17 @@ __metadata:
languageName: node
linkType: hard

"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
version: 6.0.15
resolution: "postcss-selector-parser@npm:6.0.15"
dependencies:
cssesc: "npm:^3.0.0"
util-deprecate: "npm:^1.0.2"
checksum: 10/cea591e1d9bce60eea724428863187228e27ddaebd98e5ecb4ee6d4c9a4b68e8157fd44c916b3fef1691d19ad16aa416bb7279b5eab260c32340ae630a34e200
languageName: node
linkType: hard

"postcss-selector-parser@npm:^6.0.16":
version: 6.0.16
resolution: "postcss-selector-parser@npm:6.0.16"
dependencies:
Expand Down

0 comments on commit ea3dc74

Please sign in to comment.