diff options
35 files changed, 77 insertions, 71 deletions
diff --git a/.changeset/pretty-pumpkins-work.md b/.changeset/pretty-pumpkins-work.md deleted file mode 100644 index 40d19f5cd..000000000 --- a/.changeset/pretty-pumpkins-work.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixes an issue that was breaking asset and stylesheet URLs when building for a subpath diff --git a/.changeset/sweet-vans-begin.md b/.changeset/sweet-vans-begin.md deleted file mode 100644 index 030fb8ba8..000000000 --- a/.changeset/sweet-vans-begin.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'astro': patch -'@astrojs/telemetry': patch ---- - -Update to telemetry to include AstroConfig keys used diff --git a/examples/basics/package.json b/examples/basics/package.json index 0db3619f4..24c3d5a02 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" } } diff --git a/examples/blog-multiple-authors/package.json b/examples/blog-multiple-authors/package.json index e6c39e10b..a2892738b 100644 --- a/examples/blog-multiple-authors/package.json +++ b/examples/blog-multiple-authors/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/preact": "^0.1.2", - "astro": "^1.0.0-beta.26", + "astro": "^1.0.0-beta.27", "sass": "^1.50.1" }, "dependencies": { diff --git a/examples/blog/package.json b/examples/blog/package.json index ae9a0ae32..f87b81387 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/preact": "^0.1.2", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" }, "dependencies": { "preact": "^10.7.1" diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json index 65bf55088..58b5a99b9 100644 --- a/examples/component/demo/package.json +++ b/examples/component/demo/package.json @@ -10,6 +10,6 @@ }, "devDependencies": { "@example/my-component": "workspace:*", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" } } diff --git a/examples/component/package.json b/examples/component/package.json index d6a5d0a0e..7b82728d0 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -8,6 +8,6 @@ "serve": "astro --root demo preview" }, "devDependencies": { - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" } } diff --git a/examples/docs/package.json b/examples/docs/package.json index 892a51aef..31f0c0fc6 100644 --- a/examples/docs/package.json +++ b/examples/docs/package.json @@ -20,6 +20,6 @@ "devDependencies": { "@astrojs/preact": "^0.1.2", "@astrojs/react": "^0.1.1", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" } } diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json index 25586c14f..ba120823c 100644 --- a/examples/env-vars/package.json +++ b/examples/env-vars/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" } } diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 06934cd8f..e7935ce65 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -9,7 +9,7 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" }, "dependencies": { "alpinejs": "^3.10.2" diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 7a7d7d8b2..f8803dce1 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/lit": "^0.1.2", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 55e253342..9eca5c416 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -15,7 +15,7 @@ "@astrojs/solid-js": "^0.1.2", "@astrojs/svelte": "^0.1.2", "@astrojs/vue": "^0.1.3", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index d6f25185d..643072149 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/preact": "^0.1.2", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" }, "dependencies": { "preact": "^10.7.1" diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 26dc481a4..b80062615 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/react": "^0.1.1", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" }, "dependencies": { "@types/react": "^18.0.0", diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 371a8e7af..bd4173051 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/solid-js": "^0.1.2", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" }, "dependencies": { "solid-js": "^1.3.16" diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index b2596db1c..93618975a 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/svelte": "^0.1.2", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" }, "dependencies": { "svelte": "^3.47.0" diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index c3ffac952..60e853e77 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/vue": "^0.1.3", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" }, "dependencies": { "vue": "^3.2.33" diff --git a/examples/integrations-playground/package.json b/examples/integrations-playground/package.json index c45110c69..023ae1c07 100644 --- a/examples/integrations-playground/package.json +++ b/examples/integrations-playground/package.json @@ -15,7 +15,7 @@ "@astrojs/sitemap": "^0.1.0", "@astrojs/tailwind": "^0.2.1", "@astrojs/turbolinks": "^0.1.2", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/minimal/package.json b/examples/minimal/package.json index c128e24cb..be02a21b7 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index d1476cf8c..cbf0450c8 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 7347cbe08..1c38677c7 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/preact": "^0.1.2", - "astro": "^1.0.0-beta.26", + "astro": "^1.0.0-beta.27", "sass": "^1.50.1" }, "dependencies": { diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 069ca25e8..1a16fc3e3 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@astrojs/node": "^0.1.1", "@astrojs/svelte": "^0.1.2", - "astro": "^1.0.0-beta.26", + "astro": "^1.0.0-beta.27", "concurrently": "^7.1.0", "lightcookie": "^1.0.25", "unocss": "^0.15.6", diff --git a/examples/starter/package.json b/examples/starter/package.json index 919a0992b..cbcb3e220 100644 --- a/examples/starter/package.json +++ b/examples/starter/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" } } diff --git a/examples/subpath/package.json b/examples/subpath/package.json index 0e43611ff..fa117bdcc 100644 --- a/examples/subpath/package.json +++ b/examples/subpath/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/react": "^0.1.1", - "astro": "^1.0.0-beta.26", + "astro": "^1.0.0-beta.27", "sass": "^1.50.1" }, "dependencies": { diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 38915dfa4..1cd372282 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^0.9.4", - "astro": "^1.0.0-beta.26", + "astro": "^1.0.0-beta.27", "hast-util-select": "5.0.1", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.0.1", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index b9ee7c0e0..287500b95 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -10,6 +10,6 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^0.9.4", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" } } diff --git a/examples/with-markdown/package.json b/examples/with-markdown/package.json index e711ed7b5..cfbc1fae2 100644 --- a/examples/with-markdown/package.json +++ b/examples/with-markdown/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^0.1.1", "@astrojs/svelte": "^0.1.2", "@astrojs/vue": "^0.1.3", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" }, "dependencies": { "preact": "^10.7.1", diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index a6b549041..94c7b3040 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -25,6 +25,6 @@ "@astrojs/solid-js": "^0.1.2", "@astrojs/svelte": "^0.1.2", "@astrojs/vue": "^0.1.3", - "astro": "^1.0.0-beta.26" + "astro": "^1.0.0-beta.27" } } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index b4221ff10..8f53cea02 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/tailwind": "^0.2.1", - "astro": "^1.0.0-beta.26", + "astro": "^1.0.0-beta.27", "autoprefixer": "^10.4.4", "canvas-confetti": "^1.5.1", "postcss": "^8.4.12", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 23b065644..010113a10 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -9,7 +9,7 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^1.0.0-beta.26", + "astro": "^1.0.0-beta.27", "vite-plugin-pwa": "0.11.11", "workbox-window": "^6.5.3" } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index cf4cd0a80..6c4b37c35 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,16 @@ # astro +## 1.0.0-beta.27 + +### Patch Changes + +- [#3178](https://github.com/withastro/astro/pull/3178) [`19e1686b`](https://github.com/withastro/astro/commit/19e1686b8701ea7c4f8449958911035ae29cb53a) Thanks [@tony-sull](https://github.com/tony-sull)! - Fixes an issue that was breaking asset and stylesheet URLs when building for a subpath + +* [#3299](https://github.com/withastro/astro/pull/3299) [`8021998b`](https://github.com/withastro/astro/commit/8021998bb6011e31aa736abeafa4f1cf8f5a180c) Thanks [@matthewp](https://github.com/matthewp)! - Update to telemetry to include AstroConfig keys used + +* Updated dependencies [[`8021998b`](https://github.com/withastro/astro/commit/8021998bb6011e31aa736abeafa4f1cf8f5a180c)]: + - @astrojs/telemetry@0.1.2 + ## 1.0.0-beta.26 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 717b479f0..247dfb18b 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "1.0.0-beta.26", + "version": "1.0.0-beta.27", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", @@ -79,7 +79,7 @@ "@astrojs/language-server": "^0.13.4", "@astrojs/markdown-remark": "^0.9.4", "@astrojs/prism": "0.4.1", - "@astrojs/telemetry": "^0.1.1", + "@astrojs/telemetry": "^0.1.2", "@astrojs/webapi": "^0.11.1", "@babel/core": "^7.17.9", "@babel/generator": "^7.17.9", diff --git a/packages/telemetry/CHANGELOG.md b/packages/telemetry/CHANGELOG.md index cfec6056c..d3aaa5717 100644 --- a/packages/telemetry/CHANGELOG.md +++ b/packages/telemetry/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/telemetry +## 0.1.2 + +### Patch Changes + +- [#3299](https://github.com/withastro/astro/pull/3299) [`8021998b`](https://github.com/withastro/astro/commit/8021998bb6011e31aa736abeafa4f1cf8f5a180c) Thanks [@matthewp](https://github.com/matthewp)! - Update to telemetry to include AstroConfig keys used + ## 0.1.1 ### Patch Changes diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 3a21e4704..75fd57809 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/telemetry", - "version": "0.1.1", + "version": "0.1.2", "type": "module", "types": "./dist/types/index.d.ts", "author": "withastro", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 47028f577..436a7bf9b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -45,14 +45,14 @@ importers: examples/basics: specifiers: - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 devDependencies: astro: link:../../packages/astro examples/blog: specifiers: '@astrojs/preact': ^0.1.2 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 preact: ^10.7.1 dependencies: preact: 10.7.1 @@ -63,7 +63,7 @@ importers: examples/blog-multiple-authors: specifiers: '@astrojs/preact': ^0.1.2 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 preact: ^10.7.1 sass: ^1.50.1 dependencies: @@ -75,14 +75,14 @@ importers: examples/component: specifiers: - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 devDependencies: astro: link:../../packages/astro examples/component/demo: specifiers: '@example/my-component': workspace:* - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 devDependencies: '@example/my-component': link:../packages/my-component astro: link:../../../packages/astro @@ -98,7 +98,7 @@ importers: '@docsearch/css': ^3.0.0 '@docsearch/react': ^3.0.0 '@types/react': ^17.0.44 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 preact: ^10.7.1 react: ^17.0.2 react-dom: ^17.0.2 @@ -117,14 +117,14 @@ importers: examples/env-vars: specifiers: - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 devDependencies: astro: link:../../packages/astro examples/framework-alpine: specifiers: alpinejs: ^3.10.2 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 dependencies: alpinejs: 3.10.2 devDependencies: @@ -134,7 +134,7 @@ importers: specifiers: '@astrojs/lit': ^0.1.2 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 lit: ^2.2.2 dependencies: '@webcomponents/template-shadowroot': 0.1.0 @@ -152,7 +152,7 @@ importers: '@astrojs/svelte': ^0.1.2 '@astrojs/vue': ^0.1.3 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 lit: ^2.2.2 preact: ^10.7.1 react: ^18.0.0 @@ -181,7 +181,7 @@ importers: examples/framework-preact: specifiers: '@astrojs/preact': ^0.1.2 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 preact: ^10.7.1 dependencies: preact: 10.7.1 @@ -194,7 +194,7 @@ importers: '@astrojs/react': ^0.1.1 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 react: ^18.0.0 react-dom: ^18.0.0 dependencies: @@ -209,7 +209,7 @@ importers: examples/framework-solid: specifiers: '@astrojs/solid-js': ^0.1.2 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 solid-js: ^1.3.16 dependencies: solid-js: 1.3.16 @@ -220,7 +220,7 @@ importers: examples/framework-svelte: specifiers: '@astrojs/svelte': ^0.1.2 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 svelte: ^3.47.0 dependencies: svelte: 3.47.0 @@ -231,7 +231,7 @@ importers: examples/framework-vue: specifiers: '@astrojs/vue': ^0.1.3 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 vue: ^3.2.33 dependencies: vue: 3.2.33 @@ -248,7 +248,7 @@ importers: '@astrojs/tailwind': ^0.2.1 '@astrojs/turbolinks': ^0.1.2 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 lit: ^2.2.2 preact: ^10.7.1 react: ^18.0.0 @@ -276,20 +276,20 @@ importers: examples/minimal: specifiers: - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 devDependencies: astro: link:../../packages/astro examples/non-html-pages: specifiers: - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 devDependencies: astro: link:../../packages/astro examples/portfolio: specifiers: '@astrojs/preact': ^0.1.2 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 preact: ^10.7.1 sass: ^1.50.1 dependencies: @@ -303,7 +303,7 @@ importers: specifiers: '@astrojs/node': ^0.1.1 '@astrojs/svelte': ^0.1.2 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 concurrently: ^7.1.0 lightcookie: ^1.0.25 svelte: ^3.47.0 @@ -322,14 +322,14 @@ importers: examples/starter: specifiers: - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 devDependencies: astro: link:../../packages/astro examples/subpath: specifiers: '@astrojs/react': ^0.1.1 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 react: ^18.0.0 react-dom: ^18.0.0 sass: ^1.50.1 @@ -348,7 +348,7 @@ importers: '@astrojs/react': ^0.1.1 '@astrojs/svelte': ^0.1.2 '@astrojs/vue': ^0.1.3 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 preact: ^10.7.1 react: ^18.0.0 react-dom: ^18.0.0 @@ -371,7 +371,7 @@ importers: examples/with-markdown-plugins: specifiers: '@astrojs/markdown-remark': ^0.9.4 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 hast-util-select: 5.0.1 rehype-autolink-headings: ^6.1.1 rehype-slug: ^5.0.1 @@ -389,7 +389,7 @@ importers: examples/with-markdown-shiki: specifiers: '@astrojs/markdown-remark': ^0.9.4 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 devDependencies: '@astrojs/markdown-remark': link:../../packages/markdown/remark astro: link:../../packages/astro @@ -404,7 +404,7 @@ importers: '@nanostores/preact': ^0.1.3 '@nanostores/react': ^0.1.5 '@nanostores/vue': ^0.4.1 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 nanostores: ^0.5.12 preact: ^10.7.1 react: ^18.0.0 @@ -432,7 +432,7 @@ importers: examples/with-tailwindcss: specifiers: '@astrojs/tailwind': ^0.2.1 - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 autoprefixer: ^10.4.4 canvas-confetti: ^1.5.1 postcss: ^8.4.12 @@ -447,7 +447,7 @@ importers: examples/with-vite-plugin-pwa: specifiers: - astro: ^1.0.0-beta.26 + astro: ^1.0.0-beta.27 vite-plugin-pwa: 0.11.11 workbox-window: ^6.5.3 devDependencies: @@ -461,7 +461,7 @@ importers: '@astrojs/language-server': ^0.13.4 '@astrojs/markdown-remark': ^0.9.4 '@astrojs/prism': 0.4.1 - '@astrojs/telemetry': ^0.1.1 + '@astrojs/telemetry': ^0.1.2 '@astrojs/webapi': ^0.11.1 '@babel/core': ^7.17.9 '@babel/generator': ^7.17.9 |