Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the metalsmith group with 2 updates #2966

Merged
merged 4 commits into from
Jul 25, 2023

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jul 24, 2023

Bumps the metalsmith group with 2 updates: @metalsmith/in-place and jstransformer-nunjucks.

Updates @metalsmith/in-place from 4.6.0 to 5.0.0

Release notes

Sourced from @​metalsmith/in-place's releases.

@​metalsmith/in-place 5.0.0

  • Closes #179: adds extname option & reworks multiple transform-per-file feature [#179](https://github.com/metalsmith/in-place/issues/179)
  • BREAKING: Provides dual ESM/CJS exports cc84b5b
  • test: replace nyc with c8 for coverage, update mocha to latest a10f9c8
  • BREAKING: Adds required transform option to support custom transformers, no longer supports multiple transformers per instantiation a92de2b
  • Updates README.md & documents transform option 13f7fff
  • Updates README (aligned with other core plugins) 22cff02
  • refactor: moves utils to own file & makes them private 287dda6
  • BREAKING: remove suppressNoFilesError in favor of debug.warn message 993f8ca
  • Adds Typescript types 7400b27
  • BREAKING (for Pug users): remaps setFilename option to engineOptions.filename 064cc37
  • Removes missing metalsmith.match < v2.4.1 error 8c98954
  • Drops support for Node < 14.14.0 (Node 12 EOL 2023-04-30) 96a804e
  • Renames default export to inPlace for better intellisense a87f265
Changelog

Sourced from @​metalsmith/in-place's changelog.

v5.0.0

  • Closes #179: adds extname option & reworks multiple transform-per-file feature [#179](https://github.com/metalsmith/in-place/issues/179)
  • BREAKING: Provides dual ESM/CJS exports cc84b5b
  • test: replace nyc with c8 for coverage, update mocha to latest a10f9c8
  • BREAKING: Adds required transform option to support custom transformers, no longer supports multiple transformers per instantiation a92de2b
  • Updates README.md & documents transform option 13f7fff
  • Updates README (aligned with other core plugins) 22cff02
  • refactor: moves utils to own file & makes them private 287dda6
  • BREAKING: remove suppressNoFilesError in favor of debug.warn message 993f8ca
  • Adds Typescript types 7400b27
  • BREAKING (for Pug users): remaps setFilename option to engineOptions.filename 064cc37
  • Removes missing metalsmith.match < v2.4.1 error 8c98954
  • Drops support for Node < 14.14.0 (Node 12 EOL 2023-04-30) 96a804e
  • Renames default export to inPlace for better intellisense a87f265
Commits
  • 0e456e2 Release 5.0.0
  • 53d8036 chore: update devDependencies
  • a87f265 Renames default export to inPlace for better intellisense
  • 287dda6 refactor: moves utils to own file & makes them private
  • e99cdc5 ci: fix tests on Windows
  • 22cff02 Updates README (aligned with other core plugins)
  • 8788f47 Closes #179: adds extname option & reworks multiple transform-per-file feature
  • 7400b27 Adds Typescript types
  • a9f7ac2 chore: correct & fix transform option test
  • 13f7fff Updates README.md & documents transform option
  • Additional commits viewable in compare view

Updates jstransformer-nunjucks from 1.1.0 to 1.2.0

Release notes

Sourced from jstransformer-nunjucks's releases.

jstransformer-nunjucks 1.2.0

  • Refactors filter, extension & globals resolution & addresses lint issues
  • Replaces legacy extend-shallow with Object.assign
  • Updated Nunjucks 3.2.3 => 3.2.4
  • Fixed typo in README badge
Changelog

Sourced from jstransformer-nunjucks's changelog.

1.2.0 - 2023-07-18

  • Refactors filter, extension & globals resolution & addresses lint issues
  • Replaces legacy extend-shallow with Object.assign
  • Updated Nunjucks 3.2.3 => 3.2.4
  • Fixed typo in README badge
Commits
  • 5d612f4 chore: prepare CHANGELOG.md, package.json for release 1.2.0
  • ed75c52 Refactors filter, extension & globals resolution & addresses lint issues
  • 3ff0075 test: add a simple test for nunjucks globals
  • 3a14b98 Fixes security vulnerabilities, upgrades xo 0.47 -> 0.55
  • 77bf0d1 Replaces legacy extend-shallow with Object.assign
  • 90f7fb2 Updates Nunjucks from 3.2.3 -> 3.2.4
  • bee26b2 ci: upgrade GH actions & Node versions
  • 8585074 Fix typo in readme CI badge
  • f0e83da chore: rename xo posttest to lint, fails on old Node versions
  • 27e5858 chore: try fixing CI Node version failure
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually

@dependabot dependabot bot added dependencies Pull requests that update a dependency file javascript Pull requests that update Javascript code labels Jul 24, 2023
@dependabot dependabot bot requested a review from a team July 24, 2023 09:31
@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/metalsmith-cf5bdcf2d3 branch 2 times, most recently from b5d5e67 to 6489583 Compare July 24, 2023 18:10
@netlify
Copy link

netlify bot commented Jul 24, 2023

You can preview this change here:

Name Link
🔨 Latest commit 11f4bad
🔍 Latest deploy log https://app.netlify.com/sites/govuk-design-system-preview/deploys/64bf938a83cb7200079fd9c1
😎 Deploy Preview https://deploy-preview-2966--govuk-design-system-preview.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@colinrotherham
Copy link
Contributor

@domoscargin Mind if I ask you to review this?

Remember we renamed *.md.njk.md and later split out the Markdown renderer?

The plugin @metalsmith/in-place no longer runs all installed "transformers" registered to an extension, so we avoid a fight between Nunjucks and Markdown. Each transform has a separate config:

It means we can:

  1. Render Markdown with @metalsmith/in-place again
  2. Remove @metalsmith/markdown package
  3. Remove metalsmith-renamer package

dependabot bot and others added 4 commits July 25, 2023 10:18
Bumps the metalsmith group with 2 updates: [@metalsmith/in-place](https://github.com/metalsmith/in-place) and [jstransformer-nunjucks](https://github.com/jstransformers/jstransformer-nunjucks).


Updates `@metalsmith/in-place` from 4.6.0 to 5.0.0
- [Release notes](https://github.com/metalsmith/in-place/releases)
- [Changelog](https://github.com/metalsmith/in-place/blob/main/CHANGELOG.md)
- [Commits](metalsmith/in-place@v4.6.0...v5.0.0)

Updates `jstransformer-nunjucks` from 1.1.0 to 1.2.0
- [Release notes](https://github.com/jstransformers/jstransformer-nunjucks/releases)
- [Changelog](https://github.com/jstransformers/jstransformer-nunjucks/blob/master/CHANGELOG.md)
- [Commits](jstransformers/jstransformer-nunjucks@1.1.0...1.2.0)

---
updated-dependencies:
- dependency-name: "@metalsmith/in-place"
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: metalsmith
- dependency-name: jstransformer-nunjucks
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: metalsmith
...

Signed-off-by: dependabot[bot] <[email protected]>
@colinrotherham colinrotherham force-pushed the dependabot/npm_and_yarn/metalsmith-cf5bdcf2d3 branch from 8222db1 to 11f4bad Compare July 25, 2023 09:19
@colinrotherham
Copy link
Contributor

Rebased, still no build output changes 👍

Copy link
Contributor

@domoscargin domoscargin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. I've left a comment on a pre-existing "thing to keep in mind", but I don't think it causes any problems right now.

renderer: new DesignSystemRenderer() // Markdown renderer

// Custom markdown renderer
renderer: new DesignSystemRenderer()
Copy link
Contributor

@domoscargin domoscargin Jul 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our custom renderer uses a separate marked install - we had some issues in the past around keeping that in sync with jstransformer-marked. Right now, that's using v4.3.0 of marked, whereas the custom renderer is using v5.0.2.

Though I guess metalsmith-markdown also uses an internal version of marked (v4.3.0 at the mo), so it's probably not a problem since the dependencies are the same. The explicit transform option in inPlace is really helpful in explaining what's using what here, so hopefully any issues would be easier to debug in the future.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@domoscargin Good point. Shall I drop that last commit, one for another day?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, keep it - it's the same issue but we drop a dependency, so an improvement in that sense!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Brill, will do

For reference, the dependencies are still the same (which helps)

Before

├─┬ @metalsmith/[email protected]
│ └── [email protected]
└── [email protected]

After

├─┬ [email protected]
│ └── [email protected]
└── [email protected]

const permalinks = require('@metalsmith/permalinks') // apply a permalink pattern to files
const postcss = require('@metalsmith/postcss')
const sass = require('@metalsmith/sass') // convert Sass files to CSS using Dart Sass
const { glob } = require('glob') // Match files using glob patterns
const Metalsmith = require('metalsmith') // static site generator
const canonical = require('metalsmith-canonical') // add a canonical url property to pages
const renamer = require('metalsmith-renamer') // rename files
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@colinrotherham colinrotherham merged commit d2c9162 into main Jul 25, 2023
10 checks passed
@colinrotherham colinrotherham deleted the dependabot/npm_and_yarn/metalsmith-cf5bdcf2d3 branch July 25, 2023 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file javascript Pull requests that update Javascript code
Projects
Development

Successfully merging this pull request may close these issues.

2 participants