diff --git a/.changeset/config.json b/.changeset/config.json index 6099b9f61..e8ba17558 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -6,7 +6,6 @@ "access": "public", "baseBranch": "main", "updateInternalDependencies": "patch", - "ignore": ["@example/*", "@test/*"], "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": { "onlyUpdatePeerDependentsWhenOutOfRange": true } diff --git a/.changeset/polite-pears-kneel.md b/.changeset/polite-pears-kneel.md new file mode 100644 index 000000000..2469620ec --- /dev/null +++ b/.changeset/polite-pears-kneel.md @@ -0,0 +1,6 @@ +--- +'@astrojs/telemetry': patch +'@astrojs/webapi': patch +--- + +Upgrade undici to v5.22.0 diff --git a/.changeset/quiet-cougars-fix.md b/.changeset/quiet-cougars-fix.md deleted file mode 100644 index b5a99c0f5..000000000 --- a/.changeset/quiet-cougars-fix.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/rss': minor ---- - -Added extra elements to the RSS items, including categories and enclosure diff --git a/.changeset/tall-news-hang.md b/.changeset/tall-news-hang.md new file mode 100644 index 000000000..0887bbec1 --- /dev/null +++ b/.changeset/tall-news-hang.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Update `experimental.assets`'s `image.service` configuration to allow for a config option in addition to an entrypoint diff --git a/.changeset/tidy-singers-thank.md b/.changeset/tidy-singers-thank.md new file mode 100644 index 000000000..415679383 --- /dev/null +++ b/.changeset/tidy-singers-thank.md @@ -0,0 +1,5 @@ +--- +"@astrojs/cloudflare": patch +--- + +Fix missing code language in Cloudflare README diff --git a/.changeset/wise-steaks-wash.md b/.changeset/wise-steaks-wash.md new file mode 100644 index 000000000..598059ca0 --- /dev/null +++ b/.changeset/wise-steaks-wash.md @@ -0,0 +1,6 @@ +--- +'@astrojs/tailwind': patch +'@astrojs/svelte': patch +--- + +Update dependencies diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0e9af1fe..970dc1d7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,9 +49,6 @@ jobs: - name: Install dependencies run: pnpm install - - name: Status - run: git status - # Lint autofix cannot run on forks, so just skip those! See https://github.com/wearerequired/lint-action/issues/13 - name: Lint (External) if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login != github.repository_owner }} @@ -79,17 +76,22 @@ jobs: - name: Format Check run: pnpm run format --check - # Build primes out build caches for Turbo + # Build primes out Turbo build cache and pnpm cache build: name: "Build: ${{ matrix.os }}" runs-on: ${{ matrix.os }} timeout-minutes: 3 strategy: matrix: - OS: [ubuntu-latest] + OS: [ubuntu-latest, windows-latest] NODE_VERSION: [16] fail-fast: true steps: + # Disable crlf so all OS can share the same Turbo cache + # https://github.com/actions/checkout/issues/135 + - name: Disable git crlf + run: git config --global core.autocrlf false + - name: Checkout uses: actions/checkout@v3 @@ -105,7 +107,9 @@ jobs: - name: Install dependencies run: pnpm install + # Only build in ubuntu as windows can share the build cache - name: Build Packages + if: ${{ matrix.os == 'ubuntu-latest' }} run: pnpm run build test: @@ -126,6 +130,9 @@ jobs: env: NODE_VERSION: ${{ matrix.NODE_VERSION }} steps: + - name: Disable git crlf + run: git config --global core.autocrlf false + - name: Checkout uses: actions/checkout@v3 @@ -165,6 +172,9 @@ jobs: env: NODE_VERSION: ${{ matrix.NODE_VERSION }} steps: + - name: Disable git crlf + run: git config --global core.autocrlf false + - name: Checkout uses: actions/checkout@v3 @@ -198,6 +208,9 @@ jobs: env: NODE_VERSION: ${{ matrix.NODE_VERSION }} steps: + - name: Disable git crlf + run: git config --global core.autocrlf false + - name: Checkout uses: actions/checkout@v3 @@ -219,10 +232,18 @@ jobs: - name: Install dependencies run: pnpm install --no-frozen-lockfile + # Reset lockfile changes so that Turbo can reuse the old build cache + - name: Reset lockfile changes + run: git reset --hard + - name: Build Packages run: pnpm run build + - name: Remove docs translations except for English and Korean + run: find smoke/docs/src/content/docs ! -name 'en' ! -name 'ko' -type d -mindepth 1 -maxdepth 1 -exec rm -rf {} + + - name: Test run: pnpm run test:smoke env: - SKIP_OG: 1 + SKIP_OG: true + PUBLIC_TWO_LANG: true diff --git a/.gitignore b/.gitignore index 20e8948b3..670993200 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,7 @@ packages/integrations/**/.netlify/ # ignore content collection generated files packages/**/test/**/fixtures/**/.astro/ packages/**/test/**/fixtures/**/env.d.ts +packages/**/e2e/**/fixtures/**/.astro/ packages/**/e2e/**/fixtures/**/env.d.ts +examples/**/.astro/ +examples/**/env.d.ts diff --git a/.prettierrc.cjs b/.prettierrc.cjs new file mode 100644 index 000000000..e2127a63c --- /dev/null +++ b/.prettierrc.cjs @@ -0,0 +1,23 @@ +module.exports = { + printWidth: 100, + semi: true, + singleQuote: true, + tabWidth: 2, + trailingComma: 'es5', + useTabs: true, + plugins: ['./node_modules/prettier-plugin-astro'], + overrides: [ + { + files: ['.*', '*.json', '*.md', '*.toml', '*.yml'], + options: { + useTabs: false, + }, + }, + { + files: ['**/*.astro'], + options: { + parser: 'astro', + }, + }, + ], +}; diff --git a/.prettierrc.js b/.prettierrc.js deleted file mode 100644 index d43df33f5..000000000 --- a/.prettierrc.js +++ /dev/null @@ -1,32 +0,0 @@ -// Heads up: This file should be renamed to `.cjs`, however if we did that, changesets wouldn't be able to load it -module.exports = { - printWidth: 100, - semi: true, - singleQuote: true, - tabWidth: 2, - trailingComma: 'es5', - useTabs: true, - plugins: ['./node_modules/prettier-plugin-astro'], - overrides: [ - { - // Changesets run Prettier using our configuration, however it uses a very old version of Prettier that does - // not support our plugin and it ends up doing more harm than good. As such, we'll disable our plugin for changelogs - files: ['CHANGELOG.md'], - options: { - plugins: [], - }, - }, - { - files: ['.*', '*.json', '*.md', '*.toml', '*.yml'], - options: { - useTabs: false, - }, - }, - { - files: ['**/*.astro'], - options: { - parser: 'astro', - }, - }, - ], -}; diff --git a/benchmark/packages/timer/package.json b/benchmark/packages/timer/package.json index 6b38571a0..abcfe1d3e 100644 --- a/benchmark/packages/timer/package.json +++ b/benchmark/packages/timer/package.json @@ -27,7 +27,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^2.0.18" + "astro": "workspace:^2.3.2" }, "devDependencies": { "@types/server-destroy": "^1.0.1", diff --git a/examples/basics/package.json b/examples/basics/package.json index 1175cddc6..c6e9b2f9a 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1" + "astro": "^2.3.2" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 6779fedb0..54d2161de 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -11,9 +11,9 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "@astrojs/mdx": "^0.19.0", - "@astrojs/rss": "^2.3.2", + "@astrojs/rss": "^2.4.0", "@astrojs/sitemap": "^1.2.2" } } diff --git a/examples/component/package.json b/examples/component/package.json index dadd7aad8..fc413dd7b 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^2.3.1" + "astro": "^2.3.2" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/deno/package.json b/examples/deno/package.json index b1145ccf9..6f64b2e51 100644 --- a/examples/deno/package.json +++ b/examples/deno/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1" + "astro": "^2.3.2" }, "devDependencies": { "@astrojs/deno": "^4.1.0" diff --git a/examples/docs/package.json b/examples/docs/package.json index 322ebcfdc..edcb9f6f9 100644 --- a/examples/docs/package.json +++ b/examples/docs/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "preact": "^10.7.3", "react": "^18.1.0", "react-dom": "^18.1.0", diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 71611c20e..3073dfe49 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "alpinejs": "^3.10.2", "@astrojs/alpinejs": "^0.2.1", "@types/alpinejs": "^3.7.0" diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index c9a17a1b4..ae3359cc2 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "lit": "^2.7.0", "@astrojs/lit": "^2.0.1", "@webcomponents/template-shadowroot": "^0.2.1" diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 6234d8fa8..572f3abd7 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "preact": "^10.7.3", "react": "^18.1.0", "react-dom": "^18.1.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index ef1cff5d5..e83c7c857 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "preact": "^10.7.3", "@astrojs/preact": "^2.1.0", "@preact/signals": "^1.1.0" diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 9c0cb398e..f8c0adcd9 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "react": "^18.1.0", "react-dom": "^18.1.0", "@astrojs/react": "^2.1.1", diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 483c63505..cf905e2ec 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "solid-js": "^1.4.3", "@astrojs/solid-js": "^2.1.0" } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 1cc147373..09a87954a 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -13,6 +13,6 @@ "dependencies": { "svelte": "^3.48.0", "@astrojs/svelte": "^2.1.0", - "astro": "^2.3.1" + "astro": "^2.3.2" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index a4acb66da..50bbc6568 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "vue": "^3.2.37", "@astrojs/vue": "^2.1.1" } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index aab194b2f..11ffdd9d6 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^5.1.1", - "astro": "^2.3.1" + "astro": "^2.3.2" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 278fd20e3..c9fbb9e1e 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^2.3.1" + "astro": "^2.3.2" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 25b682c1e..3631c1ae0 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1" + "astro": "^2.3.2" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index ec2ebbc77..8e8c7fd1e 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1" + "astro": "^2.3.2" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index a07d6ede6..0db06fb40 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1" + "astro": "^2.3.2" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index e8c1d454a..d9a3ea679 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -12,7 +12,7 @@ "server": "node dist/server/entry.mjs" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "svelte": "^3.48.0", "@astrojs/svelte": "^2.1.0", "@astrojs/node": "^5.1.1", diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 6419ddf05..cd1ddc6c4 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdoc": "^0.1.1", - "astro": "^2.3.1", + "astro": "^2.3.2", "kleur": "^4.1.5" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index ab3886734..68e823516 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "@astrojs/markdown-remark": "^2.1.4", "hast-util-select": "5.0.1", "rehype-autolink-headings": "^6.1.1", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index fd33e66e1..2e40c38fc 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1" + "astro": "^2.3.2" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index fb9923165..7e9879176 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "preact": "^10.6.5", "@astrojs/preact": "^2.1.0", "@astrojs/mdx": "^0.19.0" diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index c39f43911..2e0bce854 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "preact": "^10.7.3", "@astrojs/preact": "^2.1.0", "nanostores": "^0.5.12", diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index c74de2ecf..b29f021df 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,10 +14,10 @@ "@astrojs/mdx": "^0.19.0", "@astrojs/tailwind": "^3.1.1", "@types/canvas-confetti": "^1.4.3", - "astro": "^2.3.1", - "autoprefixer": "^10.4.7", + "astro": "^2.3.2", + "autoprefixer": "^10.4.14", "canvas-confetti": "^1.5.1", - "postcss": "^8.4.14", - "tailwindcss": "^3.0.24" + "postcss": "^8.4.23", + "tailwindcss": "^3.3.2" } } diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 9a8d5d6c4..03e19e4ff 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "vite-plugin-pwa": "0.11.11", "workbox-window": "^6.5.3" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 221b49bcf..2cdee37f0 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^2.3.1", + "astro": "^2.3.2", "vitest": "^0.20.3" } } diff --git a/package.json b/package.json index f9e2580b7..fabf01b44 100644 --- a/package.json +++ b/package.json @@ -8,19 +8,21 @@ }, "scripts": { "release": "pnpm run build && changeset publish", - "build": "turbo run build --output-logs=new-only --no-deps --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", - "build:ci": "turbo run build:ci --output-logs=new-only --no-deps --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", + "build": "turbo run build --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", + "build:ci": "turbo run build:ci --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", "build:examples": "turbo run build --filter=\"@example/*\"", - "dev": "turbo run dev --no-deps --no-cache --parallel --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", + "dev": "turbo run dev --parallel --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", "format": "pnpm run format:code", "format:ci": "pnpm run format:imports && pnpm run format:code", "format:code": "prettier -w . --cache --plugin-search-dir=.", "format:imports": "organize-imports-cli ./packages/*/tsconfig.json ./packages/*/*/tsconfig.json", - "test": "turbo run test --output-logs=new-only --concurrency=1 --filter=astro --filter=create-astro --filter=\"@astrojs/*\"", + "test": "turbo run test --concurrency=1 --filter=astro --filter=create-astro --filter=\"@astrojs/*\"", "test:match": "cd packages/astro && pnpm run test:match", - "test:smoke": "turbo run build --filter=\"@example/*\" --filter=\"docs\" --output-logs=new-only --concurrency=1", + "test:smoke": "pnpm test:smoke:example && pnpm test:smoke:docs", + "test:smoke:example": "turbo run build --concurrency=100% --filter=\"@example/*\"", + "test:smoke:docs": "turbo run build --filter=docs", "test:check-examples": "node ./scripts/smoke/check.js", - "test:vite-ci": "turbo run test --filter=astro --output-logs=new-only --no-deps --concurrency=1", + "test:vite-ci": "turbo run test --filter=astro", "test:e2e": "cd packages/astro && pnpm playwright install && pnpm run test:e2e", "test:e2e:match": "cd packages/astro && pnpm playwright install && pnpm run test:e2e:match", "benchmark": "astro-benchmark", @@ -31,13 +33,7 @@ "workspaces": [ "packages/markdown/*", "packages/integrations/*", - "packages/*", - "examples/*", - "examples/component/demo", - "scripts", - "packages/astro/test/fixtures/component-library-shared", - "packages/astro/test/fixtures/custom-elements/my-component-lib", - "packages/astro/test/fixtures/static build/pkg" + "packages/*" ], "engines": { "node": ">=16.12.0", @@ -72,7 +68,7 @@ ] }, "patchedDependencies": { - "@changesets/cli@2.23.0": "patches/@changesets__cli@2.23.0.patch" + "@changesets/cli@2.26.1": "patches/@changesets__cli@2.26.1.patch" } }, "dependencies": { @@ -80,26 +76,22 @@ "astro-benchmark": "workspace:*" }, "devDependencies": { - "@changesets/changelog-github": "0.4.4", - "@changesets/cli": "2.23.0", - "@octokit/action": "^3.18.1", + "@changesets/changelog-github": "0.4.8", + "@changesets/cli": "2.26.1", "@types/node": "^18.7.21", "@typescript-eslint/eslint-plugin": "^5.58.0", "@typescript-eslint/parser": "^5.58.0", - "del": "^7.0.0", "esbuild": "^0.17.12", "eslint": "^8.38.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-no-only-tests": "^2.6.0", "eslint-plugin-prettier": "^4.2.1", - "execa": "^6.1.0", "only-allow": "^1.1.1", "organize-imports-cli": "^0.10.0", "prettier": "^2.8.7", "prettier-plugin-astro": "^0.8.0", - "pretty-bytes": "^6.0.0", "tiny-glob": "^0.2.9", - "turbo": "1.2.5", + "turbo": "^1.9.3", "typescript": "~5.0.2" } } diff --git a/packages/astro-rss/CHANGELOG.md b/packages/astro-rss/CHANGELOG.md index a9d96eb2d..cdbf24098 100644 --- a/packages/astro-rss/CHANGELOG.md +++ b/packages/astro-rss/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/rss +## 2.4.0 + +### Minor Changes + +- [#6707](https://github.com/withastro/astro/pull/6707) [`4ea716e56`](https://github.com/withastro/astro/commit/4ea716e5692d23361e9301330ce52733b3d05b01) Thanks [@philnash](https://github.com/philnash)! - Added extra elements to the RSS items, including categories and enclosure + ## 2.3.2 ### Patch Changes diff --git a/packages/astro-rss/package.json b/packages/astro-rss/package.json index 7f7121b62..21b07e2fb 100644 --- a/packages/astro-rss/package.json +++ b/packages/astro-rss/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/rss", "description": "Add RSS feeds to your Astro projects", - "version": "2.3.2", + "version": "2.4.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 41dadd1a4..ab0dc88b2 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,11 @@ # astro +## 2.3.2 + +### Patch Changes + +- [#6920](https://github.com/withastro/astro/pull/6920) [`b89042553`](https://github.com/withastro/astro/commit/b89042553ec45d5f6bc71747e0f3470ba969e679) Thanks [@bluwy](https://github.com/bluwy)! - Fix tsconfig alias baseUrl handling for "." and ".." imports + ## 2.3.1 ### Patch Changes diff --git a/packages/astro/e2e/fixtures/tailwindcss/package.json b/packages/astro/e2e/fixtures/tailwindcss/package.json index 6c7e4eb64..908c07915 100644 --- a/packages/astro/e2e/fixtures/tailwindcss/package.json +++ b/packages/astro/e2e/fixtures/tailwindcss/package.json @@ -5,8 +5,8 @@ "dependencies": { "@astrojs/tailwind": "workspace:*", "astro": "workspace:*", - "autoprefixer": "^10.4.7", - "postcss": "^8.4.14", - "tailwindcss": "^3.0.24" + "autoprefixer": "^10.4.14", + "postcss": "^8.4.23", + "tailwindcss": "^3.3.2" } } diff --git a/packages/astro/package.json b/packages/astro/package.json index 5786da29c..0c1cc0e32 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "2.3.1", + "version": "2.3.2", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", @@ -198,7 +198,7 @@ "sass": "^1.52.2", "sharp": "^0.31.3", "srcset-parse": "^1.1.0", - "undici": "^5.20.0", + "undici": "^5.22.0", "unified": "^10.1.2" }, "peerDependencies": { diff --git a/packages/astro/performance/package.json b/packages/astro/performance/package.json index 9069c0f86..66193df49 100644 --- a/packages/astro/performance/package.json +++ b/packages/astro/performance/package.json @@ -2,6 +2,7 @@ "name": "@test/performance", "version": "1.0.0", "description": "", + "private": true, "main": "index.js", "scripts": { "benchmark": "node ./content-benchmark.mjs" diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index e98c957ec..7ec333613 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -335,6 +335,12 @@ export interface ViteUserConfig extends vite.UserConfig { ssr?: vite.SSROptions; } +export interface ImageServiceConfig { + // eslint-disable-next-line @typescript-eslint/ban-types + entrypoint: 'astro/assets/services/sharp' | 'astro/assets/services/squoosh' | (string & {}); + config?: Record; +} + /** * Astro User Config * Docs: https://docs.astro.build/reference/configuration-reference/ @@ -763,26 +769,26 @@ export interface AstroUserConfig { /** * @docs * @name image.service (Experimental) - * @type {'astro/assets/services/sharp' | 'astro/assets/services/squoosh' | string} - * @default `'astro/assets/services/squoosh'` + * @type {{entrypoint: 'astro/assets/services/sharp' | 'astro/assets/services/squoosh' | string, config: Record}} + * @default `{entrypoint: 'astro/assets/services/squoosh', config?: {}}` * @version 2.1.0 * @description * Set which image service is used for Astro’s experimental assets support. * - * The value should be a module specifier for the image service to use: - * either one of Astro’s two built-in services, or a third-party implementation. + * The value should be an object with an entrypoint for the image service to use and optionally, a config object to pass to the service. + * + * The service entrypoint can be either one of the included services, or a third-party package. * * ```js * { * image: { * // Example: Enable the Sharp-based image service - * service: 'astro/assets/services/sharp', + * service: { entrypoint: 'astro/assets/services/sharp' }, * }, * } * ``` */ - // eslint-disable-next-line @typescript-eslint/ban-types - service: 'astro/assets/services/sharp' | 'astro/assets/services/squoosh' | (string & {}); + service: ImageServiceConfig; }; /** diff --git a/packages/astro/src/assets/image-endpoint.ts b/packages/astro/src/assets/image-endpoint.ts index e3f90941e..e3553edbc 100644 --- a/packages/astro/src/assets/image-endpoint.ts +++ b/packages/astro/src/assets/image-endpoint.ts @@ -4,6 +4,8 @@ import { isRemotePath } from '../core/path.js'; import { getConfiguredImageService } from './internal.js'; import { isLocalService } from './services/service.js'; import { etag } from './utils/etag.js'; +// @ts-expect-error +import { imageServiceConfig } from 'astro:assets'; async function loadRemoteImage(src: URL) { try { @@ -31,7 +33,7 @@ export const get: APIRoute = async ({ request }) => { } const url = new URL(request.url); - const transform = await imageService.parseURL(url); + const transform = await imageService.parseURL(url, imageServiceConfig); if (!transform || !transform.src) { throw new Error('Incorrect transform returned by `parseURL`'); @@ -49,7 +51,11 @@ export const get: APIRoute = async ({ request }) => { return new Response('Not Found', { status: 404 }); } - const { data, format } = await imageService.transform(inputBuffer, transform); + const { data, format } = await imageService.transform( + inputBuffer, + transform, + imageServiceConfig + ); return new Response(data, { status: 200, diff --git a/packages/astro/src/assets/index.ts b/packages/astro/src/assets/index.ts index 6b792fa97..bab74a815 100644 --- a/packages/astro/src/assets/index.ts +++ b/packages/astro/src/assets/index.ts @@ -1,5 +1,21 @@ +import type { ImageServiceConfig } from '../@types/astro.js'; + export { getConfiguredImageService, getImage } from './internal.js'; export { baseService, isLocalService } from './services/service.js'; export { type LocalImageProps, type RemoteImageProps } from './types.js'; export { emitESMImage } from './utils/emitAsset.js'; export { imageMetadata } from './utils/metadata.js'; + +export function sharpImageService(): ImageServiceConfig { + return { + entrypoint: 'astro/assets/services/sharp', + config: {}, + }; +} + +export function squooshImageService(): ImageServiceConfig { + return { + entrypoint: 'astro/assets/services/squoosh', + config: {}, + }; +} diff --git a/packages/astro/src/assets/internal.ts b/packages/astro/src/assets/internal.ts index f38b88124..945b5a3e8 100644 --- a/packages/astro/src/assets/internal.ts +++ b/packages/astro/src/assets/internal.ts @@ -45,7 +45,10 @@ export async function getConfiguredImageService(): Promise { * * This is functionally equivalent to using the `` component, as the component calls this function internally. */ -export async function getImage(options: ImageTransform): Promise { +export async function getImage( + options: ImageTransform, + serviceConfig: Record +): Promise { if (!options || typeof options !== 'object') { throw new AstroError({ ...AstroErrorData.ExpectedImageOptions, @@ -54,9 +57,11 @@ export async function getImage(options: ImageTransform): Promise } const service = await getConfiguredImageService(); - const validatedOptions = service.validateOptions ? service.validateOptions(options) : options; + const validatedOptions = service.validateOptions + ? service.validateOptions(options, serviceConfig) + : options; - let imageURL = service.getURL(validatedOptions); + let imageURL = service.getURL(validatedOptions, serviceConfig); // In build and for local services, we need to collect the requested parameters so we can generate the final images if (isLocalService(service) && globalThis.astroAsset.addStaticImage) { @@ -68,7 +73,9 @@ export async function getImage(options: ImageTransform): Promise options: validatedOptions, src: imageURL, attributes: - service.getHTMLAttributes !== undefined ? service.getHTMLAttributes(validatedOptions) : {}, + service.getHTMLAttributes !== undefined + ? service.getHTMLAttributes(validatedOptions, serviceConfig) + : {}, }; } @@ -121,7 +128,11 @@ export async function generateImage( serverRoot ) ); - const resultData = await imageService.transform(fileData, { ...options, src: originalImagePath }); + const resultData = await imageService.transform( + fileData, + { ...options, src: originalImagePath }, + buildOpts.settings.config.image.service.config + ); const finalFileURL = new URL('.' + filepath, clientRoot); const finalFolderURL = new URL('./', finalFileURL); diff --git a/packages/astro/src/assets/services/service.ts b/packages/astro/src/assets/services/service.ts index aa33d8901..5c19ce3d9 100644 --- a/packages/astro/src/assets/services/service.ts +++ b/packages/astro/src/assets/services/service.ts @@ -31,14 +31,17 @@ interface SharedServiceProps { * For external services, this should point to the URL your images are coming from, for instance, `/_vercel/image` * */ - getURL: (options: ImageTransform) => string; + getURL: (options: ImageTransform, serviceConfig: Record) => string; /** * Return any additional HTML attributes separate from `src` that your service requires to show the image properly. * * For example, you might want to return the `width` and `height` to avoid CLS, or a particular `class` or `style`. * In most cases, you'll want to return directly what your user supplied you, minus the attributes that were used to generate the image. */ - getHTMLAttributes?: (options: ImageTransform) => Record; + getHTMLAttributes?: ( + options: ImageTransform, + serviceConfig: Record + ) => Record; /** * Validate and return the options passed by the user. * @@ -47,7 +50,7 @@ interface SharedServiceProps { * * This method should returns options, and can be used to set defaults (ex: a default output format to be used if the user didn't specify one.) */ - validateOptions?: (options: ImageTransform) => ImageTransform; + validateOptions?: (options: ImageTransform, serviceConfig: Record) => ImageTransform; } export type ExternalImageService = SharedServiceProps; @@ -63,14 +66,15 @@ export interface LocalImageService extends SharedServiceProps { * * In most cases, this will get query parameters using, for example, `params.get('width')` and return those. */ - parseURL: (url: URL) => LocalImageTransform | undefined; + parseURL: (url: URL, serviceConfig: Record) => LocalImageTransform | undefined; /** * Performs the image transformations on the input image and returns both the binary data and * final image format of the optimized image. */ transform: ( inputBuffer: Buffer, - transform: LocalImageTransform + transform: LocalImageTransform, + serviceConfig: Record ) => Promise<{ data: Buffer; format: ImageOutputFormat }>; } diff --git a/packages/astro/src/assets/vite-plugin-assets.ts b/packages/astro/src/assets/vite-plugin-assets.ts index a78def7e8..3c0a94d2a 100644 --- a/packages/astro/src/assets/vite-plugin-assets.ts +++ b/packages/astro/src/assets/vite-plugin-assets.ts @@ -38,7 +38,7 @@ export default function assets({ const adapterName = settings.config.adapter?.name; if ( ['astro/assets/services/sharp', 'astro/assets/services/squoosh'].includes( - settings.config.image.service + settings.config.image.service.entrypoint ) && adapterName && UNSUPPORTED_ADAPTERS.has(adapterName) @@ -70,7 +70,7 @@ export default function assets({ }, async resolveId(id) { if (id === VIRTUAL_SERVICE_ID) { - return await this.resolve(settings.config.image.service); + return await this.resolve(settings.config.image.service.entrypoint); } if (id === VIRTUAL_MODULE_ID) { return resolvedVirtualModuleId; @@ -79,8 +79,12 @@ export default function assets({ load(id) { if (id === resolvedVirtualModuleId) { return ` - export { getImage, getConfiguredImageService, isLocalService } from "astro/assets"; + export { getConfiguredImageService, isLocalService } from "astro/assets"; + import { getImage as getImageInternal } from "astro/assets"; export { default as Image } from "astro/components/Image.astro"; + + export const imageServiceConfig = ${JSON.stringify(settings.config.image.service.config)}; + export const getImage = async (options) => await getImageInternal(options, imageServiceConfig); `; } }, @@ -116,7 +120,10 @@ export default function assets({ } } - const transform = await globalThis.astroAsset.imageService.parseURL(url); + const transform = await globalThis.astroAsset.imageService.parseURL( + url, + settings.config.image.service.config + ); if (transform === undefined) { error(logging, 'image', `Failed to parse transform for ${url}`); @@ -127,7 +134,11 @@ export default function assets({ let format: string = meta.format; if (transform) { - const result = await globalThis.astroAsset.imageService.transform(file, transform); + const result = await globalThis.astroAsset.imageService.transform( + file, + transform, + settings.config.image.service.config + ); data = result.data; format = result.format; } @@ -155,7 +166,7 @@ export default function assets({ >(); } - const hash = hashTransform(options, settings.config.image.service); + const hash = hashTransform(options, settings.config.image.service.entrypoint); let filePath: string; if (globalThis.astroAsset.staticImages.has(hash)) { diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts index 7aef9037b..e9900f478 100644 --- a/packages/astro/src/core/config/schema.ts +++ b/packages/astro/src/core/config/schema.ts @@ -125,14 +125,17 @@ export const AstroConfigSchema = z.object({ ), image: z .object({ - service: z.union([ - z.literal('astro/assets/services/sharp'), - z.literal('astro/assets/services/squoosh'), - z.string(), - ]), + service: z.object({ + entrypoint: z.union([ + z.literal('astro/assets/services/sharp'), + z.literal('astro/assets/services/squoosh'), + z.string(), + ]), + config: z.record(z.any()).default({}), + }), }) .default({ - service: 'astro/assets/services/squoosh', + service: { entrypoint: 'astro/assets/services/squoosh', config: {} }, }), markdown: z .object({ diff --git a/packages/astro/src/vite-plugin-config-alias/index.ts b/packages/astro/src/vite-plugin-config-alias/index.ts index 5cd7a7623..b3698c834 100644 --- a/packages/astro/src/vite-plugin-config-alias/index.ts +++ b/packages/astro/src/vite-plugin-config-alias/index.ts @@ -48,7 +48,7 @@ const getConfigAlias = (settings: AstroSettings): Alias[] | null => { // - `baseUrl` changes the way non-relative specifiers are resolved // - if `baseUrl` exists then all non-relative specifiers are resolved relative to it aliases.push({ - find: /^(?!\.*\/|\w:)(.+)$/, + find: /^(?!\.*\/|\.*$|\w:)(.+)$/, replacement: `${[...normalizePath(resolvedBaseUrl)] .map((segment) => (segment === '$' ? '$$' : segment)) .join('')}/$1`, diff --git a/packages/astro/test/alias-tsconfig.test.js b/packages/astro/test/alias-tsconfig.test.js index 84dd50c2f..4668ea66e 100644 --- a/packages/astro/test/alias-tsconfig.test.js +++ b/packages/astro/test/alias-tsconfig.test.js @@ -61,6 +61,7 @@ describe('Aliases with tsconfig.json', () => { expect($('#foo').text()).to.equal('foo'); expect($('#constants-foo').text()).to.equal('foo'); + expect($('#constants-index').text()).to.equal('index'); }); it('can load namespace packages with @* paths', async () => { @@ -107,6 +108,7 @@ describe('Aliases with tsconfig.json', () => { expect($('#foo').text()).to.equal('foo'); expect($('#constants-foo').text()).to.equal('foo'); + expect($('#constants-index').text()).to.equal('index'); }); it('can load namespace packages with @* paths', async () => { diff --git a/packages/astro/test/core-image.test.js b/packages/astro/test/core-image.test.js index 49f6ce6ae..57720f0c4 100644 --- a/packages/astro/test/core-image.test.js +++ b/packages/astro/test/core-image.test.js @@ -620,7 +620,12 @@ describe('astro:image', () => { assets: true, }, image: { - service: fileURLToPath(new URL('./fixtures/core-image/service.mjs', import.meta.url)), + service: { + entrypoint: fileURLToPath( + new URL('./fixtures/core-image/service.mjs', import.meta.url) + ), + config: { foo: 'bar' }, + }, }, }); devServer = await fixture.startDevServer(); @@ -641,5 +646,13 @@ describe('astro:image', () => { const $ = cheerio.load(html); expect($('img').attr('data-service')).to.equal('my-custom-service'); }); + + it('gets service config', async () => { + const response = await fixture.fetch('/'); + const html = await response.text(); + + const $ = cheerio.load(html); + expect($('#local img').attr('data-service-config')).to.equal('bar'); + }); }); }); diff --git a/packages/astro/test/fixtures/alias-tsconfig/src/pages/index.astro b/packages/astro/test/fixtures/alias-tsconfig/src/pages/index.astro index a3feb613b..076d608c6 100644 --- a/packages/astro/test/fixtures/alias-tsconfig/src/pages/index.astro +++ b/packages/astro/test/fixtures/alias-tsconfig/src/pages/index.astro @@ -4,7 +4,7 @@ import Foo from 'src/components/Foo.astro'; import StyleComp from 'src/components/Style.astro'; import Alias from '@components/Alias.svelte'; import { namespace } from '@test/namespace-package' -import { foo } from 'src/utils/constants'; +import { foo, index } from 'src/utils/constants'; import '@styles/main.css'; --- @@ -21,6 +21,7 @@ import '@styles/main.css';

{namespace}

{foo}

+

{index}

style-red

style-blue

diff --git a/packages/astro/test/fixtures/alias-tsconfig/src/utils/constants.js b/packages/astro/test/fixtures/alias-tsconfig/src/utils/constants.js index cb3564682..28e8a5c17 100644 --- a/packages/astro/test/fixtures/alias-tsconfig/src/utils/constants.js +++ b/packages/astro/test/fixtures/alias-tsconfig/src/utils/constants.js @@ -1 +1,3 @@ +export * from '.' + export const foo = 'foo' diff --git a/packages/astro/test/fixtures/alias-tsconfig/src/utils/index.js b/packages/astro/test/fixtures/alias-tsconfig/src/utils/index.js new file mode 100644 index 000000000..96896d711 --- /dev/null +++ b/packages/astro/test/fixtures/alias-tsconfig/src/utils/index.js @@ -0,0 +1 @@ +export const index = 'index' diff --git a/packages/astro/test/fixtures/astro-client-only/pkg/package.json b/packages/astro/test/fixtures/astro-client-only/pkg/package.json index 03e6121e6..cbf75aee9 100644 --- a/packages/astro/test/fixtures/astro-client-only/pkg/package.json +++ b/packages/astro/test/fixtures/astro-client-only/pkg/package.json @@ -1,4 +1,5 @@ { "name": "@test/astro-client-only-pkg", - "main": "index.svelte" + "main": "index.svelte", + "private": true } diff --git a/packages/astro/test/fixtures/astro-slot-with-client/package.json b/packages/astro/test/fixtures/astro-slot-with-client/package.json index 5a9f9296c..141bf165d 100644 --- a/packages/astro/test/fixtures/astro-slot-with-client/package.json +++ b/packages/astro/test/fixtures/astro-slot-with-client/package.json @@ -1,5 +1,6 @@ { "name": "@test/astro-slot-with-client", + "private": true, "dependencies": { "astro": "workspace:*", "@astrojs/preact": "workspace:*", diff --git a/packages/astro/test/fixtures/before-hydration/package.json b/packages/astro/test/fixtures/before-hydration/package.json index a4994e2d1..f04a39ae0 100644 --- a/packages/astro/test/fixtures/before-hydration/package.json +++ b/packages/astro/test/fixtures/before-hydration/package.json @@ -1,5 +1,6 @@ { "name": "@test/before-hydration", + "private": true, "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", diff --git a/packages/astro/test/fixtures/build-assets/package.json b/packages/astro/test/fixtures/build-assets/package.json index 88a91cf27..6dd278c2b 100644 --- a/packages/astro/test/fixtures/build-assets/package.json +++ b/packages/astro/test/fixtures/build-assets/package.json @@ -1,5 +1,6 @@ { "name": "@test/build-assets", + "private": true, "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", diff --git a/packages/astro/test/fixtures/core-image/service.mjs b/packages/astro/test/fixtures/core-image/service.mjs index dfede13b3..646622f51 100644 --- a/packages/astro/test/fixtures/core-image/service.mjs +++ b/packages/astro/test/fixtures/core-image/service.mjs @@ -7,8 +7,9 @@ const service = { getURL(options) { return squoosh.getURL(options); }, - getHTMLAttributes(options) { + getHTMLAttributes(options, serviceConfig) { options['data-service'] = 'my-custom-service'; + options['data-service-config'] = serviceConfig.foo; return squoosh.getHTMLAttributes(options); }, parseURL(url) { diff --git a/packages/astro/test/fixtures/css-assets/package.json b/packages/astro/test/fixtures/css-assets/package.json index bcf7875a1..5b4371f74 100644 --- a/packages/astro/test/fixtures/css-assets/package.json +++ b/packages/astro/test/fixtures/css-assets/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@astrojs/test-font-awesome-package": "file:packages/font-awesome", + "@test/astro-font-awesome-package": "file:packages/font-awesome", "astro": "workspace:*" } } diff --git a/packages/astro/test/fixtures/css-assets/packages/font-awesome/package.json b/packages/astro/test/fixtures/css-assets/packages/font-awesome/package.json index 380c365fd..e29393b89 100644 --- a/packages/astro/test/fixtures/css-assets/packages/font-awesome/package.json +++ b/packages/astro/test/fixtures/css-assets/packages/font-awesome/package.json @@ -1,4 +1,5 @@ { - "name": "@astrojs/test-font-awesome-package", - "version": "0.0.1" + "name": "@test/astro-font-awesome-package", + "version": "0.0.1", + "private": true } diff --git a/packages/astro/test/fixtures/css-assets/src/pages/one.astro b/packages/astro/test/fixtures/css-assets/src/pages/one.astro index a11c65969..c12635e39 100644 --- a/packages/astro/test/fixtures/css-assets/src/pages/one.astro +++ b/packages/astro/test/fixtures/css-assets/src/pages/one.astro @@ -6,7 +6,7 @@ font-style: normal; font-weight: 300; font-display: swap; - src: url('@astrojs/test-font-awesome-package/fontawesome-webfont.woff2') + src: url('@test/astro-font-awesome-package/fontawesome-webfont.woff2') format('woff2'); } diff --git a/packages/astro/test/fixtures/css-assets/src/pages/two.astro b/packages/astro/test/fixtures/css-assets/src/pages/two.astro index 70663a24b..3f208629f 100644 --- a/packages/astro/test/fixtures/css-assets/src/pages/two.astro +++ b/packages/astro/test/fixtures/css-assets/src/pages/two.astro @@ -7,7 +7,7 @@ font-style: normal; font-weight: 300; font-display: swap; - src: url('@astrojs/test-font-awesome-package/fontawesome-webfont2.woff2') + src: url('@test/astro-font-awesome-package/fontawesome-webfont2.woff2') format('woff2'); } diff --git a/packages/astro/test/fixtures/css-order-dynamic-import/package.json b/packages/astro/test/fixtures/css-order-dynamic-import/package.json index 229cc504f..7319b643b 100644 --- a/packages/astro/test/fixtures/css-order-dynamic-import/package.json +++ b/packages/astro/test/fixtures/css-order-dynamic-import/package.json @@ -1,5 +1,6 @@ { "name": "@test/css-order-dynamic-import", + "private": true, "dependencies": { "astro": "workspace:*" } diff --git a/packages/astro/test/fixtures/css-order-import/package.json b/packages/astro/test/fixtures/css-order-import/package.json index caf2346ea..4ab8cf8e9 100644 --- a/packages/astro/test/fixtures/css-order-import/package.json +++ b/packages/astro/test/fixtures/css-order-import/package.json @@ -1,5 +1,6 @@ { "name": "@test/css-order-import", + "private": true, "dependencies": { "@astrojs/react": "workspace:*", "astro": "workspace:*", diff --git a/packages/astro/test/fixtures/css-order-layout/package.json b/packages/astro/test/fixtures/css-order-layout/package.json index 880c27ca8..61c3c7ab6 100644 --- a/packages/astro/test/fixtures/css-order-layout/package.json +++ b/packages/astro/test/fixtures/css-order-layout/package.json @@ -1,5 +1,6 @@ { "name": "@test/css-order-layout", + "private": true, "dependencies": { "astro": "workspace:*" } diff --git a/packages/astro/test/fixtures/css-order/package.json b/packages/astro/test/fixtures/css-order/package.json index cf8074efe..f1d730fed 100644 --- a/packages/astro/test/fixtures/css-order/package.json +++ b/packages/astro/test/fixtures/css-order/package.json @@ -1,5 +1,6 @@ { "name": "@test/css-order", + "private": true, "dependencies": { "astro": "workspace:*" } diff --git a/packages/astro/test/fixtures/dont-delete-me/package.json b/packages/astro/test/fixtures/dont-delete-me/package.json index 7ef7c1f14..5a8654b22 100644 --- a/packages/astro/test/fixtures/dont-delete-me/package.json +++ b/packages/astro/test/fixtures/dont-delete-me/package.json @@ -1,5 +1,6 @@ { "name": "@test/dont-delete-me", + "private": true, "dependencies": { "astro": "workspace:*" } diff --git a/packages/astro/test/fixtures/lazy-layout/package.json b/packages/astro/test/fixtures/lazy-layout/package.json index 4fe627073..7727b7bac 100644 --- a/packages/astro/test/fixtures/lazy-layout/package.json +++ b/packages/astro/test/fixtures/lazy-layout/package.json @@ -1,5 +1,6 @@ { "name": "@test/lazy-layout", + "private": true, "dependencies": { "astro": "workspace:*" } diff --git a/packages/astro/test/fixtures/multiple-renderers/astro.config.mjs b/packages/astro/test/fixtures/multiple-renderers/astro.config.mjs index 526323dbf..145e1f82f 100644 --- a/packages/astro/test/fixtures/multiple-renderers/astro.config.mjs +++ b/packages/astro/test/fixtures/multiple-renderers/astro.config.mjs @@ -1,5 +1,5 @@ -import one from '@astrojs/renderer-one'; -import two from '@astrojs/renderer-two'; +import one from '@test/astro-renderer-one'; +import two from '@test/astro-renderer-two'; export default { integrations: [one(), two()] diff --git a/packages/astro/test/fixtures/multiple-renderers/package.json b/packages/astro/test/fixtures/multiple-renderers/package.json index 9372a6e94..c35db17cf 100644 --- a/packages/astro/test/fixtures/multiple-renderers/package.json +++ b/packages/astro/test/fixtures/multiple-renderers/package.json @@ -1,8 +1,9 @@ { "name": "@test/multiple-renderers", + "private": true, "dependencies": { "astro": "workspace:*", - "@astrojs/renderer-one": "file:./renderers/one", - "@astrojs/renderer-two": "file:./renderers/two" + "@test/astro-renderer-one": "file:./renderers/one", + "@test/astro-renderer-two": "file:./renderers/two" } } diff --git a/packages/astro/test/fixtures/multiple-renderers/renderers/one/index.mjs b/packages/astro/test/fixtures/multiple-renderers/renderers/one/index.mjs index 3e39696bf..09e928a2b 100644 --- a/packages/astro/test/fixtures/multiple-renderers/renderers/one/index.mjs +++ b/packages/astro/test/fixtures/multiple-renderers/renderers/one/index.mjs @@ -7,7 +7,7 @@ export default function() { addRenderer({ name: 'renderer-one', clientEntrypoint: null, - serverEntrypoint: '@astrojs/renderer-one/server.mjs', + serverEntrypoint: '@test/astro-renderer-one/server.mjs', }); } } diff --git a/packages/astro/test/fixtures/multiple-renderers/renderers/one/package.json b/packages/astro/test/fixtures/multiple-renderers/renderers/one/package.json index 30a2cf6de..436ae0be5 100644 --- a/packages/astro/test/fixtures/multiple-renderers/renderers/one/package.json +++ b/packages/astro/test/fixtures/multiple-renderers/renderers/one/package.json @@ -1,5 +1,6 @@ { - "name": "@astrojs/renderer-one", + "name": "@test/astro-renderer-one", "version": "1.0.0", + "private": true, "main": "index.mjs" } diff --git a/packages/astro/test/fixtures/multiple-renderers/renderers/two/index.mjs b/packages/astro/test/fixtures/multiple-renderers/renderers/two/index.mjs index 729356d24..9662e8a5c 100644 --- a/packages/astro/test/fixtures/multiple-renderers/renderers/two/index.mjs +++ b/packages/astro/test/fixtures/multiple-renderers/renderers/two/index.mjs @@ -7,7 +7,7 @@ export default function() { addRenderer({ name: 'renderer-two', clientEntrypoint: null, - serverEntrypoint: '@astrojs/renderer-two/server.mjs', + serverEntrypoint: '@test/astro-renderer-two/server.mjs', }); } } diff --git a/packages/astro/test/fixtures/multiple-renderers/renderers/two/package.json b/packages/astro/test/fixtures/multiple-renderers/renderers/two/package.json index 51216ac57..ae82f6761 100644 --- a/packages/astro/test/fixtures/multiple-renderers/renderers/two/package.json +++ b/packages/astro/test/fixtures/multiple-renderers/renderers/two/package.json @@ -1,5 +1,6 @@ { - "name": "@astrojs/renderer-two", + "name": "@test/astro-renderer-two", "version": "1.0.0", + "private": true, "main": "index.mjs" } diff --git a/packages/astro/test/fixtures/postcss/package.json b/packages/astro/test/fixtures/postcss/package.json index fcb30c06f..7d240362b 100644 --- a/packages/astro/test/fixtures/postcss/package.json +++ b/packages/astro/test/fixtures/postcss/package.json @@ -7,8 +7,8 @@ "@astrojs/svelte": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "autoprefixer": "^10.4.7", - "postcss": "^8.4.14", + "autoprefixer": "^10.4.14", + "postcss": "^8.4.23", "solid-js": "^1.5.6", "svelte": "^3.48.0", "vue": "^3.2.39" diff --git a/packages/astro/test/fixtures/react-and-solid/package.json b/packages/astro/test/fixtures/react-and-solid/package.json index 228c39ea7..644e1911c 100644 --- a/packages/astro/test/fixtures/react-and-solid/package.json +++ b/packages/astro/test/fixtures/react-and-solid/package.json @@ -1,5 +1,6 @@ { "name": "@test/react-and-solid", + "private": true, "dependencies": { "@astrojs/react": "workspace:*", "@astrojs/solid-js": "workspace:*", diff --git a/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json b/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json index 15ec0ab64..f5b58cbcb 100644 --- a/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json +++ b/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json @@ -1,5 +1,6 @@ { "name": "@test/reexport-astro-containing-client-component", + "private": true, "dependencies": { "@astrojs/preact": "workspace:", "astro": "workspace:", diff --git a/packages/astro/test/fixtures/set-html/package.json b/packages/astro/test/fixtures/set-html/package.json index 8310c0560..c40fcd8ac 100644 --- a/packages/astro/test/fixtures/set-html/package.json +++ b/packages/astro/test/fixtures/set-html/package.json @@ -1,6 +1,7 @@ { "name": "@test/set-html", "version": "1.0.0", + "private": true, "dependencies": { "astro": "workspace:*" } diff --git a/packages/astro/test/fixtures/static-build-ssr/package.json b/packages/astro/test/fixtures/static-build-ssr/package.json index 9a7678a74..6c8f1e499 100644 --- a/packages/astro/test/fixtures/static-build-ssr/package.json +++ b/packages/astro/test/fixtures/static-build-ssr/package.json @@ -1,6 +1,7 @@ { "name": "@test/static-build-ssr", "version": "0.0.0", + "private": true, "dependencies": { "@astrojs/node": "workspace:*", "@test/static-build-pkg": "workspace:*", diff --git a/packages/astro/test/fixtures/static-build/package.json b/packages/astro/test/fixtures/static-build/package.json index c57569171..f4d9ae9a2 100644 --- a/packages/astro/test/fixtures/static-build/package.json +++ b/packages/astro/test/fixtures/static-build/package.json @@ -1,6 +1,7 @@ { "name": "@test/static-build", "version": "0.0.0", + "private": true, "dependencies": { "@astrojs/preact": "workspace:*", "@test/static-build-pkg": "workspace:*", diff --git a/packages/astro/test/fixtures/tailwindcss-ts/package.json b/packages/astro/test/fixtures/tailwindcss-ts/package.json index 78ead447f..3ab11a25d 100644 --- a/packages/astro/test/fixtures/tailwindcss-ts/package.json +++ b/packages/astro/test/fixtures/tailwindcss-ts/package.json @@ -5,7 +5,7 @@ "dependencies": { "@astrojs/tailwind": "workspace:*", "astro": "workspace:*", - "tailwindcss": "^3.2.4", - "postcss": ">=8.3.3 <9.0.0" + "tailwindcss": "^3.3.2", + "postcss": "^8.4.23" } } diff --git a/packages/astro/test/fixtures/tailwindcss/package.json b/packages/astro/test/fixtures/tailwindcss/package.json index 00646e0fd..78cfb17cb 100644 --- a/packages/astro/test/fixtures/tailwindcss/package.json +++ b/packages/astro/test/fixtures/tailwindcss/package.json @@ -6,8 +6,8 @@ "@astrojs/tailwind": "workspace:*", "@astrojs/mdx": "workspace:*", "astro": "workspace:*", - "autoprefixer": "^10.4.7", - "postcss": "^8.4.14", - "tailwindcss": "^3.0.24" + "autoprefixer": "^10.4.14", + "postcss": "^8.4.23", + "tailwindcss": "^3.3.2" } } diff --git a/packages/create-astro/test/fixtures/not-empty/package.json b/packages/create-astro/test/fixtures/not-empty/package.json index 0967ef424..5edb64fea 100644 --- a/packages/create-astro/test/fixtures/not-empty/package.json +++ b/packages/create-astro/test/fixtures/not-empty/package.json @@ -1 +1,4 @@ -{} +{ + "name": "@test/create-astro-not-empty", + "private": true +} diff --git a/packages/integrations/cloudflare/CHANGELOG.md b/packages/integrations/cloudflare/CHANGELOG.md index 950b83aa8..a34f6bff3 100644 --- a/packages/integrations/cloudflare/CHANGELOG.md +++ b/packages/integrations/cloudflare/CHANGELOG.md @@ -1,5 +1,14 @@ # @astrojs/cloudflare +## 6.2.3 + +### Patch Changes + +- [#6222](https://github.com/withastro/astro/pull/6222) [`081b2402c`](https://github.com/withastro/astro/commit/081b2402cfb48b5eb8dbd02664d8af2f7c798edf) Thanks [@AirBorne04](https://github.com/AirBorne04)! - add option to compile unminified code + +- Updated dependencies [[`b89042553`](https://github.com/withastro/astro/commit/b89042553ec45d5f6bc71747e0f3470ba969e679)]: + - astro@2.3.2 + ## 6.2.2 ### Patch Changes diff --git a/packages/integrations/cloudflare/README.md b/packages/integrations/cloudflare/README.md index 207952185..c6ca85c56 100644 --- a/packages/integrations/cloudflare/README.md +++ b/packages/integrations/cloudflare/README.md @@ -108,10 +108,28 @@ By default, `@astrojs/cloudflare` will generate a `_routes.json` file that lists ## Troubleshooting + For help, check out the `#support` channel on [Discord](https://astro.build/chat). Our friendly Support Squad members are here to help! You can also check our [Astro Integration Documentation][astro-integration] for more on integrations. +### Meaningful error messages + +Currently, errors during running your application in Wrangler are not very useful, due to the minification of your code. For better debugging, you can add `vite.build.minify = false` setting to your `astro.config.js` + +```js +export default defineConfig({ + adapter: cloudflare(), + output: 'server', + + vite: { + build: { + minify: false + } + } +}); +``` + ## Contributing This package is maintained by Astro's Core team. You're welcome to submit an issue or PR! diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index e926f313f..59a7a984c 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/cloudflare", "description": "Deploy your site to Cloudflare Workers/Pages", - "version": "6.2.2", + "version": "6.2.3", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -38,7 +38,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^2.3.1" + "astro": "workspace:^2.3.2" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts index f5c4fc370..dd3ed7005 100644 --- a/packages/integrations/cloudflare/src/index.ts +++ b/packages/integrations/cloudflare/src/index.ts @@ -103,7 +103,7 @@ export default function createIntegration(args?: Options): AstroIntegration { allowOverwrite: true, format: 'esm', bundle: true, - minify: true, + minify: _config.vite?.build?.minify !== false, banner: { js: SHIM, }, diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 88556ce40..b05ea0846 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -33,7 +33,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.3.1" + "astro": "workspace:^2.3.2" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index a2fd5e70e..8f12944f8 100644 --- a/packages/integrations/image/package.json +++ b/packages/integrations/image/package.json @@ -63,7 +63,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.3.1", + "astro": "workspace:^2.3.2", "sharp": ">=0.31.0" }, "peerDependenciesMeta": { diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index 252063442..f7d416b4b 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -41,7 +41,7 @@ "zod": "^3.17.3" }, "peerDependencies": { - "astro": "workspace:^2.3.1" + "astro": "workspace:^2.3.2" }, "devDependencies": { "@types/chai": "^4.3.1", diff --git a/packages/integrations/mdx/test/fixtures/mdx-images/package.json b/packages/integrations/mdx/test/fixtures/mdx-images/package.json index 7ff215df1..b32f3d1a6 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-images/package.json +++ b/packages/integrations/mdx/test/fixtures/mdx-images/package.json @@ -1,5 +1,6 @@ { - "name": "@test/mdx-page", + "name": "@test/mdx-images", + "private": true, "dependencies": { "@astrojs/mdx": "workspace:*", "astro": "workspace:*", diff --git a/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json b/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json index 5d1ab5632..80b1b2f0c 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json +++ b/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json @@ -1,6 +1,7 @@ { "name": "@test/mdx-infinite-loop", "type": "module", + "private": true, "dependencies": { "@astrojs/mdx": "workspace:*", "@astrojs/preact": "workspace:*", diff --git a/packages/integrations/mdx/test/fixtures/mdx-namespace/package.json b/packages/integrations/mdx/test/fixtures/mdx-namespace/package.json index 68a482c21..c8cb139d2 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-namespace/package.json +++ b/packages/integrations/mdx/test/fixtures/mdx-namespace/package.json @@ -1,5 +1,6 @@ { "name": "@test/mdx-namespace", + "private": true, "dependencies": { "@astrojs/mdx": "workspace:*", "@astrojs/react": "workspace:*", diff --git a/packages/integrations/mdx/test/fixtures/mdx-page/package.json b/packages/integrations/mdx/test/fixtures/mdx-page/package.json index 7ff215df1..51eeeed27 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-page/package.json +++ b/packages/integrations/mdx/test/fixtures/mdx-page/package.json @@ -1,5 +1,6 @@ { "name": "@test/mdx-page", + "private": true, "dependencies": { "@astrojs/mdx": "workspace:*", "astro": "workspace:*", diff --git a/packages/integrations/mdx/test/fixtures/mdx-plus-react/package.json b/packages/integrations/mdx/test/fixtures/mdx-plus-react/package.json index a4c8bb5f4..6869dca09 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-plus-react/package.json +++ b/packages/integrations/mdx/test/fixtures/mdx-plus-react/package.json @@ -1,5 +1,6 @@ { "name": "@test/mdx-plus-react", + "private": true, "dependencies": { "@astrojs/mdx": "workspace:*", "@astrojs/react": "workspace:*", diff --git a/packages/integrations/mdx/test/fixtures/mdx-vite-env-vars/package.json b/packages/integrations/mdx/test/fixtures/mdx-vite-env-vars/package.json index d282c887e..b7c45b3e3 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-vite-env-vars/package.json +++ b/packages/integrations/mdx/test/fixtures/mdx-vite-env-vars/package.json @@ -1,5 +1,6 @@ { "name": "@test/mdx-env-variables", + "private": true, "dependencies": { "astro": "workspace:*", "@astrojs/mdx": "workspace:*" diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 5a96bb615..f2e029a96 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -39,7 +39,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.3.1" + "astro": "workspace:^2.3.2" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 341e2f4dc..da6885f44 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -35,7 +35,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^2.3.1" + "astro": "workspace:^2.3.2" }, "devDependencies": { "@types/send": "^0.17.1", @@ -46,6 +46,6 @@ "cheerio": "^1.0.0-rc.11", "mocha": "^9.2.2", "node-mocks-http": "^1.11.0", - "undici": "^5.20.0" + "undici": "^5.22.0" } } diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 21723cae1..ff00cfd63 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -33,7 +33,7 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "@sveltejs/vite-plugin-svelte": "^2.0.2", + "@sveltejs/vite-plugin-svelte": "^2.1.1", "svelte2tsx": "^0.5.11" }, "devDependencies": { @@ -43,7 +43,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.3.1", + "astro": "workspace:^2.3.2", "svelte": "^3.54.0" }, "engines": { diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index afc3bc0a5..a69429b51 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -28,19 +28,19 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "@proload/core": "^0.3.2", - "autoprefixer": "^10.4.7", - "postcss": "^8.4.14", + "@proload/core": "^0.3.3", + "autoprefixer": "^10.4.14", + "postcss": "^8.4.23", "postcss-load-config": "^4.0.1" }, "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "tailwindcss": "^3.0.24", + "tailwindcss": "^3.3.2", "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.3.1", + "astro": "workspace:^2.3.2", "tailwindcss": "^3.0.24" }, "pnpm": { diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index e46621d1f..56e160623 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -53,7 +53,7 @@ "web-vitals": "^3.1.1" }, "peerDependencies": { - "astro": "workspace:^2.3.1" + "astro": "workspace:^2.3.2" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.2", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index dd4c60e9f..09a7d2d32 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -50,7 +50,7 @@ "vue": "^3.2.37" }, "peerDependencies": { - "astro": "workspace:^2.3.1", + "astro": "workspace:^2.3.2", "vue": "^3.2.30" }, "engines": { diff --git a/packages/markdown/component/test/fixtures/astro-markdown-plugins/package.json b/packages/markdown/component/test/fixtures/astro-markdown-plugins/package.json index 77481c297..62a1cfa98 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown-plugins/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown-plugins/package.json @@ -1,5 +1,5 @@ { - "name": "@test/astro-markdown-component-plugins", + "name": "@test/astro-markdown-component-astro-markdown-component-plugins", "version": "0.0.0", "private": true, "dependencies": { diff --git a/packages/markdown/component/test/fixtures/astro-markdown-shiki/langs/package.json b/packages/markdown/component/test/fixtures/astro-markdown-shiki/langs/package.json index ecf89dba4..98e1b2806 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown-shiki/langs/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown-shiki/langs/package.json @@ -1,5 +1,5 @@ { - "name": "@test/astro-markdown-skiki-langs", + "name": "@test/astro-markdown-component-astro-markdown-shiki-langs", "version": "0.0.0", "private": true, "dependencies": { diff --git a/packages/markdown/component/test/fixtures/astro-markdown-shiki/normal/package.json b/packages/markdown/component/test/fixtures/astro-markdown-shiki/normal/package.json index 6b54139e4..21082f4ee 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown-shiki/normal/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown-shiki/normal/package.json @@ -1,5 +1,5 @@ { - "name": "@test/astro-markdown-skiki-normal", + "name": "@test/astro-markdown-component-astro-markdown-shiki-normal", "version": "0.0.0", "private": true, "dependencies": { diff --git a/packages/markdown/component/test/fixtures/astro-markdown-shiki/package.json b/packages/markdown/component/test/fixtures/astro-markdown-shiki/package.json index 876b42a66..e25b78c20 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown-shiki/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown-shiki/package.json @@ -1,5 +1,5 @@ { - "name": "@test/astro-markdown-component-shiki", + "name": "@test/astro-markdown-component-astro-markdown-component-shiki", "version": "0.0.0", "private": true, "dependencies": { diff --git a/packages/markdown/component/test/fixtures/astro-markdown-shiki/themes-custom/package.json b/packages/markdown/component/test/fixtures/astro-markdown-shiki/themes-custom/package.json index fd2a6e55f..f42a39c06 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown-shiki/themes-custom/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown-shiki/themes-custom/package.json @@ -1,5 +1,5 @@ { - "name": "@test/astro-markdown-skiki-themes-custom", + "name": "@test/astro-markdown-component-astro-markdown-shiki-themes-custom", "version": "0.0.0", "private": true, "dependencies": { diff --git a/packages/markdown/component/test/fixtures/astro-markdown-shiki/themes-integrated/package.json b/packages/markdown/component/test/fixtures/astro-markdown-shiki/themes-integrated/package.json index b4c652551..d4e1c515a 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown-shiki/themes-integrated/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown-shiki/themes-integrated/package.json @@ -1,5 +1,5 @@ { - "name": "@test/astro-markdown-skiki-themes-integrated", + "name": "@test/astro-markdown-component-astro-markdown-shiki-themes-integrated", "version": "0.0.0", "private": true, "dependencies": { diff --git a/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-false/package.json b/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-false/package.json index 13fd7a90a..9e593db67 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-false/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-false/package.json @@ -1,5 +1,5 @@ { - "name": "@test/astro-markdown-skiki-wrap-false", + "name": "@test/astro-markdown-component-astro-markdown-shiki-wrap-false", "version": "0.0.0", "private": true, "dependencies": { diff --git a/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-null/package.json b/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-null/package.json index 6e1b2e8e6..a32cc28b6 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-null/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-null/package.json @@ -1,5 +1,5 @@ { - "name": "@test/astro-markdown-skiki-wrap-null", + "name": "@test/astro-markdown-component-astro-markdown-shiki-wrap-null", "version": "0.0.0", "private": true, "dependencies": { diff --git a/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-true/package.json b/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-true/package.json index e51b0a746..d3440f66f 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-true/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown-shiki/wrap-true/package.json @@ -1,5 +1,5 @@ { - "name": "@test/astro-markdown-skiki-wrap-true", + "name": "@test/astro-markdown-component-astro-markdown-shiki-wrap-true", "version": "0.0.0", "private": true, "dependencies": { diff --git a/packages/markdown/component/test/fixtures/astro-markdown/package.json b/packages/markdown/component/test/fixtures/astro-markdown/package.json index 8dec19e14..307a2910f 100644 --- a/packages/markdown/component/test/fixtures/astro-markdown/package.json +++ b/packages/markdown/component/test/fixtures/astro-markdown/package.json @@ -1,5 +1,5 @@ { - "name": "@test/astro-markdown-component", + "name": "@test/astro-markdown-component-astro-markdown-component", "version": "0.0.0", "private": true, "dependencies": { diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 2095775a9..74f3fd637 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -32,7 +32,7 @@ "dset": "^3.1.2", "is-docker": "^3.0.0", "is-wsl": "^2.2.0", - "undici": "^5.20.0", + "undici": "^5.22.0", "which-pm-runs": "^1.1.0" }, "devDependencies": { diff --git a/packages/webapi/package.json b/packages/webapi/package.json index 346d186c8..ef7920102 100644 --- a/packages/webapi/package.json +++ b/packages/webapi/package.json @@ -50,7 +50,7 @@ "bugs": "https://github.com/withastro/astro/issues", "homepage": "https://github.com/withastro/astro/tree/main/packages/webapi#readme", "dependencies": { - "undici": "5.20.0" + "undici": "^5.22.0" }, "devDependencies": { "@rollup/plugin-alias": "^3.1.9", diff --git a/patches/@changesets__cli@2.23.0.patch b/patches/@changesets__cli@2.26.1.patch similarity index 88% rename from patches/@changesets__cli@2.23.0.patch rename to patches/@changesets__cli@2.26.1.patch index 621c0596e..22baa97df 100644 --- a/patches/@changesets__cli@2.23.0.patch +++ b/patches/@changesets__cli@2.26.1.patch @@ -1,5 +1,5 @@ diff --git a/dist/cli.cjs.dev.js b/dist/cli.cjs.dev.js -index 5511d0c05d3b7472876dcc8410e938ccf612654f..aa75e3982b68e1226ba1877a7f32017e517480f5 100644 +index 73ab02a861b1f5a8e1bf10984340a0a6b1518b15..2309d78fb1ff07428bc76136d9eb4f4d8d6571cc 100644 --- a/dist/cli.cjs.dev.js +++ b/dist/cli.cjs.dev.js @@ -279,6 +279,9 @@ async function confirmMajorRelease(pkgJSON) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 78ebfde8e..64614a659 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,9 +6,9 @@ overrides: packageExtensionsChecksum: 01871422d489547c532184effb134b35 patchedDependencies: - '@changesets/cli@2.23.0': - hash: kcozqtpxuwjzskw6zg5royevn4 - path: patches/@changesets__cli@2.23.0.patch + '@changesets/cli@2.26.1': + hash: rpibscpwt2erpjuy2wpxneagme + path: patches/@changesets__cli@2.26.1.patch importers: @@ -22,14 +22,11 @@ importers: version: link:benchmark devDependencies: '@changesets/changelog-github': - specifier: 0.4.4 - version: 0.4.4 + specifier: 0.4.8 + version: 0.4.8 '@changesets/cli': - specifier: 2.23.0 - version: 2.23.0(patch_hash=kcozqtpxuwjzskw6zg5royevn4) - '@octokit/action': - specifier: ^3.18.1 - version: 3.18.1 + specifier: 2.26.1 + version: 2.26.1(patch_hash=rpibscpwt2erpjuy2wpxneagme) '@types/node': specifier: ^18.7.21 version: 18.7.21 @@ -39,9 +36,6 @@ importers: '@typescript-eslint/parser': specifier: ^5.58.0 version: 5.58.0(eslint@8.38.0)(typescript@5.0.2) - del: - specifier: ^7.0.0 - version: 7.0.0 esbuild: specifier: ^0.17.12 version: 0.17.12 @@ -57,9 +51,6 @@ importers: eslint-plugin-prettier: specifier: ^4.2.1 version: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.38.0)(prettier@2.8.7) - execa: - specifier: ^6.1.0 - version: 6.1.0 only-allow: specifier: ^1.1.1 version: 1.1.1 @@ -72,15 +63,12 @@ importers: prettier-plugin-astro: specifier: ^0.8.0 version: 0.8.0 - pretty-bytes: - specifier: ^6.0.0 - version: 6.0.0 tiny-glob: specifier: ^0.2.9 version: 0.2.9 turbo: - specifier: 1.2.5 - version: 1.2.5 + specifier: ^1.9.3 + version: 1.9.3 typescript: specifier: ~5.0.2 version: 5.0.2 @@ -140,7 +128,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro examples/blog: @@ -149,25 +137,25 @@ importers: specifier: ^0.19.0 version: link:../../packages/integrations/mdx '@astrojs/rss': - specifier: ^2.3.2 + specifier: ^2.4.0 version: link:../../packages/astro-rss '@astrojs/sitemap': specifier: ^1.2.2 version: link:../../packages/integrations/sitemap astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro examples/deno: dependencies: astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro devDependencies: '@astrojs/deno': @@ -201,7 +189,7 @@ importers: specifier: ^18.0.0 version: 18.0.6 astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro preact: specifier: ^10.7.3 @@ -229,7 +217,7 @@ importers: specifier: ^3.10.2 version: 3.10.2 astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro examples/framework-lit: @@ -241,7 +229,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro lit: specifier: ^2.7.0 @@ -265,7 +253,7 @@ importers: specifier: ^2.1.1 version: link:../../packages/integrations/vue astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro preact: specifier: ^10.7.3 @@ -295,7 +283,7 @@ importers: specifier: ^1.1.0 version: 1.1.1(preact@10.11.0) astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro preact: specifier: ^10.7.3 @@ -313,7 +301,7 @@ importers: specifier: ^18.0.5 version: 18.0.6 astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro react: specifier: ^18.1.0 @@ -328,7 +316,7 @@ importers: specifier: ^2.1.0 version: link:../../packages/integrations/solid astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro solid-js: specifier: ^1.4.3 @@ -340,7 +328,7 @@ importers: specifier: ^2.1.0 version: link:../../packages/integrations/svelte astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro svelte: specifier: ^3.48.0 @@ -352,7 +340,7 @@ importers: specifier: ^2.1.1 version: link:../../packages/integrations/vue astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro vue: specifier: ^3.2.37 @@ -364,31 +352,31 @@ importers: specifier: ^5.1.1 version: link:../../packages/integrations/node astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro examples/minimal: dependencies: astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro examples/ssr: @@ -400,7 +388,7 @@ importers: specifier: ^2.1.0 version: link:../../packages/integrations/svelte astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro concurrently: specifier: ^7.2.1 @@ -421,7 +409,7 @@ importers: specifier: ^0.1.1 version: link:../../packages/integrations/markdoc astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro kleur: specifier: ^4.1.5 @@ -433,7 +421,7 @@ importers: specifier: ^2.1.4 version: link:../../packages/markdown/remark astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro hast-util-select: specifier: 5.0.1 @@ -454,7 +442,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro examples/with-mdx: @@ -466,7 +454,7 @@ importers: specifier: ^2.1.0 version: link:../../packages/integrations/preact astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro preact: specifier: ^10.6.5 @@ -481,7 +469,7 @@ importers: specifier: ^0.1.3 version: 0.1.3(nanostores@0.5.12)(preact@10.11.0) astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro nanostores: specifier: ^0.5.12 @@ -502,25 +490,25 @@ importers: specifier: ^1.4.3 version: 1.4.3 astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro autoprefixer: - specifier: ^10.4.7 - version: 10.4.7(postcss@8.4.14) + specifier: ^10.4.14 + version: 10.4.14(postcss@8.4.23) canvas-confetti: specifier: ^1.5.1 version: 1.5.1 postcss: - specifier: ^8.4.14 - version: 8.4.14 + specifier: ^8.4.23 + version: 8.4.23 tailwindcss: - specifier: ^3.0.24 - version: 3.2.4(postcss@8.4.14) + specifier: ^3.3.2 + version: 3.3.2 examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.11.11 @@ -532,7 +520,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^2.3.1 + specifier: ^2.3.2 version: link:../../packages/astro vitest: specifier: ^0.20.3 @@ -812,8 +800,8 @@ importers: specifier: ^1.1.0 version: 1.1.0 undici: - specifier: ^5.20.0 - version: 5.20.0 + specifier: ^5.22.0 + version: 5.22.0 unified: specifier: ^10.1.2 version: 10.1.2 @@ -1483,14 +1471,14 @@ importers: specifier: workspace:* version: link:../../.. autoprefixer: - specifier: ^10.4.7 - version: 10.4.7(postcss@8.4.14) + specifier: ^10.4.14 + version: 10.4.14(postcss@8.4.23) postcss: - specifier: ^8.4.14 - version: 8.4.14 + specifier: ^8.4.23 + version: 8.4.23 tailwindcss: - specifier: ^3.0.24 - version: 3.2.4(postcss@8.4.14) + specifier: ^3.3.2 + version: 3.3.2 packages/astro/e2e/fixtures/ts-resolution: dependencies: @@ -2390,7 +2378,7 @@ importers: packages/astro/test/fixtures/css-assets: dependencies: - '@astrojs/test-font-awesome-package': + '@test/astro-font-awesome-package': specifier: file:packages/font-awesome version: file:packages/astro/test/fixtures/css-assets/packages/font-awesome astro: @@ -2749,10 +2737,10 @@ importers: packages/astro/test/fixtures/multiple-renderers: dependencies: - '@astrojs/renderer-one': + '@test/astro-renderer-one': specifier: file:./renderers/one version: file:packages/astro/test/fixtures/multiple-renderers/renderers/one - '@astrojs/renderer-two': + '@test/astro-renderer-two': specifier: file:./renderers/two version: file:packages/astro/test/fixtures/multiple-renderers/renderers/two astro: @@ -2802,11 +2790,11 @@ importers: specifier: workspace:* version: link:../../.. autoprefixer: - specifier: ^10.4.7 - version: 10.4.7(postcss@8.4.14) + specifier: ^10.4.14 + version: 10.4.14(postcss@8.4.23) postcss: - specifier: ^8.4.14 - version: 8.4.14 + specifier: ^8.4.23 + version: 8.4.23 solid-js: specifier: ^1.5.6 version: 1.5.6 @@ -2819,7 +2807,7 @@ importers: devDependencies: postcss-preset-env: specifier: ^7.7.1 - version: 7.7.1(postcss@8.4.14) + version: 7.7.1(postcss@8.4.23) packages/astro/test/fixtures/preact-compat-component: dependencies: @@ -3334,14 +3322,14 @@ importers: specifier: workspace:* version: link:../../.. autoprefixer: - specifier: ^10.4.7 - version: 10.4.7(postcss@8.4.14) + specifier: ^10.4.14 + version: 10.4.14(postcss@8.4.23) postcss: - specifier: ^8.4.14 - version: 8.4.14 + specifier: ^8.4.23 + version: 8.4.23 tailwindcss: - specifier: ^3.0.24 - version: 3.2.4(postcss@8.4.14) + specifier: ^3.3.2 + version: 3.3.2 packages/astro/test/fixtures/tailwindcss-ts: dependencies: @@ -3352,11 +3340,11 @@ importers: specifier: workspace:* version: link:../../.. postcss: - specifier: '>=8.3.3 <9.0.0' - version: 8.4.14 + specifier: ^8.4.23 + version: 8.4.23 tailwindcss: - specifier: ^3.2.4 - version: 3.2.4(postcss@8.4.14) + specifier: ^3.3.2 + version: 3.3.2 packages/astro/test/fixtures/third-party-astro: dependencies: @@ -4309,8 +4297,8 @@ importers: specifier: ^1.11.0 version: 1.11.0 undici: - specifier: ^5.20.0 - version: 5.20.0 + specifier: ^5.22.0 + version: 5.22.0 packages/integrations/node/test/fixtures/api-route: dependencies: @@ -4549,8 +4537,8 @@ importers: packages/integrations/svelte: dependencies: '@sveltejs/vite-plugin-svelte': - specifier: ^2.0.2 - version: 2.0.2(svelte@3.54.0)(vite@4.3.1) + specifier: ^2.1.1 + version: 2.1.1(svelte@3.54.0)(vite@4.3.1) svelte2tsx: specifier: ^0.5.11 version: 0.5.11(svelte@3.54.0)(typescript@5.0.2) @@ -4571,17 +4559,17 @@ importers: packages/integrations/tailwind: dependencies: '@proload/core': - specifier: ^0.3.2 - version: 0.3.2 + specifier: ^0.3.3 + version: 0.3.3 autoprefixer: - specifier: ^10.4.7 - version: 10.4.7(postcss@8.4.14) + specifier: ^10.4.14 + version: 10.4.14(postcss@8.4.23) postcss: - specifier: ^8.4.14 - version: 8.4.14 + specifier: ^8.4.23 + version: 8.4.23 postcss-load-config: specifier: ^4.0.1 - version: 4.0.1(postcss@8.4.14) + version: 4.0.1(postcss@8.4.23) devDependencies: astro: specifier: workspace:* @@ -4590,8 +4578,8 @@ importers: specifier: workspace:* version: link:../../../scripts tailwindcss: - specifier: ^3.0.24 - version: 3.2.4(postcss@8.4.14) + specifier: ^3.3.2 + version: 3.3.2 vite: specifier: ^4.3.1 version: 4.3.1(@types/node@18.7.21)(sass@1.52.2) @@ -4957,8 +4945,8 @@ importers: specifier: ^2.2.0 version: 2.2.0 undici: - specifier: ^5.20.0 - version: 5.20.0 + specifier: ^5.22.0 + version: 5.22.0 which-pm-runs: specifier: ^1.1.0 version: 1.1.0 @@ -4988,8 +4976,8 @@ importers: packages/webapi: dependencies: undici: - specifier: 5.20.0 - version: 5.20.0 + specifier: ^5.22.0 + version: 5.22.0 devDependencies: '@rollup/plugin-alias': specifier: ^3.1.9 @@ -5045,9 +5033,6 @@ importers: '@astrojs/webapi': specifier: workspace:* version: link:../packages/webapi - adm-zip: - specifier: ^0.5.9 - version: 0.5.9 arg: specifier: ^5.0.2 version: 5.0.2 @@ -5067,9 +5052,18 @@ importers: specifier: ^6.1.11 version: 6.1.11 devDependencies: + '@octokit/action': + specifier: ^3.18.1 + version: 3.18.1 + del: + specifier: ^7.0.0 + version: 7.0.0 esbuild-plugin-copy: specifier: ^2.0.2 version: 2.0.2(esbuild@0.17.12) + execa: + specifier: ^6.1.0 + version: 6.1.0 tsconfig-resolver: specifier: ^3.0.1 version: 3.0.1 @@ -5211,6 +5205,10 @@ packages: '@algolia/requester-common': 4.17.0 dev: false + /@alloc/quick-lru@5.2.0: + resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==} + engines: {node: '>=10'} + /@altano/tiny-async-pool@1.0.2: resolution: {integrity: sha512-qQzaI0TBUPdpjZ3qo5b2ziQY9MSNpbziH2ZrE5lvtUZL+kn9GwVuVJwoOubaoNkeDB+rqEefnpu1k+oMpOCYiw==} dev: false @@ -6920,8 +6918,8 @@ packages: '@changesets/types': 5.2.1 dev: true - /@changesets/changelog-github@0.4.4: - resolution: {integrity: sha512-htSILqCkyYtTB5/LoVKwx7GCJQGxAiBcYbfUKWiz/QoDARuM01owYtMXhV6/iytJZq/Dqqz3PjMZUNB4MphpbQ==} + /@changesets/changelog-github@0.4.8: + resolution: {integrity: sha512-jR1DHibkMAb5v/8ym77E4AMNWZKB5NPzw5a5Wtqm1JepAuIF+hrKp2u04NKM14oBZhHglkCfrla9uq8ORnK/dw==} dependencies: '@changesets/get-github-info': 0.5.2 '@changesets/types': 5.2.1 @@ -6930,8 +6928,8 @@ packages: - encoding dev: true - /@changesets/cli@2.23.0(patch_hash=kcozqtpxuwjzskw6zg5royevn4): - resolution: {integrity: sha512-Gi3tMi0Vr6eNd8GX6q73tbOm9XOzGfuLEm4PYVeWG2neg5DlRGNOjYwrFULJ/An3N9MHtHn4r5h1Qvnju9Ijug==} + /@changesets/cli@2.26.1(patch_hash=rpibscpwt2erpjuy2wpxneagme): + resolution: {integrity: sha512-XnTa+b51vt057fyAudvDKGB0Sh72xutQZNAdXkCqPBKO2zvs2yYZx5hFZj1u9cbtpwM6Sxtcr02/FQJfZOzemQ==} hasBin: true dependencies: '@babel/runtime': 7.21.0 @@ -6942,12 +6940,12 @@ packages: '@changesets/errors': 0.1.4 '@changesets/get-dependents-graph': 1.3.5 '@changesets/get-release-plan': 3.0.16 - '@changesets/git': 1.5.0 + '@changesets/git': 2.0.0 '@changesets/logger': 0.0.5 '@changesets/pre': 1.0.14 '@changesets/read': 0.5.9 '@changesets/types': 5.2.1 - '@changesets/write': 0.1.9 + '@changesets/write': 0.2.3 '@manypkg/get-packages': 1.1.3 '@types/is-ci': 3.0.0 '@types/semver': 6.2.3 @@ -7023,17 +7021,6 @@ packages: resolution: {integrity: sha512-SVqwYs5pULYjYT4op21F2pVbcrca4qA/bAA3FmFXKMN7Y+HcO8sbZUTx3TAy2VXulP2FACd1aC7f2nTuqSPbqg==} dev: true - /@changesets/git@1.5.0: - resolution: {integrity: sha512-Xo8AT2G7rQJSwV87c8PwMm6BAc98BnufRMsML7m7Iw8Or18WFvFmxqG5aOL5PBvhgq9KrKvaeIBNIymracSuHg==} - dependencies: - '@babel/runtime': 7.21.0 - '@changesets/errors': 0.1.4 - '@changesets/types': 5.2.1 - '@manypkg/get-packages': 1.1.3 - is-subdir: 1.2.0 - spawndamnit: 2.0.0 - dev: true - /@changesets/git@2.0.0: resolution: {integrity: sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==} dependencies: @@ -7090,14 +7077,14 @@ packages: resolution: {integrity: sha512-myLfHbVOqaq9UtUKqR/nZA/OY7xFjQMdfgfqeZIBK4d0hA6pgxArvdv8M+6NUzzBsjWLOtvApv8YHr4qM+Kpfg==} dev: true - /@changesets/write@0.1.9: - resolution: {integrity: sha512-E90ZrsrfJVOOQaP3Mm5Xd7uDwBAqq3z5paVEavTHKA8wxi7NAL8CmjgbGxSFuiP7ubnJA2BuHlrdE4z86voGOg==} + /@changesets/write@0.2.3: + resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==} dependencies: '@babel/runtime': 7.21.0 '@changesets/types': 5.2.1 fs-extra: 7.0.1 human-id: 1.0.2 - prettier: 1.19.1 + prettier: 2.8.7 dev: true /@cloudflare/kv-asset-handler@0.2.0: @@ -7113,128 +7100,128 @@ packages: dev: false optional: true - /@csstools/postcss-cascade-layers@1.1.1(postcss@8.4.14): + /@csstools/postcss-cascade-layers@1.1.1(postcss@8.4.23): resolution: {integrity: sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.11) - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true - /@csstools/postcss-color-function@1.1.1(postcss@8.4.14): + /@csstools/postcss-color-function@1.1.1(postcss@8.4.23): resolution: {integrity: sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.14) - postcss: 8.4.14 + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-font-format-keywords@1.0.1(postcss@8.4.14): + /@csstools/postcss-font-format-keywords@1.0.1(postcss@8.4.23): resolution: {integrity: sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-hwb-function@1.0.2(postcss@8.4.14): + /@csstools/postcss-hwb-function@1.0.2(postcss@8.4.23): resolution: {integrity: sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-ic-unit@1.0.1(postcss@8.4.14): + /@csstools/postcss-ic-unit@1.0.1(postcss@8.4.23): resolution: {integrity: sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.14) - postcss: 8.4.14 + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-is-pseudo-class@2.0.7(postcss@8.4.14): + /@csstools/postcss-is-pseudo-class@2.0.7(postcss@8.4.23): resolution: {integrity: sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.11) - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true - /@csstools/postcss-normalize-display-values@1.0.1(postcss@8.4.14): + /@csstools/postcss-normalize-display-values@1.0.1(postcss@8.4.23): resolution: {integrity: sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-oklab-function@1.1.1(postcss@8.4.14): + /@csstools/postcss-oklab-function@1.1.1(postcss@8.4.23): resolution: {integrity: sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.14) - postcss: 8.4.14 + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-progressive-custom-properties@1.3.0(postcss@8.4.14): + /@csstools/postcss-progressive-custom-properties@1.3.0(postcss@8.4.23): resolution: {integrity: sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.3 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-stepped-value-functions@1.0.1(postcss@8.4.14): + /@csstools/postcss-stepped-value-functions@1.0.1(postcss@8.4.23): resolution: {integrity: sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-trigonometric-functions@1.0.2(postcss@8.4.14): + /@csstools/postcss-trigonometric-functions@1.0.2(postcss@8.4.23): resolution: {integrity: sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==} engines: {node: ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-unset-value@1.0.2(postcss@8.4.14): + /@csstools/postcss-unset-value@1.0.2(postcss@8.4.23): resolution: {integrity: sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 dev: true /@csstools/selector-specificity@2.2.0(postcss-selector-parser@6.0.11): @@ -7604,17 +7591,14 @@ packages: '@jridgewell/set-array': 1.1.2 '@jridgewell/sourcemap-codec': 1.4.15 '@jridgewell/trace-mapping': 0.3.18 - dev: false /@jridgewell/resolve-uri@3.1.0: resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} engines: {node: '>=6.0.0'} - dev: false /@jridgewell/set-array@1.1.2: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} engines: {node: '>=6.0.0'} - dev: false /@jridgewell/source-map@0.3.3: resolution: {integrity: sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==} @@ -7625,7 +7609,6 @@ packages: /@jridgewell/sourcemap-codec@1.4.14: resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} - dev: false /@jridgewell/sourcemap-codec@1.4.15: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} @@ -7635,7 +7618,6 @@ packages: dependencies: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.14 - dev: false /@jsdevtools/rehype-toc@3.0.2: resolution: {integrity: sha512-n5JEf16Wr4mdkRMZ8wMP/wN9/sHmTjRPbouXjJH371mZ2LEGDl72t8tEsMRNFerQN/QJtivOxqK1frdGa4QK5Q==} @@ -8160,8 +8142,8 @@ packages: preact: 10.11.0 dev: false - /@proload/core@0.3.2: - resolution: {integrity: sha512-4ga4HpS0ieVYWVMS+F62W++6SNACBu0lkw8snw3tEdH6AeqZu8i8262n3I81jWAWXVcg3sMfhb+kBexrfGrTUQ==} + /@proload/core@0.3.3: + resolution: {integrity: sha512-7dAFWsIK84C90AMl24+N/ProHKm4iw0akcnoKjRvbfHifJZBLhaDsDus1QJmhG12lXj4e/uB/8mB/0aduCW+NQ==} dependencies: deepmerge: 4.3.1 escalade: 3.1.1 @@ -8335,8 +8317,8 @@ packages: string.prototype.matchall: 4.0.8 dev: false - /@sveltejs/vite-plugin-svelte@2.0.2(svelte@3.54.0)(vite@4.3.1): - resolution: {integrity: sha512-xCEan0/NNpQuL0l5aS42FjwQ6wwskdxC3pW1OeFtEKNZwRg7Evro9lac9HesGP6TdFsTv2xMes5ASQVKbCacxg==} + /@sveltejs/vite-plugin-svelte@2.1.1(svelte@3.54.0)(vite@4.3.1): + resolution: {integrity: sha512-7YeBDt4us0FiIMNsVXxyaP4Hwyn2/v9x3oqStkHU3ZdIc5O22pGwUwH33wUqYo+7Itdmo8zxJ45Qvfm3H7UUjQ==} engines: {node: ^14.18.0 || >= 16} peerDependencies: svelte: ^3.54.0 @@ -8348,7 +8330,7 @@ packages: debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 - magic-string: 0.27.0 + magic-string: 0.30.0 svelte: 3.54.0 svelte-hmr: 0.15.1(svelte@3.54.0) vite: 4.3.1(@types/node@18.7.21)(sass@1.52.2) @@ -8370,7 +8352,7 @@ packages: /@ts-morph/common@0.16.0: resolution: {integrity: sha512-SgJpzkTgZKLKqQniCjLaE3c2L2sdL7UShvmTmPBejAKd2OKV/yfMpQ2IWpAuA+VY5wy7PkSUaEObIqEK6afFuw==} dependencies: - fast-glob: 3.2.11 + fast-glob: 3.2.12 minimatch: 5.1.6 mkdirp: 1.0.4 path-browserify: 1.0.1 @@ -9159,7 +9141,7 @@ packages: '@vue/shared': 3.2.39 estree-walker: 2.0.2 magic-string: 0.25.9 - postcss: 8.4.14 + postcss: 8.4.23 source-map: 0.6.1 dev: false @@ -9174,7 +9156,7 @@ packages: '@vue/shared': 3.2.40 estree-walker: 2.0.2 magic-string: 0.25.9 - postcss: 8.4.14 + postcss: 8.4.23 source-map: 0.6.1 /@vue/compiler-ssr@3.2.39: @@ -9297,16 +9279,10 @@ packages: dependencies: acorn: 8.8.1 - /acorn-node@1.8.2: - resolution: {integrity: sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==} - dependencies: - acorn: 7.4.1 - acorn-walk: 7.2.0 - xtend: 4.0.2 - /acorn-walk@7.2.0: resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==} engines: {node: '>=0.4.0'} + dev: true /acorn-walk@8.2.0: resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==} @@ -9317,17 +9293,13 @@ packages: resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==} engines: {node: '>=0.4.0'} hasBin: true + dev: true /acorn@8.8.1: resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==} engines: {node: '>=0.4.0'} hasBin: true - /adm-zip@0.5.9: - resolution: {integrity: sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg==} - engines: {node: '>=6.0'} - dev: false - /agent-base@6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} @@ -9433,6 +9405,9 @@ packages: engines: {node: '>=12'} dev: false + /any-promise@1.3.0: + resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} + /anymatch@3.1.3: resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} engines: {node: '>= 8'} @@ -9577,8 +9552,8 @@ packages: timestring: 6.0.0 dev: false - /autoprefixer@10.4.7(postcss@8.4.14): - resolution: {integrity: sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==} + /autoprefixer@10.4.14(postcss@8.4.23): + resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==} engines: {node: ^10 || ^12 || >=14} hasBin: true peerDependencies: @@ -9589,7 +9564,7 @@ packages: fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 /available-typed-arrays@1.0.5: @@ -10139,6 +10114,10 @@ packages: /commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} + /commander@4.1.1: + resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} + engines: {node: '>= 6'} + /commander@8.3.0: resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} engines: {node: '>= 12'} @@ -10264,36 +10243,36 @@ packages: engines: {node: '>=8'} dev: false - /css-blank-pseudo@3.0.3(postcss@8.4.14): + /css-blank-pseudo@3.0.3(postcss@8.4.23): resolution: {integrity: sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==} engines: {node: ^12 || ^14 || >=16} hasBin: true peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true - /css-has-pseudo@3.0.4(postcss@8.4.14): + /css-has-pseudo@3.0.4(postcss@8.4.23): resolution: {integrity: sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==} engines: {node: ^12 || ^14 || >=16} hasBin: true peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true - /css-prefers-color-scheme@6.0.3(postcss@8.4.14): + /css-prefers-color-scheme@6.0.3(postcss@8.4.23): resolution: {integrity: sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==} engines: {node: ^12 || ^14 || >=16} hasBin: true peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 dev: true /css-select@5.1.0: @@ -10504,9 +10483,6 @@ packages: has-property-descriptors: 1.0.0 object-keys: 1.1.1 - /defined@1.0.1: - resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==} - /defu@5.0.1: resolution: {integrity: sha512-EPS1carKg+dkEVy3qNTqIdp2qV7mUP08nIsupfwQpz++slCVRw7qbQyWvSTig+kFPwz2XXp5/kIIkH+CwrJKkQ==} dev: false @@ -10578,15 +10554,6 @@ packages: resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==} engines: {node: '>=8'} - /detective@5.2.1: - resolution: {integrity: sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==} - engines: {node: '>=0.8.0'} - hasBin: true - dependencies: - acorn-node: 1.8.2 - defined: 1.0.1 - minimist: 1.2.8 - /devalue@4.2.0: resolution: {integrity: sha512-mbjoAaCL2qogBKgeFxFPOXAUsZchircF+B/79LD4sHH0+NHfYm8gZpQrskKDn5gENGt35+5OI1GUF7hLVnkPDw==} @@ -11950,6 +11917,16 @@ packages: dependencies: is-glob: 4.0.3 + /glob@7.1.6: + resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 3.1.2 + once: 1.4.0 + path-is-absolute: 1.0.1 + /glob@7.2.0: resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==} dependencies: @@ -12009,7 +11986,7 @@ packages: '@types/glob': 7.2.0 array-union: 2.1.0 dir-glob: 3.0.1 - fast-glob: 3.2.11 + fast-glob: 3.2.12 glob: 7.2.3 ignore: 5.2.4 merge2: 1.4.1 @@ -12022,7 +11999,7 @@ packages: dependencies: array-union: 2.1.0 dir-glob: 3.0.1 - fast-glob: 3.2.11 + fast-glob: 3.2.12 ignore: 5.2.4 merge2: 1.4.1 slash: 3.0.0 @@ -12045,7 +12022,7 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: dir-glob: 3.0.1 - fast-glob: 3.2.11 + fast-glob: 3.2.12 ignore: 5.2.4 merge2: 1.4.1 slash: 4.0.0 @@ -12845,7 +12822,6 @@ packages: /jiti@1.18.2: resolution: {integrity: sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==} hasBin: true - dev: false /js-sdsl@4.4.0: resolution: {integrity: sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==} @@ -13025,7 +13001,6 @@ packages: /lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} - dev: true /linkedom@0.14.17: resolution: {integrity: sha512-PD6GQKvZ4s6Ai4/WkpyHc8MhiZdCz4hWmMOWJk+MO3/kl1QvPUbo4nQWS9+VHO7lRBk1ucIa9ONS9qzCUcBAmQ==} @@ -13227,6 +13202,13 @@ packages: dependencies: '@jridgewell/sourcemap-codec': 1.4.15 + /magic-string@0.30.0: + resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + dev: false + /make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} @@ -14065,6 +14047,13 @@ packages: hasBin: true dev: true + /mz@2.7.0: + resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} + dependencies: + any-promise: 1.3.0 + object-assign: 4.1.1 + thenify-all: 1.6.0 + /nanoid@3.3.1: resolution: {integrity: sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -14273,7 +14262,6 @@ packages: /object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} - dev: false /object-hash@3.0.0: resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} @@ -14655,6 +14643,10 @@ packages: resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} engines: {node: '>=6'} + /pirates@4.0.5: + resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==} + engines: {node: '>= 6'} + /pkg-dir@4.2.0: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} @@ -14687,220 +14679,204 @@ packages: resolution: {integrity: sha512-Hz/WvSNt5+7x+Rq1Cn6DetJOZxKtLDehJ1mLCYge6ju4QvSF/PHvRgy94e1SKJVI96AJTcqEdNwkkaAFad+TXQ==} dev: false - /postcss-attribute-case-insensitive@5.0.2(postcss@8.4.14): + /postcss-attribute-case-insensitive@5.0.2(postcss@8.4.23): resolution: {integrity: sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true - /postcss-clamp@4.1.0(postcss@8.4.14): + /postcss-clamp@4.1.0(postcss@8.4.23): resolution: {integrity: sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==} engines: {node: '>=7.6.0'} peerDependencies: postcss: ^8.4.6 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-color-functional-notation@4.2.4(postcss@8.4.14): + /postcss-color-functional-notation@4.2.4(postcss@8.4.23): resolution: {integrity: sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-color-hex-alpha@8.0.4(postcss@8.4.14): + /postcss-color-hex-alpha@8.0.4(postcss@8.4.23): resolution: {integrity: sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-color-rebeccapurple@7.1.1(postcss@8.4.14): + /postcss-color-rebeccapurple@7.1.1(postcss@8.4.23): resolution: {integrity: sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-custom-media@8.0.2(postcss@8.4.14): + /postcss-custom-media@8.0.2(postcss@8.4.23): resolution: {integrity: sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.3 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-custom-properties@12.1.11(postcss@8.4.14): + /postcss-custom-properties@12.1.11(postcss@8.4.23): resolution: {integrity: sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-custom-selectors@6.0.3(postcss@8.4.14): + /postcss-custom-selectors@6.0.3(postcss@8.4.23): resolution: {integrity: sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.3 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true - /postcss-dir-pseudo-class@6.0.5(postcss@8.4.14): + /postcss-dir-pseudo-class@6.0.5(postcss@8.4.23): resolution: {integrity: sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true - /postcss-double-position-gradients@3.1.2(postcss@8.4.14): + /postcss-double-position-gradients@3.1.2(postcss@8.4.23): resolution: {integrity: sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.14) - postcss: 8.4.14 + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-env-function@4.0.6(postcss@8.4.14): + /postcss-env-function@4.0.6(postcss@8.4.23): resolution: {integrity: sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-focus-visible@6.0.4(postcss@8.4.14): + /postcss-focus-visible@6.0.4(postcss@8.4.23): resolution: {integrity: sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true - /postcss-focus-within@5.0.4(postcss@8.4.14): + /postcss-focus-within@5.0.4(postcss@8.4.23): resolution: {integrity: sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true - /postcss-font-variant@5.0.0(postcss@8.4.14): + /postcss-font-variant@5.0.0(postcss@8.4.23): resolution: {integrity: sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 dev: true - /postcss-gap-properties@3.0.5(postcss@8.4.14): + /postcss-gap-properties@3.0.5(postcss@8.4.23): resolution: {integrity: sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 dev: true - /postcss-image-set-function@4.0.7(postcss@8.4.14): + /postcss-image-set-function@4.0.7(postcss@8.4.23): resolution: {integrity: sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-import@14.1.0(postcss@8.4.14): - resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==} - engines: {node: '>=10.0.0'} + /postcss-import@15.1.0(postcss@8.4.23): + resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==} + engines: {node: '>=14.0.0'} peerDependencies: postcss: ^8.0.0 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.2 - /postcss-initial@4.0.1(postcss@8.4.14): + /postcss-initial@4.0.1(postcss@8.4.23): resolution: {integrity: sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==} peerDependencies: postcss: ^8.0.0 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 dev: true - /postcss-js@4.0.1(postcss@8.4.14): + /postcss-js@4.0.1(postcss@8.4.23): resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==} engines: {node: ^12 || ^14 || >= 16} peerDependencies: postcss: ^8.4.21 dependencies: camelcase-css: 2.0.1 - postcss: 8.4.14 + postcss: 8.4.23 - /postcss-lab-function@4.2.1(postcss@8.4.14): + /postcss-lab-function@4.2.1(postcss@8.4.23): resolution: {integrity: sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.14) - postcss: 8.4.14 + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-load-config@3.1.4(postcss@8.4.14): - resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} - engines: {node: '>= 10'} - peerDependencies: - postcss: '>=8.0.9' - ts-node: '>=9.0.0' - peerDependenciesMeta: - postcss: - optional: true - ts-node: - optional: true - dependencies: - lilconfig: 2.1.0 - postcss: 8.4.14 - yaml: 1.10.2 - - /postcss-load-config@4.0.1(postcss@8.4.14): + /postcss-load-config@4.0.1(postcss@8.4.23): resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} engines: {node: '>= 14'} peerDependencies: @@ -14913,166 +14889,165 @@ packages: optional: true dependencies: lilconfig: 2.1.0 - postcss: 8.4.14 + postcss: 8.4.23 yaml: 2.2.1 - dev: false - /postcss-logical@5.0.4(postcss@8.4.14): + /postcss-logical@5.0.4(postcss@8.4.23): resolution: {integrity: sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.4 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 dev: true - /postcss-media-minmax@5.0.0(postcss@8.4.14): + /postcss-media-minmax@5.0.0(postcss@8.4.23): resolution: {integrity: sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==} engines: {node: '>=10.0.0'} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 dev: true - /postcss-nested@6.0.0(postcss@8.4.14): - resolution: {integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==} + /postcss-nested@6.0.1(postcss@8.4.23): + resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==} engines: {node: '>=12.0'} peerDependencies: postcss: ^8.2.14 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 - /postcss-nesting@10.2.0(postcss@8.4.14): + /postcss-nesting@10.2.0(postcss@8.4.23): resolution: {integrity: sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.11) - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true - /postcss-opacity-percentage@1.1.3(postcss@8.4.14): + /postcss-opacity-percentage@1.1.3(postcss@8.4.23): resolution: {integrity: sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 dev: true - /postcss-overflow-shorthand@3.0.4(postcss@8.4.14): + /postcss-overflow-shorthand@3.0.4(postcss@8.4.23): resolution: {integrity: sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-page-break@3.0.4(postcss@8.4.14): + /postcss-page-break@3.0.4(postcss@8.4.23): resolution: {integrity: sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==} peerDependencies: postcss: ^8 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 dev: true - /postcss-place@7.0.5(postcss@8.4.14): + /postcss-place@7.0.5(postcss@8.4.23): resolution: {integrity: sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-value-parser: 4.2.0 dev: true - /postcss-preset-env@7.7.1(postcss@8.4.14): + /postcss-preset-env@7.7.1(postcss@8.4.23): resolution: {integrity: sha512-1sx6+Nl1wMVJzaYLVaz4OAR6JodIN/Z1upmVqLwSPCLT6XyxrEoePgNMHPH08kseLe3z06i9Vfkt/32BYEKDeA==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/postcss-cascade-layers': 1.1.1(postcss@8.4.14) - '@csstools/postcss-color-function': 1.1.1(postcss@8.4.14) - '@csstools/postcss-font-format-keywords': 1.0.1(postcss@8.4.14) - '@csstools/postcss-hwb-function': 1.0.2(postcss@8.4.14) - '@csstools/postcss-ic-unit': 1.0.1(postcss@8.4.14) - '@csstools/postcss-is-pseudo-class': 2.0.7(postcss@8.4.14) - '@csstools/postcss-normalize-display-values': 1.0.1(postcss@8.4.14) - '@csstools/postcss-oklab-function': 1.1.1(postcss@8.4.14) - '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.14) - '@csstools/postcss-stepped-value-functions': 1.0.1(postcss@8.4.14) - '@csstools/postcss-trigonometric-functions': 1.0.2(postcss@8.4.14) - '@csstools/postcss-unset-value': 1.0.2(postcss@8.4.14) - autoprefixer: 10.4.7(postcss@8.4.14) + '@csstools/postcss-cascade-layers': 1.1.1(postcss@8.4.23) + '@csstools/postcss-color-function': 1.1.1(postcss@8.4.23) + '@csstools/postcss-font-format-keywords': 1.0.1(postcss@8.4.23) + '@csstools/postcss-hwb-function': 1.0.2(postcss@8.4.23) + '@csstools/postcss-ic-unit': 1.0.1(postcss@8.4.23) + '@csstools/postcss-is-pseudo-class': 2.0.7(postcss@8.4.23) + '@csstools/postcss-normalize-display-values': 1.0.1(postcss@8.4.23) + '@csstools/postcss-oklab-function': 1.1.1(postcss@8.4.23) + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.23) + '@csstools/postcss-stepped-value-functions': 1.0.1(postcss@8.4.23) + '@csstools/postcss-trigonometric-functions': 1.0.2(postcss@8.4.23) + '@csstools/postcss-unset-value': 1.0.2(postcss@8.4.23) + autoprefixer: 10.4.14(postcss@8.4.23) browserslist: 4.21.5 - css-blank-pseudo: 3.0.3(postcss@8.4.14) - css-has-pseudo: 3.0.4(postcss@8.4.14) - css-prefers-color-scheme: 6.0.3(postcss@8.4.14) + css-blank-pseudo: 3.0.3(postcss@8.4.23) + css-has-pseudo: 3.0.4(postcss@8.4.23) + css-prefers-color-scheme: 6.0.3(postcss@8.4.23) cssdb: 6.6.3 - postcss: 8.4.14 - postcss-attribute-case-insensitive: 5.0.2(postcss@8.4.14) - postcss-clamp: 4.1.0(postcss@8.4.14) - postcss-color-functional-notation: 4.2.4(postcss@8.4.14) - postcss-color-hex-alpha: 8.0.4(postcss@8.4.14) - postcss-color-rebeccapurple: 7.1.1(postcss@8.4.14) - postcss-custom-media: 8.0.2(postcss@8.4.14) - postcss-custom-properties: 12.1.11(postcss@8.4.14) - postcss-custom-selectors: 6.0.3(postcss@8.4.14) - postcss-dir-pseudo-class: 6.0.5(postcss@8.4.14) - postcss-double-position-gradients: 3.1.2(postcss@8.4.14) - postcss-env-function: 4.0.6(postcss@8.4.14) - postcss-focus-visible: 6.0.4(postcss@8.4.14) - postcss-focus-within: 5.0.4(postcss@8.4.14) - postcss-font-variant: 5.0.0(postcss@8.4.14) - postcss-gap-properties: 3.0.5(postcss@8.4.14) - postcss-image-set-function: 4.0.7(postcss@8.4.14) - postcss-initial: 4.0.1(postcss@8.4.14) - postcss-lab-function: 4.2.1(postcss@8.4.14) - postcss-logical: 5.0.4(postcss@8.4.14) - postcss-media-minmax: 5.0.0(postcss@8.4.14) - postcss-nesting: 10.2.0(postcss@8.4.14) - postcss-opacity-percentage: 1.1.3(postcss@8.4.14) - postcss-overflow-shorthand: 3.0.4(postcss@8.4.14) - postcss-page-break: 3.0.4(postcss@8.4.14) - postcss-place: 7.0.5(postcss@8.4.14) - postcss-pseudo-class-any-link: 7.1.6(postcss@8.4.14) - postcss-replace-overflow-wrap: 4.0.0(postcss@8.4.14) - postcss-selector-not: 6.0.1(postcss@8.4.14) + postcss: 8.4.23 + postcss-attribute-case-insensitive: 5.0.2(postcss@8.4.23) + postcss-clamp: 4.1.0(postcss@8.4.23) + postcss-color-functional-notation: 4.2.4(postcss@8.4.23) + postcss-color-hex-alpha: 8.0.4(postcss@8.4.23) + postcss-color-rebeccapurple: 7.1.1(postcss@8.4.23) + postcss-custom-media: 8.0.2(postcss@8.4.23) + postcss-custom-properties: 12.1.11(postcss@8.4.23) + postcss-custom-selectors: 6.0.3(postcss@8.4.23) + postcss-dir-pseudo-class: 6.0.5(postcss@8.4.23) + postcss-double-position-gradients: 3.1.2(postcss@8.4.23) + postcss-env-function: 4.0.6(postcss@8.4.23) + postcss-focus-visible: 6.0.4(postcss@8.4.23) + postcss-focus-within: 5.0.4(postcss@8.4.23) + postcss-font-variant: 5.0.0(postcss@8.4.23) + postcss-gap-properties: 3.0.5(postcss@8.4.23) + postcss-image-set-function: 4.0.7(postcss@8.4.23) + postcss-initial: 4.0.1(postcss@8.4.23) + postcss-lab-function: 4.2.1(postcss@8.4.23) + postcss-logical: 5.0.4(postcss@8.4.23) + postcss-media-minmax: 5.0.0(postcss@8.4.23) + postcss-nesting: 10.2.0(postcss@8.4.23) + postcss-opacity-percentage: 1.1.3(postcss@8.4.23) + postcss-overflow-shorthand: 3.0.4(postcss@8.4.23) + postcss-page-break: 3.0.4(postcss@8.4.23) + postcss-place: 7.0.5(postcss@8.4.23) + postcss-pseudo-class-any-link: 7.1.6(postcss@8.4.23) + postcss-replace-overflow-wrap: 4.0.0(postcss@8.4.23) + postcss-selector-not: 6.0.1(postcss@8.4.23) postcss-value-parser: 4.2.0 dev: true - /postcss-pseudo-class-any-link@7.1.6(postcss@8.4.14): + /postcss-pseudo-class-any-link@7.1.6(postcss@8.4.23): resolution: {integrity: sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true - /postcss-replace-overflow-wrap@4.0.0(postcss@8.4.14): + /postcss-replace-overflow-wrap@4.0.0(postcss@8.4.23): resolution: {integrity: sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==} peerDependencies: postcss: ^8.0.3 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 dev: true - /postcss-selector-not@6.0.1(postcss@8.4.14): + /postcss-selector-not@6.0.1(postcss@8.4.23): resolution: {integrity: sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==} engines: {node: ^12 || ^14 || >=16} peerDependencies: postcss: ^8.2 dependencies: - postcss: 8.4.14 + postcss: 8.4.23 postcss-selector-parser: 6.0.11 dev: true @@ -15086,16 +15061,8 @@ packages: /postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - /postcss@8.4.14: - resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==} - engines: {node: ^10 || ^12 || >=14} - dependencies: - nanoid: 3.3.6 - picocolors: 1.0.0 - source-map-js: 1.0.2 - - /postcss@8.4.21: - resolution: {integrity: sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==} + /postcss@8.4.23: + resolution: {integrity: sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.6 @@ -15182,12 +15149,6 @@ packages: synckit: 0.8.5 dev: true - /prettier@1.19.1: - resolution: {integrity: sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==} - engines: {node: '>=4'} - hasBin: true - dev: true - /prettier@2.8.7: resolution: {integrity: sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==} engines: {node: '>=10.13.0'} @@ -15201,6 +15162,7 @@ packages: /pretty-bytes@6.0.0: resolution: {integrity: sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==} engines: {node: ^14.13.1 || >=16.0.0} + dev: false /pretty-format@3.8.0: resolution: {integrity: sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==} @@ -15283,10 +15245,6 @@ packages: engines: {node: '>=8'} dev: true - /quick-lru@5.1.1: - resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==} - engines: {node: '>=10'} - /randombytes@2.1.0: resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==} dependencies: @@ -16393,6 +16351,19 @@ packages: minimist: 1.2.8 dev: false + /sucrase@3.32.0: + resolution: {integrity: sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==} + engines: {node: '>=8'} + hasBin: true + dependencies: + '@jridgewell/gen-mapping': 0.3.3 + commander: 4.1.1 + glob: 7.1.6 + lines-and-columns: 1.2.4 + mz: 2.7.0 + pirates: 4.0.5 + ts-interface-checker: 0.1.13 + /suf-log@2.5.3: resolution: {integrity: sha512-KvC8OPjzdNOe+xQ4XWJV2whQA0aM1kGVczMQ8+dStAO6KfEB140JEVQ9dE76ONZ0/Ylf67ni4tILPJB41U0eow==} dependencies: @@ -16474,36 +16445,34 @@ packages: '@pkgr/utils': 2.3.1 tslib: 2.5.0 - /tailwindcss@3.2.4(postcss@8.4.14): - resolution: {integrity: sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==} - engines: {node: '>=12.13.0'} + /tailwindcss@3.3.2: + resolution: {integrity: sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==} + engines: {node: '>=14.0.0'} hasBin: true - peerDependencies: - postcss: ^8.0.9 dependencies: + '@alloc/quick-lru': 5.2.0 arg: 5.0.2 chokidar: 3.5.3 - color-name: 1.1.4 - detective: 5.2.1 didyoumean: 1.2.2 dlv: 1.1.3 fast-glob: 3.2.12 glob-parent: 6.0.2 is-glob: 4.0.3 + jiti: 1.18.2 lilconfig: 2.1.0 micromatch: 4.0.5 normalize-path: 3.0.0 object-hash: 3.0.0 picocolors: 1.0.0 - postcss: 8.4.14 - postcss-import: 14.1.0(postcss@8.4.14) - postcss-js: 4.0.1(postcss@8.4.14) - postcss-load-config: 3.1.4(postcss@8.4.14) - postcss-nested: 6.0.0(postcss@8.4.14) + postcss: 8.4.23 + postcss-import: 15.1.0(postcss@8.4.23) + postcss-js: 4.0.1(postcss@8.4.23) + postcss-load-config: 4.0.1(postcss@8.4.23) + postcss-nested: 6.0.1(postcss@8.4.23) postcss-selector-parser: 6.0.11 postcss-value-parser: 4.2.0 - quick-lru: 5.1.1 resolve: 1.22.2 + sucrase: 3.32.0 transitivePeerDependencies: - ts-node @@ -16589,6 +16558,17 @@ packages: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} dev: true + /thenify-all@1.6.0: + resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} + engines: {node: '>=0.8'} + dependencies: + thenify: 3.3.1 + + /thenify@3.3.1: + resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} + dependencies: + any-promise: 1.3.0 + /throttles@1.0.1: resolution: {integrity: sha512-fab7Xg+zELr9KOv4fkaBoe/b3L0GMGLd0IBSCn16GoE/Qx6/OfCr1eGNyEcDU2pUA79qQfZ8kPQWlRuok4YwTw==} engines: {node: '>=6'} @@ -16683,6 +16663,9 @@ packages: /trough@2.1.0: resolution: {integrity: sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==} + /ts-interface-checker@0.1.13: + resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} + /ts-morph@15.1.0: resolution: {integrity: sha512-RBsGE2sDzUXFTnv8Ba22QfeuKbgvAGJFuTN7HfmIRUkgT/NaVLfDM/8OFm2NlFkGlWEXdpW5OaFIp1jvqdDuOg==} dependencies: @@ -16748,119 +16731,65 @@ packages: dependencies: safe-buffer: 5.2.1 - /turbo-darwin-64@1.2.5: - resolution: {integrity: sha512-AjMEF8hlA9vy1gXLHBruqgO42s0M0rKKZLQPM239wli5lKEprmxd8WMSjd9YmxRflS+/fwrXfjVl0QRhHjDIww==} + /turbo-darwin-64@1.9.3: + resolution: {integrity: sha512-0dFc2cWXl82kRE4Z+QqPHhbEFEpUZho1msHXHWbz5+PqLxn8FY0lEVOHkq5tgKNNEd5KnGyj33gC/bHhpZOk5g==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.2.5: - resolution: {integrity: sha512-2kj4+X9XMGF9o398qVo4HDsaoPy2kcl77X+EYlq2bROoQlGXRrR7R+i/qMvLh4tLsSQAm5eOqEbFyvtMkxT/xg==} + /turbo-darwin-arm64@1.9.3: + resolution: {integrity: sha512-1cYbjqLBA2zYE1nbf/qVnEkrHa4PkJJbLo7hnuMuGM0bPzh4+AnTNe98gELhqI1mkTWBu/XAEeF5u6dgz0jLNA==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-freebsd-64@1.2.5: - resolution: {integrity: sha512-29eQUiS/Fky7O8E0YzGh3EETPvMKmMDkFjJn4XtRGO+iZfkIxlqKnAUpT+8kx3nQ/5dAAoTGHflyf4FNEZaCKA==} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - - /turbo-freebsd-arm64@1.2.5: - resolution: {integrity: sha512-WRFmzgXqXurdRntPrEb7hcOM1Zfjse8OC/sH3V8R9QspYE+upZ42m9ePLt2n5N2shc4XLced/9VFdczx9549Tw==} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - - /turbo-linux-32@1.2.5: - resolution: {integrity: sha512-YBzKqXJEoORpPq7vwpNf9ovbVru9aQi7HD88fxYW1wvvuPdNx2ZAmjn8sEMZZPkndfOlf9fXgO3aXr0fjqUWMw==} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /turbo-linux-64@1.2.5: - resolution: {integrity: sha512-a85WEfOj4Cw0zd/wo1xoRmqW4kZHAz63nf+vWINyxZOK2H899TCUs+KJpgsacafU0fO36l1rsx2fdUDce/3Dww==} + /turbo-linux-64@1.9.3: + resolution: {integrity: sha512-UuBPFefawEwpuxh5pM9Jqq3q4C8M0vYxVYlB3qea/nHQ80pxYq7ZcaLGEpb10SGnr3oMUUs1zZvkXWDNKCJb8Q==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.2.5: - resolution: {integrity: sha512-ZtPQx9yw+iMT+sYPYcrtbCye7a/aj93gA2krir4MI+CDp69LuHLuZOOfc8u4JCxSJTbRLoYcwJrdfB9uBSddIQ==} + /turbo-linux-arm64@1.9.3: + resolution: {integrity: sha512-vUrNGa3hyDtRh9W0MkO+l1dzP8Co2gKnOVmlJQW0hdpOlWlIh22nHNGGlICg+xFa2f9j4PbQlWTsc22c019s8Q==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm@1.2.5: - resolution: {integrity: sha512-JlLk5cGmj5yRwBQuPMH36w5ZJg0sBfi+dxBZTkJUV9XM9MRgNUs0MkNnjh9ogGvB4R08HY4ud6XcyRdoKLs9pA==} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /turbo-linux-mips64le@1.2.5: - resolution: {integrity: sha512-3LLnEwKc5pf7MlUhwvq/ND2cx0f7v3LHK5587CVTQI9nnwgie42n5U168J7BPPPkIE0k0j4S1jeXU18DV3vWbA==} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /turbo-linux-ppc64le@1.2.5: - resolution: {integrity: sha512-1k4lBCu2jdQNF3KXjPAbOER5/j37AdBqHnuHB6JuiOocm+v3WgEfkctkqLrgow3q1HLeb4me3wGXstV//6dzSg==} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /turbo-windows-32@1.2.5: - resolution: {integrity: sha512-XT2g/kZopqARjs39MNVP5XysrK2R0P9QVnrRdVY72zgswLvvcvDI6SM5SPX/SWF4iLU5OEUlpCaUz5dJLGMGUw==} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /turbo-windows-64@1.2.5: - resolution: {integrity: sha512-Ut097JJv9qy/8cpHANB7/BH0uh2IZbUeSSRudTl8tfMX8ZEdla/NpJd+omMV4CwPRrZAO6SyKiTfeHFOt/6NgQ==} + /turbo-windows-64@1.9.3: + resolution: {integrity: sha512-0BZ7YaHs6r+K4ksqWus1GKK3W45DuDqlmfjm/yuUbTEVc8szmMCs12vugU2Zi5GdrdJSYfoKfEJ/PeegSLIQGQ==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.2.5: - resolution: {integrity: sha512-KXk5BGCaiSSXhtorrLUILB3OTqZ/uruIi0ggb0jSp55ZDSS+G/4OANw7y5QuRjizCpjwunb47AAOox/2Zn2nbA==} + /turbo-windows-arm64@1.9.3: + resolution: {integrity: sha512-QJUYLSsxdXOsR1TquiOmLdAgtYcQ/RuSRpScGvnZb1hY0oLc7JWU0llkYB81wVtWs469y8H9O0cxbKwCZGR4RQ==} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /turbo@1.9.3: + resolution: {integrity: sha512-ID7mxmaLUPKG/hVkp+h0VuucB1U99RPCJD9cEuSEOdIPoSIuomcIClEJtKamUsdPLhLCud+BvapBNnhgh58Nzw==} hasBin: true requiresBuild: true optionalDependencies: - turbo-darwin-64: 1.2.5 - turbo-darwin-arm64: 1.2.5 - turbo-freebsd-64: 1.2.5 - turbo-freebsd-arm64: 1.2.5 - turbo-linux-32: 1.2.5 - turbo-linux-64: 1.2.5 - turbo-linux-arm: 1.2.5 - turbo-linux-arm64: 1.2.5 - turbo-linux-mips64le: 1.2.5 - turbo-linux-ppc64le: 1.2.5 - turbo-windows-32: 1.2.5 - turbo-windows-64: 1.2.5 + turbo-darwin-64: 1.9.3 + turbo-darwin-arm64: 1.9.3 + turbo-linux-64: 1.9.3 + turbo-linux-arm64: 1.9.3 + turbo-windows-64: 1.9.3 + turbo-windows-arm64: 1.9.3 dev: true /turbolinks@5.2.0: @@ -16973,6 +16902,13 @@ packages: engines: {node: '>=12.18'} dependencies: busboy: 1.6.0 + dev: true + + /undici@5.22.0: + resolution: {integrity: sha512-fR9RXCc+6Dxav4P9VV/sp5w3eFiSdOjJYsbtWfd4s5L5C4ogyuVpdKIVHeW0vV1MloM65/f7W45nR9ZxwVdyiA==} + engines: {node: '>=14.0'} + dependencies: + busboy: 1.6.0 /unherit@3.0.1: resolution: {integrity: sha512-akOOQ/Yln8a2sgcLj4U0Jmx0R5jpIg2IUyRrWOzmEbjBtGzBdHtSeFKgoEcoH4KYIG/Pb8GQ/BwtYm0GCq1Sqg==} @@ -17309,7 +17245,7 @@ packages: dependencies: '@types/node': 18.7.21 esbuild: 0.15.18 - postcss: 8.4.21 + postcss: 8.4.23 resolve: 1.22.2 rollup: 2.79.1 optionalDependencies: @@ -17343,7 +17279,7 @@ packages: dependencies: '@types/node': 18.7.21 esbuild: 0.17.12 - postcss: 8.4.21 + postcss: 8.4.23 rollup: 3.20.6 sass: 1.52.2 optionalDependencies: @@ -17913,10 +17849,6 @@ packages: resolution: {integrity: sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==} dev: true - /xtend@4.0.2: - resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} - engines: {node: '>=0.4'} - /xxhash-wasm@1.0.2: resolution: {integrity: sha512-ibF0Or+FivM9lNrg+HGJfVX8WJqgo+kCLDc4vx6xMeTce7Aj+DLttKbxxRR/gNLSAelRc1omAPlJ77N/Jem07A==} dev: true @@ -17939,14 +17871,9 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - /yaml@1.10.2: - resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} - engines: {node: '>= 6'} - /yaml@2.2.1: resolution: {integrity: sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==} engines: {node: '>= 14'} - dev: false /yargs-parser@18.1.3: resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==} @@ -18045,19 +17972,19 @@ packages: file:packages/astro/test/fixtures/css-assets/packages/font-awesome: resolution: {directory: packages/astro/test/fixtures/css-assets/packages/font-awesome, type: directory} - name: '@astrojs/test-font-awesome-package' + name: '@test/astro-font-awesome-package' version: 0.0.1 dev: false file:packages/astro/test/fixtures/multiple-renderers/renderers/one: resolution: {directory: packages/astro/test/fixtures/multiple-renderers/renderers/one, type: directory} - name: '@astrojs/renderer-one' + name: '@test/astro-renderer-one' version: 1.0.0 dev: false file:packages/astro/test/fixtures/multiple-renderers/renderers/two: resolution: {directory: packages/astro/test/fixtures/multiple-renderers/renderers/two, type: directory} - name: '@astrojs/renderer-two' + name: '@test/astro-renderer-two' version: 1.0.0 dev: false diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index e40ca6514..be78c826e 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -5,3 +5,5 @@ packages: - 'scripts' - 'benchmark' - 'benchmark/packages/*' + # Below excludes are only for Turbo because it doesn't respect gitignore like pnpm does + - '!**/.vercel/**' diff --git a/scripts/package.json b/scripts/package.json index 7e01b42ff..47f65d972 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -9,7 +9,6 @@ }, "dependencies": { "@astrojs/webapi": "workspace:*", - "adm-zip": "^0.5.9", "arg": "^5.0.2", "esbuild": "^0.17.12", "globby": "^12.2.0", @@ -18,6 +17,9 @@ "tar": "^6.1.11" }, "devDependencies": { + "@octokit/action": "^3.18.1", + "del": "^7.0.0", + "execa": "^6.1.0", "esbuild-plugin-copy": "^2.0.2", "tsconfig-resolver": "^3.0.1" } diff --git a/turbo.json b/turbo.json index 813cdbdf6..43f9c00e7 100644 --- a/turbo.json +++ b/turbo.json @@ -1,28 +1,42 @@ { "$schema": "https://turborepo.org/schema.json", - "baseBranch": "origin/main", "pipeline": { "build": { "dependsOn": ["^build"], - "outputs": ["dist/**/*", "!vendor/**", "mod.js", "mod.js.map"] + "inputs": [ + "**/*", + "!test/**/*", + "!e2e/**/*", + "!performance/**/*", + "!.astro/**/*", + "!.cache/**/*", + "!mod.js", + "!mod.js.map" + ], + "outputs": ["dist/**/*", "!vendor/**", "mod.js", "mod.js.map"], + "outputMode": "new-only" }, "build:ci": { "dependsOn": ["^build:ci"], - "outputs": ["dist/**/*", "!vendor/**", "mod.js", "mod.js.map"] + "inputs": [ + "**/*", + "!test/**/*", + "!e2e/**/*", + "!performance/**/*", + "!.astro/**/*", + "!.cache/**/*", + "!mod.js", + "!mod.js.map" + ], + "outputs": ["dist/**/*", "!vendor/**", "mod.js", "mod.js.map"], + "outputMode": "new-only" }, "dev": { "cache": false }, "test": { - "outputs": [], - "dependsOn": ["$RUNNER_OS", "$NODE_VERSION"] - }, - "benchmark": { - "dependsOn": ["^build"], - "outputs": [] - }, - "lint": { - "outputs": [] + "env": ["RUNNER_OS", "NODE_VERSION"], + "outputMode": "new-only" } } }