diff --git a/packages/astro/package.json b/packages/astro/package.json index 09ce8ab24..df59aced2 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -40,7 +40,7 @@ "test": "mocha --parallel --timeout 15000" }, "dependencies": { - "@astrojs/compiler": "^0.1.14", + "@astrojs/compiler": "^0.1.15", "@astrojs/language-server": "^0.7.16", "@astrojs/markdown-remark": "^0.3.1", "@astrojs/markdown-support": "0.3.1", @@ -60,16 +60,16 @@ "connect": "^3.7.0", "del": "^6.0.0", "es-module-lexer": "^0.7.1", - "esbuild": "^0.12.28", + "esbuild": "^0.13.6", "estree-util-value-to-estree": "^1.2.0", "fast-xml-parser": "^3.19.0", "html-entities": "^2.3.2", "kleur": "^4.1.4", "mime": "^2.5.2", "morphdom": "^2.6.1", - "node-fetch": "^2.6.1", + "node-fetch": "^2.6.5", "path-to-regexp": "^6.2.0", - "sass": "^1.42.0", + "sass": "^1.43.2", "semver": "^7.3.5", "send": "^0.17.1", "shiki": "^0.9.10", @@ -81,7 +81,7 @@ "strip-ansi": "^7.0.1", "supports-esm": "^1.0.0", "tiny-glob": "^0.2.8", - "vite": "^2.6.5", + "vite": "^2.6.7", "yargs-parser": "^20.2.9", "zod": "^3.8.1" }, @@ -98,7 +98,7 @@ "@types/yargs-parser": "^20.2.1", "chai": "^4.3.4", "cheerio": "^1.0.0-rc.10", - "mocha": "^9.1.1" + "mocha": "^9.1.2" }, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0", diff --git a/packages/astro/src/build/index.ts b/packages/astro/src/build/index.ts index 7a64da486..f238d27ad 100644 --- a/packages/astro/src/build/index.ts +++ b/packages/astro/src/build/index.ts @@ -127,13 +127,7 @@ class AstroBuilder { }, target: 'es2020', // must match an esbuild target }, - plugins: [ - rollupPluginHTML({ - input, - extractAssets: false, - }) as any, // CI fix: ignore typing of this plugin - ...(viteConfig.plugins || []), - ], + plugins: [rollupPluginHTML({ input, extractAssets: false }), ...(viteConfig.plugins || [])], publicDir: viteConfig.publicDir, root: viteConfig.root, server: viteConfig.server, diff --git a/packages/astro/src/build/stats.ts b/packages/astro/src/build/stats.ts index 3b7a65711..8711ebe3f 100644 --- a/packages/astro/src/build/stats.ts +++ b/packages/astro/src/build/stats.ts @@ -87,7 +87,7 @@ export async function profileJS({ cwd, entryHTML }: { cwd: URL; entryHTML?: URL const relPath = url.pathname.replace(cwd.pathname, ''); if (sizes[relPath]) return; try { - let code = url.protocol === 'file:' ? await fs.promises.readFile(url, 'utf8') : await fetch(url).then((body) => body.text()); + let code = url.protocol === 'file:' ? await fs.promises.readFile(url, 'utf8') : await fetch(url.href).then((body) => body.text()); sizes[relPath] = Buffer.byteLength(code); const staticImports = eslexer.parse(code)[0].filter(({ d }) => { if (!visitedEntry) return true; // if we’re on the entry file, count async imports, too diff --git a/packages/astro/src/internal/index.ts b/packages/astro/src/internal/index.ts index 05c18c60c..a08c071aa 100644 --- a/packages/astro/src/internal/index.ts +++ b/packages/astro/src/internal/index.ts @@ -91,27 +91,27 @@ interface ExtractedHydration { directive: string; value: string; componentUrl: string; - componentExport: { value: string; }; + componentExport: { value: string }; } | null; - props: Record + props: Record; } function extractHydrationDirectives(inputProps: Record): ExtractedHydration { let extracted: ExtractedHydration = { hydration: null, - props: {} + props: {}, }; for (const [key, value] of Object.entries(inputProps)) { if (key.startsWith('client:')) { - if(!extracted.hydration) { + if (!extracted.hydration) { extracted.hydration = { directive: '', value: '', componentUrl: '', - componentExport: { value: '' } + componentExport: { value: '' }, }; } - switch(key) { + switch (key) { case 'client:component-path': { extracted.hydration.componentUrl = value; break; @@ -212,8 +212,8 @@ export async function renderComponent(result: SSRResult, displayName: string, Co } } - if(renderer === null) { - if(typeof Component === 'string') { + if (renderer === null) { + if (typeof Component === 'string') { html = await renderAstroComponent(await render`<${Component}${spreadAttributes(props)}>${children}`); } else { throw new Error(`Astro is unable to render ${metadata.displayName}!\nIs there a renderer to handle this type of component defined in your Astro config?`); @@ -251,10 +251,12 @@ function createFetchContentFn(url: URL) { if (!mod.frontmatter) { return; } + const urlSpec = new URL(spec, url).pathname.replace(/[\\/\\\\]/, '/'); return { content: mod.metadata, metadata: mod.frontmatter, file: new URL(spec, url), + url: urlSpec.includes('/pages/') && urlSpec.replace(/^.*\/pages\//, '/').replace(/\.md$/, ''), }; }) .filter(Boolean); @@ -264,18 +266,15 @@ function createFetchContentFn(url: URL) { export function createAstro(fileURLStr: string, site: string): TopLevelAstro { const url = pathToFileURL(fileURLStr); - const fetchContent = createFetchContentFn(url) as unknown as TopLevelAstro['fetchContent']; + const fetchContent = createFetchContentFn(url) as unknown as TopLevelAstro['fetchContent']; return { // TODO I think this is no longer needed. isPage: false, site: new URL(site), fetchContent, resolve(...segments) { - return segments.reduce( - (u, segment) => new URL(segment, u), - url - ).pathname - } + return segments.reduce((u, segment) => new URL(segment, u), url).pathname; + }, }; } diff --git a/packages/astro/src/runtime/vite/plugin-astro.ts b/packages/astro/src/runtime/vite/plugin-astro.ts index 1d374dc33..f09429ec6 100644 --- a/packages/astro/src/runtime/vite/plugin-astro.ts +++ b/packages/astro/src/runtime/vite/plugin-astro.ts @@ -32,11 +32,11 @@ export default function astro({ config, devServer }: AstroPluginOptions): Plugin site: config.buildOptions.site, sourcefile: id, sourcemap: 'both', - internalURL: 'astro/internal' + internalURL: 'astro/internal', }); // 2. Compile `.ts` to `.js` const { code, map } = await esbuild.transform(tsResult.code, { loader: 'ts', sourcemap: 'external', sourcefile: id }); - + return { code, map, diff --git a/packages/astro/test/astro-assets.test.js b/packages/astro/test/astro-assets.test.js index 4981d75cc..2e75f3920 100644 --- a/packages/astro/test/astro-assets.test.js +++ b/packages/astro/test/astro-assets.test.js @@ -1,8 +1,7 @@ /** * UNCOMMENT: add support for automatic and srcset in build - import { expect } from 'chai'; -import { loadFixture } from './test-utils'; +import { loadFixture } from './test-utils.js'; let fixture; diff --git a/packages/astro/test/astro-doctype.test.js b/packages/astro/test/astro-doctype.test.js index 1b8a52bef..c467af78a 100644 --- a/packages/astro/test/astro-doctype.test.js +++ b/packages/astro/test/astro-doctype.test.js @@ -1,5 +1,5 @@ /** - * UNCOMMENT: fix layout bug + * UNCOMMENT: compiler doesn’t insert import { expect } from 'chai'; import cheerio from 'cheerio'; import { loadFixture } from './test-utils.js'; diff --git a/packages/astro/test/astro-expr.test.js b/packages/astro/test/astro-expr.test.js index 0ca5a66b3..2e97e6352 100644 --- a/packages/astro/test/astro-expr.test.js +++ b/packages/astro/test/astro-expr.test.js @@ -1,5 +1,3 @@ -/** - * UNCOMMENT: @astrojs/compiler transform error import { expect } from 'chai'; import cheerio from 'cheerio'; import { loadFixture } from './test-utils.js'; @@ -102,6 +100,3 @@ describe('Expressions', () => { expect($('#frag-undefined')).to.have.lengthOf(0); }); }); -*/ - -it.skip('is skipped', () => {}); diff --git a/packages/astro/test/astro-external-files.test.js b/packages/astro/test/astro-external-files.test.js index 67b67cc54..fba051c65 100644 --- a/packages/astro/test/astro-external-files.test.js +++ b/packages/astro/test/astro-external-files.test.js @@ -1,5 +1,5 @@ /** - * UNCOMMENT: fix Vite error for external files + * UNCOMMENT: add support for smarter "external" scripts in Rollup import { expect } from 'chai'; import { loadFixture } from './test-utils.js'; diff --git a/packages/astro/test/astro-get-static-paths.test.js b/packages/astro/test/astro-get-static-paths.test.js index 20b0fe9f8..735d19288 100644 --- a/packages/astro/test/astro-get-static-paths.test.js +++ b/packages/astro/test/astro-get-static-paths.test.js @@ -1,5 +1,5 @@ /** - * UNCOMMENT: add getStaticPaths() + * UNCOMMENT: fix "Error: can only be called once!" import { expect } from 'chai'; import { loadFixture } from './test-utils'; diff --git a/packages/astro/test/astro-global.test.js b/packages/astro/test/astro-global.test.js index 641136fa6..a5ddf4bac 100644 --- a/packages/astro/test/astro-global.test.js +++ b/packages/astro/test/astro-global.test.js @@ -15,7 +15,6 @@ before(async () => { await fixture.build(); }); - describe('Astro.*', () => { it('Astro.request.url', async () => { const html = await fixture.readFile('/index.html'); @@ -55,4 +54,4 @@ describe('Astro.*', () => { expect($('img').attr('src')).to.equal('/src/images/penguin.png'); expect($('#inner-child img').attr('src')).to.equal('/src/components/nested/images/penguin.png'); }); -}); \ No newline at end of file +}); diff --git a/packages/astro/test/astro-pagination.test.js b/packages/astro/test/astro-pagination.test.js index d2430e225..408d5da17 100644 --- a/packages/astro/test/astro-pagination.test.js +++ b/packages/astro/test/astro-pagination.test.js @@ -1,5 +1,5 @@ /** - * UNCOMMENT: add Astro.fetchContent() + * UNCOMMENT: there’s a bug with Canonical URLs import { expect } from 'chai'; import cheerio from 'cheerio'; import { loadFixture } from './test-utils.js'; diff --git a/packages/astro/test/astro-rss.test.js b/packages/astro/test/astro-rss.test.js index 101a2a5ad..5266f56e6 100644 --- a/packages/astro/test/astro-rss.test.js +++ b/packages/astro/test/astro-rss.test.js @@ -1,5 +1,3 @@ -/** - * UNCOMMENT: add getStaticPaths() support import { expect } from 'chai'; import { loadFixture } from './test-utils.js'; @@ -9,18 +7,19 @@ before(async () => { fixture = await loadFixture({ projectRoot: './fixtures/astro-rss/', buildOptions: { - site: 'https://mysite.dev', + site: 'https://astro.build/', + sitemap: true, }, }); await fixture.build(); }); -describe.skip('RSS Generation', () => { +describe('RSS Generation', () => { it('generates RSS correctly', async () => { const rss = await fixture.readFile('/custom/feed.xml'); - expect(rss).to.be(''); // TODO: inline snapshot + expect(rss).to.equal( + `<![CDATA[MF Doomcast]]>https://astro.build/custom/feed.xmlen-usMF Doom<![CDATA[Fazers]]>https://astro.build/episode/fazers/Thu, 03 Jul 2003 00:00:00 GMTmusic197true<![CDATA[Rap Snitch Knishes (feat. Mr. Fantastik)]]>https://astro.build/episode/rap-snitch-knishes/Tue, 16 Nov 2004 00:00:00 GMTmusic172true<![CDATA[Rhymes Like Dimes (feat. Cucumber Slice)]]>https://astro.build/episode/rhymes-like-dimes/Tue, 19 Oct 1999 00:00:00 GMTmusic259true` + ); }); }); -*/ - -it.skip('is skipped', () => {}); diff --git a/packages/astro/test/astro-sitemap.test.js b/packages/astro/test/astro-sitemap.test.js index 5f2a434e6..a315a586c 100644 --- a/packages/astro/test/astro-sitemap.test.js +++ b/packages/astro/test/astro-sitemap.test.js @@ -1,21 +1,24 @@ -/** - * UNCOMMENT: add getStaticPaths() support import { expect } from 'chai'; import { loadFixture } from './test-utils.js'; let fixture; before(async () => { - fixture = await loadFixture({ projectRoot: './fixtures/astro-rss/' }); + fixture = await loadFixture({ + projectRoot: './fixtures/astro-rss/', + buildOptions: { + site: 'https://astro.build/', + sitemap: true, + }, + }); await fixture.build(); }); describe('Sitemap Generation', () => { it('Generates Sitemap correctly', async () => { let sitemap = await fixture.readFile('/sitemap.xml'); - expect(sitemap).to.be(''); // TODO: inline snapshot + expect(sitemap).to.equal( + `https://astro.build/404/index.htmlhttps://astro.build/episode/fazers/index.htmlhttps://astro.build/episode/rap-snitch-knishes/index.htmlhttps://astro.build/episode/rhymes-like-dimes/index.htmlhttps://astro.build/episodes/index.html\n` + ); }); }); -*/ - -it.skip('is skipped', () => {}); diff --git a/packages/astro/test/astro-styles-ssr.test.js b/packages/astro/test/astro-styles-ssr.test.js index ad562c4e6..65ce25da7 100644 --- a/packages/astro/test/astro-styles-ssr.test.js +++ b/packages/astro/test/astro-styles-ssr.test.js @@ -1,5 +1,5 @@ /** - * UNCOMMENT: fix frontmatter import hoisting + * UNCOMMENT: Add styles support import { expect } from 'chai'; import cheerio from 'cheerio'; import { loadFixture } from './test-utils.js'; diff --git a/packages/astro/test/builtins.test.js b/packages/astro/test/builtins.test.js index aea3ddc2d..299c688b9 100644 --- a/packages/astro/test/builtins.test.js +++ b/packages/astro/test/builtins.test.js @@ -1,5 +1,5 @@ /** - * UNCOMMENT: separate this fixture into two + * UNCOMMENT: Fix "Unexpected "\x00" bug import { expect } from 'chai'; import cheerio from 'cheerio'; import { loadFixture } from './test-utils.js'; diff --git a/packages/astro/test/custom-elements.test.js b/packages/astro/test/custom-elements.test.js index 2632ab5c8..ddae47ea4 100644 --- a/packages/astro/test/custom-elements.test.js +++ b/packages/astro/test/custom-elements.test.js @@ -74,4 +74,4 @@ describe('Custom Elements', () => { // test 1: Element rendered expect($('client-only-element')).to.have.lengthOf(1); }); -}); \ No newline at end of file +}); diff --git a/packages/astro/test/fixtures/astro-pagination/src/pages/index.astro b/packages/astro/test/fixtures/astro-pagination/src/pages/index.astro index 4906384c4..db72daff5 100644 --- a/packages/astro/test/fixtures/astro-pagination/src/pages/index.astro +++ b/packages/astro/test/fixtures/astro-pagination/src/pages/index.astro @@ -1,5 +1,4 @@ --- -import Child from '../components/Child.astro'; --- @@ -9,7 +8,5 @@ import Child from '../components/Child.astro';
{Astro.request.url.pathname}
Home - - diff --git a/packages/astro/test/fixtures/astro-rss/src/pages/episodes/[...page].astro b/packages/astro/test/fixtures/astro-rss/src/pages/episodes/[...page].astro index d68bdfd48..1e8d2e58c 100644 --- a/packages/astro/test/fixtures/astro-rss/src/pages/episodes/[...page].astro +++ b/packages/astro/test/fixtures/astro-rss/src/pages/episodes/[...page].astro @@ -1,5 +1,4 @@ --- - export function getStaticPaths({paginate, rss}) { const episodes = Astro.fetchContent('../episode/*.md').sort((a, b) => new Date(b.pubDate) - new Date(a.pubDate)); rss({ @@ -11,14 +10,14 @@ export function getStaticPaths({paginate, rss}) { }, customData: `en-us` + `MF Doom`, - items: episodes.map((item) => ({ - title: item.title, - link: item.url, - description: item.description, - pubDate: item.pubDate + 'Z', - customData: `${item.type}` + - `${item.duration}` + - `${item.explicit || false}`, + items: episodes.map(({ metadata, url }) => ({ + title: metadata.title, + link: url, + description: metadata.description, + pubDate: metadata.pubDate + 'Z', + customData: `${metadata.type}` + + `${metadata.duration}` + + `${metadata.explicit || false}`, })), dest: '/custom/feed.xml', }); diff --git a/packages/astro/test/fixtures/builtins/src/pages/bare.astro b/packages/astro/test/fixtures/builtins/src/pages/bare.astro index 32af9fd04..2c298ce21 100644 --- a/packages/astro/test/fixtures/builtins/src/pages/bare.astro +++ b/packages/astro/test/fixtures/builtins/src/pages/bare.astro @@ -9,4 +9,4 @@ import fs from 'fs';

Test

- \ No newline at end of file + diff --git a/packages/astro/test/lit-element.test.js b/packages/astro/test/lit-element.test.js index 9b4d05da7..178f94f95 100644 --- a/packages/astro/test/lit-element.test.js +++ b/packages/astro/test/lit-element.test.js @@ -1,5 +1,5 @@ /** - * UNCOMMENT: fix "window is not defined" Vite error + * UNCOMMENT: fix Vite SSR import of lit-element (TODO: update render API) import { expect } from 'chai'; import cheerio from 'cheerio'; import { loadFixture } from './test-utils.js'; diff --git a/yarn.lock b/yarn.lock index 2d2651fd0..239717d08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -106,10 +106,10 @@ "@algolia/logger-common" "4.10.5" "@algolia/requester-common" "4.10.5" -"@astrojs/compiler@^0.1.14": - version "0.1.14" - resolved "https://registry.yarnpkg.com/@astrojs/compiler/-/compiler-0.1.14.tgz#15bb8211312c0ef2cacb9483fdb31c5dff1013ea" - integrity sha512-iqc8upge2o9AAL87lB5ptTDZWmrrWpiFX7jGTU3Cuo4X9+KXmJL4oKSMy8sGt7JoKd2j5yZsFfLq9R5V/nwfbQ== +"@astrojs/compiler@^0.1.15": + version "0.1.15" + resolved "https://registry.yarnpkg.com/@astrojs/compiler/-/compiler-0.1.15.tgz#3d67c1a6591834c76471bd99c3fe49c6173de7fc" + integrity sha512-o8vxpbM4k9oROUN4ylOzjvCX3+g7U9P9Uoemji8VkVP7W/USDhJy56cdDI+ADvb1RxiOlzAnoowoScCPXuHtYQ== dependencies: typescript "^4.3.5" @@ -3622,13 +3622,6 @@ debug@4, debug@4.3.2, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, de dependencies: ms "2.1.2" -debug@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - debug@^3.1.0: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -4082,81 +4075,166 @@ esbuild-android-arm64@0.13.4: resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.4.tgz#5178a20d2b7aba741a31c19609f9e67b346996b9" integrity sha512-elDJt+jNyoHFId0/dKsuVYUPke3EcquIyUwzJCH17a3ERglN3A9aMBI5zbz+xNZ+FbaDNdpn0RaJHCFLbZX+fA== +esbuild-android-arm64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.6.tgz#a109b4e5203e9ec144cadccdf18a5daf021423e5" + integrity sha512-uEwrMRzqNzXxzIi0K/CtHn3/SPoRso4Dd/aJCpf9KuX+kCs9Tlhz29cKbZieznYAekdo36fDUrZyuugAwSdI+A== + esbuild-darwin-64@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.4.tgz#7a3e66c8e1271b650541b25eed65c84f3564a69d" integrity sha512-zJQGyHRAdZUXlRzbN7W+7ykmEiGC+bq3Gc4GxKYjjWTgDRSEly98ym+vRNkDjXwXYD3gGzSwvH35+MiHAtWvLA== +esbuild-darwin-64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.6.tgz#1a00ef4d2b3b1fe9de28a5cf195df113d6461155" + integrity sha512-oJdWZn2QV5LTM24/vVWaUFlMVlRhpG9zZIA6Xd+xbCULOURwYnYRQWIzRpXNtTfuAr3+em9PqKUaGtYqvO/DYg== + esbuild-darwin-arm64@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.4.tgz#793feca6032b2a57ef291eb9b2d33768d60a49d6" integrity sha512-r8oYvAtqSGq8HNTZCAx4TdLE7jZiGhX9ooGi5AQAey37MA6XNaP8ZNlw9OCpcgpx3ryU2WctXwIqPzkHO7a8dg== +esbuild-darwin-arm64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.6.tgz#f48954d441059e2d06c1675ddcc25af00b164935" + integrity sha512-+f8Yn5doTEpCWtBaGxciDTikxESdGCNZpLYtXzMJLTWFHr8zqfAf4TAYGvg6T5T6N7OMC8HHy3GM+BijFXDXMg== + esbuild-freebsd-64@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.4.tgz#294aec3c2cf4b41fb6900212fc9c33dd8fbbb4a2" integrity sha512-u9DRGkn09EN8+lCh6z7FKle7awi17PJRBuAKdRNgSo5ZrH/3m+mYaJK2PR2URHMpAfXiwJX341z231tSdVe3Yw== +esbuild-freebsd-64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.6.tgz#b3bfea7e21f0d80796220927118fc76170cac06f" + integrity sha512-Yb/DgZUX0C6i4vnOymthLzoWAJBYWbn3Y2F4wKEufsx2veGN/wlwO/yz7IWGVVzb2zMUqbt30hCLF61sUFe7gA== + esbuild-freebsd-arm64@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.4.tgz#09fe66c751c12f9b976976b1d83f3de594cb2787" integrity sha512-q3B2k68Uf6gfjATjcK16DqxvjqRQkHL8aPoOfj4op+lSqegdXvBacB1d8jw8PxbWJ8JHpdTLdAVUYU80kotQXA== +esbuild-freebsd-arm64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.6.tgz#e6f5777a85012457ada049fc6b1e3e2c36161514" + integrity sha512-UKYlEb7mwprSJ9VW9+q3/Mgxest45I6rGMB/hrKY1T6lqoBVhWS4BTbL4EGetWdk05Tw4njFAO9+nmxgl7jMlA== + esbuild-linux-32@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.4.tgz#a9f0793d7bcc9cef4f4ffa4398c525877fba5839" integrity sha512-UUYJPHSiKAO8KoN3Ls/iZtgDLZvK5HarES96aolDPWZnq9FLx4dIHM/x2z4Rxv9IYqQ/DxlPoE2Co1UPBIYYeA== +esbuild-linux-32@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.6.tgz#8b04058312a76faec6964b954f1f02ab32ce43fe" + integrity sha512-hQCZfSLBYtn8f1afFT6Dh9KeLsW12xLqrqssbhpi/xfN9c/bbCh/QQZaR9ZOEnmBHHRPb7rbSo3jQqlCWYb7LQ== + esbuild-linux-64@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.4.tgz#c0d0b4c9d62e3bbf8bdf2cece37403aa6d60fc2e" integrity sha512-+RnohAKiiUW4UHLGRkNR1AnENW1gCuDWuygEtd4jxTNPIoeC7lbXGor7rtgjj9AdUzFgOEvAXyNNX01kJ8NueQ== +esbuild-linux-64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.6.tgz#554d8edfe3f791f8b26978eb173b2e13643442c0" + integrity sha512-bRQwsD+xJoajonfyeq5JpiNRogH4mYFYbYsGhwrtQ4pMGk93V/4KuKQiKEisRZO0hYhZL4MtxufwF195zKlCAw== + esbuild-linux-arm64@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.4.tgz#1292d97bfa64a08d12728f8a7837bf92776c779b" integrity sha512-+A188cAdd6QuSRxMIwRrWLjgphQA0LDAQ/ECVlrPVJwnx+1i64NjDZivoqPYLOTkSPIKntiWwMhhf0U5/RrPHQ== +esbuild-linux-arm64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.6.tgz#2142fadbdbc0ebd52a166f956f0ecb1f6602112a" + integrity sha512-sRc1lt9ma1xBvInCwpS77ywR6KVdcJNsErsrDkDXx3mVe8DLLEn05TG0nIX9I+s8ouHEepikdKCfe1DZdILRjQ== + esbuild-linux-arm@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.4.tgz#186cd9b8885ac132b9953a4a0afe668168debd10" integrity sha512-BH5gKve4jglS7UPSsfwHSX79I5agC/lm4eKoRUEyo8lwQs89frQSRp2Xup+6SFQnxt3md5EsKcd2Dbkqeb3gPA== +esbuild-linux-arm@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.6.tgz#ced8e35a94e0adbf134e5fa4e2b661f897e14b27" + integrity sha512-qQUrpL7QoPqujXEFSpeu6QZ43z0+OdDPHDkLO0GPbpV/jebP7J+0FreMqoq7ZxWG4rPigwcRdEyqzHh8Bh4Faw== + esbuild-linux-mips64le@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.4.tgz#42049bf72bc586817b4a51cc9e32148d13e5e807" integrity sha512-0xkwtPaUkG5xMTFGaQPe1AadSe5QAiQuD4Gix1O9k5Xo/U8xGIkw9UFUTvfEUeu71vFb6ZgsIacfP1NLoFjWNw== +esbuild-linux-mips64le@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.6.tgz#e5cbc050f5d44f8ecc0f79b1641bbad3919a2b3a" + integrity sha512-1lsHZaIsHlFkHn1QRa/EONPGVHwzdIrkKn6r2m9cYUIn2J+rKtJg0e+WkNG3MaIrxozaGKaiSPGvaG1toCbZjw== + esbuild-linux-ppc64le@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.4.tgz#adf1ce2ef2302757c4383887da6ac4dd25be9d4f" integrity sha512-E1+oJPP7A+j23GPo3CEpBhGwG1bni4B8IbTA3/3rvzjURwUMZdcN3Fhrz24rnjzdLSHmULtOE4VsbT42h1Om4Q== +esbuild-linux-ppc64le@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.6.tgz#57868a7eb762c1d19fa6d367b09a4610f0cbf7ca" + integrity sha512-x223JNC8XeLDf05zLaKfxqCEWVct4frp8ft8Qc13cha33TMrqMFaSPq6cgpgT2VYuUsXtwoocoWChKfvy+AUQg== + +esbuild-netbsd-64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.6.tgz#1c5daa62571f1065e4a1100a1db5e488ef259024" + integrity sha512-TonKf530kT25+zi1Da6esITmuBJe13QiN+QGVch6YE8t720IvIelDGwkOQN3Td7A0JjbSbK3u+Fo6YaL151VxQ== + esbuild-openbsd-64@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.4.tgz#1c8122101898c52a20c8786935cf3eb7a19b83b4" integrity sha512-xEkI1o5HYxDzbv9jSox0EsDxpwraG09SRiKKv0W8pH6O3bt+zPSlnoK7+I7Q69tkvONkpIq5n2o+c55uq0X7cw== +esbuild-openbsd-64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.6.tgz#315fd85970365835f6a1eb7b6e9335d59f772564" + integrity sha512-WFa5J0IuyER0UJbCGw87gvGWXGfhxeNppYcvQjp0pWYuH4FS+YqphyjV0RJlybzzDpAXkyZ9RzkMFtSAp+6AUA== + esbuild-sunos-64@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.4.tgz#4ec95faa14a60f295fe485bebffefff408739337" integrity sha512-bjXUMcODMnB6hQicLBBmmnBl7OMDyVpFahKvHGXJfDChIi5udiIRKCmFUFIRn+AUAKVlfrofRKdyPC7kBsbvGQ== +esbuild-sunos-64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.6.tgz#8422eeb9f3712daa4befd19e5da6d7c9af9fc744" + integrity sha512-duCL8Ewri+zjKxuN/61maniDxcd8fHwSuubdAPofll0y0E6WcL/R/e/mQzhHIuoguFm5RJkKun1qua54javh7g== + esbuild-windows-32@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.4.tgz#3182c380487b797b04d0ec2c80c2945666869080" integrity sha512-z4CH07pfyVY0XF98TCsGmLxKCl0kyvshKDbdpTekW9f2d+dJqn5mmoUyWhpSVJ0SfYWJg86FoD9nMbbaMVyGdg== +esbuild-windows-32@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.6.tgz#694eb4768ee72219d3bc6415b1d3a0f843aea9ec" + integrity sha512-U8RkpT4f0/dygA5ytFyHNZ/fRECU9LWBMrqWflNhM31iTi6RhU0QTuOzFYkmpYnwl358ZZhVoBeEOm313d4u4A== + esbuild-windows-64@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.4.tgz#b9e995f92d81f433a04f33611e603e82f9232e69" integrity sha512-uVL11vORRPjocGLYam67rwFLd0LvkrHEs+JG+1oJN4UD9MQmNGZPa4gBHo6hDpF+kqRJ9kXgQSeDqUyRy0tj/Q== +esbuild-windows-64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.6.tgz#1adbf5367b08e735262f57098d19c07d0a2fec1c" + integrity sha512-A23VyUeyBfSWUYNL0jtrJi5M/2yR/RR8zfpGQ0wU0fldqV2vxnvmBYOBwRxexFYCDRpRWh4cPFsoYoXRCFa8Dg== + esbuild-windows-arm64@0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.4.tgz#fb239532f07b764d158f4cc787178ef4c6fadb5c" integrity sha512-vA6GLvptgftRcDcWngD5cMlL4f4LbL8JjU2UMT9yJ0MT5ra6hdZNFWnOeOoEtY4GtJ6OjZ0i+81sTqhAB0fMkg== +esbuild-windows-arm64@0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.6.tgz#9279083740ec90a2d638485c97b1d003771d685a" + integrity sha512-K/pFqK/s5C6wXYcFKO9iPY4yU3DI0/Gbl1W2+OhaPHoXu13VGBmqbCiQ5lohHGE72FFQl76naOjEayEiI+gDMQ== + esbuild@^0.11.16: version "0.11.23" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.23.tgz#c42534f632e165120671d64db67883634333b4b8" @@ -4189,6 +4267,29 @@ esbuild@^0.13.2: esbuild-windows-64 "0.13.4" esbuild-windows-arm64 "0.13.4" +esbuild@^0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.6.tgz#b9be288108d47e814a6c8729e495dce0fddbf441" + integrity sha512-zkMkYwC9ohVe6qxXykKf/4jfbtM/09CL8UEEnwuhO7Xq8NOTN2yAwCrmKKvHlGrEej6Y8e/tAmHB7wMMg7O0ew== + optionalDependencies: + esbuild-android-arm64 "0.13.6" + esbuild-darwin-64 "0.13.6" + esbuild-darwin-arm64 "0.13.6" + esbuild-freebsd-64 "0.13.6" + esbuild-freebsd-arm64 "0.13.6" + esbuild-linux-32 "0.13.6" + esbuild-linux-64 "0.13.6" + esbuild-linux-arm "0.13.6" + esbuild-linux-arm64 "0.13.6" + esbuild-linux-mips64le "0.13.6" + esbuild-linux-ppc64le "0.13.6" + esbuild-netbsd-64 "0.13.6" + esbuild-openbsd-64 "0.13.6" + esbuild-sunos-64 "0.13.6" + esbuild-windows-32 "0.13.6" + esbuild-windows-64 "0.13.6" + esbuild-windows-arm64 "0.13.6" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -7327,16 +7428,16 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mocha@^9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.1.tgz#33df2eb9c6262434630510c5f4283b36efda9b61" - integrity sha512-0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA== +mocha@^9.1.2: + version "9.1.2" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.2.tgz#93f53175b0f0dc4014bd2d612218fccfcf3534d3" + integrity sha512-ta3LtJ+63RIBP03VBjMGtSqbe6cWXRejF9SyM9Zyli1CKZJZ+vfCTj3oW24V7wAphMJdpOFLoMI3hjJ1LWbs0w== dependencies: "@ungap/promise-all-settled" "1.1.2" ansi-colors "4.1.1" browser-stdout "1.3.1" chokidar "3.5.2" - debug "4.3.1" + debug "4.3.2" diff "5.0.0" escape-string-regexp "4.0.0" find-up "5.0.0" @@ -7347,12 +7448,11 @@ mocha@^9.1.1: log-symbols "4.1.0" minimatch "3.0.4" ms "2.1.3" - nanoid "3.1.23" + nanoid "3.1.25" serialize-javascript "6.0.0" strip-json-comments "3.1.1" supports-color "8.1.1" which "2.0.2" - wide-align "1.1.3" workerpool "6.1.5" yargs "16.2.0" yargs-parser "20.2.4" @@ -7414,12 +7514,7 @@ mute-stream@0.0.8, mute-stream@~0.0.4: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nanoid@3.1.23: - version "3.1.23" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" - integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== - -nanoid@^3.1.23: +nanoid@3.1.25, nanoid@^3.1.23: version "3.1.25" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152" integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== @@ -7484,6 +7579,13 @@ node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@~2.6.0: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.2.tgz#986996818b73785e47b1965cc34eb093a1d464d0" integrity sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA== +node-fetch@^2.6.5: + version "2.6.5" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" + integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== + dependencies: + whatwg-url "^5.0.0" + node-gyp@^5.0.2: version "5.1.1" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e" @@ -9384,10 +9486,10 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@^5.2.1, resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sass@^1.42.0: - version "1.42.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.42.0.tgz#dc485e5cf7890a22fd6ccc6856c64f297239d595" - integrity sha512-kcjxsemgaOnfl43oZgO/IePLvXQI0ZKzo0/xbCt6uyrg3FY/FF8hVK9YoO8GiZBcEG2Ebl79EKnUc+aiE4f2Vw== +sass@^1.43.2: + version "1.43.2" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.43.2.tgz#c02501520c624ad6622529a8b3724eb08da82d65" + integrity sha512-DncYhjl3wBaPMMJR0kIUaH3sF536rVrOcqqVGmTZHQRRzj7LQlyGV7Mb8aCKFyILMr5VsPHwRYtyKpnKYlmQSQ== dependencies: chokidar ">=3.0.0 <4.0.0" @@ -10293,6 +10395,11 @@ tr46@^2.1.0: dependencies: punycode "^2.1.1" +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + trim-newlines@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" @@ -10885,10 +10992,10 @@ vfile@^5.0.0: unist-util-stringify-position "^3.0.0" vfile-message "^3.0.0" -vite@^2.6.5: - version "2.6.5" - resolved "https://registry.yarnpkg.com/vite/-/vite-2.6.5.tgz#c4d25972e2f7371e682da86828722ddf5126f3d1" - integrity sha512-vavXMChDUb4Oh4YunrK9BrH5Ox74cu0eOp0VuyI/iqFz1FqbWD72So2c9I87lLL2n0+6tFPV5ijow60KrtxuZg== +vite@^2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/vite/-/vite-2.6.7.tgz#e15c1d8327950720b5d7c4ec3fb36a5a58ccf7cb" + integrity sha512-ewk//jve9k6vlU8PfJmWUHN8k0YYdw4VaKOMvoQ3nT2Pb6k5OSMKQi4jPOzVH/TlUqMsCrq7IJ80xcuDDVyigg== dependencies: esbuild "^0.13.2" postcss "^8.3.8" @@ -11021,11 +11128,24 @@ web-namespaces@^2.0.0: resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-2.0.0.tgz#1f6a2d7b5823329abaedeb6bdf09ef2fed35db13" integrity sha512-dE7ELZRVWh0ceQsRgkjLgsAvwTuv3kcjSY/hLjqL0llleUlQBDjE9JkB9FCBY5F2mnFEwiyJoowl8+NVGHe8dw== +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + webidl-conversions@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + whatwg-url@^8.4.0: version "8.7.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" @@ -11085,7 +11205,7 @@ which@^1.2.9, which@^1.3.1: dependencies: isexe "^2.0.0" -wide-align@1.1.3, wide-align@^1.1.0: +wide-align@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==