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

Bulk package updates #203

Merged
merged 10 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ jobs:
name: "hugo"
version: ${{env.HUGO_VERSION}}

- name: Use Node.js 18.x
- name: Use Node.js 20.x
uses: actions/setup-node@v2
with:
node-version: 18.x
node-version: 20.x
# TODO: Remove when possible (https://github.com/actions/setup-node/issues/515)
- name: Windows Node fix
if: ${{ matrix.os == 'windows-latest' }}
run: |
$WhereNode = Get-Command node | Select-Object -ExpandProperty Definition
$NodeDirPath = Split-Path $WhereNode -Parent
cd $NodeDirPath
npm install npm@8.12.1
npm install npm@10.7.0
- name: Use Ruby 2.7.x
uses: ruby/setup-ruby@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ jobs:

- name: Enable Corepack before setting up Node
run: corepack enable
- name: Use Node.js 18.x
- name: Use Node.js 20.x
uses: actions/setup-node@v2
with:
node-version: 18.x
node-version: 20.x
# TODO: Remove when possible (https://github.com/actions/setup-node/issues/515)
- name: Windows Node fix
if: ${{ matrix.os == 'windows-latest' }}
run: |
$WhereNode = Get-Command node | Select-Object -ExpandProperty Definition
$NodeDirPath = Split-Path $WhereNode -Parent
cd $NodeDirPath
npm install npm@8.12.1
npm install npm@10.7.0
- name: Use Ruby 2.7.x
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [20.x]
os: [ubuntu-latest, windows-latest]

steps:
Expand Down
2 changes: 1 addition & 1 deletion javascript-modules/bookshop-sass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"access": "public"
},
"devDependencies": {
"ava": "^3.15.0",
"ava": "^6.1.3",
"fast-glob": "^3.2.7",
"nyc": "^15.1.0"
},
Expand Down
16 changes: 0 additions & 16 deletions javascript-modules/browser/lib/build/svelteFixPlugin.js

This file was deleted.

4 changes: 1 addition & 3 deletions javascript-modules/browser/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import path from "path";
import Builder from "@bookshop/builder";
import { Command } from "commander";
import sveltePlugin from "esbuild-svelte";
import svelteFixPlugin from "./lib/build/svelteFixPlugin.js";
import materialIconPlugin from "./lib/build/materialIconPlugin.js";
import { __dirname } from "./lib/build/util.js";
import BrowserServer from "./lib/build/browserServer.js";
Expand Down Expand Up @@ -40,8 +39,7 @@ export const runner = async (options) => {
esbuild: {
plugins: [
sveltePlugin({ compileOptions: { css: true } }),
materialIconPlugin(),
svelteFixPlugin
materialIconPlugin()
],
loader: {
".svg": "text"
Expand Down
13 changes: 9 additions & 4 deletions javascript-modules/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@
"access": "public"
},
"devDependencies": {
"ava": "^3.15.0",
"ava": "^6.1.3",
"nyc": "^15.1.0"
},
"dependencies": {
"@11ty/eleventy": "3.0.0",
"@astrojs/mdx": "3.1.7",
"@bookshop/builder": "3.10.1",
"@bookshop/helpers": "3.10.1",
"@codemirror/basic-setup": "^0.18.2",
Expand All @@ -39,15 +41,18 @@
"@codemirror/view": "^0.18.19",
"@ltd/j-toml": "^1.30.0",
"@material-design-icons/svg": "^0.2.7",
"@sveltejs/adapter-static": "^0.0.17",
"astro": "4.15.12",
"commander": "^8.1.0",
"esbuild": "^0.13.10",
"esbuild-svelte": "^0.5.3",
"express": "^4.17.1",
"esbuild-svelte": "^0.8.2",
"express": "^4.21.0",
"express-ws": "^5.0.2",
"fast-glob": "^3.2.7",
"js-yaml": "^4.1.0",
"normalize-path": "^3.0.0",
"svelte": "^3.39.0"
"puppeteer": "23.5.1",
"svelte": "^4.2.19"
},
"engines": {
"node": ">=14.16"
Expand Down
2 changes: 1 addition & 1 deletion javascript-modules/builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"devDependencies": {
"@bookshop/jekyll-engine": "3.10.1",
"ava": "^3.15.0",
"ava": "^6.1.3",
"nyc": "^15.1.0"
},
"dependencies": {
Expand Down
5 changes: 3 additions & 2 deletions javascript-modules/engines/astro-engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,22 @@
"devDependencies": {
"@bookshop/builder": "3.10.1",
"@bookshop/helpers": "3.10.1",
"ava": "^3.15.0",
"ava": "^6.1.3",
"nyc": "^15.1.0"
},
"dependencies": {
"@astrojs/compiler": "^1.0.0 || ^2.0.0",
"@bookshop/astro-bookshop": "3.10.1",
"@bookshop/vite-plugin-astro-bookshop": "3.10.1",
"astro": "^2.0.0 || ^3.0.0",
"esbuild": "^0.19.1",
"esbuild-sass-plugin": "^2.13.0",
"postcss": "^8.4.29",
"postcss-modules": "^6.0.0",
"svelte": "4.2.19",
"vite": "^4.2.1"
},
"peerDependencies": {
"astro": "^2.0.0 || ^3.0.0 || ^4.0.0",
"react": "^17.0.2 || ^18.0.0",
"react-dom": "^17.0.2 || ^18.0.0"
},
Expand Down
6 changes: 5 additions & 1 deletion javascript-modules/engines/eleventy-engine/lib/engine.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,13 @@ export class Engine {
async exists() {
return true
},
dirname(file) {
return file.replace(/\/[^\/]+$/, "")
},
resolve(root, file, ext) {
return `${root}${file}`
}
},
sep: "/"
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions javascript-modules/engines/eleventy-engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"access": "public"
},
"devDependencies": {
"ava": "^3.15.0",
"ava": "^6.1.3",
"nyc": "^15.1.0"
},
"dependencies": {
"@bookshop/helpers": "3.10.1",
"esbuild": "^0.13.10",
"liquidjs": "9.28.0",
"liquidjs": "10.17.0",
"markdown-it": "^13.0.1",
"punycode": "^2.1.1",
"slugify": "^1.5.3"
Expand Down
106 changes: 62 additions & 44 deletions javascript-modules/engines/hugo-engine/full-hugo-renderer/go.mod
Original file line number Diff line number Diff line change
@@ -1,91 +1,109 @@
module hugo-renderer

go 1.17
go 1.22.6

toolchain go1.23.2

require (
// Pin to an older version of overlayfs that Hugo is currently tied to
github.com/bep/overlayfs v0.6.0 // should be (v0.6.0)
github.com/gohugoio/hugo v0.111.3
github.com/spf13/afero v1.9.3
github.com/gohugoio/hugo v0.136.1
github.com/spf13/afero v1.11.0
)

require github.com/fsnotify/fsnotify v1.6.0
require github.com/fsnotify/fsnotify v1.7.0

require (
github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/PuerkitoBio/purell v1.2.0 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/alecthomas/chroma v0.10.0 // indirect
github.com/alecthomas/chroma/v2 v2.5.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/alecthomas/chroma/v2 v2.14.0 // indirect
github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c // indirect
github.com/bep/clock v0.4.0 // indirect
github.com/bep/clocks v0.5.0 // indirect
github.com/bep/debounce v1.2.1 // indirect
github.com/bep/gitmap v1.3.0 // indirect
github.com/bep/gitmap v1.6.0 // indirect
github.com/bep/goat v0.5.0 // indirect
github.com/bep/godartsass v0.16.0 // indirect
github.com/bep/golibsass v1.1.0 // indirect
github.com/bep/gowebp v0.2.0 // indirect
github.com/bep/lazycache v0.2.0 // indirect
github.com/bep/godartsass v1.2.0 // indirect
github.com/bep/godartsass/v2 v2.1.0 // indirect
github.com/bep/golibsass v1.2.0 // indirect
github.com/bep/gowebp v0.3.0 // indirect
github.com/bep/imagemeta v0.8.1 // indirect
github.com/bep/lazycache v0.4.0 // indirect
github.com/bep/logg v0.4.0 // indirect
github.com/bep/overlayfs v0.9.2 // indirect
github.com/bep/tmc v0.5.1 // indirect
github.com/clbanning/mxj/v2 v2.5.7 // indirect
github.com/cli/safeexec v1.0.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/clbanning/mxj/v2 v2.7.0 // indirect
github.com/cli/safeexec v1.0.1 // indirect
github.com/disintegration/gift v1.2.1 // indirect
github.com/dlclark/regexp2 v1.7.0 // indirect
github.com/evanw/esbuild v0.17.0 // indirect
github.com/frankban/quicktest v1.14.4 // indirect
github.com/getkin/kin-openapi v0.110.0 // indirect
github.com/dlclark/regexp2 v1.11.0 // indirect
github.com/evanw/esbuild v0.24.0 // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/frankban/quicktest v1.14.6 // indirect
github.com/getkin/kin-openapi v0.123.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gobuffalo/flect v0.3.0 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/swag v0.22.8 // indirect
github.com/gobuffalo/flect v1.0.3 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013 // indirect
github.com/gohugoio/go-i18n/v2 v2.1.3-0.20230805085216-e63c13218d0e // indirect
github.com/gohugoio/hashstructure v0.1.0 // indirect
github.com/gohugoio/httpcache v0.7.0 // indirect
github.com/gohugoio/hugo-goldmark-extensions/extras v0.2.0 // indirect
github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.3.0 // indirect
github.com/gohugoio/locales v0.14.0 // indirect
github.com/gohugoio/localescompressed v1.0.1 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/hairyhenderson/go-codeowners v0.2.3-0.20201026200250-cdc7c0759690 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/hairyhenderson/go-codeowners v0.6.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/invopop/yaml v0.2.0 // indirect
github.com/jdkato/prose v1.2.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/kyokomi/emoji/v2 v2.2.11 // indirect
github.com/kyokomi/emoji/v2 v2.2.13 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/marekm4/color-extractor v1.2.0 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/makeworld-the-better-one/dither/v2 v2.4.0 // indirect
github.com/marekm4/color-extractor v1.2.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/miekg/mmark v1.3.6 // indirect
github.com/mitchellh/hashstructure v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/muesli/smartcrop v0.3.0 // indirect
github.com/niklasfasching/go-org v1.6.6 // indirect
github.com/niklasfasching/go-org v1.7.0 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rivo/uniseg v0.4.3 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/russross/blackfriday v1.6.0 // indirect
github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd // indirect
github.com/sanity-io/litter v1.5.5 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tdewolff/minify/v2 v2.12.4 // indirect
github.com/tdewolff/parse/v2 v2.6.5 // indirect
github.com/yuin/goldmark v1.5.4 // indirect
github.com/tdewolff/minify/v2 v2.20.37 // indirect
github.com/tdewolff/parse/v2 v2.7.15 // indirect
github.com/tetratelabs/wazero v1.8.1 // indirect
github.com/yuin/goldmark v1.7.4 // indirect
github.com/yuin/goldmark-emoji v1.0.4 // indirect
github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594 // indirect
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect
golang.org/x/image v0.5.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.4.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
golang.org/x/image v0.21.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/tools v0.26.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading