From 4f413ad7715aa5b33f618c237acb69cea87b8126 Mon Sep 17 00:00:00 2001 From: tony-sull Date: Sun, 15 May 2022 21:48:18 +0000 Subject: [PATCH 01/15] [ci] format --- packages/astro/e2e/test-utils.js | 4 ++-- packages/astro/test/test-utils.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/astro/e2e/test-utils.js b/packages/astro/e2e/test-utils.js index e2552042c..71d8a26fa 100644 --- a/packages/astro/e2e/test-utils.js +++ b/packages/astro/e2e/test-utils.js @@ -8,6 +8,6 @@ export function loadFixture(inlineConfig) { // without this, the main `loadFixture` helper will resolve relative to `packages/astro/test` return baseLoadFixture({ ...inlineConfig, - root: new URL(inlineConfig.root, import.meta.url).toString() - }) + root: new URL(inlineConfig.root, import.meta.url).toString(), + }); } diff --git a/packages/astro/test/test-utils.js b/packages/astro/test/test-utils.js index bc7ff3f0b..5d56965ad 100644 --- a/packages/astro/test/test-utils.js +++ b/packages/astro/test/test-utils.js @@ -94,7 +94,8 @@ export async function loadFixture(inlineConfig) { }, }; - const resolveUrl = (url) => `http://${'127.0.0.1'}:${config.server.port}${url.replace(/^\/?/, '/')}`; + const resolveUrl = (url) => + `http://${'127.0.0.1'}:${config.server.port}${url.replace(/^\/?/, '/')}`; return { build: (opts = {}) => build(config, { mode: 'development', logging, telemetry, ...opts }), @@ -105,8 +106,7 @@ export async function loadFixture(inlineConfig) { }, config, resolveUrl, - fetch: (url, init) => - fetch(resolveUrl(url), init), + fetch: (url, init) => fetch(resolveUrl(url), init), preview: async (opts = {}) => { const previewServer = await preview(config, { logging, telemetry, ...opts }); return previewServer; From 21d9d360ec9b7703b3bb770a3639e07be9a2bafa Mon Sep 17 00:00:00 2001 From: FredKSchott Date: Mon, 16 May 2022 12:06:47 +0000 Subject: [PATCH 02/15] [ci] collect stats --- scripts/stats/stats.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/stats/stats.csv b/scripts/stats/stats.csv index 9a9e487ec..0f576d550 100644 --- a/scripts/stats/stats.csv +++ b/scripts/stats/stats.csv @@ -1,4 +1,5 @@ Date,Commits (24hr),Issues (24hr),Issues:BUG (24hr),Issues:RFC (24hr),Issues:DOC (24hr),PRs (24hr),Open PRs,Open Issues,Bugs: Needs Triage,Bugs: Accepted,RFC: In Progress,RFC: Accepted,Date (ISO) +"Monday, May 16, 2022",2,1,1,0,0,2,12,75,36,31,0,0,"2022-05-16T12:06:42.223Z" "Sunday, May 15, 2022",1,2,2,0,0,1,11,74,35,31,0,0,"2022-05-15T12:01:59.884Z" "Saturday, May 14, 2022",1,4,4,0,0,3,10,72,33,31,0,0,"2022-05-14T12:01:51.743Z" "Friday, May 13, 2022",17,6,6,0,0,5,7,70,35,28,0,0,"2022-05-13T12:01:50.988Z" From b1230152ff67ca9c184b24023651f4f8739097b8 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Mon, 16 May 2022 11:37:51 -0400 Subject: [PATCH 03/15] Support alias use with hydration scripts (#3376) * Support alias use with hydration scripts * Adds a changeset * Updated lockfile --- .changeset/tiny-donuts-own.md | 5 +++ packages/astro/src/core/build/index.ts | 1 - packages/astro/src/core/render/dev/index.ts | 13 ++----- packages/astro/src/runtime/server/index.ts | 5 +-- packages/astro/test/alias.test.js | 38 +++++++++++++++++++ .../test/fixtures/alias/astro.config.mjs | 14 +++++++ .../astro/test/fixtures/alias/package.json | 9 +++++ .../alias/src/components/Client.svelte | 2 + .../test/fixtures/alias/src/pages/index.astro | 25 ++++++++++++ pnpm-lock.yaml | 17 +++++++++ 10 files changed, 114 insertions(+), 15 deletions(-) create mode 100644 .changeset/tiny-donuts-own.md create mode 100644 packages/astro/test/alias.test.js create mode 100644 packages/astro/test/fixtures/alias/astro.config.mjs create mode 100644 packages/astro/test/fixtures/alias/package.json create mode 100644 packages/astro/test/fixtures/alias/src/components/Client.svelte create mode 100644 packages/astro/test/fixtures/alias/src/pages/index.astro diff --git a/.changeset/tiny-donuts-own.md b/.changeset/tiny-donuts-own.md new file mode 100644 index 000000000..9afdd5082 --- /dev/null +++ b/.changeset/tiny-donuts-own.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Allow using aliases for hydrated scripts diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts index 98278f72a..7639a9f18 100644 --- a/packages/astro/src/core/build/index.ts +++ b/packages/astro/src/core/build/index.ts @@ -195,7 +195,6 @@ class AstroBuilder { try { await this.build(setupData); } catch (_err) { - debugger; throw fixViteErrorMessage(createSafeError(_err), setupData.viteServer); } } diff --git a/packages/astro/src/core/render/dev/index.ts b/packages/astro/src/core/render/dev/index.ts index 9b8aaf929..56546637d 100644 --- a/packages/astro/src/core/render/dev/index.ts +++ b/packages/astro/src/core/render/dev/index.ts @@ -160,18 +160,11 @@ export async function render( pathname, scripts, // Resolves specifiers in the inline hydrated scripts, such as "@astrojs/preact/client.js" - // TODO: Can we pass the hydration code more directly through Vite, so that we - // don't need to copy-paste and maintain Vite's import resolution here? async resolve(s: string) { - const [resolvedUrl, resolvedPath] = await viteServer.moduleGraph.resolveUrl(s); - if (resolvedPath.includes('node_modules/.vite')) { - return resolvedPath.replace(/.*?node_modules\/\.vite/, '/node_modules/.vite'); + if(s.startsWith('/@fs')) { + return s; } - // NOTE: This matches the same logic that Vite uses to add the `/@id/` prefix. - if (!resolvedUrl.startsWith('.') && !resolvedUrl.startsWith('/')) { - return '/@id' + prependForwardSlash(resolvedUrl); - } - return '/@fs' + prependForwardSlash(resolvedPath); + return '/@id' + prependForwardSlash(s); }, renderers, request, diff --git a/packages/astro/src/runtime/server/index.ts b/packages/astro/src/runtime/server/index.ts index 9a46cb9c7..0d468a9d3 100644 --- a/packages/astro/src/runtime/server/index.ts +++ b/packages/astro/src/runtime/server/index.ts @@ -603,10 +603,7 @@ export async function renderHead(result: SSRResult): Promise { if ('data-astro-component-hydration' in script.props) { needsHydrationStyles = true; } - return renderElement('script', { - ...script, - props: { ...script.props, 'astro-script': result._metadata.pathname + '/script-' + i }, - }); + return renderElement('script', script); }); if (needsHydrationStyles) { styles.push( diff --git a/packages/astro/test/alias.test.js b/packages/astro/test/alias.test.js new file mode 100644 index 000000000..de0a1de4f --- /dev/null +++ b/packages/astro/test/alias.test.js @@ -0,0 +1,38 @@ +import { expect } from 'chai'; +import * as cheerio from 'cheerio'; +import { isWindows, loadFixture } from './test-utils.js'; + +describe('Aliases', () => { + let fixture; + + before(async () => { + fixture = await loadFixture({ + root: './fixtures/alias/', + }); + }); + + if (isWindows) return; + + describe('dev', () => { + let devServer; + + before(async () => { + devServer = await fixture.startDevServer(); + }); + + after(async () => { + await devServer.stop(); + }); + + it.only('can load client components', async () => { + const html = await fixture.fetch('/').then((res) => res.text()); + const $ = cheerio.load(html); + + // Should render aliased element + expect($('#client').text()).to.equal('test'); + + const scripts = $('script').toArray(); + expect(scripts.length).to.be.greaterThan(0); + }); + }); +}); diff --git a/packages/astro/test/fixtures/alias/astro.config.mjs b/packages/astro/test/fixtures/alias/astro.config.mjs new file mode 100644 index 000000000..c355cd08a --- /dev/null +++ b/packages/astro/test/fixtures/alias/astro.config.mjs @@ -0,0 +1,14 @@ +import { defineConfig } from 'astro/config'; +import svelte from '@astrojs/svelte'; + +// https://astro.build/config +export default defineConfig({ + integrations: [svelte()], + vite: { + resolve: { + alias: [ + { find:/^component:(.*)$/, replacement: '/src/components/$1' } + ] + } + } +}); diff --git a/packages/astro/test/fixtures/alias/package.json b/packages/astro/test/fixtures/alias/package.json new file mode 100644 index 000000000..1390fe040 --- /dev/null +++ b/packages/astro/test/fixtures/alias/package.json @@ -0,0 +1,9 @@ +{ + "name": "@test/aliases", + "version": "0.0.0", + "private": true, + "dependencies": { + "@astrojs/svelte": "workspace:*", + "astro": "workspace:*" + } +} diff --git a/packages/astro/test/fixtures/alias/src/components/Client.svelte b/packages/astro/test/fixtures/alias/src/components/Client.svelte new file mode 100644 index 000000000..2450d326a --- /dev/null +++ b/packages/astro/test/fixtures/alias/src/components/Client.svelte @@ -0,0 +1,2 @@ + +
test
diff --git a/packages/astro/test/fixtures/alias/src/pages/index.astro b/packages/astro/test/fixtures/alias/src/pages/index.astro new file mode 100644 index 000000000..7c9865d5d --- /dev/null +++ b/packages/astro/test/fixtures/alias/src/pages/index.astro @@ -0,0 +1,25 @@ +--- +import Client from 'component:Client.svelte' +--- + + + + + Svelte Client + + + +
+ +
+ + diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 497caf730..9b4facf0d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -681,6 +681,14 @@ importers: '@astrojs/vue': link:../../../../integrations/vue astro: link:../../.. + packages/astro/test/fixtures/alias: + specifiers: + '@astrojs/svelte': workspace:* + astro: workspace:* + dependencies: + '@astrojs/svelte': link:../../../../integrations/svelte + astro: link:../../.. + packages/astro/test/fixtures/astro-assets: specifiers: astro: workspace:* @@ -5994,6 +6002,11 @@ packages: /debug/3.2.7: resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true dependencies: ms: 2.1.3 dev: false @@ -8917,6 +8930,8 @@ packages: debug: 3.2.7 iconv-lite: 0.4.24 sax: 1.2.4 + transitivePeerDependencies: + - supports-color dev: false /netmask/2.0.2: @@ -8999,6 +9014,8 @@ packages: rimraf: 2.7.1 semver: 5.7.1 tar: 4.4.19 + transitivePeerDependencies: + - supports-color dev: false /node-releases/2.0.4: From e8007c3b8fe9328ac5e196a986abb63d4b434210 Mon Sep 17 00:00:00 2001 From: matthewp Date: Mon, 16 May 2022 15:39:02 +0000 Subject: [PATCH 04/15] [ci] format --- packages/astro/src/core/render/dev/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/astro/src/core/render/dev/index.ts b/packages/astro/src/core/render/dev/index.ts index 56546637d..e71284085 100644 --- a/packages/astro/src/core/render/dev/index.ts +++ b/packages/astro/src/core/render/dev/index.ts @@ -161,7 +161,7 @@ export async function render( scripts, // Resolves specifiers in the inline hydrated scripts, such as "@astrojs/preact/client.js" async resolve(s: string) { - if(s.startsWith('/@fs')) { + if (s.startsWith('/@fs')) { return s; } return '/@id' + prependForwardSlash(s); From e1294c422b3d3e98ccc745fe95d5672c9a17fe1f Mon Sep 17 00:00:00 2001 From: Sarah Etter Date: Mon, 16 May 2022 11:58:31 -0400 Subject: [PATCH 05/15] Netlify outdirectory (#3377) * Change dist directory, and functions out directory * Add changeset * update docs * Fix changeset --- .changeset/fair-kangaroos-talk.md | 5 +++++ packages/integrations/netlify/README.md | 2 +- .../integrations/netlify/src/integration-edge-functions.ts | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .changeset/fair-kangaroos-talk.md diff --git a/.changeset/fair-kangaroos-talk.md b/.changeset/fair-kangaroos-talk.md new file mode 100644 index 000000000..ae5937fa4 --- /dev/null +++ b/.changeset/fair-kangaroos-talk.md @@ -0,0 +1,5 @@ +--- +'@astrojs/netlify': minor +--- + +Change out directories on dist and serverEntry diff --git a/packages/integrations/netlify/README.md b/packages/integrations/netlify/README.md index 29a858d33..02e11a19e 100644 --- a/packages/integrations/netlify/README.md +++ b/packages/integrations/netlify/README.md @@ -39,7 +39,7 @@ export default defineConfig({ ### dist -We build to a `netlify` directory at the base of your project. To change this, use the `dist` option: +For Netlify Functions, we build to a `netlify` directory at the base of your project. In the case of Netlify Edge Functions, we build to a `dist` directory at the base of your project. To change this, use the `dist` option: ```js import { defineConfig } from 'astro/config'; diff --git a/packages/integrations/netlify/src/integration-edge-functions.ts b/packages/integrations/netlify/src/integration-edge-functions.ts index 0f28aeab5..843caedc1 100644 --- a/packages/integrations/netlify/src/integration-edge-functions.ts +++ b/packages/integrations/netlify/src/integration-edge-functions.ts @@ -72,7 +72,7 @@ export function netlifyEdgeFunctions({ dist }: NetlifyEdgeFunctionsOptions = {}) if (dist) { config.outDir = dist; } else { - config.outDir = new URL('./netlify/', config.root); + config.outDir = new URL('./dist/', config.root); } }, 'astro:config:done': ({ config, setAdapter }) => { @@ -82,7 +82,7 @@ export function netlifyEdgeFunctions({ dist }: NetlifyEdgeFunctionsOptions = {}) 'astro:build:start': async ({ buildConfig }) => { entryFile = buildConfig.serverEntry.replace(/\.m?js/, ''); buildConfig.client = _config.outDir; - buildConfig.server = new URL('./edge-functions/', _config.outDir); + buildConfig.server = new URL('./.netlify/edge-functions/', _config.root); buildConfig.serverEntry = 'entry.js'; }, 'astro:build:setup': ({ vite, target }) => { From b6f7a4fb4bc01dccd9bf3a35a66657a6e8c8d842 Mon Sep 17 00:00:00 2001 From: Nils Kanevad Date: Mon, 16 May 2022 18:15:36 +0200 Subject: [PATCH 06/15] Broken link to Solid package (#3372) The link to the `solid` package was pointing to `solid-js` instead of `solid` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db7591703..4abfe365e 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll | [create-astro](packages/create-astro) | [![create-astro version](https://img.shields.io/npm/v/create-astro.svg?label=%20)](packages/create-astro/CHANGELOG.md) | | [@astrojs/react](packages/integrations/react) | [![astro version](https://img.shields.io/npm/v/@astrojs/react.svg?label=%20)](packages/integrations/react/CHANGELOG.md) | | [@astrojs/preact](packages/integrations/preact) | [![astro version](https://img.shields.io/npm/v/@astrojs/preact.svg?label=%20)](packages/integrations/preact/CHANGELOG.md) | -| [@astrojs/solid-js](packages/integrations/solid-js) | [![astro version](https://img.shields.io/npm/v/@astrojs/solid-js.svg?label=%20)](packages/integrations/solid-js/CHANGELOG.md) | +| [@astrojs/solid-js](packages/integrations/solid) | [![astro version](https://img.shields.io/npm/v/@astrojs/solid-js.svg?label=%20)](packages/integrations/solid-js/CHANGELOG.md) | | [@astrojs/svelte](packages/integrations/svelte) | [![astro version](https://img.shields.io/npm/v/@astrojs/svelte.svg?label=%20)](packages/integrations/svelte/CHANGELOG.md) | | [@astrojs/vue](packages/integrations/vue) | [![astro version](https://img.shields.io/npm/v/@astrojs/vue.svg?label=%20)](packages/integrations/vue/CHANGELOG.md) | | [@astrojs/lit](packages/integrations/lit) | [![astro version](https://img.shields.io/npm/v/@astrojs/lit.svg?label=%20)](packages/integrations/lit/CHANGELOG.md) | From fe61e469b243c27781112499f151782baf9004a4 Mon Sep 17 00:00:00 2001 From: Daniel Vivar Date: Mon, 16 May 2022 18:16:30 +0200 Subject: [PATCH 07/15] test(@astrojs/lit): adding tests (#3375) * test(@astrojs/lit): adding tests * changeset --- .changeset/red-bikes-happen.md | 5 ++ packages/integrations/lit/package.json | 6 +- packages/integrations/lit/server.js | 14 ++-- packages/integrations/lit/test/server.test.js | 80 +++++++++++++++++++ pnpm-lock.yaml | 4 +- 5 files changed, 100 insertions(+), 9 deletions(-) create mode 100644 .changeset/red-bikes-happen.md create mode 100644 packages/integrations/lit/test/server.test.js diff --git a/.changeset/red-bikes-happen.md b/.changeset/red-bikes-happen.md new file mode 100644 index 000000000..41da1e2b8 --- /dev/null +++ b/.changeset/red-bikes-happen.md @@ -0,0 +1,5 @@ +--- +'@astrojs/lit': patch +--- + +Added tests and fix a small edge case for when you call render with no props/attrs diff --git a/packages/integrations/lit/package.json b/packages/integrations/lit/package.json index eea99dd8d..189ae1286 100644 --- a/packages/integrations/lit/package.json +++ b/packages/integrations/lit/package.json @@ -28,14 +28,16 @@ "scripts": { "build": "astro-scripts build \"src/**/*.ts\" && tsc", "build:ci": "astro-scripts build \"src/**/*.ts\"", - "dev": "astro-scripts dev \"src/**/*.ts\"" + "dev": "astro-scripts dev \"src/**/*.ts\"", + "test": "mocha" }, "dependencies": { "@lit-labs/ssr": "^2.1.0" }, "devDependencies": { "astro": "workspace:*", - "astro-scripts": "workspace:*" + "astro-scripts": "workspace:*", + "cheerio": "^1.0.0-rc.10" }, "peerDependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/packages/integrations/lit/server.js b/packages/integrations/lit/server.js index 1622ef619..05f0d1f9d 100644 --- a/packages/integrations/lit/server.js +++ b/packages/integrations/lit/server.js @@ -29,12 +29,14 @@ function* render(tagName, attrs, children) { // LitElementRenderer creates a new element instance, so copy over. const Ctr = getCustomElementConstructor(tagName); - for (let [name, value] of Object.entries(attrs)) { - // check if this is a reactive property - if (name in Ctr.prototype) { - instance.setProperty(name, value); - } else { - instance.setAttribute(name, value); + if (attrs) { + for (let [name, value] of Object.entries(attrs)) { + // check if this is a reactive property + if (name in Ctr.prototype) { + instance.setProperty(name, value); + } else { + instance.setAttribute(name, value); + } } } diff --git a/packages/integrations/lit/test/server.test.js b/packages/integrations/lit/test/server.test.js new file mode 100644 index 000000000..a4b691209 --- /dev/null +++ b/packages/integrations/lit/test/server.test.js @@ -0,0 +1,80 @@ +import { expect } from 'chai'; +import server from '../server.js' +import { LitElement, html } from 'lit' +import * as cheerio from 'cheerio' + +const { check, renderToStaticMarkup } = server + +describe('check', () => { + it('should be false with no component', async () => { + expect(await check()).to.equal(false) + }) + + it('should be false with a registered non-lit component', async () => { + const tagName = 'non-lit-component' + customElements.define(tagName, class TestComponent extends HTMLElement {}) + expect(await check(tagName)).to.equal(false) + }) + + it('should be true with a registered lit component', async () => { + const tagName = 'lit-component' + customElements.define(tagName, class extends LitElement {}) + expect(await check(tagName)).to.equal(true) + }) +}) + +describe('renderToStaticMarkup', () => { + it('should throw error if trying to render an unregistered component', async () => { + const tagName = 'non-registrered-component' + try { + await renderToStaticMarkup(tagName) + } catch (e) { + expect(e).to.be.an.instanceOf(TypeError) + } + }) + + it('should render emtpy component with default markup', async () => { + const tagName = 'nothing-component' + customElements.define(tagName, class extends LitElement {}) + const render = await renderToStaticMarkup(tagName) + expect(render).to.deep.equal({ + html: `<${tagName}>` + }) + }) + + it('should render component with default markup', async () => { + const tagName = 'simple-component' + customElements.define(tagName, class extends LitElement { + render() { + return html`

hola

` + } + }) + const render = await renderToStaticMarkup(tagName) + const $ = cheerio.load(render.html) + expect($(`${tagName} template`).html()).to.contain('

hola

') + }) + + it('should render component with properties and attributes', async () => { + const tagName = 'props-and-attrs-component' + const attr1 = 'test' + const prop1 = 'Daniel' + customElements.define(tagName, class extends LitElement { + static properties = { + prop1: { type: String }, + } + + constructor() { + super(); + this.prop1 = 'someone'; + } + + render() { + return html`

Hello ${this.prop1}

` + } + }) + const render = await renderToStaticMarkup(tagName, { prop1, attr1 }) + const $ = cheerio.load(render.html) + expect($(tagName).attr('attr1')).to.equal(attr1) + expect($(`${tagName} template`).text()).to.contain(`Hello ${prop1}`) + }) +}) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9b4facf0d..5bce82a20 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1349,11 +1349,13 @@ importers: '@lit-labs/ssr': ^2.1.0 astro: workspace:* astro-scripts: workspace:* + cheerio: ^1.0.0-rc.10 dependencies: '@lit-labs/ssr': 2.1.0 devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts + cheerio: 1.0.0-rc.10 packages/integrations/netlify: specifiers: @@ -5485,7 +5487,7 @@ packages: dev: false /boolbase/1.0.0: - resolution: {integrity: sha1-aN/1++YMUes3cl6p4+0xDcwed24=} + resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} /boxen/6.2.1: resolution: {integrity: sha512-H4PEsJXfFI/Pt8sjDWbHlQPx4zL/bvSQjcilJmaulGt5mLDorHOHpmdXAJcBcmru7PhYSp/cDMWRko4ZUMFkSw==} From 77beab072f6c9f86ea74f2a16f8250da3a06eacc Mon Sep 17 00:00:00 2001 From: matthewp Date: Mon, 16 May 2022 16:17:25 +0000 Subject: [PATCH 08/15] [ci] format --- packages/integrations/lit/test/server.test.js | 116 +++++++++--------- 1 file changed, 61 insertions(+), 55 deletions(-) diff --git a/packages/integrations/lit/test/server.test.js b/packages/integrations/lit/test/server.test.js index a4b691209..0769e59d4 100644 --- a/packages/integrations/lit/test/server.test.js +++ b/packages/integrations/lit/test/server.test.js @@ -1,80 +1,86 @@ import { expect } from 'chai'; -import server from '../server.js' -import { LitElement, html } from 'lit' -import * as cheerio from 'cheerio' +import server from '../server.js'; +import { LitElement, html } from 'lit'; +import * as cheerio from 'cheerio'; -const { check, renderToStaticMarkup } = server +const { check, renderToStaticMarkup } = server; describe('check', () => { it('should be false with no component', async () => { - expect(await check()).to.equal(false) - }) + expect(await check()).to.equal(false); + }); it('should be false with a registered non-lit component', async () => { - const tagName = 'non-lit-component' - customElements.define(tagName, class TestComponent extends HTMLElement {}) - expect(await check(tagName)).to.equal(false) - }) + const tagName = 'non-lit-component'; + customElements.define(tagName, class TestComponent extends HTMLElement {}); + expect(await check(tagName)).to.equal(false); + }); it('should be true with a registered lit component', async () => { - const tagName = 'lit-component' - customElements.define(tagName, class extends LitElement {}) - expect(await check(tagName)).to.equal(true) - }) -}) + const tagName = 'lit-component'; + customElements.define(tagName, class extends LitElement {}); + expect(await check(tagName)).to.equal(true); + }); +}); describe('renderToStaticMarkup', () => { it('should throw error if trying to render an unregistered component', async () => { - const tagName = 'non-registrered-component' + const tagName = 'non-registrered-component'; try { - await renderToStaticMarkup(tagName) + await renderToStaticMarkup(tagName); } catch (e) { - expect(e).to.be.an.instanceOf(TypeError) + expect(e).to.be.an.instanceOf(TypeError); } - }) + }); it('should render emtpy component with default markup', async () => { - const tagName = 'nothing-component' - customElements.define(tagName, class extends LitElement {}) - const render = await renderToStaticMarkup(tagName) + const tagName = 'nothing-component'; + customElements.define(tagName, class extends LitElement {}); + const render = await renderToStaticMarkup(tagName); expect(render).to.deep.equal({ - html: `<${tagName}>` - }) - }) + html: `<${tagName}>`, + }); + }); it('should render component with default markup', async () => { - const tagName = 'simple-component' - customElements.define(tagName, class extends LitElement { - render() { - return html`

hola

` + const tagName = 'simple-component'; + customElements.define( + tagName, + class extends LitElement { + render() { + return html`

hola

`; + } } - }) - const render = await renderToStaticMarkup(tagName) - const $ = cheerio.load(render.html) - expect($(`${tagName} template`).html()).to.contain('

hola

') - }) + ); + const render = await renderToStaticMarkup(tagName); + const $ = cheerio.load(render.html); + expect($(`${tagName} template`).html()).to.contain('

hola

'); + }); it('should render component with properties and attributes', async () => { - const tagName = 'props-and-attrs-component' - const attr1 = 'test' - const prop1 = 'Daniel' - customElements.define(tagName, class extends LitElement { - static properties = { - prop1: { type: String }, - } + const tagName = 'props-and-attrs-component'; + const attr1 = 'test'; + const prop1 = 'Daniel'; + customElements.define( + tagName, + class extends LitElement { + static properties = { + prop1: { type: String }, + }; - constructor() { - super(); - this.prop1 = 'someone'; + constructor() { + super(); + this.prop1 = 'someone'; + } + + render() { + return html`

Hello ${this.prop1}

`; + } } - - render() { - return html`

Hello ${this.prop1}

` - } - }) - const render = await renderToStaticMarkup(tagName, { prop1, attr1 }) - const $ = cheerio.load(render.html) - expect($(tagName).attr('attr1')).to.equal(attr1) - expect($(`${tagName} template`).text()).to.contain(`Hello ${prop1}`) - }) -}) + ); + const render = await renderToStaticMarkup(tagName, { prop1, attr1 }); + const $ = cheerio.load(render.html); + expect($(tagName).attr('attr1')).to.equal(attr1); + expect($(`${tagName} template`).text()).to.contain(`Hello ${prop1}`); + }); +}); From 31b0bc87a4f6f652d9007810026e99756a32cc46 Mon Sep 17 00:00:00 2001 From: Mark Leung <93582667+rotate-mark@users.noreply.github.com> Date: Mon, 16 May 2022 19:32:05 +0100 Subject: [PATCH 09/15] Add options to partytown integration (#3380) * Add options to partytown integration * Update doc --- .changeset/silent-books-train.md | 5 +++ packages/integrations/partytown/README.md | 32 ++++++++++++++++++++ packages/integrations/partytown/src/index.ts | 13 ++++++-- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 .changeset/silent-books-train.md diff --git a/.changeset/silent-books-train.md b/.changeset/silent-books-train.md new file mode 100644 index 000000000..eec5b1282 --- /dev/null +++ b/.changeset/silent-books-train.md @@ -0,0 +1,5 @@ +--- +'@astrojs/partytown': patch +--- + +Add config options for integration diff --git a/packages/integrations/partytown/README.md b/packages/integrations/partytown/README.md index 6452928cd..2c10f6af3 100644 --- a/packages/integrations/partytown/README.md +++ b/packages/integrations/partytown/README.md @@ -59,6 +59,38 @@ Partytown should be ready-to-use with zero config. If you have an existing 3rd p If you open the "Network" tab from [your browser's dev tools](https://developer.chrome.com/docs/devtools/open/), you should see the `partytown` proxy intercepting this request. +## Configuration + +### config.debug + +You can set debug mode using this integration's `config.debug` option. If `config.debug` is unset, it will fall back to `true` if the command is `dev`. + +```js +// astro.config.mjs +export default { + integrations: [partytown({ + // Example: Disable debug mode. + config: { debug: false }, + })], +} +``` + +### config.forward + +Because we’re moving third-party scripts to a web worker, the main thread needs to know which variables to patch on window, and when these services are called, the data is correctly forwarded to the web worker. You can to set it on the `config.forward` option. + +```js +// astro.config.mjs +export default { + integrations: [partytown({ + // Example: Add dataLayer.push as a forwarding-event. + config: { forward: ["dataLayer.push"] }, + })], +} +``` + +## Read more + [Head to the Partytown docs](https://partytown.builder.io/configuration) for configuration options and more usage examples. You can also check our [Astro Integration Documentation][astro-integration] for more on integrations. [astro-integration]: https://docs.astro.build/en/guides/integrations-guide/ diff --git a/packages/integrations/partytown/src/index.ts b/packages/integrations/partytown/src/index.ts index 7f235b776..24b0288a7 100644 --- a/packages/integrations/partytown/src/index.ts +++ b/packages/integrations/partytown/src/index.ts @@ -7,7 +7,14 @@ import { createRequire } from 'module'; import path from 'path'; const resolve = createRequire(import.meta.url).resolve; -export default function createPlugin(): AstroIntegration { +type PartytownOptions = { + config?: { + forward?: string[]; + debug?: boolean; + } +} | undefined; + +export default function createPlugin(options: PartytownOptions): AstroIntegration { let config: AstroConfig; let partytownSnippetHtml: string; const partytownEntrypoint = resolve('@builder.io/partytown/package.json'); @@ -16,7 +23,9 @@ export default function createPlugin(): AstroIntegration { name: '@astrojs/partytown', hooks: { 'astro:config:setup': ({ config: _config, command, injectScript }) => { - partytownSnippetHtml = partytownSnippet({ debug: command === 'dev' }); + const forward = options?.config?.forward || [] + const debug = options?.config?.debug || command === 'dev' + partytownSnippetHtml = partytownSnippet({ debug, forward }); injectScript('head-inline', partytownSnippetHtml); }, 'astro:config:done': ({ config: _config }) => { From 58cca31e799912a43e179eb32c4e9ff98bcb9e11 Mon Sep 17 00:00:00 2001 From: natemoo-re Date: Mon, 16 May 2022 18:32:54 +0000 Subject: [PATCH 10/15] [ci] format --- packages/integrations/partytown/src/index.ts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/integrations/partytown/src/index.ts b/packages/integrations/partytown/src/index.ts index 24b0288a7..425a0bc76 100644 --- a/packages/integrations/partytown/src/index.ts +++ b/packages/integrations/partytown/src/index.ts @@ -7,12 +7,14 @@ import { createRequire } from 'module'; import path from 'path'; const resolve = createRequire(import.meta.url).resolve; -type PartytownOptions = { - config?: { - forward?: string[]; - debug?: boolean; - } -} | undefined; +type PartytownOptions = + | { + config?: { + forward?: string[]; + debug?: boolean; + }; + } + | undefined; export default function createPlugin(options: PartytownOptions): AstroIntegration { let config: AstroConfig; @@ -23,8 +25,8 @@ export default function createPlugin(options: PartytownOptions): AstroIntegratio name: '@astrojs/partytown', hooks: { 'astro:config:setup': ({ config: _config, command, injectScript }) => { - const forward = options?.config?.forward || [] - const debug = options?.config?.debug || command === 'dev' + const forward = options?.config?.forward || []; + const debug = options?.config?.debug || command === 'dev'; partytownSnippetHtml = partytownSnippet({ debug, forward }); injectScript('head-inline', partytownSnippetHtml); }, From 9dd16bace5c9ee337461baaacb0fa72b6ebdc485 Mon Sep 17 00:00:00 2001 From: "Fred K. Schott" Date: Mon, 16 May 2022 11:33:16 -0700 Subject: [PATCH 11/15] [ci] update lockfile (#3363) Co-authored-by: FredKSchott --- examples/framework-multiple/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/integrations-playground/package.json | 2 +- examples/ssr/package.json | 2 +- package.json | 2 +- packages/astro/package.json | 8 +- .../fixtures/component-library/package.json | 6 +- packages/integrations/react/package.json | 2 +- packages/integrations/solid/package.json | 4 +- packages/telemetry/package.json | 2 +- packages/webapi/package.json | 4 +- pnpm-lock.yaml | 1090 +++-------------- 13 files changed, 200 insertions(+), 928 deletions(-) diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 91789676a..d9e4cd70e 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -23,7 +23,7 @@ "preact": "^10.7.2", "react": "^18.1.0", "react-dom": "^18.1.0", - "solid-js": "^1.3.17", + "solid-js": "^1.4.1", "svelte": "^3.48.0", "vue": "^3.2.33" } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 8fc372c8a..94daf664e 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@types/react": "^18.0.9", - "@types/react-dom": "^18.0.3", + "@types/react-dom": "^18.0.4", "react": "^18.1.0", "react-dom": "^18.1.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index b03151221..b8df75718 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -13,6 +13,6 @@ "astro": "^1.0.0-beta.28" }, "dependencies": { - "solid-js": "^1.3.17" + "solid-js": "^1.4.1" } } diff --git a/examples/integrations-playground/package.json b/examples/integrations-playground/package.json index 168982404..e6464128f 100644 --- a/examples/integrations-playground/package.json +++ b/examples/integrations-playground/package.json @@ -17,7 +17,7 @@ "@astrojs/tailwind": "^0.2.1", "@astrojs/turbolinks": "^0.1.2", "astro": "^1.0.0-beta.28", - "solid-js": "^1.3.17" + "solid-js": "^1.4.1" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/ssr/package.json b/examples/ssr/package.json index e420c1135..ec03b5219 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -12,7 +12,7 @@ "@astrojs/node": "^0.1.1", "@astrojs/svelte": "^0.1.3", "astro": "^1.0.0-beta.28", - "concurrently": "^7.1.0", + "concurrently": "^7.2.0", "lightcookie": "^1.0.25", "unocss": "^0.15.6", "vite-imagetools": "^4.0.3" diff --git a/package.json b/package.json index 030c2bdd3..f0266660a 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@octokit/action": "^3.18.1", "@typescript-eslint/eslint-plugin": "^5.23.0", "@typescript-eslint/parser": "^5.23.0", - "del": "^6.0.0", + "del": "^6.1.0", "esbuild": "^0.14.39", "eslint": "^8.15.0", "eslint-config-prettier": "^8.5.0", diff --git a/packages/astro/package.json b/packages/astro/package.json index c4d266a5d..790bda558 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -119,7 +119,7 @@ "prompts": "^2.4.2", "recast": "^0.20.5", "resolve": "^1.22.0", - "rollup": "^2.72.1", + "rollup": "^2.73.0", "semver": "^7.3.7", "serialize-javascript": "^6.0.0", "shiki": "^0.10.1", @@ -135,8 +135,8 @@ "zod": "^3.16.0" }, "devDependencies": { - "@babel/types": "^7.17.0", - "@playwright/test": "^1.21.1", + "@babel/types": "^7.17.10", + "@playwright/test": "^1.22.0", "@types/babel__core": "^7.1.19", "@types/babel__generator": "^7.6.4", "@types/babel__traverse": "^7.17.1", @@ -151,7 +151,7 @@ "@types/mocha": "^9.1.1", "@types/parse5": "^6.0.3", "@types/path-browserify": "^1.0.0", - "@types/prettier": "^2.6.0", + "@types/prettier": "^2.6.1", "@types/resolve": "^1.20.2", "@types/rimraf": "^3.0.2", "@types/send": "^0.17.1", diff --git a/packages/astro/test/fixtures/component-library/package.json b/packages/astro/test/fixtures/component-library/package.json index 5f13626c8..23c861101 100644 --- a/packages/astro/test/fixtures/component-library/package.json +++ b/packages/astro/test/fixtures/component-library/package.json @@ -3,12 +3,12 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "workspace:*", "@astrojs/preact": "workspace:*", "@astrojs/react": "workspace:*", "@astrojs/svelte": "workspace:*", "@test/component-library-shared": "workspace:*", - "react": "^18.0.0", - "react-dom": "^18.0.0" + "astro": "workspace:*", + "react": "^18.1.0", + "react-dom": "^18.1.0" } } diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json index be9968467..46a710baa 100644 --- a/packages/integrations/react/package.json +++ b/packages/integrations/react/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "@types/react": "^17.0.45", - "@types/react-dom": "^17.0.16", + "@types/react-dom": "^17.0.17", "astro": "workspace:*", "astro-scripts": "workspace:*", "react": "^18.1.0", diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index 88443f221..8646d4165 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -31,12 +31,12 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "babel-preset-solid": "^1.3.17" + "babel-preset-solid": "^1.4.0" }, "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "solid-js": "^1.3.17" + "solid-js": "^1.4.1" }, "peerDependencies": { "solid-js": "^1.3.6" diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index a5ed579bb..4cbebd4b4 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/dlv": "^1.1.2", - "@types/node": "^14.18.17", + "@types/node": "^14.18.18", "astro-scripts": "workspace:*" }, "engines": { diff --git a/packages/webapi/package.json b/packages/webapi/package.json index 42e8c2871..98715688c 100644 --- a/packages/webapi/package.json +++ b/packages/webapi/package.json @@ -56,7 +56,7 @@ "@rollup/plugin-typescript": "^8.3.2", "@types/chai": "^4.3.1", "@types/mocha": "^9.1.1", - "@types/node": "^14.18.17", + "@types/node": "^14.18.18", "@ungap/structured-clone": "^0.3.4", "abort-controller": "^3.0.0", "chai": "^4.3.6", @@ -66,7 +66,7 @@ "magic-string": "^0.25.9", "mocha": "^9.2.2", "node-fetch": "^3.2.4", - "rollup": "^2.72.1", + "rollup": "^2.73.0", "rollup-plugin-terser": "^7.0.2", "tslib": "^2.4.0", "typescript": "^4.6.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5bce82a20..3403dd091 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: '@octokit/action': ^3.18.1 '@typescript-eslint/eslint-plugin': ^5.23.0 '@typescript-eslint/parser': ^5.23.0 - del: ^6.0.0 + del: ^6.1.0 esbuild: ^0.14.39 eslint: ^8.15.0 eslint-config-prettier: ^8.5.0 @@ -30,7 +30,7 @@ importers: '@octokit/action': 3.18.1 '@typescript-eslint/eslint-plugin': 5.23.0_c63nfttrfhylg3zmgcxfslaw44 '@typescript-eslint/parser': 5.23.0_hcfsmds2fshutdssjqluwm76uu - del: 6.0.0 + del: 6.1.0 esbuild: 0.14.39 eslint: 8.15.0 eslint-config-prettier: 8.5.0_eslint@8.15.0 @@ -157,7 +157,7 @@ importers: preact: ^10.7.2 react: ^18.1.0 react-dom: ^18.1.0 - solid-js: ^1.3.17 + solid-js: ^1.4.1 svelte: ^3.48.0 vue: ^3.2.33 dependencies: @@ -166,7 +166,7 @@ importers: preact: 10.7.2 react: 18.1.0 react-dom: 18.1.0_react@18.1.0 - solid-js: 1.3.17 + solid-js: 1.4.1 svelte: 3.48.0 vue: 3.2.33 devDependencies: @@ -193,13 +193,13 @@ importers: specifiers: '@astrojs/react': ^0.1.2 '@types/react': ^18.0.9 - '@types/react-dom': ^18.0.3 + '@types/react-dom': ^18.0.4 astro: ^1.0.0-beta.28 react: ^18.1.0 react-dom: ^18.1.0 dependencies: '@types/react': 18.0.9 - '@types/react-dom': 18.0.3 + '@types/react-dom': 18.0.4 react: 18.1.0 react-dom: 18.1.0_react@18.1.0 devDependencies: @@ -210,9 +210,9 @@ importers: specifiers: '@astrojs/solid-js': ^0.1.2 astro: ^1.0.0-beta.28 - solid-js: ^1.3.17 + solid-js: ^1.4.1 dependencies: - solid-js: 1.3.17 + solid-js: 1.4.1 devDependencies: '@astrojs/solid-js': link:../../packages/integrations/solid astro: link:../../packages/astro @@ -254,7 +254,7 @@ importers: preact: ^10.7.2 react: ^18.1.0 react-dom: ^18.1.0 - solid-js: ^1.3.17 + solid-js: ^1.4.1 svelte: ^3.48.0 vue: ^3.2.33 dependencies: @@ -274,7 +274,7 @@ importers: '@astrojs/tailwind': link:../../packages/integrations/tailwind '@astrojs/turbolinks': link:../../packages/integrations/turbolinks astro: link:../../packages/astro - solid-js: 1.3.17 + solid-js: 1.4.1 examples/minimal: specifiers: @@ -306,7 +306,7 @@ importers: '@astrojs/node': ^0.1.1 '@astrojs/svelte': ^0.1.3 astro: ^1.0.0-beta.28 - concurrently: ^7.1.0 + concurrently: ^7.2.0 lightcookie: ^1.0.25 svelte: ^3.48.0 unocss: ^0.15.6 @@ -317,7 +317,7 @@ importers: '@astrojs/node': link:../../packages/integrations/node '@astrojs/svelte': link:../../packages/integrations/svelte astro: link:../../packages/astro - concurrently: 7.1.0 + concurrently: 7.2.0 lightcookie: 1.0.25 unocss: 0.15.6 vite-imagetools: 4.0.3 @@ -469,8 +469,8 @@ importers: '@babel/generator': ^7.17.10 '@babel/parser': ^7.17.10 '@babel/traverse': ^7.17.10 - '@babel/types': ^7.17.0 - '@playwright/test': ^1.21.1 + '@babel/types': ^7.17.10 + '@playwright/test': ^1.22.0 '@proload/core': ^0.3.2 '@proload/plugin-tsm': ^0.2.1 '@types/babel__core': ^7.1.19 @@ -487,7 +487,7 @@ importers: '@types/mocha': ^9.1.1 '@types/parse5': ^6.0.3 '@types/path-browserify': ^1.0.0 - '@types/prettier': ^2.6.0 + '@types/prettier': ^2.6.1 '@types/resolve': ^1.20.2 '@types/rimraf': ^3.0.2 '@types/send': ^0.17.1 @@ -528,7 +528,7 @@ importers: prompts: ^2.4.2 recast: ^0.20.5 resolve: ^1.22.0 - rollup: ^2.72.1 + rollup: ^2.73.0 sass: ^1.51.0 semver: ^7.3.7 serialize-javascript: ^6.0.0 @@ -588,7 +588,7 @@ importers: prompts: 2.4.2 recast: 0.20.5 resolve: 1.22.0 - rollup: 2.72.1 + rollup: 2.73.0 semver: 7.3.7 serialize-javascript: 6.0.0 shiki: 0.10.1 @@ -604,7 +604,7 @@ importers: zod: 3.16.0 devDependencies: '@babel/types': 7.17.10 - '@playwright/test': 1.21.1 + '@playwright/test': 1.22.0 '@types/babel__core': 7.1.19 '@types/babel__generator': 7.6.4 '@types/babel__traverse': 7.17.1 @@ -619,7 +619,7 @@ importers: '@types/mocha': 9.1.1 '@types/parse5': 6.0.3 '@types/path-browserify': 1.0.0 - '@types/prettier': 2.6.0 + '@types/prettier': 2.6.1 '@types/resolve': 1.20.2 '@types/rimraf': 3.0.2 '@types/send': 0.17.1 @@ -976,8 +976,8 @@ importers: '@astrojs/svelte': workspace:* '@test/component-library-shared': workspace:* astro: workspace:* - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.1.0 + react-dom: ^18.1.0 dependencies: '@astrojs/preact': link:../../../../integrations/preact '@astrojs/react': link:../../../../integrations/react @@ -1433,7 +1433,7 @@ importers: specifiers: '@babel/plugin-transform-react-jsx': ^7.17.3 '@types/react': ^17.0.45 - '@types/react-dom': ^17.0.16 + '@types/react-dom': ^17.0.17 astro: workspace:* astro-scripts: workspace:* react: ^18.1.0 @@ -1442,7 +1442,7 @@ importers: '@babel/plugin-transform-react-jsx': 7.17.3 devDependencies: '@types/react': 17.0.45 - '@types/react-dom': 17.0.16 + '@types/react-dom': 17.0.17 astro: link:../../astro astro-scripts: link:../../../scripts react: 18.1.0 @@ -1463,14 +1463,14 @@ importers: specifiers: astro: workspace:* astro-scripts: workspace:* - babel-preset-solid: ^1.3.17 - solid-js: ^1.3.17 + babel-preset-solid: ^1.4.0 + solid-js: ^1.4.1 dependencies: - babel-preset-solid: 1.3.17 + babel-preset-solid: 1.4.0 devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts - solid-js: 1.3.17 + solid-js: 1.4.1 packages/integrations/svelte: specifiers: @@ -1605,7 +1605,7 @@ importers: packages/telemetry: specifiers: '@types/dlv': ^1.1.2 - '@types/node': ^14.18.17 + '@types/node': ^14.18.18 astro-scripts: workspace:* ci-info: ^3.3.1 debug: ^4.3.4 @@ -1626,7 +1626,7 @@ importers: node-fetch: 3.2.4 devDependencies: '@types/dlv': 1.1.2 - '@types/node': 14.18.17 + '@types/node': 14.18.18 astro-scripts: link:../../scripts packages/webapi: @@ -1637,7 +1637,7 @@ importers: '@rollup/plugin-typescript': ^8.3.2 '@types/chai': ^4.3.1 '@types/mocha': ^9.1.1 - '@types/node': ^14.18.17 + '@types/node': ^14.18.18 '@ungap/structured-clone': ^0.3.4 abort-controller: ^3.0.0 chai: ^4.3.6 @@ -1647,20 +1647,20 @@ importers: magic-string: ^0.25.9 mocha: ^9.2.2 node-fetch: ^3.2.4 - rollup: ^2.72.1 + rollup: ^2.73.0 rollup-plugin-terser: ^7.0.2 tslib: ^2.4.0 typescript: ^4.6.4 urlpattern-polyfill: ^1.0.0-rc5 web-streams-polyfill: ^3.2.1 devDependencies: - '@rollup/plugin-alias': 3.1.9_rollup@2.72.1 - '@rollup/plugin-inject': 4.0.4_rollup@2.72.1 - '@rollup/plugin-node-resolve': 13.3.0_rollup@2.72.1 - '@rollup/plugin-typescript': 8.3.2_dsrqihoegvzgycupzno43pt4sq + '@rollup/plugin-alias': 3.1.9_rollup@2.73.0 + '@rollup/plugin-inject': 4.0.4_rollup@2.73.0 + '@rollup/plugin-node-resolve': 13.3.0_rollup@2.73.0 + '@rollup/plugin-typescript': 8.3.2_qvmxwb53ll4ofwdq3bekbs74hi '@types/chai': 4.3.1 '@types/mocha': 9.1.1 - '@types/node': 14.18.17 + '@types/node': 14.18.18 '@ungap/structured-clone': 0.3.4 abort-controller: 3.0.0 chai: 4.3.6 @@ -1670,8 +1670,8 @@ importers: magic-string: 0.25.9 mocha: 9.2.2 node-fetch: 3.2.4 - rollup: 2.72.1 - rollup-plugin-terser: 7.0.2_rollup@2.72.1 + rollup: 2.73.0 + rollup-plugin-terser: 7.0.2_rollup@2.73.0 tslib: 2.4.0 typescript: 4.6.4 urlpattern-polyfill: 1.0.0-rc5 @@ -1875,7 +1875,7 @@ packages: resolution: {integrity: sha512-rgi3g078uAxdb8jg1A5U8sNWMUQq7UXwHT7qmPiGOeB+h5p+tzUFy/Awq2suv99Tq8efpn3HrAGTuDvxyvbwfg==} dependencies: svelte: 3.48.0 - svelte2tsx: 0.5.9_wwvk7nlptlrqo2czohjtk6eiqm + svelte2tsx: 0.5.10_wwvk7nlptlrqo2czohjtk6eiqm transitivePeerDependencies: - typescript dev: false @@ -1890,29 +1890,6 @@ packages: resolution: {integrity: sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==} engines: {node: '>=6.9.0'} - /@babel/core/7.16.12: - resolution: {integrity: sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/code-frame': 7.16.7 - '@babel/generator': 7.17.10 - '@babel/helper-compilation-targets': 7.17.10_@babel+core@7.16.12 - '@babel/helper-module-transforms': 7.17.7 - '@babel/helpers': 7.17.9 - '@babel/parser': 7.17.10 - '@babel/template': 7.16.7 - '@babel/traverse': 7.17.10 - '@babel/types': 7.17.10 - convert-source-map: 1.8.0 - debug: 4.3.4 - gensync: 1.0.0-beta.2 - json5: 2.2.1 - semver: 6.3.0 - source-map: 0.5.7 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/core/7.17.10: resolution: {integrity: sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA==} engines: {node: '>=6.9.0'} @@ -1957,22 +1934,6 @@ packages: '@babel/types': 7.17.10 dev: true - /@babel/helper-compilation-targets/7.17.10_@babel+core@7.16.12: - resolution: {integrity: sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/compat-data': 7.17.10 - '@babel/core': 7.16.12 - '@babel/helper-validator-option': 7.16.7 - browserslist: 4.20.3 - semver: 6.3.0 - dev: true - /@babel/helper-compilation-targets/7.17.10_@babel+core@7.17.10: resolution: {integrity: sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==} engines: {node: '>=6.9.0'} @@ -1988,27 +1949,6 @@ packages: browserslist: 4.20.3 semver: 6.3.0 - /@babel/helper-create-class-features-plugin/7.17.9_@babel+core@7.16.12: - resolution: {integrity: sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-annotate-as-pure': 7.16.7 - '@babel/helper-environment-visitor': 7.16.7 - '@babel/helper-function-name': 7.17.9 - '@babel/helper-member-expression-to-functions': 7.17.7 - '@babel/helper-optimise-call-expression': 7.16.7 - '@babel/helper-replace-supers': 7.16.7 - '@babel/helper-split-export-declaration': 7.16.7 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/helper-create-class-features-plugin/7.17.9_@babel+core@7.17.10: resolution: {integrity: sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==} engines: {node: '>=6.9.0'} @@ -2270,22 +2210,6 @@ packages: - supports-color dev: true - /@babel/plugin-proposal-class-properties/7.16.7_@babel+core@7.16.12: - resolution: {integrity: sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-create-class-features-plugin': 7.17.9_@babel+core@7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/plugin-proposal-class-properties/7.16.7_@babel+core@7.17.10: resolution: {integrity: sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==} engines: {node: '>=6.9.0'} @@ -2319,20 +2243,6 @@ packages: - supports-color dev: true - /@babel/plugin-proposal-dynamic-import/7.16.7_@babel+core@7.16.12: - resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.12 - dev: true - /@babel/plugin-proposal-dynamic-import/7.16.7_@babel+core@7.17.10: resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==} engines: {node: '>=6.9.0'} @@ -2347,20 +2257,6 @@ packages: '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.17.10 dev: true - /@babel/plugin-proposal-export-namespace-from/7.16.7_@babel+core@7.16.12: - resolution: {integrity: sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.12 - dev: true - /@babel/plugin-proposal-export-namespace-from/7.16.7_@babel+core@7.17.10: resolution: {integrity: sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==} engines: {node: '>=6.9.0'} @@ -2389,20 +2285,6 @@ packages: '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.17.10 dev: true - /@babel/plugin-proposal-logical-assignment-operators/7.16.7_@babel+core@7.16.12: - resolution: {integrity: sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.12 - dev: true - /@babel/plugin-proposal-logical-assignment-operators/7.16.7_@babel+core@7.17.10: resolution: {integrity: sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==} engines: {node: '>=6.9.0'} @@ -2417,20 +2299,6 @@ packages: '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.17.10 dev: true - /@babel/plugin-proposal-nullish-coalescing-operator/7.16.7_@babel+core@7.16.12: - resolution: {integrity: sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.12 - dev: true - /@babel/plugin-proposal-nullish-coalescing-operator/7.16.7_@babel+core@7.17.10: resolution: {integrity: sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==} engines: {node: '>=6.9.0'} @@ -2445,20 +2313,6 @@ packages: '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.17.10 dev: true - /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.16.12: - resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.12 - dev: true - /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.17.10: resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==} engines: {node: '>=6.9.0'} @@ -2504,21 +2358,6 @@ packages: '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.17.10 dev: true - /@babel/plugin-proposal-optional-chaining/7.16.7_@babel+core@7.16.12: - resolution: {integrity: sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - '@babel/helper-skip-transparent-expression-wrappers': 7.16.0 - '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.12 - dev: true - /@babel/plugin-proposal-optional-chaining/7.16.7_@babel+core@7.17.10: resolution: {integrity: sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==} engines: {node: '>=6.9.0'} @@ -2534,22 +2373,6 @@ packages: '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.17.10 dev: true - /@babel/plugin-proposal-private-methods/7.16.11_@babel+core@7.16.12: - resolution: {integrity: sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-create-class-features-plugin': 7.17.9_@babel+core@7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/plugin-proposal-private-methods/7.16.11_@babel+core@7.17.10: resolution: {integrity: sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==} engines: {node: '>=6.9.0'} @@ -2566,24 +2389,6 @@ packages: - supports-color dev: true - /@babel/plugin-proposal-private-property-in-object/7.16.7_@babel+core@7.16.12: - resolution: {integrity: sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-annotate-as-pure': 7.16.7 - '@babel/helper-create-class-features-plugin': 7.17.9_@babel+core@7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.12 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/plugin-proposal-private-property-in-object/7.16.7_@babel+core@7.17.10: resolution: {integrity: sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==} engines: {node: '>=6.9.0'} @@ -2616,18 +2421,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.16.12: - resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.17.10: resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: @@ -2665,18 +2458,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.16.12: - resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.17.10: resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} peerDependencies: @@ -2689,18 +2470,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.16.12: - resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.17.10: resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} peerDependencies: @@ -2713,18 +2482,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.16.12: - resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.17.10: resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} peerDependencies: @@ -2749,18 +2506,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: false - /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.16.12: - resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.17.10: resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: @@ -2773,18 +2518,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.16.12: - resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.17.10: resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} peerDependencies: @@ -2797,18 +2530,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.16.12: - resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.17.10: resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} peerDependencies: @@ -2821,18 +2542,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.16.12: - resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.17.10: resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} peerDependencies: @@ -2845,18 +2554,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.16.12: - resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.17.10: resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} peerDependencies: @@ -2869,18 +2566,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.16.12: - resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.17.10: resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} peerDependencies: @@ -2893,19 +2578,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.16.12: - resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.17.10: resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==} engines: {node: '>=6.9.0'} @@ -2932,19 +2604,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-syntax-typescript/7.17.10_@babel+core@7.16.12: - resolution: {integrity: sha512-xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - dev: true - /@babel/plugin-transform-arrow-functions/7.16.7_@babel+core@7.17.10: resolution: {integrity: sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==} engines: {node: '>=6.9.0'} @@ -3161,24 +2820,6 @@ packages: - supports-color dev: true - /@babel/plugin-transform-modules-commonjs/7.16.8_@babel+core@7.16.12: - resolution: {integrity: sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-module-transforms': 7.17.7 - '@babel/helper-plugin-utils': 7.16.7 - '@babel/helper-simple-access': 7.17.7 - babel-plugin-dynamic-import-node: 2.3.3 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/plugin-transform-modules-commonjs/7.17.9_@babel+core@7.17.10: resolution: {integrity: sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==} engines: {node: '>=6.9.0'} @@ -3408,23 +3049,6 @@ packages: '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-transform-typescript/7.16.8_@babel+core@7.16.12: - resolution: {integrity: sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-create-class-features-plugin': 7.17.9_@babel+core@7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - '@babel/plugin-syntax-typescript': 7.17.10_@babel+core@7.16.12 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/plugin-transform-unicode-escapes/7.16.7_@babel+core@7.17.10: resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==} engines: {node: '>=6.9.0'} @@ -3556,23 +3180,6 @@ packages: esutils: 2.0.3 dev: true - /@babel/preset-typescript/7.16.7_@babel+core@7.16.12: - resolution: {integrity: sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - peerDependenciesMeta: - '@babel/core': - optional: true - dependencies: - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - '@babel/helper-validator-option': 7.16.7 - '@babel/plugin-transform-typescript': 7.16.8_@babel+core@7.16.12 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/runtime/7.17.9: resolution: {integrity: sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==} engines: {node: '>=6.9.0'} @@ -3905,17 +3512,6 @@ packages: - supports-color dev: true - /@jest/types/27.5.1: - resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@types/istanbul-lib-coverage': 2.0.4 - '@types/istanbul-reports': 3.0.1 - '@types/node': 17.0.32 - '@types/yargs': 16.0.4 - chalk: 4.1.2 - dev: true - /@jridgewell/gen-mapping/0.1.1: resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==} engines: {node: '>=6.0.0'} @@ -3959,7 +3555,7 @@ packages: dependencies: '@lit-labs/ssr-client': 1.0.1 '@lit/reactive-element': 1.3.2 - '@types/node': 16.11.34 + '@types/node': 16.11.35 lit: 2.2.3 lit-element: 3.2.0 lit-html: 2.2.3 @@ -3982,7 +3578,7 @@ packages: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: '@babel/runtime': 7.17.9 - '@types/node': 12.20.51 + '@types/node': 12.20.52 find-up: 4.1.0 fs-extra: 8.1.0 dev: true @@ -4195,49 +3791,12 @@ packages: '@octokit/openapi-types': 11.2.0 dev: true - /@playwright/test/1.21.1: - resolution: {integrity: sha512-XkkTXl5gvEm4fciqeHvY5IuSS/OfQef0MO6RpBNmtm6EuYSdtUvP/sDVuWRKsDqyVdB3WSA0az7iSw79f2//JQ==} - engines: {node: '>=12'} + /@playwright/test/1.22.0: + resolution: {integrity: sha512-ExcAjiECo3uTG5Sl5H4a7rKp/5TEHTI87dv9NHYEoUFuOHPhSVxB7QsuM70ktO+wTTZ9KzhwzcegxAGRmUFKEA==} + engines: {node: '>=14'} hasBin: true dependencies: - '@babel/code-frame': 7.16.7 - '@babel/core': 7.16.12 - '@babel/helper-plugin-utils': 7.16.7 - '@babel/plugin-proposal-class-properties': 7.16.7_@babel+core@7.16.12 - '@babel/plugin-proposal-dynamic-import': 7.16.7_@babel+core@7.16.12 - '@babel/plugin-proposal-export-namespace-from': 7.16.7_@babel+core@7.16.12 - '@babel/plugin-proposal-logical-assignment-operators': 7.16.7_@babel+core@7.16.12 - '@babel/plugin-proposal-nullish-coalescing-operator': 7.16.7_@babel+core@7.16.12 - '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.16.12 - '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.12 - '@babel/plugin-proposal-private-methods': 7.16.11_@babel+core@7.16.12 - '@babel/plugin-proposal-private-property-in-object': 7.16.7_@babel+core@7.16.12 - '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.16.12 - '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.12 - '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.12 - '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.12 - '@babel/plugin-transform-modules-commonjs': 7.16.8_@babel+core@7.16.12 - '@babel/preset-typescript': 7.16.7_@babel+core@7.16.12 - colors: 1.4.0 - commander: 8.3.0 - debug: 4.3.3 - expect: 27.2.5 - jest-matcher-utils: 27.2.5 - json5: 2.2.1 - mime: 3.0.0 - minimatch: 3.0.4 - ms: 2.1.3 - open: 8.4.0 - pirates: 4.0.4 - playwright-core: 1.21.1 - rimraf: 3.0.2 - source-map-support: 0.4.18 - stack-utils: 2.0.5 - yazl: 2.5.1 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate + playwright-core: 1.22.0 dev: true /@polka/url/1.0.0-next.21: @@ -4259,17 +3818,17 @@ packages: tsm: 2.2.1 dev: false - /@rollup/plugin-alias/3.1.9_rollup@2.72.1: + /@rollup/plugin-alias/3.1.9_rollup@2.73.0: resolution: {integrity: sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw==} engines: {node: '>=8.0.0'} peerDependencies: rollup: ^1.20.0||^2.0.0 dependencies: - rollup: 2.72.1 + rollup: 2.73.0 slash: 3.0.0 dev: true - /@rollup/plugin-babel/5.3.1_ddp4whfhauf2n5cf6yj7gaerwe: + /@rollup/plugin-babel/5.3.1_5ey36jajczjbmcqmomvpimwrdu: resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==} engines: {node: '>= 10.0.0'} peerDependencies: @@ -4284,62 +3843,62 @@ packages: dependencies: '@babel/core': 7.17.10 '@babel/helper-module-imports': 7.16.7 - '@rollup/pluginutils': 3.1.0_rollup@2.72.1 - rollup: 2.72.1 + '@rollup/pluginutils': 3.1.0_rollup@2.73.0 + rollup: 2.73.0 dev: true - /@rollup/plugin-inject/4.0.4_rollup@2.72.1: + /@rollup/plugin-inject/4.0.4_rollup@2.73.0: resolution: {integrity: sha512-4pbcU4J/nS+zuHk+c+OL3WtmEQhqxlZ9uqfjQMQDOHOPld7PsCd8k5LWs8h5wjwJN7MgnAn768F2sDxEP4eNFQ==} peerDependencies: rollup: ^1.20.0 || ^2.0.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.72.1 + '@rollup/pluginutils': 3.1.0_rollup@2.73.0 estree-walker: 2.0.2 magic-string: 0.25.9 - rollup: 2.72.1 + rollup: 2.73.0 dev: true - /@rollup/plugin-node-resolve/11.2.1_rollup@2.72.1: + /@rollup/plugin-node-resolve/11.2.1_rollup@2.73.0: resolution: {integrity: sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==} engines: {node: '>= 10.0.0'} peerDependencies: rollup: ^1.20.0||^2.0.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.72.1 + '@rollup/pluginutils': 3.1.0_rollup@2.73.0 '@types/resolve': 1.17.1 builtin-modules: 3.3.0 deepmerge: 4.2.2 is-module: 1.0.0 resolve: 1.22.0 - rollup: 2.72.1 + rollup: 2.73.0 dev: true - /@rollup/plugin-node-resolve/13.3.0_rollup@2.72.1: + /@rollup/plugin-node-resolve/13.3.0_rollup@2.73.0: resolution: {integrity: sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==} engines: {node: '>= 10.0.0'} peerDependencies: rollup: ^2.42.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.72.1 + '@rollup/pluginutils': 3.1.0_rollup@2.73.0 '@types/resolve': 1.17.1 deepmerge: 4.2.2 is-builtin-module: 3.1.0 is-module: 1.0.0 resolve: 1.22.0 - rollup: 2.72.1 + rollup: 2.73.0 dev: true - /@rollup/plugin-replace/2.4.2_rollup@2.72.1: + /@rollup/plugin-replace/2.4.2_rollup@2.73.0: resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==} peerDependencies: rollup: ^1.20.0 || ^2.0.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.72.1 + '@rollup/pluginutils': 3.1.0_rollup@2.73.0 magic-string: 0.25.9 - rollup: 2.72.1 + rollup: 2.73.0 dev: true - /@rollup/plugin-typescript/8.3.2_dsrqihoegvzgycupzno43pt4sq: + /@rollup/plugin-typescript/8.3.2_qvmxwb53ll4ofwdq3bekbs74hi: resolution: {integrity: sha512-MtgyR5LNHZr3GyN0tM7gNO9D0CS+Y+vflS4v/PHmrX17JCkHUYKvQ5jN5o3cz1YKllM3duXUqu3yOHwMPUxhDg==} engines: {node: '>=8.0.0'} peerDependencies: @@ -4347,14 +3906,14 @@ packages: tslib: '*' typescript: '>=3.7.0' dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.72.1 + '@rollup/pluginutils': 3.1.0_rollup@2.73.0 resolve: 1.22.0 - rollup: 2.72.1 + rollup: 2.73.0 tslib: 2.4.0 typescript: 4.6.4 dev: true - /@rollup/pluginutils/3.1.0_rollup@2.72.1: + /@rollup/pluginutils/3.1.0_rollup@2.73.0: resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} peerDependencies: @@ -4363,7 +3922,7 @@ packages: '@types/estree': 0.0.39 estree-walker: 1.0.1 picomatch: 2.3.1 - rollup: 2.72.1 + rollup: 2.73.0 dev: true /@rollup/pluginutils/4.2.1: @@ -4464,7 +4023,7 @@ packages: /@types/connect/3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 17.0.32 + '@types/node': 17.0.33 dev: true /@types/debug/4.1.7: @@ -4505,7 +4064,7 @@ packages: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 3.0.5 - '@types/node': 17.0.32 + '@types/node': 17.0.33 dev: true /@types/hast/2.3.4: @@ -4523,22 +4082,6 @@ packages: ci-info: 3.3.1 dev: true - /@types/istanbul-lib-coverage/2.0.4: - resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==} - dev: true - - /@types/istanbul-lib-report/3.0.0: - resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==} - dependencies: - '@types/istanbul-lib-coverage': 2.0.4 - dev: true - - /@types/istanbul-reports/3.0.1: - resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==} - dependencies: - '@types/istanbul-lib-report': 3.0.0 - dev: true - /@types/json-schema/7.0.11: resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} dev: true @@ -4585,20 +4128,20 @@ packages: '@types/unist': 2.0.6 dev: false - /@types/node/12.20.51: - resolution: {integrity: sha512-anVDMfReTatfH8GVmHmaTZOL0jeTLNZ9wK9SSrQS3tMmn4vUc+9fVWlUzAieuQefWDyWUz4Z3aqXxDgO1VsYjg==} + /@types/node/12.20.52: + resolution: {integrity: sha512-cfkwWw72849SNYp3Zx0IcIs25vABmFh73xicxhCkTcvtZQeIez15PpwQN8fY3RD7gv1Wrxlc9MEtfMORZDEsGw==} dev: true - /@types/node/14.18.17: - resolution: {integrity: sha512-oajWz4kOajqpKJMPgnCvBajPq8QAvl2xIWoFjlAJPKGu6n7pjov5SxGE45a+0RxHDoo4ycOMoZw1SCOWtDERbw==} + /@types/node/14.18.18: + resolution: {integrity: sha512-B9EoJFjhqcQ9OmQrNorItO+OwEOORNn3S31WuiHvZY/dm9ajkB7AKD/8toessEtHHNL+58jofbq7hMMY9v4yig==} dev: true - /@types/node/16.11.34: - resolution: {integrity: sha512-UrWGDyLAlQ2Z8bNOGWTsqbP9ZcBeTYBVuTRNxXTztBy5KhWUFI3BaeDWoCP/CzV/EVGgO1NTYzv9ZytBI9GAEw==} + /@types/node/16.11.35: + resolution: {integrity: sha512-QXu45LyepgnhUfnIAj/FyT4uM87ug5KpIrgXfQtUPNAlx8w5hmd8z8emqCLNvG11QkpRSCG9Qg2buMxvqfjfsQ==} dev: false - /@types/node/17.0.32: - resolution: {integrity: sha512-eAIcfAvhf/BkHcf4pkLJ7ECpBAhh9kcxRBpip9cTiO+hf+aJrsxYxBeS6OXvOd9WqNAJmavXVpZvY1rBjNsXmw==} + /@types/node/17.0.33: + resolution: {integrity: sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ==} /@types/normalize-package-data/2.4.1: resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} @@ -4611,8 +4154,8 @@ packages: resolution: {integrity: sha512-XMCcyhSvxcch8b7rZAtFAaierBYdeHXVvg2iYnxOV0MCQHmPuRRmGZPFDRzPayxcGiiSL1Te9UIO+f3cuj0tfw==} dev: true - /@types/prettier/2.6.0: - resolution: {integrity: sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw==} + /@types/prettier/2.6.1: + resolution: {integrity: sha512-XFjFHmaLVifrAKaZ+EKghFHtHSUonyw8P2Qmy2/+osBnrKbH9UYtlK10zg8/kCt47MFilll/DEDKy3DHfJ0URw==} dev: true /@types/prismjs/1.26.0: @@ -4622,7 +4165,7 @@ packages: /@types/prompts/2.0.14: resolution: {integrity: sha512-HZBd99fKxRWpYCErtm2/yxUZv6/PBI9J7N4TNFffl5JbrYMHBwF25DjQGTW3b3jmXq+9P6/8fCIb2ee57BFfYA==} dependencies: - '@types/node': 17.0.32 + '@types/node': 17.0.33 dev: false /@types/prop-types/15.7.5: @@ -4632,14 +4175,14 @@ packages: resolution: {integrity: sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==} dev: false - /@types/react-dom/17.0.16: - resolution: {integrity: sha512-DWcXf8EbMrO/gWnQU7Z88Ws/p16qxGpPyjTKTpmBSFKeE+HveVubqGO1CVK7FrwlWD5MuOcvh8gtd0/XO38NdQ==} + /@types/react-dom/17.0.17: + resolution: {integrity: sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg==} dependencies: '@types/react': 17.0.45 dev: true - /@types/react-dom/18.0.3: - resolution: {integrity: sha512-1RRW9kst+67gveJRYPxGmVy8eVJ05O43hg77G2j5m76/RFJtMbcfAs2viQ2UNsvvDg8F7OfQZx8qQcl6ymygaQ==} + /@types/react-dom/18.0.4: + resolution: {integrity: sha512-FgTtbqPOCI3dzZPZoC2T/sx3L34qxy99ITWn4eoSA95qPyXDMH0ALoAqUp49ITniiJFsXUVBtalh/KffMpg21Q==} dependencies: '@types/react': 18.0.9 dev: false @@ -4662,7 +4205,7 @@ packages: /@types/resolve/1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 14.18.17 + '@types/node': 14.18.18 dev: true /@types/resolve/1.20.2: @@ -4672,19 +4215,19 @@ packages: resolution: {integrity: sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==} dependencies: '@types/glob': 7.2.0 - '@types/node': 17.0.32 + '@types/node': 17.0.33 dev: true /@types/sass/1.43.1: resolution: {integrity: sha512-BPdoIt1lfJ6B7rw35ncdwBZrAssjcwzI5LByIrYs+tpXlj/CAkuVdRsgZDdP4lq5EjyWzwxZCqAoFyHKFwp32g==} dependencies: - '@types/node': 17.0.32 + '@types/node': 17.0.33 dev: false /@types/sax/1.2.4: resolution: {integrity: sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==} dependencies: - '@types/node': 17.0.32 + '@types/node': 17.0.33 dev: false /@types/scheduler/0.16.2: @@ -4698,11 +4241,7 @@ packages: resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} dependencies: '@types/mime': 1.3.2 - '@types/node': 17.0.32 - dev: true - - /@types/stack-utils/2.0.1: - resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} + '@types/node': 17.0.33 dev: true /@types/tailwindcss/3.0.10: @@ -4723,20 +4262,6 @@ packages: resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} dev: true - /@types/yargs/16.0.4: - resolution: {integrity: sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==} - dependencies: - '@types/yargs-parser': 21.0.0 - dev: true - - /@types/yauzl/2.10.0: - resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} - requiresBuild: true - dependencies: - '@types/node': 17.0.32 - dev: true - optional: true - /@typescript-eslint/eslint-plugin/5.23.0_c63nfttrfhylg3zmgcxfslaw44: resolution: {integrity: sha512-hEcSmG4XodSLiAp1uxv/OQSGsDY6QN3TcRU32gANp+19wGE1QQZLRS8/GV58VRUoXhnkuJ3ZxNQ3T6Z6zM59DA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -4969,7 +4494,7 @@ packages: acorn: 8.7.1 bindings: 1.5.0 estree-walker: 2.0.2 - glob: 7.2.0 + glob: 7.2.3 graceful-fs: 4.2.10 micromatch: 4.0.5 node-gyp-build: 4.4.0 @@ -5217,8 +4742,13 @@ packages: engines: {node: '>=6'} dev: true + /ansi-colors/4.1.2: + resolution: {integrity: sha512-cEG18jjLG0O74o/33eEfnmtXYDEY196ZjL0eQEISULF+Imi7vr25l6ntGYmqS5lIrQIEeze+CqUtPVItywE7ZQ==} + engines: {node: '>=6'} + dev: true + /ansi-regex/2.1.1: - resolution: {integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8=} + resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==} engines: {node: '>=0.10.0'} /ansi-regex/5.0.1: @@ -5242,11 +4772,6 @@ packages: dependencies: color-convert: 2.0.1 - /ansi-styles/5.2.0: - resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} - engines: {node: '>=10'} - dev: true - /ansi-styles/6.1.0: resolution: {integrity: sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==} engines: {node: '>=12'} @@ -5307,7 +4832,7 @@ packages: dev: false /arrify/1.0.1: - resolution: {integrity: sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=} + resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==} engines: {node: '>=0.10.0'} dev: true @@ -5355,7 +4880,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.20.3 - caniuse-lite: 1.0.30001340 + caniuse-lite: 1.0.30001341 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -5373,8 +4898,8 @@ packages: object.assign: 4.1.2 dev: true - /babel-plugin-jsx-dom-expressions/0.32.17: - resolution: {integrity: sha512-S3VLVh4zBsyWqNhMQq/Kof/sxULKZXaIhiNEy8Iy7XlpMXY4rpJ6XYtRVFtN/2+OnH+tyGDpZRWflvwqbuZxmA==} + /babel-plugin-jsx-dom-expressions/0.33.0: + resolution: {integrity: sha512-f70XzLfr+x8pOxRAZPNe7MBaILcgIp10RE6AVA7BZqtZYclsT/h/9Bj2GZU6rXG+ud1fEZCW1lAIt6gv9kt3Cw==} dependencies: '@babel/helper-module-imports': 7.16.0 '@babel/plugin-syntax-jsx': 7.16.7 @@ -5429,10 +4954,10 @@ packages: - supports-color dev: true - /babel-preset-solid/1.3.17: - resolution: {integrity: sha512-3lBNUtDj9SkEuO+sJCUlSkW7s8U/yhPJIxmRlXauSMOcGHgeOMu3omx//C9Fnz0DajG3fgSBeQLl7nhy5tS+dA==} + /babel-preset-solid/1.4.0: + resolution: {integrity: sha512-mcnAtsQj4cxX+rPomhH+XgNunTFxW6CnkyaD9nZqzpcBULtfSTnqqlfFx0+OqaD5/71Q90UgOSNv7NJp+GGU4g==} dependencies: - babel-plugin-jsx-dom-expressions: 0.32.17 + babel-plugin-jsx-dom-expressions: 0.33.0 transitivePeerDependencies: - '@babel/core' dev: false @@ -5536,14 +5061,15 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001340 + caniuse-lite: 1.0.30001341 electron-to-chromium: 1.4.137 escalade: 3.1.1 node-releases: 2.0.4 picocolors: 1.0.0 /buffer-crc32/0.2.13: - resolution: {integrity: sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=} + resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} + dev: false /buffer-from/1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} @@ -5611,8 +5137,8 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} - /caniuse-lite/1.0.30001340: - resolution: {integrity: sha512-jUNz+a9blQTQVu4uFcn17uAD8IDizPzQkIKh3LCJfg9BkyIqExYYdyc/ZSlWUSKb8iYiXxKsxbv4zYSvkqjrxw==} + /caniuse-lite/1.0.30001341: + resolution: {integrity: sha512-2SodVrFFtvGENGCv0ChVJIDQ0KPaS1cg7/qtfMaICgeMolDdo/Z2OD32F0Aq9yl6F4YFwGPBS5AaPqNYiW4PoA==} /canvas-confetti/1.5.1: resolution: {integrity: sha512-Ncz+oZJP6OvY7ti4E1slxVlyAV/3g7H7oQtcCDXgwGgARxPnwYY9PW5Oe+I8uvspYNtuHviAdgA0LfcKFWJfpg==} @@ -5693,7 +5219,7 @@ packages: dev: true /check-error/1.0.2: - resolution: {integrity: sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=} + resolution: {integrity: sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==} dev: true /cheerio-select/1.6.0: @@ -5835,11 +5361,6 @@ packages: resolution: {integrity: sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==} dev: true - /colors/1.4.0: - resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==} - engines: {node: '>=0.1.90'} - dev: true - /comma-separated-tokens/2.0.2: resolution: {integrity: sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==} @@ -5847,11 +5368,6 @@ packages: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} dev: true - /commander/8.3.0: - resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} - engines: {node: '>= 12'} - dev: true - /common-ancestor-path/1.0.1: resolution: {integrity: sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==} dev: false @@ -5864,8 +5380,8 @@ packages: /concat-map/0.0.1: resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} - /concurrently/7.1.0: - resolution: {integrity: sha512-Bz0tMlYKZRUDqJlNiF/OImojMB9ruKUz6GCfmhFnSapXgPe+3xzY4byqoKG9tUZ7L2PGEUjfLPOLfIX3labnmw==} + /concurrently/7.2.0: + resolution: {integrity: sha512-4KIVY5HopDRhN3ndAgfFOLsMk1PZUPgghlgTMZ5Pb5aTrqYg86RcZaIZC2Cz+qpZ9DsX36WHGjvWnXPqdnblhw==} engines: {node: ^12.20.0 || ^14.13.0 || >=16.0.0} hasBin: true dependencies: @@ -5873,10 +5389,11 @@ packages: date-fns: 2.28.0 lodash: 4.17.21 rxjs: 6.6.7 + shell-quote: 1.7.3 spawn-command: 0.0.2-1 supports-color: 8.1.1 tree-kill: 1.2.2 - yargs: 16.2.0 + yargs: 17.5.1 dev: true /consola/2.15.3: @@ -6013,18 +5530,6 @@ packages: ms: 2.1.3 dev: false - /debug/4.3.3: - resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - dev: true - /debug/4.3.3_supports-color@8.1.1: resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==} engines: {node: '>=6.0'} @@ -6108,11 +5613,6 @@ packages: dependencies: clone: 1.0.4 - /define-lazy-prop/2.0.0: - resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} - engines: {node: '>=8'} - dev: true - /define-properties/1.1.4: resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==} engines: {node: '>= 0.4'} @@ -6143,8 +5643,8 @@ packages: hasBin: true dev: false - /del/6.0.0: - resolution: {integrity: sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==} + /del/6.1.0: + resolution: {integrity: sha512-OpcRktOt7G7HBfyxP0srBH4Djg4824EQORX8E1qvIhIzthNNArxxhrB/Mm7dRMiLi1nvFyUpDhzD2cTtbBhV8A==} engines: {node: '>=10'} dependencies: globby: 11.1.0 @@ -6198,11 +5698,6 @@ packages: /didyoumean/1.2.2: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} - /diff-sequences/27.5.1: - resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dev: true - /diff/5.0.0: resolution: {integrity: sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==} engines: {node: '>=0.3.1'} @@ -6303,7 +5798,7 @@ packages: resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} engines: {node: '>=8.6'} dependencies: - ansi-colors: 4.1.1 + ansi-colors: 4.1.2 dev: true /entities/2.2.0: @@ -6567,11 +6062,6 @@ packages: resolution: {integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=} engines: {node: '>=0.8.0'} - /escape-string-regexp/2.0.0: - resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==} - engines: {node: '>=8'} - dev: true - /escape-string-regexp/4.0.0: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} @@ -6814,18 +6304,6 @@ packages: engines: {node: '>=6'} dev: true - /expect/27.2.5: - resolution: {integrity: sha512-ZrO0w7bo8BgGoP/bLz+HDCI+0Hfei9jUSZs5yI/Wyn9VkG9w8oJ7rHRgYj+MA7yqqFa0IwHA3flJzZtYugShJA==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@jest/types': 27.5.1 - ansi-styles: 5.2.0 - jest-get-type: 27.5.1 - jest-matcher-utils: 27.2.5 - jest-message-util: 27.5.1 - jest-regex-util: 27.5.1 - dev: true - /extend-shallow/2.0.1: resolution: {integrity: sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=} engines: {node: '>=0.10.0'} @@ -6849,20 +6327,6 @@ packages: tmp: 0.0.33 dev: true - /extract-zip/2.0.1: - resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==} - engines: {node: '>= 10.17.0'} - hasBin: true - dependencies: - debug: 4.3.4 - get-stream: 5.2.0 - yauzl: 2.10.0 - optionalDependencies: - '@types/yauzl': 2.10.0 - transitivePeerDependencies: - - supports-color - dev: true - /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} dev: true @@ -6901,12 +6365,6 @@ packages: dependencies: reusify: 1.0.4 - /fd-slicer/1.1.0: - resolution: {integrity: sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=} - dependencies: - pend: 1.2.0 - dev: true - /fetch-blob/3.1.5: resolution: {integrity: sha512-N64ZpKqoLejlrwkIAnb9iLSA3Vx/kjgzpcDhygcqJ2KKjky8nCgUQ+dzXtbrLaWZGZNmNfQTsiQ0weZ1svglHg==} engines: {node: ^12.20 || >= 14.13} @@ -6985,8 +6443,10 @@ packages: resolution: {integrity: sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==} dev: true - /foreach/2.0.6: - resolution: {integrity: sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==} + /for-each/0.3.3: + resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} + dependencies: + is-callable: 1.2.4 dev: false /formdata-polyfill/4.0.10: @@ -7131,13 +6591,6 @@ packages: resolution: {integrity: sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==} dev: true - /get-stream/5.2.0: - resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} - engines: {node: '>=8'} - dependencies: - pump: 3.0.0 - dev: true - /get-stream/6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} @@ -7191,6 +6644,17 @@ packages: minimatch: 3.1.2 once: 1.4.0 path-is-absolute: 1.0.1 + dev: true + + /glob/7.2.3: + resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} + 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 /globals/11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} @@ -7500,16 +6964,6 @@ packages: - supports-color dev: true - /https-proxy-agent/5.0.0: - resolution: {integrity: sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==} - engines: {node: '>= 6'} - dependencies: - agent-base: 6.0.2 - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - dev: true - /https-proxy-agent/5.0.1: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} @@ -7861,14 +7315,14 @@ packages: dependencies: has-symbols: 1.0.3 - /is-typed-array/1.1.8: - resolution: {integrity: sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==} + /is-typed-array/1.1.9: + resolution: {integrity: sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==} engines: {node: '>= 0.4'} dependencies: available-typed-arrays: 1.0.5 call-bind: 1.0.2 es-abstract: 1.20.0 - foreach: 2.0.6 + for-each: 0.3.3 has-tostringtag: 1.0.0 dev: false @@ -7919,56 +7373,11 @@ packages: minimatch: 3.1.2 dev: true - /jest-diff/27.5.1: - resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - chalk: 4.1.2 - diff-sequences: 27.5.1 - jest-get-type: 27.5.1 - pretty-format: 27.5.1 - dev: true - - /jest-get-type/27.5.1: - resolution: {integrity: sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dev: true - - /jest-matcher-utils/27.2.5: - resolution: {integrity: sha512-qNR/kh6bz0Dyv3m68Ck2g1fLW5KlSOUNcFQh87VXHZwWc/gY6XwnKofx76Qytz3x5LDWT09/2+yXndTkaG4aWg==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - chalk: 4.1.2 - jest-diff: 27.5.1 - jest-get-type: 27.5.1 - pretty-format: 27.5.1 - dev: true - - /jest-message-util/27.5.1: - resolution: {integrity: sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@babel/code-frame': 7.16.7 - '@jest/types': 27.5.1 - '@types/stack-utils': 2.0.1 - chalk: 4.1.2 - graceful-fs: 4.2.10 - micromatch: 4.0.5 - pretty-format: 27.5.1 - slash: 3.0.0 - stack-utils: 2.0.5 - dev: true - - /jest-regex-util/27.5.1: - resolution: {integrity: sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dev: true - /jest-worker/26.6.2: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 14.18.17 + '@types/node': 14.18.18 merge-stream: 2.0.0 supports-color: 7.2.0 dev: true @@ -7978,10 +7387,6 @@ packages: hasBin: true dev: true - /jpeg-js/0.4.3: - resolution: {integrity: sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==} - dev: true - /js-tokens/4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -8750,6 +8155,7 @@ packages: resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==} engines: {node: '>=10.0.0'} hasBin: true + dev: false /mimic-fn/2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} @@ -8768,12 +8174,6 @@ packages: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} - /minimatch/3.0.4: - resolution: {integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==} - dependencies: - brace-expansion: 1.1.11 - dev: true - /minimatch/3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: @@ -9173,15 +8573,6 @@ packages: is-wsl: 2.2.0 dev: true - /open/8.4.0: - resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==} - engines: {node: '>=12'} - dependencies: - define-lazy-prop: 2.0.0 - is-docker: 2.2.1 - is-wsl: 2.2.0 - dev: true - /optionator/0.8.3: resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==} engines: {node: '>= 0.8.0'} @@ -9432,10 +8823,6 @@ packages: resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} dev: true - /pend/1.2.0: - resolution: {integrity: sha1-elfrVQpng/kRUzH89GY9XI4AelA=} - dev: true - /picocolors/1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} @@ -9447,61 +8834,16 @@ packages: resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} engines: {node: '>=6'} - /pirates/4.0.4: - resolution: {integrity: sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==} - engines: {node: '>= 6'} - dev: true - - /pixelmatch/5.2.1: - resolution: {integrity: sha512-WjcAdYSnKrrdDdqTcVEY7aB7UhhwjYQKYhHiBXdJef0MOaQeYpUdQ+iVyBLa5YBKS8MPVPPMX7rpOByISLpeEQ==} - hasBin: true - dependencies: - pngjs: 4.0.1 - dev: true - /pkg-dir/4.2.0: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} dependencies: find-up: 4.1.0 - /playwright-core/1.21.1: - resolution: {integrity: sha512-SbK5dEsai9ZUKlxcinqegorBq4GnftXd4/GfW+pLsdQIQWrLCM/JNh6YQ2Rf2enVykXCejtoXW8L5vJXBBVSJQ==} - engines: {node: '>=12'} + /playwright-core/1.22.0: + resolution: {integrity: sha512-XnDPiV4NCzTtXWxQdyJ6Wg8xhST3ciUjt5mITaxoqOoYggmRtofKm0PXLehfbetXh2ppPYj5U8UhtUpdIE4wag==} + engines: {node: '>=14'} hasBin: true - dependencies: - colors: 1.4.0 - commander: 8.3.0 - debug: 4.3.3 - extract-zip: 2.0.1 - https-proxy-agent: 5.0.0 - jpeg-js: 0.4.3 - mime: 3.0.0 - pixelmatch: 5.2.1 - pngjs: 6.0.0 - progress: 2.0.3 - proper-lockfile: 4.1.2 - proxy-from-env: 1.1.0 - rimraf: 3.0.2 - socks-proxy-agent: 6.1.1 - stack-utils: 2.0.5 - ws: 8.4.2 - yauzl: 2.10.0 - yazl: 2.5.1 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: true - - /pngjs/4.0.1: - resolution: {integrity: sha512-rf5+2/ioHeQxR6IxuYNYGFytUyG3lma/WW1nsmjeHlWwtb2aByla6dkVc8pmJ9nplzkTA0q2xx7mMWrOTqT4Gg==} - engines: {node: '>=8.0.0'} - dev: true - - /pngjs/6.0.0: - resolution: {integrity: sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==} - engines: {node: '>=12.13.0'} dev: true /postcss-js/4.0.0_postcss@8.4.13: @@ -9656,15 +8998,6 @@ packages: engines: {node: ^14.13.1 || >=16.0.0} dev: true - /pretty-format/27.5.1: - resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - ansi-regex: 5.0.1 - ansi-styles: 5.2.0 - react-is: 17.0.2 - dev: true - /pretty-format/3.8.0: resolution: {integrity: sha1-v77VbV6ad2ZF9LH/eqGjrE+jw4U=} dev: false @@ -9676,11 +9009,6 @@ packages: /process-nextick-args/2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} - /progress/2.0.3: - resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} - engines: {node: '>=0.4.0'} - dev: true - /prompts/2.4.2: resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} engines: {node: '>= 6'} @@ -9689,14 +9017,6 @@ packages: sisteransi: 1.0.5 dev: false - /proper-lockfile/4.1.2: - resolution: {integrity: sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==} - dependencies: - graceful-fs: 4.2.10 - retry: 0.12.0 - signal-exit: 3.0.7 - dev: true - /property-information/6.1.1: resolution: {integrity: sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==} @@ -9792,10 +9112,6 @@ packages: react: 18.1.0 scheduler: 0.22.0 - /react-is/17.0.2: - resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} - dev: true - /react/17.0.2: resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} engines: {node: '>=0.10.0'} @@ -10113,11 +9429,6 @@ packages: unified: 10.1.2 dev: false - /retry/0.12.0: - resolution: {integrity: sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=} - engines: {node: '>= 4'} - dev: true - /reusify/1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} @@ -10126,22 +9437,22 @@ packages: resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} hasBin: true dependencies: - glob: 7.2.0 + glob: 7.2.3 /rimraf/3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} hasBin: true dependencies: - glob: 7.2.0 + glob: 7.2.3 - /rollup-plugin-terser/7.0.2_rollup@2.72.1: + /rollup-plugin-terser/7.0.2_rollup@2.73.0: resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==} peerDependencies: rollup: ^2.0.0 dependencies: '@babel/code-frame': 7.16.7 jest-worker: 26.6.2 - rollup: 2.72.1 + rollup: 2.73.0 serialize-javascript: 4.0.0 terser: 5.13.1 dev: true @@ -10152,8 +9463,8 @@ packages: estree-walker: 0.6.1 dev: false - /rollup/2.72.1: - resolution: {integrity: sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==} + /rollup/2.73.0: + resolution: {integrity: sha512-h/UngC3S4Zt28mB3g0+2YCMegT5yoftnQplwzPqGZcKvlld5e+kT/QRmJiL+qxGyZKOYpgirWGdLyEO1b0dpLQ==} engines: {node: '>=10.0.0'} hasBin: true optionalDependencies: @@ -10303,6 +9614,10 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} + /shell-quote/1.7.3: + resolution: {integrity: sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==} + dev: true + /shiki/0.10.1: resolution: {integrity: sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==} dependencies: @@ -10366,7 +9681,7 @@ packages: engines: {node: '>=12.0.0', npm: '>=5.6.0'} hasBin: true dependencies: - '@types/node': 17.0.32 + '@types/node': 17.0.33 '@types/sax': 1.2.4 arg: 5.0.1 sax: 1.2.4 @@ -10415,17 +9730,6 @@ packages: - supports-color dev: true - /socks-proxy-agent/6.1.1: - resolution: {integrity: sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==} - engines: {node: '>= 10'} - dependencies: - agent-base: 6.0.2 - debug: 4.3.4 - socks: 2.6.2 - transitivePeerDependencies: - - supports-color - dev: true - /socks/2.6.2: resolution: {integrity: sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==} engines: {node: '>= 10.13.0', npm: '>= 3.0.0'} @@ -10434,14 +9738,14 @@ packages: smart-buffer: 4.2.0 dev: true - /solid-js/1.3.17: - resolution: {integrity: sha512-BFCosxa4hRm+LF7S+kBL5bNr4RtuZif6AaR5FdQkBpV1E6QNLAOFm4HWgEN8vL2aCWEKl384cT8Etw8ziW8aag==} + /solid-js/1.4.1: + resolution: {integrity: sha512-ts480PccmUW9WAludSXET2dbBevjv+l6XMmN/OyG/a/xA8ZQoX4hNBN3gGhW785ZZv90fowbUSuSQUwOISm3YA==} /solid-nanostores/0.0.6: resolution: {integrity: sha512-iwbgdBzQSxBKoxkzaZgC9MGGUsHWJ74at9i7FF0naoqtwGuKdLYOgOJ9QRlA353DHDS/ttH2e0SRS6s3gz8NLQ==} dependencies: nanostores: 0.5.12 - solid-js: 1.3.17 + solid-js: 1.4.1 dev: false /sorcery/0.10.0: @@ -10458,12 +9762,6 @@ packages: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} engines: {node: '>=0.10.0'} - /source-map-support/0.4.18: - resolution: {integrity: sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==} - dependencies: - source-map: 0.5.7 - dev: true - /source-map-support/0.5.21: resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} dependencies: @@ -10471,11 +9769,6 @@ packages: source-map: 0.6.1 dev: true - /source-map/0.5.7: - resolution: {integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=} - engines: {node: '>=0.10.0'} - dev: true - /source-map/0.6.1: resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} engines: {node: '>=0.10.0'} @@ -10539,13 +9832,6 @@ packages: resolution: {integrity: sha512-JWp4cG2eybkvKA1QUHGoNK6JDEYcOnSuhzNGjZuYUPqXreDl/VkkvP2sZW7Rmh+icuCttrR9ccb2WPIazyM/Cw==} dev: true - /stack-utils/2.0.5: - resolution: {integrity: sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==} - engines: {node: '>=10'} - dependencies: - escape-string-regexp: 2.0.0 - dev: true - /statuses/2.0.1: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} engines: {node: '>= 0.8'} @@ -10804,8 +10090,8 @@ packages: resolution: {integrity: sha512-fN2YRm/bGumvjUpu6yI3BpvZnpIm9I6A7HR4oUNYd7ggYyIwSA/BX7DJ+UXXffLp6XNcUijyLvttbPVCYa/3xQ==} engines: {node: '>= 8'} - /svelte2tsx/0.5.9_wwvk7nlptlrqo2czohjtk6eiqm: - resolution: {integrity: sha512-xTDASjlh+rKo4QRhTRYSH87sS7fRoyX67xhGIMPKa3FYqftRHRmMes6nVgEskiuhBovslNHYYpMMg5YM5n/STg==} + /svelte2tsx/0.5.10_wwvk7nlptlrqo2czohjtk6eiqm: + resolution: {integrity: sha512-nokQ0HTTWMcNX6tLrDLiOmJCuqjKZU9nCZ6/mVuCL3nusXdbp+9nv69VG2pCy7uQC66kV4Ls+j0WfvvJuGVnkg==} peerDependencies: svelte: ^3.24 typescript: ^4.1.2 @@ -11429,9 +10715,9 @@ packages: inherits: 2.0.4 is-arguments: 1.1.1 is-generator-function: 1.0.10 - is-typed-array: 1.1.8 + is-typed-array: 1.1.9 safe-buffer: 5.2.1 - which-typed-array: 1.1.7 + which-typed-array: 1.1.8 dev: false /uvu/0.5.3: @@ -11496,7 +10782,7 @@ packages: debug: 4.3.4 fast-glob: 3.2.11 pretty-bytes: 5.6.0 - rollup: 2.72.1 + rollup: 2.73.0 workbox-build: 6.5.3 workbox-window: 6.5.3 transitivePeerDependencies: @@ -11523,7 +10809,7 @@ packages: esbuild: 0.14.39 postcss: 8.4.13 resolve: 1.22.0 - rollup: 2.72.1 + rollup: 2.73.0 optionalDependencies: fsevents: 2.3.2 dev: false @@ -11547,7 +10833,7 @@ packages: esbuild: 0.14.39 postcss: 8.4.13 resolve: 1.22.0 - rollup: 2.72.1 + rollup: 2.73.0 sass: 1.51.0 optionalDependencies: fsevents: 2.3.2 @@ -11706,16 +10992,16 @@ packages: load-yaml-file: 0.2.0 path-exists: 4.0.0 - /which-typed-array/1.1.7: - resolution: {integrity: sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==} + /which-typed-array/1.1.8: + resolution: {integrity: sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==} engines: {node: '>= 0.4'} dependencies: available-typed-arrays: 1.0.5 call-bind: 1.0.2 es-abstract: 1.20.0 - foreach: 2.0.6 + for-each: 0.3.3 has-tostringtag: 1.0.0 - is-typed-array: 1.1.8 + is-typed-array: 1.1.9 dev: false /which/1.3.1: @@ -11735,7 +11021,7 @@ packages: /wide-align/1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} dependencies: - string-width: 4.2.3 + string-width: 1.0.2 /widest-line/4.0.1: resolution: {integrity: sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==} @@ -11770,19 +11056,19 @@ packages: '@babel/core': 7.17.10 '@babel/preset-env': 7.17.10_@babel+core@7.17.10 '@babel/runtime': 7.17.9 - '@rollup/plugin-babel': 5.3.1_ddp4whfhauf2n5cf6yj7gaerwe - '@rollup/plugin-node-resolve': 11.2.1_rollup@2.72.1 - '@rollup/plugin-replace': 2.4.2_rollup@2.72.1 + '@rollup/plugin-babel': 5.3.1_5ey36jajczjbmcqmomvpimwrdu + '@rollup/plugin-node-resolve': 11.2.1_rollup@2.73.0 + '@rollup/plugin-replace': 2.4.2_rollup@2.73.0 '@surma/rollup-plugin-off-main-thread': 2.2.3 ajv: 8.11.0 common-tags: 1.8.2 fast-json-stable-stringify: 2.1.0 fs-extra: 9.1.0 - glob: 7.2.0 + glob: 7.2.3 lodash: 4.17.21 pretty-bytes: 5.6.0 - rollup: 2.72.1 - rollup-plugin-terser: 7.0.2_rollup@2.72.1 + rollup: 2.73.0 + rollup-plugin-terser: 7.0.2_rollup@2.73.0 source-map: 0.8.0-beta.0 stringify-object: 3.3.0 strip-comments: 2.0.1 @@ -11929,19 +11215,6 @@ packages: /wrappy/1.0.2: resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=} - /ws/8.4.2: - resolution: {integrity: sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==} - engines: {node: '>=10.0.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - dev: true - /xregexp/2.0.0: resolution: {integrity: sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=} dev: true @@ -11989,7 +11262,6 @@ packages: /yargs-parser/21.0.1: resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==} engines: {node: '>=12'} - dev: false /yargs-unparser/2.0.0: resolution: {integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==} @@ -12031,17 +11303,17 @@ packages: yargs-parser: 20.2.4 dev: true - /yauzl/2.10.0: - resolution: {integrity: sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=} + /yargs/17.5.1: + resolution: {integrity: sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==} + engines: {node: '>=12'} dependencies: - buffer-crc32: 0.2.13 - fd-slicer: 1.1.0 - dev: true - - /yazl/2.5.1: - resolution: {integrity: sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==} - dependencies: - buffer-crc32: 0.2.13 + cliui: 7.0.4 + escalade: 3.1.1 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 21.0.1 dev: true /yocto-queue/0.1.0: From 9d01f93b1c7db5d4afc4041e6ee73fb52f24d2d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Seery?= Date: Mon, 16 May 2022 15:34:46 -0300 Subject: [PATCH 12/15] feat(vercel): remove `nodeVersion` (#3368) * Remove `nodeVersion` * Changeset --- .changeset/silver-toes-retire.md | 5 +++++ packages/integrations/vercel/README.md | 13 ------------- .../integrations/vercel/src/serverless/adapter.ts | 14 ++++++++------ 3 files changed, 13 insertions(+), 19 deletions(-) create mode 100644 .changeset/silver-toes-retire.md diff --git a/.changeset/silver-toes-retire.md b/.changeset/silver-toes-retire.md new file mode 100644 index 000000000..326244211 --- /dev/null +++ b/.changeset/silver-toes-retire.md @@ -0,0 +1,5 @@ +--- +'@astrojs/vercel': patch +--- + +Remove `nodeVersion` option for `serverless` target. Now it is inferred from Vercel diff --git a/packages/integrations/vercel/README.md b/packages/integrations/vercel/README.md index a30617b67..3545774cf 100644 --- a/packages/integrations/vercel/README.md +++ b/packages/integrations/vercel/README.md @@ -59,19 +59,6 @@ import vercel from '@astrojs/vercel/serverless'; import vercel from '@astrojs/vercel/static'; ``` -### Node.js version - -When deploying to `serverless` you can choose what version of Node.js you want to target: `12.x`, `14.x` or `16.x` (default). - -```js -import { defineConfig } from 'astro/config'; -import vercel from '@astrojs/vercel/serverless'; - -export default defineConfig({ - adapter: vercel({ nodeVersion: '14.x' }) -}); -``` - ## Limitations **A few known complex packages (example: [puppeteer](https://github.com/puppeteer/puppeteer)) do not support bundling and therefore will not work properly with this adapter.** By default, Vercel doesn't include npm installed files & packages from your project's `./node_modules` folder. To address this, the `@astrojs/vercel` adapter automatically bundles your final build output using `esbuild`. diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts index babda1f84..a554fe175 100644 --- a/packages/integrations/vercel/src/serverless/adapter.ts +++ b/packages/integrations/vercel/src/serverless/adapter.ts @@ -14,11 +14,7 @@ function getAdapter(): AstroAdapter { }; } -export interface Options { - nodeVersion?: '12.x' | '14.x' | '16.x'; -} - -export default function vercelEdge({ nodeVersion = '16.x' }: Options = {}): AstroIntegration { +export default function vercelEdge(): AstroIntegration { let _config: AstroConfig; let functionFolder: URL; let serverEntry: string; @@ -57,7 +53,7 @@ export default function vercelEdge({ nodeVersion = '16.x' }: Options = {}): Astr // Serverless function config // https://vercel.com/docs/build-output-api/v3#vercel-primitives/serverless-functions/configuration await writeJson(new URL(`./.vc-config.json`, functionFolder), { - runtime: `nodejs${nodeVersion}`, + runtime: getRuntime(), handler: serverEntry, launcherType: 'Nodejs', }); @@ -76,3 +72,9 @@ export default function vercelEdge({ nodeVersion = '16.x' }: Options = {}): Astr }, }; } + +function getRuntime() { + const version = process.version.slice(1); // 'v16.5.0' --> '16.5.0' + const major = version.split('.')[0]; // '16.5.0' --> '16' + return `nodejs${major}.x`; +} From 0259d7658be82a4a5e09fb703498571d958a0569 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Mon, 16 May 2022 14:44:15 -0400 Subject: [PATCH 13/15] Fix for loading markdown pages with spaces in the name (#3379) * Fix for loading markdown pages with spaces in the name * Adds a changeset --- .changeset/stupid-donkeys-care.md | 5 +++ .../astro/src/vite-plugin-markdown/index.ts | 8 ++-- packages/astro/test/astro-pages.test.js | 39 ++++++++++++++++--- .../{astro-pages => astro pages}/package.json | 0 .../fixtures/astro pages/src/pages/index.md | 1 + .../src/pages/posts/name-with-index.md | 0 pnpm-lock.yaml | 12 +++--- 7 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 .changeset/stupid-donkeys-care.md rename packages/astro/test/fixtures/{astro-pages => astro pages}/package.json (100%) create mode 100644 packages/astro/test/fixtures/astro pages/src/pages/index.md rename packages/astro/test/fixtures/{astro-pages => astro pages}/src/pages/posts/name-with-index.md (100%) diff --git a/.changeset/stupid-donkeys-care.md b/.changeset/stupid-donkeys-care.md new file mode 100644 index 000000000..9fe8eebb8 --- /dev/null +++ b/.changeset/stupid-donkeys-care.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fixes issue with loading md pages in project with a space in folder name diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts index 2bbd72ffa..8e702054d 100644 --- a/packages/astro/src/vite-plugin-markdown/index.ts +++ b/packages/astro/src/vite-plugin-markdown/index.ts @@ -9,8 +9,8 @@ import type { Plugin } from 'vite'; import type { AstroConfig } from '../@types/astro'; import { PAGE_SSR_SCRIPT_ID } from '../vite-plugin-scripts/index.js'; import { pagesVirtualModuleId } from '../core/app/index.js'; -import { appendForwardSlash } from '../core/path.js'; -import { resolvePages } from '../core/util.js'; +import { appendForwardSlash, prependForwardSlash } from '../core/path.js'; +import { resolvePages, viteID } from '../core/util.js'; interface AstroPluginOptions { config: AstroConfig; @@ -156,7 +156,9 @@ ${setup}`.trim(); site: config.site ? new URL(config.base, config.site).toString() : undefined, sourcefile: id, sourcemap: 'inline', - internalURL: `/@fs${new URL('../runtime/server/index.js', import.meta.url).pathname}`, + internalURL: `/@fs${prependForwardSlash( + viteID(new URL('../runtime/server/index.js', import.meta.url)) + )}`, }); tsResult = `\nexport const metadata = ${JSON.stringify(metadata)}; diff --git a/packages/astro/test/astro-pages.test.js b/packages/astro/test/astro-pages.test.js index 0539388dd..708836a64 100644 --- a/packages/astro/test/astro-pages.test.js +++ b/packages/astro/test/astro-pages.test.js @@ -1,19 +1,46 @@ import { expect } from 'chai'; import * as cheerio from 'cheerio'; -import { loadFixture } from './test-utils.js'; +import { loadFixture, isWindows} from './test-utils.js'; describe('Pages', () => { let fixture; before(async () => { - fixture = await loadFixture({ root: './fixtures/astro-pages/' }); + fixture = await loadFixture({ root: './fixtures/astro pages/' }); await fixture.build(); }); - it('Can find page with "index" at the end file name', async () => { - const html = await fixture.readFile('/posts/name-with-index/index.html'); - const $ = cheerio.load(html); + describe('Build', () => { + before(async () => { + await fixture.build(); + }); - expect($('h1').text()).to.equal('Name with index'); + it('Can find page with "index" at the end file name', async () => { + const html = await fixture.readFile('/posts/name-with-index/index.html'); + const $ = cheerio.load(html); + + expect($('h1').text()).to.equal('Name with index'); + }); + }); + + if(isWindows) return; + + describe('Development', () => { + let devServer; + + before(async () => { + devServer = await fixture.startDevServer(); + }); + + after(async () => { + await devServer.stop(); + }); + + it('Is able to load md pages', async () => { + const html = await fixture.fetch('/').then((res) => res.text()); + const $ = cheerio.load(html); + + expect($('#testing').length).to.be.greaterThan(0); + }); }); }); diff --git a/packages/astro/test/fixtures/astro-pages/package.json b/packages/astro/test/fixtures/astro pages/package.json similarity index 100% rename from packages/astro/test/fixtures/astro-pages/package.json rename to packages/astro/test/fixtures/astro pages/package.json diff --git a/packages/astro/test/fixtures/astro pages/src/pages/index.md b/packages/astro/test/fixtures/astro pages/src/pages/index.md new file mode 100644 index 000000000..f00b526a9 --- /dev/null +++ b/packages/astro/test/fixtures/astro pages/src/pages/index.md @@ -0,0 +1 @@ +# Testing diff --git a/packages/astro/test/fixtures/astro-pages/src/pages/posts/name-with-index.md b/packages/astro/test/fixtures/astro pages/src/pages/posts/name-with-index.md similarity index 100% rename from packages/astro/test/fixtures/astro-pages/src/pages/posts/name-with-index.md rename to packages/astro/test/fixtures/astro pages/src/pages/posts/name-with-index.md diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3403dd091..59461efe9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -689,6 +689,12 @@ importers: '@astrojs/svelte': link:../../../../integrations/svelte astro: link:../../.. + packages/astro/test/fixtures/astro pages: + specifiers: + astro: workspace:* + dependencies: + astro: link:../../.. + packages/astro/test/fixtures/astro-assets: specifiers: astro: workspace:* @@ -925,12 +931,6 @@ importers: dependencies: astro: link:../../.. - packages/astro/test/fixtures/astro-pages: - specifiers: - astro: workspace:* - dependencies: - astro: link:../../.. - packages/astro/test/fixtures/astro-pagination: specifiers: astro: workspace:* From 43d922277afaeca9c90364fbf0b19477fd2c6566 Mon Sep 17 00:00:00 2001 From: Sarah Etter Date: Mon, 16 May 2022 14:44:21 -0400 Subject: [PATCH 14/15] Update out directories for Netlify Functions (#3381) * Change out directories for Netlify Functions * Changeset * Update test --- .changeset/eight-feet-reflect.md | 5 +++++ packages/integrations/netlify/README.md | 2 +- packages/integrations/netlify/src/integration-functions.ts | 4 ++-- packages/integrations/netlify/test/functions/cookies.test.js | 5 ++++- 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 .changeset/eight-feet-reflect.md diff --git a/.changeset/eight-feet-reflect.md b/.changeset/eight-feet-reflect.md new file mode 100644 index 000000000..1b26622c5 --- /dev/null +++ b/.changeset/eight-feet-reflect.md @@ -0,0 +1,5 @@ +--- +'@astrojs/netlify': minor +--- + +Updating out directories for Netlify Functions diff --git a/packages/integrations/netlify/README.md b/packages/integrations/netlify/README.md index 02e11a19e..b0daeadef 100644 --- a/packages/integrations/netlify/README.md +++ b/packages/integrations/netlify/README.md @@ -39,7 +39,7 @@ export default defineConfig({ ### dist -For Netlify Functions, we build to a `netlify` directory at the base of your project. In the case of Netlify Edge Functions, we build to a `dist` directory at the base of your project. To change this, use the `dist` option: +We build to a `dist` directory at the base of your project. To change this, use the `dist` option: ```js import { defineConfig } from 'astro/config'; diff --git a/packages/integrations/netlify/src/integration-functions.ts b/packages/integrations/netlify/src/integration-functions.ts index b353220ce..fd8ec0b9a 100644 --- a/packages/integrations/netlify/src/integration-functions.ts +++ b/packages/integrations/netlify/src/integration-functions.ts @@ -24,7 +24,7 @@ function netlifyFunctions({ dist }: NetlifyFunctionsOptions = {}): AstroIntegrat if (dist) { config.outDir = dist; } else { - config.outDir = new URL('./netlify/', config.root); + config.outDir = new URL('./dist/', config.root); } }, 'astro:config:done': ({ config, setAdapter }) => { @@ -34,7 +34,7 @@ function netlifyFunctions({ dist }: NetlifyFunctionsOptions = {}): AstroIntegrat 'astro:build:start': async ({ buildConfig }) => { entryFile = buildConfig.serverEntry.replace(/\.m?js/, ''); buildConfig.client = _config.outDir; - buildConfig.server = new URL('./functions/', _config.outDir); + buildConfig.server = new URL('./.netlify/functions-internal/', _config.root); }, 'astro:build:done': async ({ routes, dir }) => { await createRedirects(routes, dir, entryFile, false); diff --git a/packages/integrations/netlify/test/functions/cookies.test.js b/packages/integrations/netlify/test/functions/cookies.test.js index 43c55916b..e9121b429 100644 --- a/packages/integrations/netlify/test/functions/cookies.test.js +++ b/packages/integrations/netlify/test/functions/cookies.test.js @@ -24,7 +24,10 @@ describe('Cookies', () => { }); it('Can set multiple', async () => { - const entryURL = new URL('./fixtures/cookies/dist/functions/entry.mjs', import.meta.url); + const entryURL = new URL( + './fixtures/cookies/.netlify/functions-internal/entry.mjs', + import.meta.url + ); const { handler } = await import(entryURL); const resp = await handler({ httpMethod: 'POST', From 3ceff2595967c68b332bc6e48877e87f77520244 Mon Sep 17 00:00:00 2001 From: matthewp Date: Mon, 16 May 2022 18:45:15 +0000 Subject: [PATCH 15/15] [ci] format --- packages/astro/test/astro-pages.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/astro/test/astro-pages.test.js b/packages/astro/test/astro-pages.test.js index 708836a64..9d365adb7 100644 --- a/packages/astro/test/astro-pages.test.js +++ b/packages/astro/test/astro-pages.test.js @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as cheerio from 'cheerio'; -import { loadFixture, isWindows} from './test-utils.js'; +import { loadFixture, isWindows } from './test-utils.js'; describe('Pages', () => { let fixture; @@ -23,7 +23,7 @@ describe('Pages', () => { }); }); - if(isWindows) return; + if (isWindows) return; describe('Development', () => { let devServer;