diff --git a/.changeset/dull-moles-sell.md b/.changeset/dull-moles-sell.md new file mode 100644 index 000000000000..ba551c12acf6 --- /dev/null +++ b/.changeset/dull-moles-sell.md @@ -0,0 +1,5 @@ +--- +'@astrojs/solid-js': patch +--- + +Improve third-party solid packages config handling diff --git a/.changeset/four-donuts-reply.md b/.changeset/four-donuts-reply.md new file mode 100644 index 000000000000..5c15ad63002c --- /dev/null +++ b/.changeset/four-donuts-reply.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Support rendering `@motionone/solid` components diff --git a/.changeset/mighty-chairs-reply.md b/.changeset/mighty-chairs-reply.md new file mode 100644 index 000000000000..c72e330874a4 --- /dev/null +++ b/.changeset/mighty-chairs-reply.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix not included file extension in `url` metadata for newly added markdown files diff --git a/.changeset/new-pumas-begin.md b/.changeset/new-pumas-begin.md new file mode 100644 index 000000000000..f7f1d558a2b2 --- /dev/null +++ b/.changeset/new-pumas-begin.md @@ -0,0 +1,5 @@ +--- +'@astrojs/cloudflare': patch +--- + +Exports new runtime entrypoint's types diff --git a/.changeset/tasty-mugs-approve.md b/.changeset/tasty-mugs-approve.md new file mode 100644 index 000000000000..a30e9108be79 --- /dev/null +++ b/.changeset/tasty-mugs-approve.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Upgrade Vite to 3.2 diff --git a/.changeset/wicked-pans-wait.md b/.changeset/wicked-pans-wait.md new file mode 100644 index 000000000000..091e51c88004 --- /dev/null +++ b/.changeset/wicked-pans-wait.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Allow importing public files in SSR diff --git a/.github/workflows/check-merge.yml b/.github/workflows/check-merge.yml index f377df49abb3..9dc60dfd27e1 100644 --- a/.github/workflows/check-merge.yml +++ b/.github/workflows/check-merge.yml @@ -9,19 +9,23 @@ jobs: check: runs-on: ubuntu-latest steps: - - name: Retrieve existing PR reviews - id: set-reviews - run: | - echo ::set-output name=reviews::$(curl --request GET \ - --url https://api.github.com/repos/${{github.repository}}/pulls/${{github.event.number}}/reviews \ - --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}') - - name: Check if there is already a block on this PR id: set-blocks - run: | - echo ::set-output name=blocks::$(echo '${{ steps.set-reviews.outputs.reviews }}' \ - | jq '.[] | select(.user.id == 41898282 and .state == "CHANGES_REQUESTED") | length' \ - | uniq) + uses: actions/github-script@v6 + with: + script: | + const url = 'https://api.github.com/repos/' + context.repo.owner + '/' + context.repo.repo + '/pulls/' + context.issue.number + '/reviews'; + console.log('reviews URL', url); + const result = await github.request(url); + console.log(result); + const reviews = result.data; + for(const review of reviews) { + if(review.user.id === 41898282 && review.state === 'CHANGES_REQUESTED') { + return 'block'; + } + } + return ''; + result-encoding: string - uses: actions/checkout@v3 if: steps.set-blocks.outputs.blocks == '' diff --git a/packages/astro/package.json b/packages/astro/package.json index 6fbed246f5c6..2ff25b26785a 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -146,7 +146,7 @@ "recast": "^0.20.5", "rehype": "^12.0.1", "resolve": "^1.22.0", - "rollup": "~2.78.0", + "rollup": "^2.79.1", "semver": "^7.3.7", "shiki": "^0.11.1", "sirv": "^2.0.2", @@ -158,7 +158,7 @@ "typescript": "*", "unist-util-visit": "^4.1.0", "vfile": "^5.3.2", - "vite": "~3.1.3", + "vite": "~3.2.1", "vitefu": "^0.1.0", "yargs-parser": "^21.0.1", "zod": "^3.17.3" diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index 3746fc583eeb..79a746c7d339 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -124,6 +124,7 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp emptyOutDir: false, manifest: false, outDir: fileURLToPath(out), + copyPublicDir: !ssr, rollupOptions: { ...viteConfig.build?.rollupOptions, input: [], @@ -138,7 +139,7 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp ssr: true, // improve build performance minify: false, - polyfillModulePreload: false, + modulePreload: { polyfill: false }, reportCompressedSize: false, }, plugins: [ @@ -154,7 +155,6 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp settings.config.output === 'server' && vitePluginSSR(internals, settings.adapter!), vitePluginAnalyzer(internals), ], - publicDir: ssr ? false : viteConfig.publicDir, envPrefix: 'PUBLIC_', base: settings.config.base, }; diff --git a/packages/astro/src/runtime/server/render/astro.ts b/packages/astro/src/runtime/server/render/astro.ts index cd1c04885b2a..d6da03007e42 100644 --- a/packages/astro/src/runtime/server/render/astro.ts +++ b/packages/astro/src/runtime/server/render/astro.ts @@ -57,7 +57,7 @@ export function isAstroComponent(obj: any): obj is AstroComponent { } export function isAstroComponentFactory(obj: any): obj is AstroComponentFactory { - return obj == null ? false : !!obj.isAstroComponentFactory; + return obj == null ? false : obj.isAstroComponentFactory === true; } export async function* renderAstroComponent( diff --git a/packages/astro/src/runtime/server/render/component.ts b/packages/astro/src/runtime/server/render/component.ts index 0b6c90ebeba2..54dfb372f8f8 100644 --- a/packages/astro/src/runtime/server/render/component.ts +++ b/packages/astro/src/runtime/server/render/component.ts @@ -56,7 +56,7 @@ export async function renderComponent( _props: Record, slots: any = {} ): Promise { - Component = await Component; + Component = (await Component) ?? Component; switch (getComponentType(Component)) { case 'fragment': { @@ -133,7 +133,14 @@ Did you mean to add ${formatList(probableRendererNames.map((r) => '`' + r + '`') // If this component ran through `__astro_tag_component__`, we already know // which renderer to match to and can skip the usual `check` calls. // This will help us throw most relevant error message for modules with runtime errors - if (Component && (Component as any)[Renderer]) { + let isTagged = false; + try { + isTagged = Component && (Component as any)[Renderer]; + } catch { + // Accessing `Component[Renderer]` may throw if `Component` is a Proxy that doesn't + // return the actual read-only value. In this case, ignore. + } + if (isTagged) { const rendererName = (Component as any)[Renderer]; renderer = renderers.find(({ name }) => name === rendererName); } diff --git a/packages/astro/src/vite-plugin-utils/index.ts b/packages/astro/src/vite-plugin-utils/index.ts index 48c13274ac17..2c09e76d4821 100644 --- a/packages/astro/src/vite-plugin-utils/index.ts +++ b/packages/astro/src/vite-plugin-utils/index.ts @@ -9,7 +9,9 @@ export function getFileInfo(id: string, config: AstroConfig) { const fileId = id.split('?')[0]; let fileUrl = fileId.includes('/pages/') - ? fileId.replace(/^.*?\/pages\//, sitePathname).replace(/(\/index)?\.(md|astro)$/, '') + ? fileId + .replace(/^.*?\/pages\//, sitePathname) + .replace(/(\/index)?\.(md|markdown|mdown|mkdn|mkd|mdwn|md|astro)$/, '') : undefined; if (fileUrl && config.trailingSlash === 'always') { fileUrl = appendForwardSlash(fileUrl); diff --git a/packages/astro/test/astro-global.test.js b/packages/astro/test/astro-global.test.js index ddd24a953207..b8aa3ddb0412 100644 --- a/packages/astro/test/astro-global.test.js +++ b/packages/astro/test/astro-global.test.js @@ -15,12 +15,9 @@ describe('Astro Global', () => { describe('dev', () => { let devServer; - let $; before(async () => { devServer = await fixture.startDevServer(); - const html = await fixture.fetch('/blog/?foo=42').then((res) => res.text()); - $ = cheerio.load(html); }); after(async () => { @@ -28,11 +25,21 @@ describe('Astro Global', () => { }); it('Astro.request.url', async () => { + const html = await fixture.fetch('/blog/?foo=42').then((res) => res.text()); + const $ = cheerio.load(html); expect($('#pathname').text()).to.equal('/blog/'); expect($('#searchparams').text()).to.equal('{}'); expect($('#child-pathname').text()).to.equal('/blog/'); expect($('#nested-child-pathname').text()).to.equal('/blog/'); }); + + it('Astro.glob() returned `url` metadata of each markdown file extensions DOES NOT include the extension', async () => { + const html = await fixture.fetch('/blog/omit-markdown-extensions/').then((res) => res.text()); + const $ = cheerio.load(html); + expect($('[data-any-url-contains-extension]').data('any-url-contains-extension')).to.equal( + false + ); + }); }); describe('build', () => { @@ -65,8 +72,8 @@ describe('Astro Global', () => { it('Astro.glob() correctly returns meta info for MD and Astro files', async () => { const html = await fixture.readFile('/glob/index.html'); const $ = cheerio.load(html); - expect($('[data-file]').length).to.equal(3); - expect($('.post-url[href]').length).to.equal(3); + expect($('[data-file]').length).to.equal(8); + expect($('.post-url[href]').length).to.equal(8); }); }); }); diff --git a/packages/astro/test/fixtures/astro-global/src/pages/omit-markdown-extensions.astro b/packages/astro/test/fixtures/astro-global/src/pages/omit-markdown-extensions.astro new file mode 100644 index 000000000000..67f307b0f0e0 --- /dev/null +++ b/packages/astro/test/fixtures/astro-global/src/pages/omit-markdown-extensions.astro @@ -0,0 +1,16 @@ +--- +const markdownPosts = await Astro.glob('./post/**/*.{markdown,mdown,mkdn,mkd,mdwn,md}'); +const markdownExtensions = /(\.(markdown|mdown|mkdn|mkd|mdwn|md))$/g +const aUrlContainsExtension = markdownPosts.some((page:any)=> { + return markdownExtensions.test(page.url) + }) +--- + + + + Extensions omitted + + +

Placeholder

+ + diff --git a/packages/astro/test/fixtures/astro-global/src/pages/post/post-4.markdown b/packages/astro/test/fixtures/astro-global/src/pages/post/post-4.markdown new file mode 100644 index 000000000000..e9a2e4beba4b --- /dev/null +++ b/packages/astro/test/fixtures/astro-global/src/pages/post/post-4.markdown @@ -0,0 +1,6 @@ +--- +title: 'Another post' +layout: '../../layouts/post.astro' +--- + +# Another post diff --git a/packages/astro/test/fixtures/astro-global/src/pages/post/post-5.mdown b/packages/astro/test/fixtures/astro-global/src/pages/post/post-5.mdown new file mode 100644 index 000000000000..e9a2e4beba4b --- /dev/null +++ b/packages/astro/test/fixtures/astro-global/src/pages/post/post-5.mdown @@ -0,0 +1,6 @@ +--- +title: 'Another post' +layout: '../../layouts/post.astro' +--- + +# Another post diff --git a/packages/astro/test/fixtures/astro-global/src/pages/post/post-6.mkdn b/packages/astro/test/fixtures/astro-global/src/pages/post/post-6.mkdn new file mode 100644 index 000000000000..e9a2e4beba4b --- /dev/null +++ b/packages/astro/test/fixtures/astro-global/src/pages/post/post-6.mkdn @@ -0,0 +1,6 @@ +--- +title: 'Another post' +layout: '../../layouts/post.astro' +--- + +# Another post diff --git a/packages/astro/test/fixtures/astro-global/src/pages/post/post-7.mkd b/packages/astro/test/fixtures/astro-global/src/pages/post/post-7.mkd new file mode 100644 index 000000000000..e9a2e4beba4b --- /dev/null +++ b/packages/astro/test/fixtures/astro-global/src/pages/post/post-7.mkd @@ -0,0 +1,6 @@ +--- +title: 'Another post' +layout: '../../layouts/post.astro' +--- + +# Another post diff --git a/packages/astro/test/fixtures/astro-global/src/pages/post/post-8.mdwn b/packages/astro/test/fixtures/astro-global/src/pages/post/post-8.mdwn new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/packages/astro/test/fixtures/solid-component/src/components/ProxyComponent.jsx b/packages/astro/test/fixtures/solid-component/src/components/ProxyComponent.jsx new file mode 100644 index 000000000000..9132c9a6cd9a --- /dev/null +++ b/packages/astro/test/fixtures/solid-component/src/components/ProxyComponent.jsx @@ -0,0 +1,16 @@ +import { Dynamic } from 'solid-js/web' + +const BaseComponent = ({ tag } = {}) => { + return Hello world; +} + +// Motion uses a Proxy to support syntax like `` and `` etc +// https://cdn.jsdelivr.net/npm/@motionone/solid@10.14.2/dist/source/motion.jsx +const ProxyComponent = new Proxy(BaseComponent, { + get: (_, tag) => (props) => { + delete props.tag + return ; + } +}) + +export default ProxyComponent; diff --git a/packages/astro/test/fixtures/solid-component/src/pages/index.astro b/packages/astro/test/fixtures/solid-component/src/pages/index.astro index 06c48e18a68d..a484a6b8d248 100644 --- a/packages/astro/test/fixtures/solid-component/src/pages/index.astro +++ b/packages/astro/test/fixtures/solid-component/src/pages/index.astro @@ -2,6 +2,7 @@ import Hello from '../components/Hello.jsx'; import WithNewlines from '../components/WithNewlines.jsx'; import { Router } from "@solidjs/router"; +import ProxyComponent from '../components/ProxyComponent.jsx'; --- Solid @@ -10,6 +11,7 @@ import { Router } from "@solidjs/router"; + diff --git a/packages/astro/test/fixtures/vue-component/public/favicon.svg b/packages/astro/test/fixtures/vue-component/public/favicon.svg new file mode 100644 index 000000000000..0f3906297879 --- /dev/null +++ b/packages/astro/test/fixtures/vue-component/public/favicon.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/packages/astro/test/fixtures/vue-component/src/components/Img.vue b/packages/astro/test/fixtures/vue-component/src/components/Img.vue new file mode 100644 index 000000000000..7c521a62a13a --- /dev/null +++ b/packages/astro/test/fixtures/vue-component/src/components/Img.vue @@ -0,0 +1,3 @@ + diff --git a/packages/astro/test/fixtures/vue-component/src/pages/index.astro b/packages/astro/test/fixtures/vue-component/src/pages/index.astro index 7cae724dc9b1..f8d808f70046 100644 --- a/packages/astro/test/fixtures/vue-component/src/pages/index.astro +++ b/packages/astro/test/fixtures/vue-component/src/pages/index.astro @@ -1,5 +1,6 @@ --- import Counter from '../components/Counter.vue' +import Img from '../components/Img.vue' --- @@ -28,6 +29,7 @@ import Counter from '../components/Counter.vue' SSR Rendered, client:visible SSR Rendered, client:visible + diff --git a/packages/astro/test/solid-component.test.js b/packages/astro/test/solid-component.test.js index 0a05118eb08d..ed3af45e8883 100644 --- a/packages/astro/test/solid-component.test.js +++ b/packages/astro/test/solid-component.test.js @@ -22,6 +22,9 @@ describe('Solid component', () => { // test 1: Works expect($('.hello')).to.have.lengthOf(1); + + // test 2: Support rendering proxy components + expect($('#proxy-component').text()).to.be.equal('Hello world'); }); }); @@ -38,6 +41,17 @@ describe('Solid component', () => { await devServer.stop(); }); + it('Can load a component', async () => { + const html = await fixture.fetch('/').then((res) => res.text()); + const $ = cheerio.load(html); + + // test 1: Works + expect($('.hello')).to.have.lengthOf(1); + + // test 2: Support rendering proxy components + expect($('#proxy-component').text()).to.be.equal('Hello world'); + }); + it('scripts proxy correctly', async () => { const html = await fixture.fetch('/').then((res) => res.text()); const $ = cheerio.load(html); diff --git a/packages/astro/test/vue-component.test.js b/packages/astro/test/vue-component.test.js index 5ee632a47e43..07d2cdad7dc6 100644 --- a/packages/astro/test/vue-component.test.js +++ b/packages/astro/test/vue-component.test.js @@ -39,6 +39,9 @@ describe('Vue component', () => { // test 5: components with identical render output and props have been deduplicated const uniqueRootUIDs = $('astro-island').map((i, el) => $(el).attr('uid')); expect(new Set(uniqueRootUIDs).size).to.equal(5); + + // test 6: import public files work + expect($('#vue-img')).to.be.ok; }); }); diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 46f588908542..bdb1bb48d7ed 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -19,7 +19,10 @@ "homepage": "https://docs.astro.build/en/guides/integrations-guide/cloudflare/", "exports": { ".": "./dist/index.js", - "./runtime": "./dist/runtime.js", + "./runtime": { + "types": "./runtime.d.ts", + "default": "./dist/runtime.js" + }, "./server.advanced.js": "./dist/server.advanced.js", "./server.directory.js": "./dist/server.directory.js", "./package.json": "./package.json" diff --git a/packages/integrations/cloudflare/runtime.d.ts b/packages/integrations/cloudflare/runtime.d.ts new file mode 100644 index 000000000000..e2a72940a0c7 --- /dev/null +++ b/packages/integrations/cloudflare/runtime.d.ts @@ -0,0 +1,3 @@ +export type { WorkerRuntime, PagesRuntime } from './dist/runtime'; + +export { getRuntime } from './dist/runtime'; diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index df1fc3199d33..b867fd069513 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -32,7 +32,8 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "babel-preset-solid": "^1.4.2" + "babel-preset-solid": "^1.4.2", + "vitefu": "^0.1.0" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/solid/src/dependencies.ts b/packages/integrations/solid/src/dependencies.ts index 6a073148f2b6..93e870bc1de0 100644 --- a/packages/integrations/solid/src/dependencies.ts +++ b/packages/integrations/solid/src/dependencies.ts @@ -1,55 +1,26 @@ -// This file is a fork of vite-plugin-solid. -// Original: https://github.com/solidjs/vite-plugin-solid/blob/03130c8a0a2ceaab9a07e16f1e1df832b996e1b8/src/index.ts#L251-L297 -// License: MIT (https://github.com/solidjs/vite-plugin-solid/blob/03130c8a0a2ceaab9a07e16f1e1df832b996e1b8/package.json#L38) - -import fs from 'fs'; -import { createRequire } from 'module'; -import path from 'path'; import { fileURLToPath } from 'url'; +import { crawlFrameworkPkgs } from 'vitefu'; + +export async function getSolidPkgsConfig(root: URL, isBuild: boolean) { + return await crawlFrameworkPkgs({ + root: fileURLToPath(root), + isBuild, + isFrameworkPkgByJson(pkgJson) { + return containsSolidField(pkgJson.exports || {}); + }, + }); +} +// Reference vite-plugin-solid heuristic +// https://github.com/solidjs/vite-plugin-solid/blob/5558486b0c63788e1275244256918f80294a8338/src/index.ts#L251-L259 +// License: MIT (https://github.com/solidjs/vite-plugin-solid/blob/5558486b0c63788e1275244256918f80294a8338/package.json#L38) function containsSolidField(fields: Record) { const keys = Object.keys(fields); for (let i = 0; i < keys.length; i++) { const key = keys[i]; if (key === 'solid') return true; - if (typeof fields[key] === 'object' && containsSolidField(fields[key])) return true; + if (typeof fields[key] === 'object' && fields[key] != null && containsSolidField(fields[key])) + return true; } return false; } - -export function getSolidDeps(root: URL) { - const pkgPath = path.join(fileURLToPath(root), 'package.json'); - if (!fs.existsSync(pkgPath)) { - // eslint-disable-next-line no-console - console.log('No package.json found at project root'); - return []; - } - const require = createRequire(pkgPath); - const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8')); - const deps = [...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.devDependencies || {})]; - const pkgs = deps.map((dep) => { - try { - return require(`${dep}/package.json`); - } catch { - try { - let dir = path.dirname(require.resolve(dep)); - while (dir) { - const subPkgPath = path.join(dir, 'package.json'); - if (fs.existsSync(subPkgPath)) { - const subPkg = JSON.parse(fs.readFileSync(subPkgPath, 'utf-8')); - if (subPkg && subPkg.name === dep) return subPkg; - } - const parent = path.dirname(dir); - if (parent === dir) { - break; - } - dir = parent; - } - } catch {} - } - }); - return deps.reduce((acc, dep, i) => { - if (pkgs[i] && pkgs[i].exports && containsSolidField(pkgs[i].exports)) acc.push(dep); - return acc; - }, []); -} diff --git a/packages/integrations/solid/src/index.ts b/packages/integrations/solid/src/index.ts index 5241141a92c1..1a7667d59c80 100644 --- a/packages/integrations/solid/src/index.ts +++ b/packages/integrations/solid/src/index.ts @@ -1,5 +1,5 @@ import type { AstroIntegration, AstroRenderer } from 'astro'; -import { getSolidDeps } from './dependencies.js'; +import { getSolidPkgsConfig } from './dependencies.js'; function getRenderer(): AstroRenderer { return { @@ -24,10 +24,11 @@ function getRenderer(): AstroRenderer { }; } -function getViteConfiguration(isDev: boolean, root: URL) { +async function getViteConfiguration(isDev: boolean, root: URL) { // https://github.com/solidjs/vite-plugin-solid // We inject the dev mode only if the user explicitely wants it or if we are in dev (serve) mode const nestedDeps = ['solid-js', 'solid-js/web', 'solid-js/store', 'solid-js/html', 'solid-js/h']; + const solidPkgsConfig = await getSolidPkgsConfig(root, !isDev); return { /** * We only need esbuild on .ts or .js files. @@ -40,13 +41,13 @@ function getViteConfiguration(isDev: boolean, root: URL) { alias: [{ find: /^solid-refresh$/, replacement: '/@solid-refresh' }], }, optimizeDeps: { - include: nestedDeps, - exclude: ['@astrojs/solid-js/server.js'], + include: [...nestedDeps, ...solidPkgsConfig.optimizeDeps.include], + exclude: ['@astrojs/solid-js/server.js', ...solidPkgsConfig.optimizeDeps.exclude], }, ssr: { - external: ['babel-preset-solid'], target: 'node', - noExternal: ['solid-js', ...getSolidDeps(root)], + external: ['babel-preset-solid', ...solidPkgsConfig.ssr.external], + noExternal: ['solid-js', ...solidPkgsConfig.ssr.noExternal], }, }; } @@ -55,9 +56,9 @@ export default function (): AstroIntegration { return { name: '@astrojs/solid-js', hooks: { - 'astro:config:setup': ({ command, addRenderer, updateConfig, config }) => { + 'astro:config:setup': async ({ command, addRenderer, updateConfig, config }) => { addRenderer(getRenderer()); - updateConfig({ vite: getViteConfiguration(command === 'dev', config.root) }); + updateConfig({ vite: await getViteConfiguration(command === 'dev', config.root) }); }, }, }; diff --git a/packages/webapi/package.json b/packages/webapi/package.json index ad34d105b7d9..72e1d65b9fc9 100644 --- a/packages/webapi/package.json +++ b/packages/webapi/package.json @@ -70,7 +70,7 @@ "formdata-polyfill": "^4.0.10", "magic-string": "^0.25.9", "mocha": "^9.2.2", - "rollup": "^2.75.6", + "rollup": "^2.79.1", "rollup-plugin-terser": "^7.0.2", "tslib": "^2.4.0", "typescript": "~4.7.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f0e3de730bdd..4483265394d1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -439,7 +439,7 @@ importers: rehype-toc: ^3.0.2 remark-code-titles: ^0.1.2 resolve: ^1.22.0 - rollup: ~2.78.0 + rollup: ^2.79.1 sass: ^1.52.2 semver: ^7.3.7 shiki: ^0.11.1 @@ -454,7 +454,7 @@ importers: unified: ^10.1.2 unist-util-visit: ^4.1.0 vfile: ^5.3.2 - vite: ~3.1.3 + vite: ~3.2.1 vitefu: ^0.1.0 yargs-parser: ^21.0.1 zod: ^3.17.3 @@ -505,7 +505,7 @@ importers: recast: 0.20.5 rehype: 12.0.1 resolve: 1.22.1 - rollup: 2.78.1 + rollup: 2.79.1 semver: 7.3.8 shiki: 0.11.1 sirv: 2.0.2 @@ -517,8 +517,8 @@ importers: typescript: 4.8.4 unist-util-visit: 4.1.1 vfile: 5.3.5 - vite: 3.1.8_sass@1.55.0 - vitefu: 0.1.0_vite@3.1.8 + vite: 3.2.1_sass@1.55.0 + vitefu: 0.1.0_vite@3.2.1 yargs-parser: 21.1.1 zod: 3.19.1 devDependencies: @@ -3083,8 +3083,10 @@ importers: astro-scripts: workspace:* babel-preset-solid: ^1.4.2 solid-js: ^1.5.1 + vitefu: ^0.1.0 dependencies: babel-preset-solid: 1.6.0 + vitefu: 0.1.0 devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts @@ -3449,7 +3451,7 @@ importers: magic-string: ^0.25.9 mocha: ^9.2.2 node-fetch: ^3.2.5 - rollup: ^2.75.6 + rollup: ^2.79.1 rollup-plugin-terser: ^7.0.2 tslib: ^2.4.0 typescript: ~4.7.3 @@ -16463,14 +16465,6 @@ packages: dependencies: estree-walker: 0.6.1 - /rollup/2.78.1: - resolution: {integrity: sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==} - engines: {node: '>=10.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.2 - dev: false - /rollup/2.79.1: resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} engines: {node: '>=10.0.0'} @@ -17956,14 +17950,15 @@ packages: - supports-color dev: false - /vite/3.1.8_sass@1.55.0: - resolution: {integrity: sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==} + /vite/3.2.0: + resolution: {integrity: sha512-Ovj7+cqIdM1I0LPCk2CWxzgADXMix3NLXpUT6g7P7zg/a9grk/TaC3qn9YMg7w7M0POIVCBOp1aBANJW+RH7oA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: less: '*' sass: '*' stylus: '*' + sugarss: '*' terser: ^5.4.0 peerDependenciesMeta: less: @@ -17972,20 +17967,20 @@ packages: optional: true stylus: optional: true + sugarss: + optional: true terser: optional: true dependencies: esbuild: 0.15.12 postcss: 8.4.18 resolve: 1.22.1 - rollup: 2.78.1 - sass: 1.55.0 + rollup: 2.79.1 optionalDependencies: fsevents: 2.3.2 - dev: false - /vite/3.2.0: - resolution: {integrity: sha512-Ovj7+cqIdM1I0LPCk2CWxzgADXMix3NLXpUT6g7P7zg/a9grk/TaC3qn9YMg7w7M0POIVCBOp1aBANJW+RH7oA==} + /vite/3.2.1_sass@1.55.0: + resolution: {integrity: sha512-ADtMkfHuWq4tskJsri2n2FZkORO8ZyhI+zIz7zTrDAgDEtct1jdxOg3YsZBfHhKjmMoWLOSCr+64qrEDGo/DbQ==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -18010,10 +18005,23 @@ packages: postcss: 8.4.18 resolve: 1.22.1 rollup: 2.79.1 + sass: 1.55.0 optionalDependencies: fsevents: 2.3.2 + dev: false + + /vitefu/0.1.0: + resolution: {integrity: sha512-5MQSHP9yr0HIve8q4XNb7QXfO1P4tzZDZP99qH0FM5ClcwYddeGXRDQ4TQYRUeXLjZ+vLecirHtGNpwFFUF7sw==} + peerDependencies: + vite: ^3.0.0 + peerDependenciesMeta: + vite: + optional: true + dependencies: + import-meta-resolve: 2.1.0 + dev: false - /vitefu/0.1.0_vite@3.1.8: + /vitefu/0.1.0_vite@3.2.1: resolution: {integrity: sha512-5MQSHP9yr0HIve8q4XNb7QXfO1P4tzZDZP99qH0FM5ClcwYddeGXRDQ4TQYRUeXLjZ+vLecirHtGNpwFFUF7sw==} peerDependencies: vite: ^3.0.0 @@ -18022,7 +18030,7 @@ packages: optional: true dependencies: import-meta-resolve: 2.1.0 - vite: 3.1.8_sass@1.55.0 + vite: 3.2.1_sass@1.55.0 dev: false /vitest/0.20.3: