From 9904c4c89d671739df4ea72db33dd4a4a00b10ae Mon Sep 17 00:00:00 2001 From: "Fred K. Schott" Date: Mon, 28 Mar 2022 15:47:17 -0700 Subject: [PATCH 01/17] [ci] update lockfile (#2900) Co-authored-by: FredKSchott --- package.json | 6 +- packages/astro/package.json | 4 +- pnpm-lock.yaml | 355 +++++++++++++++++++----------------- 3 files changed, 190 insertions(+), 175 deletions(-) diff --git a/package.json b/package.json index fc7de1c50..a3b4b276c 100644 --- a/package.json +++ b/package.json @@ -55,14 +55,14 @@ "@astrojs/webapi": "workspace:*" }, "devDependencies": { - "@changesets/changelog-github": "^0.4.3", - "@changesets/cli": "^2.21.1", + "@changesets/changelog-github": "^0.4.4", + "@changesets/cli": "^2.22.0", "@octokit/action": "^3.18.0", "@typescript-eslint/eslint-plugin": "^5.16.0", "@typescript-eslint/parser": "^5.16.0", "del": "^6.0.0", "esbuild": "0.14.25", - "eslint": "^8.11.0", + "eslint": "^8.12.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.0.0", "execa": "^6.1.0", diff --git a/packages/astro/package.json b/packages/astro/package.json index a071e3149..1a73d9516 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -97,7 +97,7 @@ "execa": "^6.1.0", "fast-glob": "^3.2.11", "fast-xml-parser": "^4.0.7", - "html-entities": "^2.3.2", + "html-entities": "^2.3.3", "html-escaper": "^3.0.3", "htmlparser2": "^7.2.0", "kleur": "^4.1.4", @@ -129,7 +129,7 @@ "tsconfig-resolver": "^3.0.1", "vite": "^2.8.6", "yargs-parser": "^21.0.1", - "zod": "^3.14.2" + "zod": "^3.14.3" }, "devDependencies": { "@babel/types": "^7.17.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b83cc73b1..6b2a4c04f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,14 +5,14 @@ importers: .: specifiers: '@astrojs/webapi': workspace:* - '@changesets/changelog-github': ^0.4.3 - '@changesets/cli': ^2.21.1 + '@changesets/changelog-github': ^0.4.4 + '@changesets/cli': ^2.22.0 '@octokit/action': ^3.18.0 '@typescript-eslint/eslint-plugin': ^5.16.0 '@typescript-eslint/parser': ^5.16.0 del: ^6.0.0 esbuild: 0.14.25 - eslint: ^8.11.0 + eslint: ^8.12.0 eslint-config-prettier: ^8.5.0 eslint-plugin-prettier: ^4.0.0 execa: ^6.1.0 @@ -24,16 +24,16 @@ importers: dependencies: '@astrojs/webapi': link:packages/webapi devDependencies: - '@changesets/changelog-github': 0.4.3 - '@changesets/cli': 2.21.1 + '@changesets/changelog-github': 0.4.4 + '@changesets/cli': 2.22.0 '@octokit/action': 3.18.0 - '@typescript-eslint/eslint-plugin': 5.16.0_bc68a9cd5bf604202498b1a9faaf9387 - '@typescript-eslint/parser': 5.16.0_eslint@8.11.0+typescript@4.6.3 + '@typescript-eslint/eslint-plugin': 5.16.0_4df62b6e125e6f18efee2d013b4a9d80 + '@typescript-eslint/parser': 5.16.0_eslint@8.12.0+typescript@4.6.3 del: 6.0.0 esbuild: 0.14.25 - eslint: 8.11.0 - eslint-config-prettier: 8.5.0_eslint@8.11.0 - eslint-plugin-prettier: 4.0.0_e2923b5169e23c4db59b86a638c599a3 + eslint: 8.12.0 + eslint-config-prettier: 8.5.0_eslint@8.12.0 + eslint-plugin-prettier: 4.0.0_b253a92c95b42c3296c682f11cccb3bd execa: 6.1.0 prettier: 2.6.1 pretty-bytes: 6.0.0 @@ -488,7 +488,7 @@ importers: execa: ^6.1.0 fast-glob: ^3.2.11 fast-xml-parser: ^4.0.7 - html-entities: ^2.3.2 + html-entities: ^2.3.3 html-escaper: ^3.0.3 htmlparser2: ^7.2.0 kleur: ^4.1.4 @@ -522,7 +522,7 @@ importers: tsconfig-resolver: ^3.0.1 vite: ^2.8.6 yargs-parser: ^21.0.1 - zod: ^3.14.2 + zod: ^3.14.3 dependencies: '@astrojs/compiler': 0.13.1 '@astrojs/language-server': 0.13.2 @@ -548,7 +548,7 @@ importers: execa: 6.1.0 fast-glob: 3.2.11 fast-xml-parser: 4.0.7 - html-entities: 2.3.2 + html-entities: 2.3.3 html-escaper: 3.0.3 htmlparser2: 7.2.0 kleur: 4.1.4 @@ -580,7 +580,7 @@ importers: tsconfig-resolver: 3.0.1 vite: 2.8.6_sass@1.49.9 yargs-parser: 21.0.1 - zod: 3.14.2 + zod: 3.14.3 devDependencies: '@babel/types': 7.17.0 '@types/babel__core': 7.1.19 @@ -3062,14 +3062,14 @@ packages: hasBin: true dev: false - /@changesets/apply-release-plan/5.0.5: - resolution: {integrity: sha512-CxL9dkhzjHiVmXCyHgsLCQj7i/coFTMv/Yy0v6BC5cIWZkQml+lf7zvQqAcFXwY7b54HxRWZPku02XFB53Q0Uw==} + /@changesets/apply-release-plan/6.0.0: + resolution: {integrity: sha512-gp6nIdVdfYdwKww2+f8whckKmvfE4JEm4jJgBhTmooi0uzHWhnxvk6JIzQi89qEAMINN0SeVNnXiAtbFY0Mj3w==} dependencies: '@babel/runtime': 7.17.8 - '@changesets/config': 1.7.0 + '@changesets/config': 2.0.0 '@changesets/get-version-range-type': 0.3.2 - '@changesets/git': 1.3.1 - '@changesets/types': 4.1.0 + '@changesets/git': 1.3.2 + '@changesets/types': 5.0.0 '@manypkg/get-packages': 1.1.3 detect-indent: 6.1.0 fs-extra: 7.0.1 @@ -3080,51 +3080,51 @@ packages: semver: 5.7.1 dev: true - /@changesets/assemble-release-plan/5.1.1: - resolution: {integrity: sha512-TQRZnK1sqYuoibJdSwpqE81rfDh0Xrkkr/M6bCQZ1ogGoRJNVbNYDWvNfkNvR4rEdRylri8cfKzffo/ruoy8QA==} + /@changesets/assemble-release-plan/5.1.2: + resolution: {integrity: sha512-nOFyDw4APSkY/vh5WNwGEtThPgEjVShp03PKVdId6wZTJALVcAALCSLmDRfeqjE2z9EsGJb7hZdDlziKlnqZgw==} dependencies: '@babel/runtime': 7.17.8 '@changesets/errors': 0.1.4 - '@changesets/get-dependents-graph': 1.3.1 - '@changesets/types': 4.1.0 + '@changesets/get-dependents-graph': 1.3.2 + '@changesets/types': 5.0.0 '@manypkg/get-packages': 1.1.3 semver: 5.7.1 dev: true - /@changesets/changelog-git/0.1.10: - resolution: {integrity: sha512-4t7zqPOv3aDZp4Y+AyDhiOG2ypaUXDpOz+MT1wOk3uSZNv78AaDByam0hdk5kfYuH1RlMecWU4/U5lO1ZL5eaA==} + /@changesets/changelog-git/0.1.11: + resolution: {integrity: sha512-sWJvAm+raRPeES9usNpZRkooeEB93lOpUN0Lmjz5vhVAb7XGIZrHEJ93155bpE1S0c4oJ5Di9ZWgzIwqhWP/Wg==} dependencies: - '@changesets/types': 4.1.0 + '@changesets/types': 5.0.0 dev: true - /@changesets/changelog-github/0.4.3: - resolution: {integrity: sha512-93X4arork7DV4+tVYeNlOTrw7HOXIvvd41yRPY9atJ+nS32W0uS+ewkZdc6WThuqmwGx9xaU+pxHtVLeYJTF0A==} + /@changesets/changelog-github/0.4.4: + resolution: {integrity: sha512-htSILqCkyYtTB5/LoVKwx7GCJQGxAiBcYbfUKWiz/QoDARuM01owYtMXhV6/iytJZq/Dqqz3PjMZUNB4MphpbQ==} dependencies: '@changesets/get-github-info': 0.5.0 - '@changesets/types': 4.1.0 + '@changesets/types': 5.0.0 dotenv: 8.6.0 transitivePeerDependencies: - encoding dev: true - /@changesets/cli/2.21.1: - resolution: {integrity: sha512-4AJKo/UW0P217m2VHjiuhZy+CstLw54eu9I1fsY7tst76GeEN7mX0mVrTNEisR6CvOH7wLav3ITqvDcKVPbKsw==} + /@changesets/cli/2.22.0: + resolution: {integrity: sha512-4bA3YoBkd5cm5WUxmrR2N9WYE7EeQcM+R3bVYMUj2NvffkQVpU3ckAI+z8UICoojq+HRl2OEwtz+S5UBmYY4zw==} hasBin: true dependencies: '@babel/runtime': 7.17.8 - '@changesets/apply-release-plan': 5.0.5 - '@changesets/assemble-release-plan': 5.1.1 - '@changesets/changelog-git': 0.1.10 - '@changesets/config': 1.7.0 + '@changesets/apply-release-plan': 6.0.0 + '@changesets/assemble-release-plan': 5.1.2 + '@changesets/changelog-git': 0.1.11 + '@changesets/config': 2.0.0 '@changesets/errors': 0.1.4 - '@changesets/get-dependents-graph': 1.3.1 - '@changesets/get-release-plan': 3.0.7 - '@changesets/git': 1.3.1 + '@changesets/get-dependents-graph': 1.3.2 + '@changesets/get-release-plan': 3.0.8 + '@changesets/git': 1.3.2 '@changesets/logger': 0.0.5 - '@changesets/pre': 1.0.10 - '@changesets/read': 0.5.4 - '@changesets/types': 4.1.0 - '@changesets/write': 0.1.7 + '@changesets/pre': 1.0.11 + '@changesets/read': 0.5.5 + '@changesets/types': 5.0.0 + '@changesets/write': 0.1.8 '@manypkg/get-packages': 1.1.3 '@types/is-ci': 3.0.0 '@types/semver': 6.2.3 @@ -3138,19 +3138,20 @@ packages: outdent: 0.5.0 p-limit: 2.3.0 preferred-pm: 3.0.3 + resolve-from: 5.0.0 semver: 5.7.1 spawndamnit: 2.0.0 term-size: 2.2.1 tty-table: 2.8.13 dev: true - /@changesets/config/1.7.0: - resolution: {integrity: sha512-Ctk6ZO5Ay6oZ95bbKXyA2a1QG0jQUePaGCY6BKkZtUG4PgysesfmiQOPgOY5OsRMt8exJeo6l+DJ75YiKmh0rQ==} + /@changesets/config/2.0.0: + resolution: {integrity: sha512-r5bIFY6CN3K6SQ+HZbjyE3HXrBIopONR47mmX7zUbORlybQXtympq9rVAOzc0Oflbap8QeIexc+hikfZoREXDg==} dependencies: '@changesets/errors': 0.1.4 - '@changesets/get-dependents-graph': 1.3.1 + '@changesets/get-dependents-graph': 1.3.2 '@changesets/logger': 0.0.5 - '@changesets/types': 4.1.0 + '@changesets/types': 5.0.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 micromatch: 4.0.5 @@ -3162,10 +3163,10 @@ packages: extendable-error: 0.1.7 dev: true - /@changesets/get-dependents-graph/1.3.1: - resolution: {integrity: sha512-HwUs8U0XK/ZqCQon1/80jJEyswS8JVmTiHTZslrTpuavyhhhxrSpO1eVCdKgaVHBRalOw3gRzdS3uzkmqYsQSQ==} + /@changesets/get-dependents-graph/1.3.2: + resolution: {integrity: sha512-tsqA6qZRB86SQuApSoDvI8yEWdyIlo/WLI4NUEdhhxLMJ0dapdeT6rUZRgSZzK1X2nv5YwR0MxQBbDAiDibKrg==} dependencies: - '@changesets/types': 4.1.0 + '@changesets/types': 5.0.0 '@manypkg/get-packages': 1.1.3 chalk: 2.4.2 fs-extra: 7.0.1 @@ -3181,15 +3182,15 @@ packages: - encoding dev: true - /@changesets/get-release-plan/3.0.7: - resolution: {integrity: sha512-zDp6RIEKvERIF4Osy8sJ5BzqTiiLMhPWBO02y6w3nzTQJ0VBMaTs4hhwImQ/54O9I34eUHR3D0DwmwGQ27ifaw==} + /@changesets/get-release-plan/3.0.8: + resolution: {integrity: sha512-TJYiWNuP0Lzu2dL/KHuk75w7TkiE5HqoYirrXF7SJIxkhlgH9toQf2C7IapiFTObtuF1qDN8HJAX1CuIOwXldg==} dependencies: '@babel/runtime': 7.17.8 - '@changesets/assemble-release-plan': 5.1.1 - '@changesets/config': 1.7.0 - '@changesets/pre': 1.0.10 - '@changesets/read': 0.5.4 - '@changesets/types': 4.1.0 + '@changesets/assemble-release-plan': 5.1.2 + '@changesets/config': 2.0.0 + '@changesets/pre': 1.0.11 + '@changesets/read': 0.5.5 + '@changesets/types': 5.0.0 '@manypkg/get-packages': 1.1.3 dev: true @@ -3197,12 +3198,12 @@ packages: resolution: {integrity: sha512-SVqwYs5pULYjYT4op21F2pVbcrca4qA/bAA3FmFXKMN7Y+HcO8sbZUTx3TAy2VXulP2FACd1aC7f2nTuqSPbqg==} dev: true - /@changesets/git/1.3.1: - resolution: {integrity: sha512-yg60QUi38VA0XGXdBy9SRYJhs8xJHE97Z1CaB/hFyByBlh5k1i+avFNBvvw66MsoT/aiml6y9scIG6sC8R5mfg==} + /@changesets/git/1.3.2: + resolution: {integrity: sha512-p5UL+urAg0Nnpt70DLiBe2iSsMcDubTo9fTOD/61krmcJ466MGh71OHwdAwu1xG5+NKzeysdy1joRTg8CXcEXA==} dependencies: '@babel/runtime': 7.17.8 '@changesets/errors': 0.1.4 - '@changesets/types': 4.1.0 + '@changesets/types': 5.0.0 '@manypkg/get-packages': 1.1.3 is-subdir: 1.2.0 spawndamnit: 2.0.0 @@ -3214,31 +3215,31 @@ packages: chalk: 2.4.2 dev: true - /@changesets/parse/0.3.12: - resolution: {integrity: sha512-FOBz2L1dT9PcvyQU1Qp2sQ0B4Jw7EgRDAKFVzAQwhzXqCq03TcE7vgKU6VSksCJAioMYDowdVVHNnv/Uak6yZQ==} + /@changesets/parse/0.3.13: + resolution: {integrity: sha512-wh9Ifa0dungY6d2nMz6XxF6FZ/1I7j+mEgPAqrIyKS64nifTh1Ua82qKKMMK05CL7i4wiB2NYc3SfnnCX3RVeA==} dependencies: - '@changesets/types': 4.1.0 + '@changesets/types': 5.0.0 js-yaml: 3.14.1 dev: true - /@changesets/pre/1.0.10: - resolution: {integrity: sha512-cZC1C1wTSC17/TcTWivAQ4LAXz5jEYDuy3UeZiBz1wnTTzMHyTHLLwJi60juhl4hawXunDLw0mwZkcpS8Ivitg==} + /@changesets/pre/1.0.11: + resolution: {integrity: sha512-CXZnt4SV9waaC9cPLm7818+SxvLKIDHUxaiTXnJYDp1c56xIexx1BNfC1yMuOdzO2a3rAIcZua5Odxr3dwSKfg==} dependencies: '@babel/runtime': 7.17.8 '@changesets/errors': 0.1.4 - '@changesets/types': 4.1.0 + '@changesets/types': 5.0.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 dev: true - /@changesets/read/0.5.4: - resolution: {integrity: sha512-12dTx+p5ztFs9QgJDGHRHR6HzTIbHct9S4lK2I/i6Qkz1cNfAPVIbdoMCdbPIWeLank9muMUjiiFmCWJD7tQIg==} + /@changesets/read/0.5.5: + resolution: {integrity: sha512-bzonrPWc29Tsjvgh+8CqJ0apQOwWim0zheeD4ZK44ApSa/GudnZJTODtA3yNOOuQzeZmL0NUebVoHIurtIkA7w==} dependencies: '@babel/runtime': 7.17.8 - '@changesets/git': 1.3.1 + '@changesets/git': 1.3.2 '@changesets/logger': 0.0.5 - '@changesets/parse': 0.3.12 - '@changesets/types': 4.1.0 + '@changesets/parse': 0.3.13 + '@changesets/types': 5.0.0 chalk: 2.4.2 fs-extra: 7.0.1 p-filter: 2.1.0 @@ -3248,11 +3249,15 @@ packages: resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==} dev: true - /@changesets/write/0.1.7: - resolution: {integrity: sha512-6r+tc6u2l5BBIwEAh7ivRYWFir+XKiw0q/6Hx6NJA4dSN5fNu9uyWRQ+IMHCllD9dBcsh+e79sOepc+xT8l28g==} + /@changesets/types/5.0.0: + resolution: {integrity: sha512-IT1kBLSbAgTS4WtpU6P5ko054hq12vk4tgeIFRVE7Vnm4a/wgbNvBalgiKP0MjEXbCkZbItiGQHkCGxYWR55sA==} + dev: true + + /@changesets/write/0.1.8: + resolution: {integrity: sha512-oIHeFVMuP6jf0TPnKPpaFpvvAf3JBc+s2pmVChbeEgQTBTALoF51Z9kqxQfG4XONZPHZnqkmy564c7qohhhhTQ==} dependencies: '@babel/runtime': 7.17.8 - '@changesets/types': 4.1.0 + '@changesets/types': 5.0.0 fs-extra: 7.0.1 human-id: 1.0.2 prettier: 1.19.1 @@ -3888,8 +3893,8 @@ packages: ci-info: 3.3.0 dev: true - /@types/json-schema/7.0.10: - resolution: {integrity: sha512-BLO9bBq59vW3fxCpD4o0N4U+DXsvwvIcl+jofw0frQo/GrBFC+/jRZj1E7kgp6dvTyNmA4y6JCV5Id/r3mNP5A==} + /@types/json-schema/7.0.11: + resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} dev: true /@types/json5/0.0.30: @@ -4051,7 +4056,7 @@ packages: resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} dev: true - /@typescript-eslint/eslint-plugin/5.16.0_bc68a9cd5bf604202498b1a9faaf9387: + /@typescript-eslint/eslint-plugin/5.16.0_4df62b6e125e6f18efee2d013b4a9d80: resolution: {integrity: sha512-SJoba1edXvQRMmNI505Uo4XmGbxCK9ARQpkvOd00anxzri9RNQk0DDCxD+LIl+jYhkzOJiOMMKYEHnHEODjdCw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4062,12 +4067,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.16.0_eslint@8.11.0+typescript@4.6.3 + '@typescript-eslint/parser': 5.16.0_eslint@8.12.0+typescript@4.6.3 '@typescript-eslint/scope-manager': 5.16.0 - '@typescript-eslint/type-utils': 5.16.0_eslint@8.11.0+typescript@4.6.3 - '@typescript-eslint/utils': 5.16.0_eslint@8.11.0+typescript@4.6.3 + '@typescript-eslint/type-utils': 5.16.0_eslint@8.12.0+typescript@4.6.3 + '@typescript-eslint/utils': 5.16.0_eslint@8.12.0+typescript@4.6.3 debug: 4.3.4 - eslint: 8.11.0 + eslint: 8.12.0 functional-red-black-tree: 1.0.1 ignore: 5.2.0 regexpp: 3.2.0 @@ -4078,7 +4083,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.16.0_eslint@8.11.0+typescript@4.6.3: + /@typescript-eslint/parser/5.16.0_eslint@8.12.0+typescript@4.6.3: resolution: {integrity: sha512-fkDq86F0zl8FicnJtdXakFs4lnuebH6ZADDw6CYQv0UZeIjHvmEw87m9/29nk2Dv5Lmdp0zQ3zDQhiMWQf/GbA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4092,7 +4097,7 @@ packages: '@typescript-eslint/types': 5.16.0 '@typescript-eslint/typescript-estree': 5.16.0_typescript@4.6.3 debug: 4.3.4 - eslint: 8.11.0 + eslint: 8.12.0 typescript: 4.6.3 transitivePeerDependencies: - supports-color @@ -4106,7 +4111,7 @@ packages: '@typescript-eslint/visitor-keys': 5.16.0 dev: true - /@typescript-eslint/type-utils/5.16.0_eslint@8.11.0+typescript@4.6.3: + /@typescript-eslint/type-utils/5.16.0_eslint@8.12.0+typescript@4.6.3: resolution: {integrity: sha512-SKygICv54CCRl1Vq5ewwQUJV/8padIWvPgCxlWPGO/OgQLCijY9G7lDu6H+mqfQtbzDNlVjzVWQmeqbLMBLEwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4116,9 +4121,9 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/utils': 5.16.0_eslint@8.11.0+typescript@4.6.3 + '@typescript-eslint/utils': 5.16.0_eslint@8.12.0+typescript@4.6.3 debug: 4.3.4 - eslint: 8.11.0 + eslint: 8.12.0 tsutils: 3.21.0_typescript@4.6.3 typescript: 4.6.3 transitivePeerDependencies: @@ -4151,19 +4156,19 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.16.0_eslint@8.11.0+typescript@4.6.3: + /@typescript-eslint/utils/5.16.0_eslint@8.12.0+typescript@4.6.3: resolution: {integrity: sha512-iYej2ER6AwmejLWMWzJIHy3nPJeGDuCqf8Jnb+jAQVoPpmWzwQOfa9hWVB8GIQE5gsCv/rfN4T+AYb/V06WseQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@types/json-schema': 7.0.10 + '@types/json-schema': 7.0.11 '@typescript-eslint/scope-manager': 5.16.0 '@typescript-eslint/types': 5.16.0 '@typescript-eslint/typescript-estree': 5.16.0_typescript@4.6.3 - eslint: 8.11.0 + eslint: 8.12.0 eslint-scope: 5.1.1 - eslint-utils: 3.0.0_eslint@8.11.0 + eslint-utils: 3.0.0_eslint@8.12.0 transitivePeerDependencies: - supports-color - typescript @@ -4797,7 +4802,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001320 - electron-to-chromium: 1.4.93 + electron-to-chromium: 1.4.96 escalade: 3.1.1 node-releases: 2.0.2 picocolors: 1.0.0 @@ -5477,8 +5482,8 @@ packages: jake: 10.8.4 dev: true - /electron-to-chromium/1.4.93: - resolution: {integrity: sha512-ywq9Pc5Gwwpv7NG767CtoU8xF3aAUQJjH9//Wy3MBCg4w5JSLbJUq2L8IsCdzPMjvSgxuue9WcVaTOyyxCL0aQ==} + /electron-to-chromium/1.4.96: + resolution: {integrity: sha512-DPNjvNGPabv6FcyjzLAN4C0psN/GgD9rSGvMTuv81SeXG/EX3mCz0wiw9N1tUEnfQXYCJi3H8M0oFPRziZh7rw==} /emmet/2.3.6: resolution: {integrity: sha512-pLS4PBPDdxuUAmw7Me7+TcHbykTsBKN/S9XJbUOMFQrNv9MoshzyMFK/R57JBm94/6HSL4vHnDeEmxlC82NQ4A==} @@ -5577,8 +5582,8 @@ packages: requiresBuild: true optional: true - /esbuild-android-64/0.14.27: - resolution: {integrity: sha512-LuEd4uPuj/16Y8j6kqy3Z2E9vNY9logfq8Tq+oTE2PZVuNs3M1kj5Qd4O95ee66yDGb3isaOCV7sOLDwtMfGaQ==} + /esbuild-android-64/0.14.28: + resolution: {integrity: sha512-A52C3zq+9tNwCqZ+4kVLBxnk/WnrYM8P2+QNvNE9B6d2OVPs214lp3g6UyO+dKDhUdefhfPCuwkP8j2A/+szNA==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -5594,8 +5599,8 @@ packages: requiresBuild: true optional: true - /esbuild-android-arm64/0.14.27: - resolution: {integrity: sha512-E8Ktwwa6vX8q7QeJmg8yepBYXaee50OdQS3BFtEHKrzbV45H4foMOeEE7uqdjGQZFBap5VAqo7pvjlyA92wznQ==} + /esbuild-android-arm64/0.14.28: + resolution: {integrity: sha512-sm0fDEGElZhMC3HLZeECI2juE4aG7uPfMBMqNUhy9CeX399Pz8rC6e78OXMXInGjSdEAwQmCOHmfsP7uv3Q8rA==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -5611,8 +5616,8 @@ packages: requiresBuild: true optional: true - /esbuild-darwin-64/0.14.27: - resolution: {integrity: sha512-czw/kXl/1ZdenPWfw9jDc5iuIYxqUxgQ/Q+hRd4/3udyGGVI31r29LCViN2bAJgGvQkqyLGVcG03PJPEXQ5i2g==} + /esbuild-darwin-64/0.14.28: + resolution: {integrity: sha512-nzDd7mQ44FvsFHtOafZdBgn3Li5SMsnMnoz1J2MM37xJmR3wGNTFph88KypjHgWqwbxCI7MXS1U+sN4qDeeW6Q==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -5628,8 +5633,8 @@ packages: requiresBuild: true optional: true - /esbuild-darwin-arm64/0.14.27: - resolution: {integrity: sha512-BEsv2U2U4o672oV8+xpXNxN9bgqRCtddQC6WBh4YhXKDcSZcdNh7+6nS+DM2vu7qWIWNA4JbRG24LUUYXysimQ==} + /esbuild-darwin-arm64/0.14.28: + resolution: {integrity: sha512-XEq/bLR/glsUl+uGrBimQzOVs/CmwI833fXUhP9xrLI3IJ+rKyrZ5IA8u+1crOEf1LoTn8tV+hInmX6rGjbScw==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -5645,8 +5650,8 @@ packages: requiresBuild: true optional: true - /esbuild-freebsd-64/0.14.27: - resolution: {integrity: sha512-7FeiFPGBo+ga+kOkDxtPmdPZdayrSzsV9pmfHxcyLKxu+3oTcajeZlOO1y9HW+t5aFZPiv7czOHM4KNd0tNwCA==} + /esbuild-freebsd-64/0.14.28: + resolution: {integrity: sha512-rTKLgUj/HEcPeE5XZ7IZwWpFx7IWMfprN7QRk/TUJE1s1Ipb58esboIesUpjirJz/BwrgHq+FDG9ChAI8dZAtQ==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -5662,8 +5667,8 @@ packages: requiresBuild: true optional: true - /esbuild-freebsd-arm64/0.14.27: - resolution: {integrity: sha512-8CK3++foRZJluOWXpllG5zwAVlxtv36NpHfsbWS7TYlD8S+QruXltKlXToc/5ZNzBK++l6rvRKELu/puCLc7jA==} + /esbuild-freebsd-arm64/0.14.28: + resolution: {integrity: sha512-sBffxD1UMOsB7aWMoExmipycjcy3HJGwmqE4GQZUTZvdiH4GhjgUiVdtPyt7kSCdL40JqnWQJ4b1l8Y51oCF4Q==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -5679,8 +5684,8 @@ packages: requiresBuild: true optional: true - /esbuild-linux-32/0.14.27: - resolution: {integrity: sha512-qhNYIcT+EsYSBClZ5QhLzFzV5iVsP1YsITqblSaztr3+ZJUI+GoK8aXHyzKd7/CKKuK93cxEMJPpfi1dfsOfdw==} + /esbuild-linux-32/0.14.28: + resolution: {integrity: sha512-+Wxidh3fBEQ9kHcCsD4etlBTMb1n6QY2uXv3rFhVn88CY/JP782MhA57/ipLMY4kOLeSKEuFGN4rtjHuhmRMig==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -5696,8 +5701,8 @@ packages: requiresBuild: true optional: true - /esbuild-linux-64/0.14.27: - resolution: {integrity: sha512-ESjck9+EsHoTaKWlFKJpPZRN26uiav5gkI16RuI8WBxUdLrrAlYuYSndxxKgEn1csd968BX/8yQZATYf/9+/qg==} + /esbuild-linux-64/0.14.28: + resolution: {integrity: sha512-7+xgsC4LvR6cnzaBdiljNnPDjbkwzahogN+S9uy9AoYw7ZjPnnXc6sjQAVCbqGb7MEgrWdpa6u/Tao79i4lWxg==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -5713,8 +5718,8 @@ packages: requiresBuild: true optional: true - /esbuild-linux-arm/0.14.27: - resolution: {integrity: sha512-JnnmgUBdqLQO9hoNZQqNHFWlNpSX82vzB3rYuCJMhtkuaWQEmQz6Lec1UIxJdC38ifEghNTBsF9bbe8dFilnCw==} + /esbuild-linux-arm/0.14.28: + resolution: {integrity: sha512-L5isjmlLbh9E0WVllXiVETbScgMbth/+XkXQii1WwgO1RvLIfaGrVFz8d2n6EH/ImtgYxPYGx+OcvIKQBc91Rg==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -5730,8 +5735,8 @@ packages: requiresBuild: true optional: true - /esbuild-linux-arm64/0.14.27: - resolution: {integrity: sha512-no6Mi17eV2tHlJnqBHRLekpZ2/VYx+NfGxKcBE/2xOMYwctsanCaXxw4zapvNrGE9X38vefVXLz6YCF8b1EHiQ==} + /esbuild-linux-arm64/0.14.28: + resolution: {integrity: sha512-EjRHgwg+kgXABzyoPGPOPg4d5wZqRnZ/ZAxBDzLY+i6DS8OUfTSlZHWIOZzU4XF7125WxRBg9ULbrFJBl+57Eg==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -5747,8 +5752,8 @@ packages: requiresBuild: true optional: true - /esbuild-linux-mips64le/0.14.27: - resolution: {integrity: sha512-NolWP2uOvIJpbwpsDbwfeExZOY1bZNlWE/kVfkzLMsSgqeVcl5YMen/cedRe9mKnpfLli+i0uSp7N+fkKNU27A==} + /esbuild-linux-mips64le/0.14.28: + resolution: {integrity: sha512-krx9SSg7yfiUKk64EmjefOyiEF6nv2bRE4um/LiTaQ6Y/6FP4UF3/Ou/AxZVyR154uSRq63xejcAsmswXAYRsw==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -5764,8 +5769,8 @@ packages: requiresBuild: true optional: true - /esbuild-linux-ppc64le/0.14.27: - resolution: {integrity: sha512-/7dTjDvXMdRKmsSxKXeWyonuGgblnYDn0MI1xDC7J1VQXny8k1qgNp6VmrlsawwnsymSUUiThhkJsI+rx0taNA==} + /esbuild-linux-ppc64le/0.14.28: + resolution: {integrity: sha512-LD0Xxu9g+DNuhsEBV5QuVZ4uKVBMup0xPIruLweuAf9/mHXFnaCuNXUBF5t0DxKl7GQ5MSioKtnb92oMo+QXEw==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -5781,8 +5786,8 @@ packages: requiresBuild: true optional: true - /esbuild-linux-riscv64/0.14.27: - resolution: {integrity: sha512-D+aFiUzOJG13RhrSmZgrcFaF4UUHpqj7XSKrIiCXIj1dkIkFqdrmqMSOtSs78dOtObWiOrFCDDzB24UyeEiNGg==} + /esbuild-linux-riscv64/0.14.28: + resolution: {integrity: sha512-L/DWfRh2P0vxq4Y+qieSNXKGdMg+e9Qe8jkbN2/8XSGYDTPzO2OcAxSujob4qIh7iSl+cknbXV+BvH0YFR0jbg==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -5798,8 +5803,8 @@ packages: requiresBuild: true optional: true - /esbuild-linux-s390x/0.14.27: - resolution: {integrity: sha512-CD/D4tj0U4UQjELkdNlZhQ8nDHU5rBn6NGp47Hiz0Y7/akAY5i0oGadhEIg0WCY/HYVXFb3CsSPPwaKcTOW3bg==} + /esbuild-linux-s390x/0.14.28: + resolution: {integrity: sha512-rrgxmsbmL8QQknWGnAL9bGJRQYLOi2AzXy5OTwfhxnj9eqjo5mSVbJXjgiq5LPUAMQZGdPH5yaNK0obAXS81Zw==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -5815,8 +5820,8 @@ packages: requiresBuild: true optional: true - /esbuild-netbsd-64/0.14.27: - resolution: {integrity: sha512-h3mAld69SrO1VoaMpYl3a5FNdGRE/Nqc+E8VtHOag4tyBwhCQXxtvDDOAKOUQexBGca0IuR6UayQ4ntSX5ij1Q==} + /esbuild-netbsd-64/0.14.28: + resolution: {integrity: sha512-h8wntIyOR8/xMVVM6TvJxxWKh4AjmLK87IPKpuVi8Pq0kyk0RMA+eo4PFGk5j2XK0D7dj8PcSF5NSlP9kN/j0A==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -5832,8 +5837,8 @@ packages: requiresBuild: true optional: true - /esbuild-openbsd-64/0.14.27: - resolution: {integrity: sha512-xwSje6qIZaDHXWoPpIgvL+7fC6WeubHHv18tusLYMwL+Z6bEa4Pbfs5IWDtQdHkArtfxEkIZz77944z8MgDxGw==} + /esbuild-openbsd-64/0.14.28: + resolution: {integrity: sha512-HBv18rVapbuDx52/fhZ/c/w6TXyaQAvRxiDDn5Hz/pBcwOs3cdd2WxeIKlWmDoqm2JMx5EVlq4IWgoaRX9mVkw==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -5849,8 +5854,8 @@ packages: requiresBuild: true optional: true - /esbuild-sunos-64/0.14.27: - resolution: {integrity: sha512-/nBVpWIDjYiyMhuqIqbXXsxBc58cBVH9uztAOIfWShStxq9BNBik92oPQPJ57nzWXRNKQUEFWr4Q98utDWz7jg==} + /esbuild-sunos-64/0.14.28: + resolution: {integrity: sha512-zlIxePhZxKYheR2vBCgPVvTixgo/ozOfOMoP6RZj8dxzquU1NgeyhjkcRXucbLCtmoNJ+i4PtWwPZTLuDd3bGg==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -5866,8 +5871,8 @@ packages: requiresBuild: true optional: true - /esbuild-windows-32/0.14.27: - resolution: {integrity: sha512-Q9/zEjhZJ4trtWhFWIZvS/7RUzzi8rvkoaS9oiizkHTTKd8UxFwn/Mm2OywsAfYymgUYm8+y2b+BKTNEFxUekw==} + /esbuild-windows-32/0.14.28: + resolution: {integrity: sha512-am9DIJxXlld1BOAY/VlvBQHMUCPL7S3gB/lnXIY3M4ys0gfuRqPf4EvMwZMzYUbFKBY+/Qb8SRgPRRGhwnJ8Kg==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -5883,8 +5888,8 @@ packages: requiresBuild: true optional: true - /esbuild-windows-64/0.14.27: - resolution: {integrity: sha512-b3y3vTSl5aEhWHK66ngtiS/c6byLf6y/ZBvODH1YkBM+MGtVL6jN38FdHUsZasCz9gFwYs/lJMVY9u7GL6wfYg==} + /esbuild-windows-64/0.14.28: + resolution: {integrity: sha512-78PhySDnmRZlsPNp/W/5Fim8iivlBQQxfhBFIqR7xwvfDmCFUSByyMKP7LCHgNtb04yNdop8nJJkJaQ8Xnwgiw==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -5900,8 +5905,8 @@ packages: requiresBuild: true optional: true - /esbuild-windows-arm64/0.14.27: - resolution: {integrity: sha512-I/reTxr6TFMcR5qbIkwRGvldMIaiBu2+MP0LlD7sOlNXrfqIl9uNjsuxFPGEG4IRomjfQ5q8WT+xlF/ySVkqKg==} + /esbuild-windows-arm64/0.14.28: + resolution: {integrity: sha512-VhXGBTo6HELD8zyHXynV6+L2jWx0zkKnGx4TmEdSBK7UVFACtOyfUqpToG0EtnYyRZ0HESBhzPSVpP781ovmvA==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -5936,32 +5941,32 @@ packages: esbuild-windows-64: 0.14.25 esbuild-windows-arm64: 0.14.25 - /esbuild/0.14.27: - resolution: {integrity: sha512-MZQt5SywZS3hA9fXnMhR22dv0oPGh6QtjJRIYbgL1AeqAoQZE+Qn5ppGYQAoHv/vq827flj4tIJ79Mrdiwk46Q==} + /esbuild/0.14.28: + resolution: {integrity: sha512-YLNprkCcMVKQ5sekmCKEQ3Obu/L7s6+iij38xNKyBeSmSsTWur4Ky/9zB3XIGT8SCJITG/bZwAR2l7YOAXch4Q==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-64: 0.14.27 - esbuild-android-arm64: 0.14.27 - esbuild-darwin-64: 0.14.27 - esbuild-darwin-arm64: 0.14.27 - esbuild-freebsd-64: 0.14.27 - esbuild-freebsd-arm64: 0.14.27 - esbuild-linux-32: 0.14.27 - esbuild-linux-64: 0.14.27 - esbuild-linux-arm: 0.14.27 - esbuild-linux-arm64: 0.14.27 - esbuild-linux-mips64le: 0.14.27 - esbuild-linux-ppc64le: 0.14.27 - esbuild-linux-riscv64: 0.14.27 - esbuild-linux-s390x: 0.14.27 - esbuild-netbsd-64: 0.14.27 - esbuild-openbsd-64: 0.14.27 - esbuild-sunos-64: 0.14.27 - esbuild-windows-32: 0.14.27 - esbuild-windows-64: 0.14.27 - esbuild-windows-arm64: 0.14.27 + esbuild-android-64: 0.14.28 + esbuild-android-arm64: 0.14.28 + esbuild-darwin-64: 0.14.28 + esbuild-darwin-arm64: 0.14.28 + esbuild-freebsd-64: 0.14.28 + esbuild-freebsd-arm64: 0.14.28 + esbuild-linux-32: 0.14.28 + esbuild-linux-64: 0.14.28 + esbuild-linux-arm: 0.14.28 + esbuild-linux-arm64: 0.14.28 + esbuild-linux-mips64le: 0.14.28 + esbuild-linux-ppc64le: 0.14.28 + esbuild-linux-riscv64: 0.14.28 + esbuild-linux-s390x: 0.14.28 + esbuild-netbsd-64: 0.14.28 + esbuild-openbsd-64: 0.14.28 + esbuild-sunos-64: 0.14.28 + esbuild-windows-32: 0.14.28 + esbuild-windows-64: 0.14.28 + esbuild-windows-arm64: 0.14.28 dev: false /escalade/3.1.1: @@ -5995,16 +6000,16 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-prettier/8.5.0_eslint@8.11.0: + /eslint-config-prettier/8.5.0_eslint@8.12.0: resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 8.11.0 + eslint: 8.12.0 dev: true - /eslint-plugin-prettier/4.0.0_e2923b5169e23c4db59b86a638c599a3: + /eslint-plugin-prettier/4.0.0_b253a92c95b42c3296c682f11cccb3bd: resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==} engines: {node: '>=6.0.0'} peerDependencies: @@ -6015,8 +6020,8 @@ packages: eslint-config-prettier: optional: true dependencies: - eslint: 8.11.0 - eslint-config-prettier: 8.5.0_eslint@8.11.0 + eslint: 8.12.0 + eslint-config-prettier: 8.5.0_eslint@8.12.0 prettier: 2.6.1 prettier-linter-helpers: 1.0.0 dev: true @@ -6037,13 +6042,13 @@ packages: estraverse: 5.3.0 dev: true - /eslint-utils/3.0.0_eslint@8.11.0: + /eslint-utils/3.0.0_eslint@8.12.0: resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} peerDependencies: eslint: '>=5' dependencies: - eslint: 8.11.0 + eslint: 8.12.0 eslint-visitor-keys: 2.1.0 dev: true @@ -6057,8 +6062,8 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint/8.11.0: - resolution: {integrity: sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==} + /eslint/8.12.0: + resolution: {integrity: sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: @@ -6071,7 +6076,7 @@ packages: doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.1.1 - eslint-utils: 3.0.0_eslint@8.11.0 + eslint-utils: 3.0.0_eslint@8.12.0 eslint-visitor-keys: 3.3.0 espree: 9.3.1 esquery: 1.4.0 @@ -6759,6 +6764,10 @@ packages: resolution: {integrity: sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==} dev: false + /html-entities/2.3.3: + resolution: {integrity: sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==} + dev: false + /html-escaper/3.0.3: resolution: {integrity: sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==} dev: false @@ -8088,6 +8097,12 @@ packages: resolution: {integrity: sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true + dev: true + + /nanoid/3.3.2: + resolution: {integrity: sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true /nanostores/0.5.12: resolution: {integrity: sha512-5BccS7nNInTc7Noz2gv19gyx5h5y6m72nj6ZnCTV98GdFdwvcFJf2MMl+7VsX76E1toV1YrLqlDn+R+OF73PVg==} @@ -8531,7 +8546,7 @@ packages: resolution: {integrity: sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==} engines: {node: ^10 || ^12 || >=14} dependencies: - nanoid: 3.3.1 + nanoid: 3.3.2 picocolors: 1.0.0 source-map-js: 1.0.2 @@ -9923,7 +9938,7 @@ packages: engines: {node: '>=12'} hasBin: true dependencies: - esbuild: 0.14.27 + esbuild: 0.14.25 dev: false /tsutils/3.21.0_typescript@4.6.3: @@ -10434,7 +10449,7 @@ packages: stylus: optional: true dependencies: - esbuild: 0.14.27 + esbuild: 0.14.28 postcss: 8.4.12 resolve: 1.22.0 rollup: 2.70.1 @@ -10458,7 +10473,7 @@ packages: stylus: optional: true dependencies: - esbuild: 0.14.27 + esbuild: 0.14.28 postcss: 8.4.12 resolve: 1.22.0 rollup: 2.70.1 @@ -10922,8 +10937,8 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - /zod/3.14.2: - resolution: {integrity: sha512-iF+wrtzz7fQfkmn60PG6XFxaWBhYYKzp2i+nv24WbLUWb2JjymdkHlzBwP0erpc78WotwP5g9AAu7Sk8GWVVNw==} + /zod/3.14.3: + resolution: {integrity: sha512-OzwRCSXB1+/8F6w6HkYHdbuWysYWnAF4fkRgKDcSFc54CE+Sv0rHXKfeNUReGCrHukm1LNpi6AYeXotznhYJbQ==} dev: false /zwitch/2.0.2: From 425139f91220a3d3e07ee8b4c7db62f2cde25be8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 16:52:04 -0700 Subject: [PATCH 02/17] [ci] release (#2923) Co-authored-by: github-actions[bot] --- .changeset/real-starfishes-turn.md | 5 -- examples/blog-multiple-authors/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/demo/package.json | 2 +- examples/component/package.json | 2 +- examples/docs/package.json | 2 +- examples/env-vars/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/integrations-playground/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/starter/package.json | 2 +- examples/subpath/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-markdown/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- packages/astro/CHANGELOG.md | 70 ++++++++++--------- packages/astro/package.json | 2 +- pnpm-lock.yaml | 54 +++++++------- 31 files changed, 93 insertions(+), 92 deletions(-) delete mode 100644 .changeset/real-starfishes-turn.md diff --git a/.changeset/real-starfishes-turn.md b/.changeset/real-starfishes-turn.md deleted file mode 100644 index bccddb3fe..000000000 --- a/.changeset/real-starfishes-turn.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fix typing of `integrations` array in user config diff --git a/examples/blog-multiple-authors/package.json b/examples/blog-multiple-authors/package.json index 26a149981..10ac77139 100644 --- a/examples/blog-multiple-authors/package.json +++ b/examples/blog-multiple-authors/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/preact": "^0.0.2", - "astro": "^0.25.3", + "astro": "^0.25.4", "sass": "^1.49.9" }, "dependencies": { diff --git a/examples/blog/package.json b/examples/blog/package.json index 2aa6de6fb..a817c7e67 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -9,7 +9,7 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^0.25.3", + "astro": "^0.25.4", "@astrojs/preact": "^0.0.2" }, "dependencies": { diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json index a327d59cf..9b54773f6 100644 --- a/examples/component/demo/package.json +++ b/examples/component/demo/package.json @@ -10,6 +10,6 @@ }, "devDependencies": { "@example/my-component": "workspace:*", - "astro": "^0.25.3" + "astro": "^0.25.4" } } diff --git a/examples/component/package.json b/examples/component/package.json index 665cd0667..e7e63cb83 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -8,6 +8,6 @@ "serve": "astro --project-root demo preview" }, "devDependencies": { - "astro": "^0.25.3" + "astro": "^0.25.4" } } diff --git a/examples/docs/package.json b/examples/docs/package.json index 3529de1c7..dba62dc47 100644 --- a/examples/docs/package.json +++ b/examples/docs/package.json @@ -20,6 +20,6 @@ "devDependencies": { "@astrojs/preact": "^0.0.2", "@astrojs/react": "^0.0.2", - "astro": "^0.25.3" + "astro": "^0.25.4" } } diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json index 1d934f60e..e0011d2df 100644 --- a/examples/env-vars/package.json +++ b/examples/env-vars/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^0.25.3" + "astro": "^0.25.4" } } diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 89ce3a5d9..41fb3eca2 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^0.25.3" + "astro": "^0.25.4" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index d2c789019..444d29ac6 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/lit": "^0.0.2", - "astro": "^0.25.3" + "astro": "^0.25.4" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index cf7162a5e..8f95c6935 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -15,7 +15,7 @@ "@astrojs/solid-js": "^0.0.3", "@astrojs/svelte": "^0.0.2", "@astrojs/vue": "^0.0.2", - "astro": "^0.25.3" + "astro": "^0.25.4" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 1f10b5bc2..5be07dd77 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/preact": "^0.0.2", - "astro": "^0.25.3" + "astro": "^0.25.4" }, "dependencies": { "preact": "^10.6.6" diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 030c7fc88..69bfc446c 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/react": "^0.0.2", - "astro": "^0.25.3" + "astro": "^0.25.4" }, "dependencies": { "react": "^17.0.2", diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index a75ca71b1..820bbee06 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/solid-js": "^0.0.3", - "astro": "^0.25.3" + "astro": "^0.25.4" }, "dependencies": { "solid-js": "^1.3.13" diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 942099309..f7af94738 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/svelte": "^0.0.2", - "astro": "^0.25.3" + "astro": "^0.25.4" }, "dependencies": { "svelte": "^3.46.4" diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index ecd829b5e..eeada1a5e 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/vue": "^0.0.2", - "astro": "^0.25.3" + "astro": "^0.25.4" }, "dependencies": { "vue": "^3.2.31" diff --git a/examples/integrations-playground/package.json b/examples/integrations-playground/package.json index ada918853..6c08c5f46 100644 --- a/examples/integrations-playground/package.json +++ b/examples/integrations-playground/package.json @@ -15,7 +15,7 @@ "@astrojs/sitemap": "^0.0.2", "@astrojs/tailwind": "^0.0.2", "@astrojs/turbolinks": "^0.0.2", - "astro": "^0.25.3" + "astro": "^0.25.4" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/minimal/package.json b/examples/minimal/package.json index cecbf5c5f..4adc0c827 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^0.25.3" + "astro": "^0.25.4" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 6cbfb1568..27553f811 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^0.25.3" + "astro": "^0.25.4" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 35bdca866..ae5d52396 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/preact": "^0.0.2", - "astro": "^0.25.3", + "astro": "^0.25.4", "sass": "^1.49.9" }, "dependencies": { diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 884a18a54..da2856570 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@astrojs/svelte": "^0.0.2", "@astrojs/node": "^0.0.2", - "astro": "^0.25.3", + "astro": "^0.25.4", "concurrently": "^7.0.0", "lightcookie": "^1.0.25", "unocss": "^0.15.6", diff --git a/examples/starter/package.json b/examples/starter/package.json index 0fff1a509..65ea2b04d 100644 --- a/examples/starter/package.json +++ b/examples/starter/package.json @@ -9,6 +9,6 @@ "preview": "astro preview" }, "devDependencies": { - "astro": "^0.25.3" + "astro": "^0.25.4" } } diff --git a/examples/subpath/package.json b/examples/subpath/package.json index cc4c33c3c..f48f47a11 100644 --- a/examples/subpath/package.json +++ b/examples/subpath/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/react": "^0.0.2", - "astro": "^0.25.3", + "astro": "^0.25.4", "sass": "^1.49.9" }, "dependencies": { diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 52495596a..7c02a8014 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^0.7.0", - "astro": "^0.25.3", + "astro": "^0.25.4", "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 c1feb2baa..33de85830 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -10,6 +10,6 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^0.7.0", - "astro": "^0.25.3" + "astro": "^0.25.4" } } diff --git a/examples/with-markdown/package.json b/examples/with-markdown/package.json index 3f2e894a3..843ee33ff 100644 --- a/examples/with-markdown/package.json +++ b/examples/with-markdown/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^0.0.2", "@astrojs/svelte": "^0.0.2", "@astrojs/vue": "^0.0.2", - "astro": "^0.25.3" + "astro": "^0.25.4" }, "dependencies": { "preact": "^10.6.6", diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 5bfc50268..828a8a608 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -25,6 +25,6 @@ "@astrojs/solid-js": "^0.0.3", "@astrojs/svelte": "^0.0.2", "@astrojs/vue": "^0.0.2", - "astro": "^0.25.3" + "astro": "^0.25.4" } } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 8b48d6084..04cfa9258 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@astrojs/tailwind": "^0.0.2", - "astro": "^0.25.3", + "astro": "^0.25.4", "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 47051bf98..4ac168012 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": "^0.25.3", + "astro": "^0.25.4", "vite-plugin-pwa": "0.11.11", "workbox-window": "^6.5.2" } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index b106e3fa4..8ed4ac4a3 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,11 @@ # astro +## 0.25.4 + +### Patch Changes + +- [#2907](https://github.com/withastro/astro/pull/2907) [`22b1432e`](https://github.com/withastro/astro/commit/22b1432e3eed6ff40a0ab383c8f1f06f0df10d62) Thanks [@delucis](https://github.com/delucis)! - Fix typing of `integrations` array in user config + ## 0.25.3 ### Patch Changes @@ -47,7 +53,7 @@ import netlify from '@astrojs/netlify/functions'; export default defineConfig({ - adapter: netlify(), + adapter: netlify(), }); ``` @@ -67,7 +73,7 @@ import nodejs from '@astrojs/node'; export default { - adapter: nodejs(), + adapter: nodejs(), }; ``` @@ -127,7 +133,7 @@ import nodejs from '@astrojs/node'; export default { - adapter: nodejs(), + adapter: nodejs(), }; ``` @@ -223,7 +229,7 @@ import { defineConfig } from 'astro/config'; export default defineConfig({ - renderers: [], + renderers: [], }); ``` @@ -261,9 +267,9 @@ ```json { - "scripts": { - "build": "astro build --legacy-build" - } + "scripts": { + "build": "astro build --legacy-build" + } } ``` @@ -283,7 +289,7 @@ ```ts if (Astro.slots.has('default')) { - const content = await Astro.slots.render('default'); + const content = await Astro.slots.render('default'); } ``` @@ -367,7 +373,7 @@ ```ts if (Astro.slots.has('default')) { - const content = await Astro.slots.render('default'); + const content = await Astro.slots.render('default'); } ``` @@ -391,9 +397,9 @@ ```json { - "scripts": { - "build": "astro build --legacy-build" - } + "scripts": { + "build": "astro build --legacy-build" + } } ``` @@ -505,12 +511,12 @@ ```typescript // src/pages/company.json.ts export async function get() { - return { - body: JSON.stringify({ - name: 'Astro Technology Company', - url: 'https://astro.build/', - }), - }; + return { + body: JSON.stringify({ + name: 'Astro Technology Company', + url: 'https://astro.build/', + }), + }; } ``` @@ -672,12 +678,12 @@ ```typescript // src/pages/company.json.ts export async function get() { - return { - body: JSON.stringify({ - name: 'Astro Technology Company', - url: 'https://astro.build/', - }), - }; + return { + body: JSON.stringify({ + name: 'Astro Technology Company', + url: 'https://astro.build/', + }), + }; } ``` @@ -2032,10 +2038,10 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve ```js export default { - markdownOptions: { - remarkPlugins: ['remark-slug', ['remark-autolink-headings', { behavior: 'prepend' }]], - rehypePlugins: ['rehype-slug', ['rehype-autolink-headings', { behavior: 'prepend' }]], - }, + markdownOptions: { + remarkPlugins: ['remark-slug', ['remark-autolink-headings', { behavior: 'prepend' }]], + rehypePlugins: ['rehype-slug', ['rehype-autolink-headings', { behavior: 'prepend' }]], + }, }; ``` @@ -2055,10 +2061,10 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve ```js export default { - name: '@matthewp/my-renderer', - server: './server.js', - client: './client.js', - hydrationPolyfills: ['./my-polyfill.js'], + name: '@matthewp/my-renderer', + server: './server.js', + client: './client.js', + hydrationPolyfills: ['./my-polyfill.js'], }; ``` diff --git a/packages/astro/package.json b/packages/astro/package.json index 1a73d9516..9e0a508bf 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "0.25.3", + "version": "0.25.4", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b2a4c04f..7e547cbb7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,7 +44,7 @@ importers: examples/blog: specifiers: '@astrojs/preact': ^0.0.2 - astro: ^0.25.3 + astro: ^0.25.4 preact: ^10.6.6 dependencies: preact: 10.6.6 @@ -55,7 +55,7 @@ importers: examples/blog-multiple-authors: specifiers: '@astrojs/preact': ^0.0.2 - astro: ^0.25.3 + astro: ^0.25.4 preact: ^10.6.6 sass: ^1.49.9 dependencies: @@ -67,14 +67,14 @@ importers: examples/component: specifiers: - astro: ^0.25.3 + astro: ^0.25.4 devDependencies: astro: link:../../packages/astro examples/component/demo: specifiers: '@example/my-component': workspace:* - astro: ^0.25.3 + astro: ^0.25.4 devDependencies: '@example/my-component': link:../packages/my-component astro: link:../../../packages/astro @@ -90,7 +90,7 @@ importers: '@docsearch/css': ^3.0.0 '@docsearch/react': ^3.0.0 '@types/react': ^17.0.43 - astro: ^0.25.3 + astro: ^0.25.4 preact: ^10.6.6 react: ^17.0.2 react-dom: ^17.0.2 @@ -109,13 +109,13 @@ importers: examples/env-vars: specifiers: - astro: ^0.25.3 + astro: ^0.25.4 devDependencies: astro: link:../../packages/astro examples/framework-alpine: specifiers: - astro: ^0.25.3 + astro: ^0.25.4 devDependencies: astro: link:../../packages/astro @@ -123,7 +123,7 @@ importers: specifiers: '@astrojs/lit': ^0.0.2 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^0.25.3 + astro: ^0.25.4 lit: ^2.2.1 dependencies: '@webcomponents/template-shadowroot': 0.1.0 @@ -141,7 +141,7 @@ importers: '@astrojs/svelte': ^0.0.2 '@astrojs/vue': ^0.0.2 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^0.25.3 + astro: ^0.25.4 lit: ^2.2.1 preact: ^10.6.6 react: ^17.0.2 @@ -170,7 +170,7 @@ importers: examples/framework-preact: specifiers: '@astrojs/preact': ^0.0.2 - astro: ^0.25.3 + astro: ^0.25.4 preact: ^10.6.6 dependencies: preact: 10.6.6 @@ -181,7 +181,7 @@ importers: examples/framework-react: specifiers: '@astrojs/react': ^0.0.2 - astro: ^0.25.3 + astro: ^0.25.4 react: ^17.0.2 react-dom: ^17.0.2 dependencies: @@ -194,7 +194,7 @@ importers: examples/framework-solid: specifiers: '@astrojs/solid-js': ^0.0.3 - astro: ^0.25.3 + astro: ^0.25.4 solid-js: ^1.3.13 dependencies: solid-js: 1.3.13 @@ -205,7 +205,7 @@ importers: examples/framework-svelte: specifiers: '@astrojs/svelte': ^0.0.2 - astro: ^0.25.3 + astro: ^0.25.4 svelte: ^3.46.4 dependencies: svelte: 3.46.4 @@ -216,7 +216,7 @@ importers: examples/framework-vue: specifiers: '@astrojs/vue': ^0.0.2 - astro: ^0.25.3 + astro: ^0.25.4 vue: ^3.2.31 dependencies: vue: 3.2.31 @@ -233,7 +233,7 @@ importers: '@astrojs/tailwind': ^0.0.2 '@astrojs/turbolinks': ^0.0.2 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^0.25.3 + astro: ^0.25.4 lit: ^2.2.1 preact: ^10.6.6 react: ^17.0.2 @@ -261,20 +261,20 @@ importers: examples/minimal: specifiers: - astro: ^0.25.3 + astro: ^0.25.4 devDependencies: astro: link:../../packages/astro examples/non-html-pages: specifiers: - astro: ^0.25.3 + astro: ^0.25.4 devDependencies: astro: link:../../packages/astro examples/portfolio: specifiers: '@astrojs/preact': ^0.0.2 - astro: ^0.25.3 + astro: ^0.25.4 preact: ^10.6.6 sass: ^1.49.9 dependencies: @@ -288,7 +288,7 @@ importers: specifiers: '@astrojs/node': ^0.0.2 '@astrojs/svelte': ^0.0.2 - astro: ^0.25.3 + astro: ^0.25.4 concurrently: ^7.0.0 lightcookie: ^1.0.25 svelte: ^3.46.4 @@ -307,14 +307,14 @@ importers: examples/starter: specifiers: - astro: ^0.25.3 + astro: ^0.25.4 devDependencies: astro: link:../../packages/astro examples/subpath: specifiers: '@astrojs/react': ^0.0.2 - astro: ^0.25.3 + astro: ^0.25.4 react: ^17.0.2 react-dom: ^17.0.2 sass: ^1.49.9 @@ -333,7 +333,7 @@ importers: '@astrojs/react': ^0.0.2 '@astrojs/svelte': ^0.0.2 '@astrojs/vue': ^0.0.2 - astro: ^0.25.3 + astro: ^0.25.4 preact: ^10.6.6 react: ^17.0.2 react-dom: ^17.0.2 @@ -356,7 +356,7 @@ importers: examples/with-markdown-plugins: specifiers: '@astrojs/markdown-remark': ^0.7.0 - astro: ^0.25.3 + astro: ^0.25.4 hast-util-select: 5.0.1 rehype-autolink-headings: ^6.1.1 rehype-slug: ^5.0.1 @@ -374,7 +374,7 @@ importers: examples/with-markdown-shiki: specifiers: '@astrojs/markdown-remark': ^0.7.0 - astro: ^0.25.3 + astro: ^0.25.4 devDependencies: '@astrojs/markdown-remark': link:../../packages/markdown/remark astro: link:../../packages/astro @@ -389,7 +389,7 @@ importers: '@nanostores/preact': ^0.1.3 '@nanostores/react': ^0.1.5 '@nanostores/vue': ^0.4.1 - astro: ^0.25.3 + astro: ^0.25.4 nanostores: ^0.5.12 preact: ^10.6.6 react: ^17.0.2 @@ -417,7 +417,7 @@ importers: examples/with-tailwindcss: specifiers: '@astrojs/tailwind': ^0.0.2 - astro: ^0.25.3 + astro: ^0.25.4 autoprefixer: ^10.4.4 canvas-confetti: ^1.5.1 postcss: ^8.4.12 @@ -432,7 +432,7 @@ importers: examples/with-vite-plugin-pwa: specifiers: - astro: ^0.25.3 + astro: ^0.25.4 vite-plugin-pwa: 0.11.11 workbox-window: ^6.5.2 devDependencies: From ab9e3d5988100a89991f1e47cbb228a948a542d6 Mon Sep 17 00:00:00 2001 From: FredKSchott Date: Mon, 28 Mar 2022 23:52:58 +0000 Subject: [PATCH 03/17] [ci] format --- packages/astro/CHANGELOG.md | 64 ++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 8ed4ac4a3..7b86e33b4 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -53,7 +53,7 @@ import netlify from '@astrojs/netlify/functions'; export default defineConfig({ - adapter: netlify(), + adapter: netlify(), }); ``` @@ -73,7 +73,7 @@ import nodejs from '@astrojs/node'; export default { - adapter: nodejs(), + adapter: nodejs(), }; ``` @@ -133,7 +133,7 @@ import nodejs from '@astrojs/node'; export default { - adapter: nodejs(), + adapter: nodejs(), }; ``` @@ -229,7 +229,7 @@ import { defineConfig } from 'astro/config'; export default defineConfig({ - renderers: [], + renderers: [], }); ``` @@ -267,9 +267,9 @@ ```json { - "scripts": { - "build": "astro build --legacy-build" - } + "scripts": { + "build": "astro build --legacy-build" + } } ``` @@ -289,7 +289,7 @@ ```ts if (Astro.slots.has('default')) { - const content = await Astro.slots.render('default'); + const content = await Astro.slots.render('default'); } ``` @@ -373,7 +373,7 @@ ```ts if (Astro.slots.has('default')) { - const content = await Astro.slots.render('default'); + const content = await Astro.slots.render('default'); } ``` @@ -397,9 +397,9 @@ ```json { - "scripts": { - "build": "astro build --legacy-build" - } + "scripts": { + "build": "astro build --legacy-build" + } } ``` @@ -511,12 +511,12 @@ ```typescript // src/pages/company.json.ts export async function get() { - return { - body: JSON.stringify({ - name: 'Astro Technology Company', - url: 'https://astro.build/', - }), - }; + return { + body: JSON.stringify({ + name: 'Astro Technology Company', + url: 'https://astro.build/', + }), + }; } ``` @@ -678,12 +678,12 @@ ```typescript // src/pages/company.json.ts export async function get() { - return { - body: JSON.stringify({ - name: 'Astro Technology Company', - url: 'https://astro.build/', - }), - }; + return { + body: JSON.stringify({ + name: 'Astro Technology Company', + url: 'https://astro.build/', + }), + }; } ``` @@ -2038,10 +2038,10 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve ```js export default { - markdownOptions: { - remarkPlugins: ['remark-slug', ['remark-autolink-headings', { behavior: 'prepend' }]], - rehypePlugins: ['rehype-slug', ['rehype-autolink-headings', { behavior: 'prepend' }]], - }, + markdownOptions: { + remarkPlugins: ['remark-slug', ['remark-autolink-headings', { behavior: 'prepend' }]], + rehypePlugins: ['rehype-slug', ['rehype-autolink-headings', { behavior: 'prepend' }]], + }, }; ``` @@ -2061,10 +2061,10 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve ```js export default { - name: '@matthewp/my-renderer', - server: './server.js', - client: './client.js', - hydrationPolyfills: ['./my-polyfill.js'], + name: '@matthewp/my-renderer', + server: './server.js', + client: './client.js', + hydrationPolyfills: ['./my-polyfill.js'], }; ``` From b7ee8554f50b75f752ecba26dd96529b5d302200 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Mon, 28 Mar 2022 19:55:12 -0400 Subject: [PATCH 04/17] Enable next mode (#2920) * Enable next mode * update next mode Co-authored-by: Fred K. Schott --- .changeset/pre.json | 61 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 000000000..5b9fb8f21 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,61 @@ +{ + "mode": "pre", + "tag": "next", + "initialVersions": { + "@example/blog": "0.0.1", + "@example/blog-multiple-authors": "0.0.1", + "@example/component": "0.0.1", + "@example/my-component-demo": "0.0.1", + "@example/my-component": "0.0.1", + "@example/docs": "0.0.1", + "@example/env-vars": "0.0.1", + "@example/framework-alpine": "0.0.1", + "@example/framework-lit": "0.0.1", + "@example/framework-multiple": "0.0.1", + "@example/framework-preact": "0.0.1", + "@example/framework-react": "0.0.1", + "@example/framework-solid": "0.0.1", + "@example/framework-svelte": "0.0.1", + "@example/framework-vue": "0.0.1", + "@example/integrations-playground": "0.0.1", + "@example/minimal": "0.0.1", + "@example/non-html-pages": "0.0.1", + "@example/portfolio": "0.0.1", + "@example/ssr": "0.0.1", + "@example/starter": "0.0.1", + "@example/subpath": "0.0.1", + "@example/with-markdown": "0.0.1", + "@example/with-markdown-plugins": "0.0.2", + "@example/with-markdown-shiki": "0.0.1", + "@example/with-nanostores": "0.0.1", + "@example/with-tailwindcss": "0.0.1", + "@example/with-vite-plugin-pwa": "0.0.1", + "astro": "0.25.4", + "@astrojs/prism": "0.4.1", + "@test/custom-element-renderer": "0.1.0", + "@test/static-build-pkg": "0.0.0", + "create-astro": "0.8.0", + "@astrojs/lit": "0.0.2", + "@astrojs/netlify": "0.0.2", + "@astrojs/node": "0.0.2", + "@astrojs/partytown": "0.0.2", + "@astrojs/preact": "0.0.2", + "@astrojs/react": "0.0.2", + "@astrojs/sitemap": "0.0.2", + "@astrojs/solid-js": "0.0.3", + "@astrojs/svelte": "0.0.2", + "@astrojs/tailwind": "0.0.2", + "@astrojs/turbolinks": "0.0.2", + "@astrojs/vue": "0.0.2", + "@astrojs/markdown-remark": "0.7.0", + "@astrojs/renderer-lit": "0.4.0", + "@astrojs/renderer-preact": "0.5.0", + "@astrojs/renderer-react": "0.5.0", + "@astrojs/renderer-solid": "0.4.0", + "@astrojs/renderer-svelte": "0.5.2", + "@astrojs/renderer-vue": "0.4.0", + "@astrojs/webapi": "0.11.0", + "astro-scripts": "0.0.2" + }, + "changesets": [] +} From f70207082abf369390a01882a85a7e057843fddd Mon Sep 17 00:00:00 2001 From: "Fred K. Schott" Date: Mon, 28 Mar 2022 16:55:36 -0700 Subject: [PATCH 05/17] Restyle error messages (#2902) * clean up error logging in astro * update from ben feedback * Update packages/astro/src/core/build/generate.ts Co-authored-by: Ben Holmes Co-authored-by: Ben Holmes --- .changeset/small-radios-remain.md | 5 + packages/astro/src/cli/check.ts | 6 +- packages/astro/src/cli/index.ts | 40 ++--- packages/astro/src/core/add/index.ts | 18 +- packages/astro/src/core/build/common.ts | 2 +- packages/astro/src/core/build/generate.ts | 161 ++++++++---------- packages/astro/src/core/build/index.ts | 88 ++++++---- packages/astro/src/core/build/static-build.ts | 8 +- packages/astro/src/core/config.ts | 5 - packages/astro/src/core/dev/index.ts | 2 +- packages/astro/src/core/dev/util.ts | 50 ------ packages/astro/src/core/endpoint/dev/index.ts | 19 +-- packages/astro/src/core/errors.ts | 78 +++++++++ packages/astro/src/core/messages.ts | 67 ++++++-- packages/astro/src/core/render/dev/error.ts | 44 ----- packages/astro/src/core/render/dev/index.ts | 10 +- packages/astro/src/core/util.ts | 55 +++++- .../src/vite-plugin-astro-server/index.ts | 12 +- .../astro/src/vite-plugin-build-html/index.ts | 41 ++--- packages/astro/test/cli.test.js | 2 +- packages/astro/test/config-validate.test.js | 7 +- 21 files changed, 371 insertions(+), 349 deletions(-) create mode 100644 .changeset/small-radios-remain.md delete mode 100644 packages/astro/src/core/dev/util.ts create mode 100644 packages/astro/src/core/errors.ts delete mode 100644 packages/astro/src/core/render/dev/error.ts diff --git a/.changeset/small-radios-remain.md b/.changeset/small-radios-remain.md new file mode 100644 index 000000000..d0747a700 --- /dev/null +++ b/.changeset/small-radios-remain.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Update CLI error format and style diff --git a/packages/astro/src/cli/check.ts b/packages/astro/src/cli/check.ts index 499ac9afd..ffdc246df 100644 --- a/packages/astro/src/cli/check.ts +++ b/packages/astro/src/cli/check.ts @@ -57,7 +57,7 @@ function offsetAt({ line, character }: { line: number; character: number }, text return i; } -function pad(str: string, len: number) { +function generateString(str: string, len: number) { return Array.from({ length: len }, () => str).join(''); } @@ -86,8 +86,8 @@ export async function check(astroConfig: AstroConfig) { const lineNumStr = d.range.start.line.toString(); const lineNumLen = lineNumStr.length; console.error(`${bgWhite(black(lineNumStr))} ${str}`); - let tildes = pad('~', d.range.end.character - d.range.start.character); - let spaces = pad(' ', d.range.start.character + lineNumLen - 1); + let tildes = generateString('~', d.range.end.character - d.range.start.character); + let spaces = generateString(' ', d.range.start.character + lineNumLen - 1); console.error(` ${spaces}${bold(red(tildes))}\n`); result.errors++; break; diff --git a/packages/astro/src/cli/index.ts b/packages/astro/src/cli/index.ts index 4108d4984..5b4f2abbc 100644 --- a/packages/astro/src/cli/index.ts +++ b/packages/astro/src/cli/index.ts @@ -12,8 +12,9 @@ import add from '../core/add/index.js'; import devServer from '../core/dev/index.js'; import preview from '../core/preview/index.js'; import { check } from './check.js'; -import { formatConfigError, loadConfig } from '../core/config.js'; -import { printHelp } from '../core/messages.js'; +import { loadConfig } from '../core/config.js'; +import { printHelp, formatErrorMessage, formatConfigErrorMessage } from '../core/messages.js'; +import { createSafeError } from '../core/util.js'; type Arguments = yargs.Arguments; type CLICommand = 'help' | 'version' | 'add' | 'dev' | 'build' | 'preview' | 'reload' | 'check'; @@ -102,40 +103,33 @@ export async function cli(args: string[]) { // For now, `add` has to resolve the config again internally config = await loadConfig({ cwd: projectRoot, flags }); } catch (err) { - throwAndExit(err); - return; + return throwAndExit(err); } switch (cmd) { case 'add': { try { const packages = flags._.slice(3) as string[]; - await add(packages, { cwd: projectRoot, flags, logging }); - process.exit(0); + return await add(packages, { cwd: projectRoot, flags, logging }); } catch (err) { - throwAndExit(err); + return throwAndExit(err); } - return; } case 'dev': { try { await devServer(config, { logging }); - - await new Promise(() => {}); // don’t close dev server + return await new Promise(() => {}); // lives forever } catch (err) { - throwAndExit(err); + return throwAndExit(err); } - return; } case 'build': { try { - await build(config, { logging }); - process.exit(0); + return await build(config, { logging }); } catch (err) { - throwAndExit(err); + return throwAndExit(err); } - return; } case 'check': { @@ -145,11 +139,10 @@ export async function cli(args: string[]) { case 'preview': { try { - await preview(config, { logging }); // this will keep running + return await preview(config, { logging }); // this will keep running } catch (err) { - throwAndExit(err); + return throwAndExit(err); } - return; } default: { @@ -159,14 +152,11 @@ export async function cli(args: string[]) { } /** Display error and exit */ -function throwAndExit(err: any) { +function throwAndExit(err: unknown) { if (err instanceof z.ZodError) { - console.error(formatConfigError(err)); - } else if (err.stack) { - const [mainMsg, ...stackMsg] = err.stack.split('\n'); - console.error(colors.red(mainMsg) + '\n' + colors.dim(stackMsg.join('\n'))); + console.error(formatConfigErrorMessage(err)); } else { - console.error(colors.red(err.toString() || err)); + console.error(formatErrorMessage(createSafeError(err))); } process.exit(1); } diff --git a/packages/astro/src/core/add/index.ts b/packages/astro/src/core/add/index.ts index 74045cc6e..d1f63a9cf 100644 --- a/packages/astro/src/core/add/index.ts +++ b/packages/astro/src/core/add/index.ts @@ -54,6 +54,7 @@ export default async function add(names: string[], { cwd, flags, logging }: AddO } applyPolyfill(); + // If no integrations were given, prompt the user for some popular ones. if (names.length === 0) { const response = await prompts([ { @@ -72,16 +73,13 @@ export default async function add(names: string[], { cwd, flags, logging }: AddO }, ]); - if (!response.frameworks && !response.addons) { - info(logging, null, msg.cancelled(`Integrations skipped.`, `You can always run ${cyan('astro add')} later!`)); - return; - } - const selected = [response.frameworks ?? [], response.addons ?? []].flat(1); - if (selected.length === 0) { - error(logging, null, `\n${red('No integrations specified!')}\n${dim('Try running')} astro add again.`); - return; - } - names = selected; + names = [...(response.frameworks ?? []), ...(response.addons ?? [])]; + } + + // If still empty after prompting, exit gracefully. + if (names.length === 0) { + error(logging, null, `No integrations specified.`); + return; } // Some packages might have a common alias! We normalize those here. diff --git a/packages/astro/src/core/build/common.ts b/packages/astro/src/core/build/common.ts index 5407f66fd..a29aa356c 100644 --- a/packages/astro/src/core/build/common.ts +++ b/packages/astro/src/core/build/common.ts @@ -4,7 +4,7 @@ import { appendForwardSlash } from '../../core/path.js'; const STATUS_CODE_PAGES = new Set(['/404', '/500']); -export function getOutRoot(astroConfig: AstroConfig): URL { +function getOutRoot(astroConfig: AstroConfig): URL { return new URL('./', astroConfig.dist); } diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts index 119274e76..84d9dd7e2 100644 --- a/packages/astro/src/core/build/generate.ts +++ b/packages/astro/src/core/build/generate.ts @@ -1,21 +1,21 @@ -import type { OutputAsset, OutputChunk, RollupOutput } from 'rollup'; -import type { AstroConfig, ComponentInstance, EndpointHandler, SSRLoadedRenderer } from '../../@types/astro'; -import type { PageBuildData, StaticBuildOptions, SingleFileBuiltModule } from './types'; -import type { BuildInternals } from '../../core/build/internal.js'; -import type { RenderOptions } from '../../core/render/core'; - import fs from 'fs'; +import { bgGreen, bgMagenta, black, cyan, dim, green, magenta } from 'kleur/colors'; import npath from 'path'; +import type { OutputAsset, OutputChunk, RollupOutput } from 'rollup'; import { fileURLToPath } from 'url'; -import { debug, error, info } from '../../core/logger.js'; -import { prependForwardSlash } from '../../core/path.js'; +import type { AstroConfig, ComponentInstance, EndpointHandler, SSRLoadedRenderer } from '../../@types/astro'; +import type { BuildInternals } from '../../core/build/internal.js'; +import { debug, info } from '../../core/logger.js'; +import { appendForwardSlash, prependForwardSlash } from '../../core/path.js'; +import type { RenderOptions } from '../../core/render/core'; import { BEFORE_HYDRATION_SCRIPT_ID } from '../../vite-plugin-scripts/index.js'; import { call as callEndpoint } from '../endpoint/index.js'; import { render } from '../render/core.js'; import { createLinkStylesheetElementSet, createModuleScriptElementWithSrcSet } from '../render/ssr-element.js'; -import { getOutFile, getOutRoot, getOutFolder } from './common.js'; -import { getPageDataByComponent, eachPageData } from './internal.js'; -import { bgMagenta, black, cyan, dim, magenta } from 'kleur/colors'; +import { getOutputFilename } from '../util.js'; +import { getOutFile, getOutFolder } from './common.js'; +import { eachPageData, getPageDataByComponent } from './internal.js'; +import type { PageBuildData, SingleFileBuiltModule, StaticBuildOptions } from './types'; import { getTimeStat } from './util.js'; // Render is usually compute, which Node.js can't parallelize well. @@ -67,7 +67,8 @@ export function chunkIsPage(astroConfig: AstroConfig, output: OutputAsset | Outp } export async function generatePages(result: RollupOutput, opts: StaticBuildOptions, internals: BuildInternals, facadeIdToPageDataMap: Map) { - info(opts.logging, null, `\n${bgMagenta(black(' generating static routes '))}\n`); + const timer = performance.now(); + info(opts.logging, null, `\n${bgGreen(black(' generating static routes '))}`); const ssr = !!opts.astroConfig._ctx.adapter?.serverEntrypoint; const serverEntry = opts.buildConfig.serverEntry; @@ -78,6 +79,7 @@ export async function generatePages(result: RollupOutput, opts: StaticBuildOptio for (const pageData of eachPageData(internals)) { await generatePage(opts, internals, pageData, ssrEntry); } + info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.\n`)); } async function generatePage( @@ -109,31 +111,18 @@ async function generatePage( renderers, }; - const icon = pageData.route.type === 'page' ? cyan('') : magenta('{-}'); + const icon = pageData.route.type === 'page' ? green('▶') : magenta('λ'); info(opts.logging, null, `${icon} ${pageData.route.component}`); - // Throttle the paths to avoid overloading the CPU with too many tasks. - const renderPromises = []; - for (const paths of throttle(MAX_CONCURRENT_RENDERS, pageData.paths)) { - for (const path of paths) { - renderPromises.push(generatePath(path, opts, generationOptions)); - } - // This blocks generating more paths until these 10 complete. - await Promise.all(renderPromises); + for (let i = 0; i < pageData.paths.length; i++) { + const path = pageData.paths[i]; + await generatePath(path, opts, generationOptions); const timeEnd = performance.now(); const timeChange = getTimeStat(timeStart, timeEnd); - let shouldLogTimeChange = !getTimeStat(timeStart, timeEnd).startsWith('0'); - for (const path of paths) { - const timeIncrease = shouldLogTimeChange ? ` ${dim(`+${timeChange}`)}` : ''; - info(opts.logging, null, ` ${dim('┃')} ${path}${timeIncrease}`); - // Should only log build time on the first generated path - // Logging for all generated paths adds extra noise - shouldLogTimeChange = false; - } - // Reset timeStart for the next batch of rendered paths - timeStart = performance.now(); - // This empties the array without allocating a new one. - renderPromises.length = 0; + const timeIncrease = `(+${timeChange})`; + const filePath = getOutputFilename(opts.astroConfig, path); + const lineIcon = i === pageData.paths.length - 1 ? '└─' : '├─'; + info(opts.logging, null, ` ${cyan(lineIcon)} ${dim(filePath)} ${dim(timeIncrease)}`); } } @@ -175,65 +164,61 @@ async function generatePath(pathname: string, opts: StaticBuildOptions, gopts: G } } - try { - const options: RenderOptions = { - legacyBuild: false, - links, - logging, - markdownRender: astroConfig.markdownOptions.render, - mod, - origin, - pathname, - scripts, - renderers, - async resolve(specifier: string) { - const hashedFilePath = internals.entrySpecifierToBundleMap.get(specifier); - if (typeof hashedFilePath !== 'string') { - // If no "astro:scripts/before-hydration.js" script exists in the build, - // then we can assume that no before-hydration scripts are needed. - // Return this as placeholder, which will be ignored by the browser. - // TODO: In the future, we hope to run this entire script through Vite, - // removing the need to maintain our own custom Vite-mimic resolve logic. - if (specifier === BEFORE_HYDRATION_SCRIPT_ID) { - return 'data:text/javascript;charset=utf-8,//[no before-hydration script]'; - } - throw new Error(`Cannot find the built path for ${specifier}`); + const options: RenderOptions = { + legacyBuild: false, + links, + logging, + markdownRender: astroConfig.markdownOptions.render, + mod, + origin, + pathname, + scripts, + renderers, + async resolve(specifier: string) { + const hashedFilePath = internals.entrySpecifierToBundleMap.get(specifier); + if (typeof hashedFilePath !== 'string') { + // If no "astro:scripts/before-hydration.js" script exists in the build, + // then we can assume that no before-hydration scripts are needed. + // Return this as placeholder, which will be ignored by the browser. + // TODO: In the future, we hope to run this entire script through Vite, + // removing the need to maintain our own custom Vite-mimic resolve logic. + if (specifier === BEFORE_HYDRATION_SCRIPT_ID) { + return 'data:text/javascript;charset=utf-8,//[no before-hydration script]'; } - const relPath = npath.posix.relative(pathname, '/' + hashedFilePath); - const fullyRelativePath = relPath[0] === '.' ? relPath : './' + relPath; - return fullyRelativePath; - }, - method: 'GET', - headers: new Headers(), - route: pageData.route, - routeCache, - site: astroConfig.buildOptions.site, - ssr: opts.astroConfig.buildOptions.experimentalSsr, - }; - - let body: string; - if (pageData.route.type === 'endpoint') { - const result = await callEndpoint(mod as unknown as EndpointHandler, options); - - if (result.type === 'response') { - throw new Error(`Returning a Response from an endpoint is not supported in SSG mode.`); + throw new Error(`Cannot find the built path for ${specifier}`); } - body = result.body; - } else { - const result = await render(options); + const relPath = npath.posix.relative(pathname, '/' + hashedFilePath); + const fullyRelativePath = relPath[0] === '.' ? relPath : './' + relPath; + return fullyRelativePath; + }, + method: 'GET', + headers: new Headers(), + route: pageData.route, + routeCache, + site: astroConfig.buildOptions.site, + ssr: opts.astroConfig.buildOptions.experimentalSsr, + }; - // If there's a redirect or something, just do nothing. - if (result.type !== 'html') { - return; - } - body = result.html; + let body: string; + if (pageData.route.type === 'endpoint') { + const result = await callEndpoint(mod as unknown as EndpointHandler, options); + + if (result.type === 'response') { + throw new Error(`Returning a Response from an endpoint is not supported in SSG mode.`); } + body = result.body; + } else { + const result = await render(options); - const outFolder = getOutFolder(astroConfig, pathname, pageData.route.type); - const outFile = getOutFile(astroConfig, outFolder, pathname, pageData.route.type); - await fs.promises.mkdir(outFolder, { recursive: true }); - await fs.promises.writeFile(outFile, body, 'utf-8'); - } catch (err) { - error(opts.logging, 'build', `Error rendering:`, err); + // If there's a redirect or something, just do nothing. + if (result.type !== 'html') { + return; + } + body = result.html; } + + const outFolder = getOutFolder(astroConfig, pathname, pageData.route.type); + const outFile = getOutFile(astroConfig, outFolder, pathname, pageData.route.type); + await fs.promises.mkdir(outFolder, { recursive: true }); + await fs.promises.writeFile(outFile, body, 'utf-8'); } diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts index 7a360b01e..4962ce1c7 100644 --- a/packages/astro/src/core/build/index.ts +++ b/packages/astro/src/core/build/index.ts @@ -16,6 +16,8 @@ import { staticBuild } from './static-build.js'; import { RouteCache } from '../render/route-cache.js'; import { runHookBuildDone, runHookBuildStart, runHookConfigDone, runHookConfigSetup } from '../../integrations/index.js'; import { getTimeStat } from './util.js'; +import { createSafeError } from '../util.js'; +import { fixViteErrorMessage } from '../errors.js'; export interface BuildOptions { mode?: string; @@ -24,8 +26,9 @@ export interface BuildOptions { /** `astro build` */ export default async function build(config: AstroConfig, options: BuildOptions = { logging: defaultLogOptions }): Promise { + applyPolyfill(); const builder = new AstroBuilder(config, options); - await builder.build(); + await builder.run(); } class AstroBuilder { @@ -35,32 +38,30 @@ class AstroBuilder { private origin: string; private routeCache: RouteCache; private manifest: ManifestData; - private viteServer?: vite.ViteDevServer; - private viteConfig?: ViteConfigWithSSR; + private timer: Record; constructor(config: AstroConfig, options: BuildOptions) { - applyPolyfill(); - if (!config.buildOptions.site && config.buildOptions.sitemap !== false) { warn(options.logging, 'config', `Set "buildOptions.site" to generate correct canonical URLs and sitemap`); } - - if (options.mode) this.mode = options.mode; + if (options.mode) { + this.mode = options.mode; + } this.config = config; const port = config.devOptions.port; // no need to save this (don’t rely on port in builder) this.logging = options.logging; this.routeCache = new RouteCache(this.logging); this.origin = config.buildOptions.site ? new URL(config.buildOptions.site).origin : `http://localhost:${port}`; this.manifest = createRouteManifest({ config }, this.logging); + this.timer = {}; } - async build() { - info(this.logging, 'build', 'Initial setup...'); - - const { logging, origin } = this; - const timer: Record = {}; - timer.init = performance.now(); - timer.viteStart = performance.now(); + /** Setup Vite and run any async setup logic that couldn't run inside of the constructor. */ + private async setup() { + debug('build', 'Initial setup...'); + const { logging } = this; + this.timer.init = performance.now(); + this.timer.viteStart = performance.now(); this.config = await runHookConfigSetup({ config: this.config, command: 'build' }); const viteConfig = await createVite( { @@ -74,10 +75,14 @@ class AstroBuilder { ); await runHookConfigDone({ config: this.config }); warnIfUsingExperimentalSSR(logging, this.config); - this.viteConfig = viteConfig; const viteServer = await vite.createServer(viteConfig); - this.viteServer = viteServer; - debug('build', timerMessage('Vite started', timer.viteStart)); + debug('build', timerMessage('Vite started', this.timer.viteStart)); + return { viteConfig, viteServer }; + } + + /** Run the build logic. build() is marked private because usage should go through ".run()" */ + private async build({ viteConfig, viteServer }: { viteConfig: ViteConfigWithSSR; viteServer: vite.ViteDevServer }) { + const { origin } = this; const buildConfig: BuildConfig = { client: new URL('./client/', this.config.dist), server: new URL('./server/', this.config.dist), @@ -86,15 +91,15 @@ class AstroBuilder { }; await runHookBuildStart({ config: this.config, buildConfig }); - info(this.logging, 'build', 'Collecting page data...'); - timer.loadStart = performance.now(); + info(this.logging, 'build', 'Collecting build information...'); + this.timer.loadStart = performance.now(); const { assets, allPages } = await collectPagesData({ astroConfig: this.config, logging: this.logging, manifest: this.manifest, origin, routeCache: this.routeCache, - viteServer: this.viteServer, + viteServer, ssr: this.config.buildOptions.experimentalSsr, }); @@ -104,21 +109,21 @@ class AstroBuilder { // TODO: add better type inference to data.preload[1] const frontmatter = (data.preload[1] as any).frontmatter; if (Boolean(frontmatter.draft) && !this.config.buildOptions.drafts) { - debug('build', timerMessage(`Skipping draft page ${page}`, timer.loadStart)); + debug('build', timerMessage(`Skipping draft page ${page}`, this.timer.loadStart)); delete allPages[page]; } } }); - debug('build', timerMessage('All pages loaded', timer.loadStart)); + debug('build', timerMessage('All pages loaded', this.timer.loadStart)); // The names of each pages const pageNames: string[] = []; // Bundle the assets in your final build: This currently takes the HTML output // of every page (stored in memory) and bundles the assets pointed to on those pages. - timer.buildStart = performance.now(); - info(this.logging, 'build', colors.dim(`Completed in ${getTimeStat(timer.init, performance.now())}`)); + this.timer.buildStart = performance.now(); + info(this.logging, 'build', colors.dim(`Completed in ${getTimeStat(this.timer.init, performance.now())}.`)); // Use the new faster static based build. if (!this.config.buildOptions.legacyBuild) { @@ -130,7 +135,7 @@ class AstroBuilder { origin: this.origin, pageNames, routeCache: this.routeCache, - viteConfig: this.viteConfig, + viteConfig, buildConfig, }); } else { @@ -141,13 +146,13 @@ class AstroBuilder { origin: this.origin, pageNames, routeCache: this.routeCache, - viteConfig: this.viteConfig, - viteServer: this.viteServer, + viteConfig, + viteServer, }); } // Write any additionally generated assets to disk. - timer.assetsStart = performance.now(); + this.timer.assetsStart = performance.now(); Object.keys(assets).map((k) => { if (!assets[k]) return; const filePath = new URL(`file://${k}`); @@ -155,11 +160,11 @@ class AstroBuilder { fs.writeFileSync(filePath, assets[k], 'utf8'); delete assets[k]; // free up memory }); - debug('build', timerMessage('Additional assets copied', timer.assetsStart)); + debug('build', timerMessage('Additional assets copied', this.timer.assetsStart)); // Build your final sitemap. if (this.config.buildOptions.sitemap && this.config.buildOptions.site) { - timer.sitemapStart = performance.now(); + this.timer.sitemapStart = performance.now(); const sitemapFilter = this.config.buildOptions.sitemapFilter ? (this.config.buildOptions.sitemapFilter as (page: string) => boolean) : undefined; const sitemap = generateSitemap( pageNames.map((pageName) => new URL(pageName, this.config.buildOptions.site).href), @@ -168,16 +173,27 @@ class AstroBuilder { const sitemapPath = new URL('./sitemap.xml', this.config.dist); await fs.promises.mkdir(new URL('./', sitemapPath), { recursive: true }); await fs.promises.writeFile(sitemapPath, sitemap, 'utf8'); - debug('build', timerMessage('Sitemap built', timer.sitemapStart)); + debug('build', timerMessage('Sitemap built', this.timer.sitemapStart)); } // You're done! Time to clean up. await viteServer.close(); await runHookBuildDone({ config: this.config, pages: pageNames, routes: Object.values(allPages).map((pd) => pd.route) }); - if (logging.level && levels[logging.level] <= levels['info']) { + if (this.logging.level && levels[this.logging.level] <= levels['info']) { const buildMode = this.config.buildOptions.experimentalSsr ? 'ssr' : 'static'; - await this.printStats({ logging, timeStart: timer.init, pageCount: pageNames.length, buildMode }); + await this.printStats({ logging: this.logging, timeStart: this.timer.init, pageCount: pageNames.length, buildMode }); + } + } + + /** Build the given Astro project. */ + async run() { + const setupData = await this.setup(); + try { + await this.build(setupData); + } catch (_err) { + debugger; + throw fixViteErrorMessage(createSafeError(_err), setupData.viteServer); } } @@ -188,14 +204,12 @@ class AstroBuilder { let messages: string[] = []; if (buildMode === 'static') { - const timePerPage = Math.round(buildTime / pageCount); - const perPageMsg = colors.dim(`(${colors.bold(`${timePerPage}ms`)} avg per page + resources)`); - messages = [`${pageCount} pages built in`, colors.bold(total), perPageMsg]; + messages = [`${pageCount} page(s) built in`, colors.bold(total)]; } else { messages = ['Server built in', colors.bold(total)]; } info(logging, 'build', messages.join(' ')); - info(logging, 'build', `🚀 ${colors.cyan(colors.bold('Done'))}`); + info(logging, 'build', `${colors.bold('Complete!')}`); } } diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index f5e54b7bf..8e1559e97 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -41,7 +41,6 @@ export async function staticBuild(opts: StaticBuildOptions) { const timer: Record = {}; timer.buildStart = performance.now(); - info(opts.logging, 'build', 'Discovering entrypoints...'); for (const [component, pageData] of Object.entries(allPages)) { const astroModuleURL = new URL('./' + component, astroConfig.projectRoot); @@ -97,7 +96,7 @@ export async function staticBuild(opts: StaticBuildOptions) { timer.ssr = performance.now(); info(opts.logging, 'build', 'Building for SSR...'); const ssrResult = (await ssrBuild(opts, internals, pageInput)) as RollupOutput; - info(opts.logging, 'build', dim(`Completed in ${getTimeStat(timer.ssr, performance.now())}`)); + info(opts.logging, 'build', dim(`Completed in ${getTimeStat(timer.ssr, performance.now())}.`)); timer.generate = performance.now(); if (opts.buildConfig.staticMode) { @@ -107,7 +106,6 @@ export async function staticBuild(opts: StaticBuildOptions) { info(opts.logging, null, `\n${bgMagenta(black(' finalizing server assets '))}\n`); await ssrMoveAssets(opts); } - info(opts.logging, null, dim(`Completed in ${getTimeStat(timer.generate, performance.now())}\n`)); } async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, input: Set) { @@ -171,7 +169,7 @@ async function clientBuild(opts: StaticBuildOptions, internals: BuildInternals, } // TODO: use vite.mergeConfig() here? - info(opts.logging, null, `\n${bgGreen(black(' building resources '))}\n`); + info(opts.logging, null, `\n${bgGreen(black(' building client '))}`); const out = isBuildingToSSR(astroConfig) ? opts.buildConfig.client : astroConfig.dist; @@ -210,7 +208,7 @@ async function clientBuild(opts: StaticBuildOptions, internals: BuildInternals, server: viteConfig.server, base: appendForwardSlash(astroConfig.buildOptions.site ? new URL(astroConfig.buildOptions.site).pathname : '/'), }); - info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}\n`)); + info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.\n`)); return buildResult; } diff --git a/packages/astro/src/core/config.ts b/packages/astro/src/core/config.ts index 39fa44174..394c1c42d 100644 --- a/packages/astro/src/core/config.ts +++ b/packages/astro/src/core/config.ts @@ -327,11 +327,6 @@ export async function resolveConfig(userConfig: AstroUserConfig, root: string, f return validatedConfig; } -export function formatConfigError(err: z.ZodError) { - const errorList = err.issues.map((issue) => ` ! ${colors.bold(issue.path.join('.'))} ${colors.red(issue.message + '.')}`); - return `${colors.red('[config]')} Astro found issue(s) with your configuration:\n${errorList.join('\n')}`; -} - function mergeConfigRecursively(defaults: Record, overrides: Record, rootPath: string) { const merged: Record = { ...defaults }; for (const key in overrides) { diff --git a/packages/astro/src/core/dev/index.ts b/packages/astro/src/core/dev/index.ts index 166009cda..cc1e7bde2 100644 --- a/packages/astro/src/core/dev/index.ts +++ b/packages/astro/src/core/dev/index.ts @@ -7,7 +7,7 @@ import { createVite } from '../create-vite.js'; import { defaultLogOptions, info, LogOptions, warn, warnIfUsingExperimentalSSR } from '../logger.js'; import * as msg from '../messages.js'; import { apply as applyPolyfill } from '../polyfill.js'; -import { getResolvedHostForVite } from './util.js'; +import { getResolvedHostForVite } from '../util.js'; export interface DevOptions { logging: LogOptions; diff --git a/packages/astro/src/core/dev/util.ts b/packages/astro/src/core/dev/util.ts deleted file mode 100644 index 9b0c974fd..000000000 --- a/packages/astro/src/core/dev/util.ts +++ /dev/null @@ -1,50 +0,0 @@ -import type { AstroConfig } from '../../@types/astro'; - -export const localIps = new Set(['localhost', '127.0.0.1']); - -/** Pad string () */ -export function pad(input: string, minLength: number, dir?: 'left' | 'right'): string { - let output = input; - while (output.length < minLength) { - output = dir === 'left' ? ' ' + output : output + ' '; - } - return output; -} - -export function emoji(char: string, fallback: string) { - return process.platform !== 'win32' ? char : fallback; -} - -// TODO: remove once --hostname is baselined -export function getResolvedHostForVite(config: AstroConfig) { - if (config.devOptions.host === false && config.devOptions.hostname !== 'localhost') { - return config.devOptions.hostname; - } else { - return config.devOptions.host; - } -} - -export function getLocalAddress(serverAddress: string, config: AstroConfig): string { - // TODO: remove once --hostname is baselined - const host = getResolvedHostForVite(config); - if (typeof host === 'boolean' || host === 'localhost') { - return 'localhost'; - } else { - return serverAddress; - } -} - -export type NetworkLogging = 'none' | 'host-to-expose' | 'visible'; - -export function getNetworkLogging(config: AstroConfig): NetworkLogging { - // TODO: remove once --hostname is baselined - const host = getResolvedHostForVite(config); - - if (host === false) { - return 'host-to-expose'; - } else if (typeof host === 'string' && localIps.has(host)) { - return 'none'; - } else { - return 'visible'; - } -} diff --git a/packages/astro/src/core/endpoint/dev/index.ts b/packages/astro/src/core/endpoint/dev/index.ts index 3190a500f..da3671bc0 100644 --- a/packages/astro/src/core/endpoint/dev/index.ts +++ b/packages/astro/src/core/endpoint/dev/index.ts @@ -1,21 +1,12 @@ import type { EndpointHandler } from '../../../@types/astro'; import type { SSROptions } from '../../render/dev'; - import { preload } from '../../render/dev/index.js'; -import { errorHandler } from '../../render/dev/error.js'; import { call as callEndpoint } from '../index.js'; -import { getParamsAndProps, GetParamsAndPropsError } from '../../render/core.js'; -import { createRequest } from '../../render/request.js'; export async function call(ssrOpts: SSROptions) { - try { - const [, mod] = await preload(ssrOpts); - return await callEndpoint(mod as unknown as EndpointHandler, { - ...ssrOpts, - ssr: ssrOpts.astroConfig.buildOptions.experimentalSsr, - }); - } catch (e: unknown) { - await errorHandler(e, { viteServer: ssrOpts.viteServer, filePath: ssrOpts.filePath }); - throw e; - } + const [, mod] = await preload(ssrOpts); + return await callEndpoint(mod as unknown as EndpointHandler, { + ...ssrOpts, + ssr: ssrOpts.astroConfig.buildOptions.experimentalSsr, + }); } diff --git a/packages/astro/src/core/errors.ts b/packages/astro/src/core/errors.ts new file mode 100644 index 000000000..0150978dc --- /dev/null +++ b/packages/astro/src/core/errors.ts @@ -0,0 +1,78 @@ +import type { BuildResult } from 'esbuild'; +import type { ViteDevServer } from 'vite'; +import type { SSRError } from '../@types/astro'; +import eol from 'eol'; +import fs from 'fs'; +import { codeFrame, createSafeError } from './util.js'; + +export interface ErrorWithMetadata { + [name: string]: any; + message: string; + stack: string; + id?: string; + frame?: string; + plugin?: string; + pluginCode?: string; + loc?: { + file?: string; + line: number; + column: number; + }; +} + +export function cleanErrorStack(stack: string) { + return stack + .split(/\n/g) + .filter((l) => /^\s*at/.test(l)) + .join('\n'); +} + +/** Update the error message to correct any vite-isms that we don't want to expose to the user. */ +export function fixViteErrorMessage(_err: unknown, server: ViteDevServer) { + const err = createSafeError(_err); + // Vite will give you better stacktraces, using sourcemaps. + server.ssrFixStacktrace(err); + // Fix: Astro.glob() compiles to import.meta.glob() by the time Vite sees it, + // so we need to update this error message in case it originally came from Astro.glob(). + if (err.message === 'import.meta.glob() can only accept string literals.') { + err.message = 'Astro.glob() and import.meta.glob() can only accept string literals.'; + } + return err; +} + +/** + * Takes any error-like object and returns a standardized Error + metadata object. + * Useful for consistent reporting regardless of where the error surfaced from. + */ +export function collectErrorMetadata(e: any): ErrorWithMetadata { + // normalize error stack line-endings to \n + if ((e as any).stack) { + (e as any).stack = eol.lf((e as any).stack); + } + + // Astro error (thrown by esbuild so it needs to be formatted for Vite) + if (Array.isArray((e as any).errors)) { + const { location, pluginName, text } = (e as BuildResult).errors[0]; + const err = e as SSRError; + if (location) { + err.loc = { file: location.file, line: location.line, column: location.column }; + err.id = err.id || location?.file; + } + const possibleFilePath = err.pluginCode || err.id || location?.file; + if (possibleFilePath && !err.frame) { + try { + const fileContents = fs.readFileSync(possibleFilePath, 'utf8'); + err.frame = codeFrame(fileContents, err.loc); + } catch { + // do nothing, code frame isn't that big a deal + } + } + if (pluginName) { + err.plugin = pluginName; + } + return err; + } + + // Generic error (probably from Vite, and already formatted) + return e; +} diff --git a/packages/astro/src/core/messages.ts b/packages/astro/src/core/messages.ts index e3a7741c4..888e6fcf4 100644 --- a/packages/astro/src/core/messages.ts +++ b/packages/astro/src/core/messages.ts @@ -2,12 +2,13 @@ * Dev server messages (organized here to prevent clutter) */ -import stripAnsi from 'strip-ansi'; import { bold, dim, red, green, underline, yellow, bgYellow, cyan, bgGreen, black, bgRed, bgWhite } from 'kleur/colors'; -import { pad, emoji, getLocalAddress, getNetworkLogging } from './dev/util.js'; import os from 'os'; import type { AddressInfo } from 'net'; import type { AstroConfig } from '../@types/astro'; +import { collectErrorMetadata, cleanErrorStack } from './errors.js'; +import { ZodError } from 'zod'; +import { emoji, getLocalAddress, getResolvedHostForVite, padMultilineString } from './util.js'; const PREFIX_PADDING = 6; @@ -18,15 +19,15 @@ export function req({ url, statusCode, reqTime }: { url: string; statusCode: num else if (statusCode >= 400) color = yellow; else if (statusCode >= 300) color = dim; else if (statusCode >= 200) color = green; - return `${bold(color(pad(`${statusCode}`, PREFIX_PADDING)))} ${pad(url, 40)} ${reqTime ? dim(Math.round(reqTime) + 'ms') : ''}`.trim(); + return `${bold(color(`${statusCode}`.padStart(PREFIX_PADDING)))} ${url.padStart(40)} ${reqTime ? dim(Math.round(reqTime) + 'ms') : ''}`.trim(); } export function reload({ file }: { file: string }): string { - return `${green(pad('reload', PREFIX_PADDING))} ${file}`; + return `${green('reload'.padStart(PREFIX_PADDING))} ${file}`; } export function hmr({ file }: { file: string }): string { - return `${green(pad('update', PREFIX_PADDING))} ${file}`; + return `${green('update'.padStart(PREFIX_PADDING))} ${file}`; } /** Display dev server host and startup time */ @@ -91,7 +92,7 @@ export function success(message: string, tip?: string) { const badge = bgGreen(black(` success `)); const headline = green(message); const footer = tip ? `\n ▶ ${tip}` : undefined; - return ['', badge, headline, footer] + return ['', `${badge} ${headline}`, footer] .filter((v) => v !== undefined) .map((msg) => ` ${msg}`) .join('\n'); @@ -101,7 +102,7 @@ export function failure(message: string, tip?: string) { const badge = bgRed(black(` error `)); const headline = red(message); const footer = tip ? `\n ▶ ${tip}` : undefined; - return ['', badge, headline, footer] + return ['', `${badge} ${headline}`, footer] .filter((v) => v !== undefined) .map((msg) => ` ${msg}`) .join('\n'); @@ -111,7 +112,7 @@ export function cancelled(message: string, tip?: string) { const badge = bgYellow(black(` cancelled `)); const headline = yellow(message); const footer = tip ? `\n ▶ ${tip}` : undefined; - return ['', badge, headline, footer] + return ['', `${badge} ${headline}`, footer] .filter((v) => v !== undefined) .map((msg) => ` ${msg}`) .join('\n'); @@ -122,15 +123,45 @@ export function portInUse({ port }: { port: number }): string { return `Port ${port} in use. Trying a new one…`; } -/** Pretty-print errors */ -export function err(error: Error): string { - if (!error.stack) return stripAnsi(error.message); - let message = stripAnsi(error.message); - let stack = stripAnsi(error.stack); - const split = stack.indexOf(message) + message.length; - message = stack.slice(0, split); - stack = stack.slice(split).replace(/^\n+/, ''); - return `${message}\n${dim(stack)}`; +const LOCAL_IP_HOSTS = new Set(['localhost', '127.0.0.1']); + +export function getNetworkLogging(config: AstroConfig): 'none' | 'host-to-expose' | 'visible' { + // TODO: remove once --hostname is baselined + const host = getResolvedHostForVite(config); + + if (host === false) { + return 'host-to-expose'; + } else if (typeof host === 'string' && LOCAL_IP_HOSTS.has(host)) { + return 'none'; + } else { + return 'visible'; + } +} + +export function formatConfigErrorMessage(err: ZodError) { + const errorList = err.issues.map((issue) => ` ! ${bold(issue.path.join('.'))} ${red(issue.message + '.')}`); + return `${red('[config]')} Astro found issue(s) with your configuration:\n${errorList.join('\n')}`; +} + +export function formatErrorMessage(_err: Error, args: string[] = []): string { + const err = collectErrorMetadata(_err); + args.push(`${bgRed(black(` error `))}${red(bold(padMultilineString(err.message)))}`); + if (err.id) { + args.push(` ${bold('File:')}`); + args.push(red(` ${err.id}`)); + } + if (err.frame) { + args.push(` ${bold('Code:')}`); + args.push(red(padMultilineString(err.frame, 4))); + } + if (args.length === 1 && err.stack) { + args.push(dim(cleanErrorStack(err.stack))); + } else if (err.stack) { + args.push(` ${bold('Stacktrace:')}`); + args.push(dim(cleanErrorStack(err.stack))); + args.push(``); + } + return args.join('\n'); } export function printHelp({ @@ -157,7 +188,7 @@ export function printHelp({ let raw = ''; for (const row of rows) { - raw += `${opts.prefix}${bold(pad(`${row[0]}`, opts.padding - opts.prefix.length))}`; + raw += `${opts.prefix}${bold(`${row[0]}`.padStart(opts.padding - opts.prefix.length))}`; if (split) raw += '\n '; raw += dim(row[1]) + '\n'; } diff --git a/packages/astro/src/core/render/dev/error.ts b/packages/astro/src/core/render/dev/error.ts deleted file mode 100644 index 352211b1f..000000000 --- a/packages/astro/src/core/render/dev/error.ts +++ /dev/null @@ -1,44 +0,0 @@ -import type { BuildResult } from 'esbuild'; -import type * as vite from 'vite'; -import type { SSRError } from '../../../@types/astro'; - -import eol from 'eol'; -import fs from 'fs'; -import { codeFrame } from '../../util.js'; - -interface ErrorHandlerOptions { - filePath: URL; - viteServer: vite.ViteDevServer; -} - -export async function errorHandler(e: unknown, { viteServer, filePath }: ErrorHandlerOptions) { - // normalize error stack line-endings to \n - if ((e as any).stack) { - (e as any).stack = eol.lf((e as any).stack); - } - - // fix stack trace with Vite (this searches its module graph for matches) - if (e instanceof Error) { - viteServer.ssrFixStacktrace(e); - } - - // Astro error (thrown by esbuild so it needs to be formatted for Vite) - if (Array.isArray((e as any).errors)) { - const { location, pluginName, text } = (e as BuildResult).errors[0]; - const err = e as SSRError; - if (location) err.loc = { file: location.file, line: location.line, column: location.column }; - let src = err.pluginCode; - if (!src && err.id && fs.existsSync(err.id)) src = await fs.promises.readFile(err.id, 'utf8'); - if (!src) src = await fs.promises.readFile(filePath, 'utf8'); - err.frame = codeFrame(src, err.loc); - err.id = location?.file; - err.message = `${location?.file}: ${text} -${err.frame} -`; - if (pluginName) err.plugin = pluginName; - throw err; - } - - // Generic error (probably from Vite, and already formatted) - throw e; -} diff --git a/packages/astro/src/core/render/dev/index.ts b/packages/astro/src/core/render/dev/index.ts index d16cb8923..af92aca85 100644 --- a/packages/astro/src/core/render/dev/index.ts +++ b/packages/astro/src/core/render/dev/index.ts @@ -7,7 +7,6 @@ import { prependForwardSlash } from '../../../core/path.js'; import { RouteCache } from '../route-cache.js'; import { createModuleScriptElementWithSrcSet } from '../ssr-element.js'; import { getStylesForURL } from './css.js'; -import { errorHandler } from './error.js'; import { getHmrScript } from './hmr.js'; import { injectTags } from './html.js'; export interface SSROptions { @@ -216,11 +215,6 @@ export async function render(renderers: SSRLoadedRenderer[], mod: ComponentInsta } export async function ssr(preloadedComponent: ComponentPreload, ssrOpts: SSROptions): Promise { - try { - const [renderers, mod] = preloadedComponent; - return await render(renderers, mod, ssrOpts); // note(drew): without "await", errors won’t get caught by errorHandler() - } catch (e: unknown) { - await errorHandler(e, { viteServer: ssrOpts.viteServer, filePath: ssrOpts.filePath }); - throw e; - } + const [renderers, mod] = preloadedComponent; + return await render(renderers, mod, ssrOpts); // NOTE: without "await", errors won’t get caught below } diff --git a/packages/astro/src/core/util.ts b/packages/astro/src/core/util.ts index 6787f177b..373d6cff1 100644 --- a/packages/astro/src/core/util.ts +++ b/packages/astro/src/core/util.ts @@ -1,11 +1,12 @@ -import type { AstroConfig } from '../@types/astro'; -import type { ErrorPayload } from 'vite'; import eol from 'eol'; -import path from 'path'; -import slash from 'slash'; import fs from 'fs'; -import { fileURLToPath, pathToFileURL } from 'url'; +import path from 'path'; import resolve from 'resolve'; +import slash from 'slash'; +import { fileURLToPath, pathToFileURL } from 'url'; +import type { ErrorPayload } from 'vite'; +import type { AstroConfig } from '../@types/astro'; +import { removeEndingForwardSlash } from './path.js'; /** Normalize URL to its canonical form */ export function canonicalURL(url: string, base?: string): URL { @@ -35,6 +36,28 @@ export function arraify(target: T | T[]): T[] { return Array.isArray(target) ? target : [target]; } +export function padMultilineString(source: string, n = 2) { + const lines = source.split(/\r?\n/); + return lines.map((l) => ` `.repeat(n) + l).join(`\n`); +} + +const STATUS_CODE_REGEXP = /^\/?[0-9]{3}$/; + +/** + * Get the correct output filename for a route, based on your config. + * Handles both "/foo" and "foo" `name` formats. + * Handles `/404` and `/` correctly. + */ +export function getOutputFilename(astroConfig: AstroConfig, name: string) { + if (name === '/' || name === '') { + return path.posix.join(name, 'index.html'); + } + if (astroConfig.buildOptions.pageUrlFormat === 'directory' && !STATUS_CODE_REGEXP.test(name)) { + return path.posix.join(name, 'index.html'); + } + return `${removeEndingForwardSlash(name || 'index')}.html`; +} + /** is a specifier an npm package? */ export function parseNpmName(spec: string): { scope?: string; name: string; subpath?: string } | undefined { // not an npm package @@ -137,6 +160,28 @@ export function isBuildingToSSR(config: AstroConfig): boolean { return !!config._ctx.adapter?.serverEntrypoint; } +export function emoji(char: string, fallback: string) { + return process.platform !== 'win32' ? char : fallback; +} + +// TODO: remove once --hostname is baselined +export function getResolvedHostForVite(config: AstroConfig) { + if (config.devOptions.host === false && config.devOptions.hostname !== 'localhost') { + return config.devOptions.hostname; + } else { + return config.devOptions.host; + } +} + +export function getLocalAddress(serverAddress: string, config: AstroConfig): string { + const host = getResolvedHostForVite(config); + if (typeof host === 'boolean' || host === 'localhost') { + return 'localhost'; + } else { + return serverAddress; + } +} + // Vendored from https://github.com/genmon/aboutfeeds/blob/main/tools/pretty-feed-v3.xsl /** Basic stylesheet for RSS feeds */ export const PRETTY_FEED_V3 = ` diff --git a/packages/astro/src/vite-plugin-astro-server/index.ts b/packages/astro/src/vite-plugin-astro-server/index.ts index bc45596da..5b4ae41b8 100644 --- a/packages/astro/src/vite-plugin-astro-server/index.ts +++ b/packages/astro/src/vite-plugin-astro-server/index.ts @@ -2,7 +2,7 @@ import type * as vite from 'vite'; import type http from 'http'; import type { AstroConfig, ManifestData } from '../@types/astro'; import type { RenderResponse, SSROptions } from '../core/render/dev/index'; -import { info, warn, error, LogOptions } from '../core/logger.js'; +import { debug, info, warn, error, LogOptions } from '../core/logger.js'; import { getParamsAndProps, GetParamsAndPropsError } from '../core/render/core.js'; import { createRouteManifest, matchRoute } from '../core/routing/index.js'; import stripAnsi from 'strip-ansi'; @@ -10,11 +10,10 @@ import { createSafeError } from '../core/util.js'; import { ssr, preload } from '../core/render/dev/index.js'; import { call as callEndpoint } from '../core/endpoint/dev/index.js'; import * as msg from '../core/messages.js'; - import notFoundTemplate, { subpathNotUsedTemplate } from '../template/4xx.js'; import serverErrorTemplate from '../template/5xx.js'; import { RouteCache } from '../core/render/route-cache.js'; -import { AstroRequest } from '../core/render/request.js'; +import { fixViteErrorMessage } from '../core/errors.js'; interface AstroPluginOptions { config: AstroConfig; @@ -207,11 +206,10 @@ async function handleRequest( const result = await ssr(preloadedComponent, options); return await writeSSRResult(result, res, statusCode); } - } catch (_err: any) { + } catch (_err) { debugger; - info(logging, 'serve', msg.req({ url: pathname, statusCode: 500 })); - const err = createSafeError(_err); - error(logging, 'error', msg.err(err)); + const err = fixViteErrorMessage(createSafeError(_err), viteServer); + error(logging, null, msg.formatErrorMessage(err)); handle500Response(viteServer, origin, req, res, err); } } diff --git a/packages/astro/src/vite-plugin-build-html/index.ts b/packages/astro/src/vite-plugin-build-html/index.ts index 1dc6e3392..80dd480a1 100644 --- a/packages/astro/src/vite-plugin-build-html/index.ts +++ b/packages/astro/src/vite-plugin-build-html/index.ts @@ -1,21 +1,22 @@ -import type { AstroConfig } from '../@types/astro'; -import type { LogOptions } from '../core/logger.js'; -import type { ViteDevServer, Plugin as VitePlugin } from 'vite'; -import type { OutputChunk, PreRenderedChunk, PluginContext } from 'rollup'; -import type { AllPagesData } from '../core/build/types'; -import type { BuildInternals } from '../core/build/internal'; -import parse5 from 'parse5'; -import srcsetParse from 'srcset-parse'; -import * as npath from 'path'; +import { createElement, createScript, getAttribute, hasAttribute, insertBefore, remove, setAttribute } from '@web/parse5-utils'; import { promises as fs } from 'fs'; -import { getAttribute, hasAttribute, insertBefore, remove, createScript, createElement, setAttribute } from '@web/parse5-utils'; -import { addRollupInput } from './add-rollup-input.js'; -import { findAssets, findExternalScripts, findInlineScripts, findInlineStyles, getTextContent, getAttributes } from './extract-assets.js'; -import { isBuildableImage, isBuildableLink, isHoistedScript, isInSrcDirectory, hasSrcSet } from './util.js'; +import parse5 from 'parse5'; +import * as npath from 'path'; +import type { OutputChunk, PluginContext, PreRenderedChunk } from 'rollup'; +import srcsetParse from 'srcset-parse'; +import type { Plugin as VitePlugin, ViteDevServer } from 'vite'; +import type { AstroConfig } from '../@types/astro'; +import type { BuildInternals } from '../core/build/internal'; +import type { AllPagesData } from '../core/build/types'; +import type { LogOptions } from '../core/logger.js'; +import { prependDotSlash } from '../core/path.js'; import { render as ssrRender } from '../core/render/dev/index.js'; -import { getAstroStyleId, getAstroPageStyleId } from '../vite-plugin-build-css/index.js'; -import { prependDotSlash, removeEndingForwardSlash } from '../core/path.js'; import { RouteCache } from '../core/render/route-cache.js'; +import { getOutputFilename } from '../core/util.js'; +import { getAstroPageStyleId, getAstroStyleId } from '../vite-plugin-build-css/index.js'; +import { addRollupInput } from './add-rollup-input.js'; +import { findAssets, findExternalScripts, findInlineScripts, findInlineStyles, getAttributes, getTextContent } from './extract-assets.js'; +import { hasSrcSet, isBuildableImage, isBuildableLink, isHoistedScript, isInSrcDirectory } from './util.js'; // This package isn't real ESM, so have to coerce it const matchSrcset: typeof srcsetParse = (srcsetParse as any).default; @@ -25,7 +26,6 @@ const ASTRO_PAGE_PREFIX = '@astro-page'; const ASTRO_SCRIPT_PREFIX = '@astro-script'; const ASTRO_EMPTY = '@astro-empty'; -const STATUS_CODE_REGEXP = /^[0-9]{3}$/; interface PluginOptions { astroConfig: AstroConfig; @@ -487,14 +487,7 @@ export function rollupPluginAstroScanHTML(options: PluginOptions): VitePlugin { const outHTML = parse5.serialize(document); const name = pathname.substr(1); - let outPath: string; - - // Output directly to 404.html rather than 404/index.html - if (astroConfig.buildOptions.pageUrlFormat === 'file' || STATUS_CODE_REGEXP.test(name)) { - outPath = `${removeEndingForwardSlash(name || 'index')}.html`; - } else { - outPath = npath.posix.join(name, 'index.html'); - } + const outPath = getOutputFilename(astroConfig, name); this.emitFile({ fileName: outPath, diff --git a/packages/astro/test/cli.test.js b/packages/astro/test/cli.test.js index d84ca56e4..c23fca34f 100644 --- a/packages/astro/test/cli.test.js +++ b/packages/astro/test/cli.test.js @@ -28,7 +28,7 @@ describe('astro cli', () => { it('astro build', async () => { const projectRootURL = new URL('./fixtures/astro-basic/', import.meta.url); const proc = await cli('build', '--project-root', fileURLToPath(projectRootURL)); - expect(proc.stdout).to.include('Done'); + expect(proc.stdout).to.include('Complete'); }); it('astro dev welcome', async () => { diff --git a/packages/astro/test/config-validate.test.js b/packages/astro/test/config-validate.test.js index b1079b6f4..c543a013c 100644 --- a/packages/astro/test/config-validate.test.js +++ b/packages/astro/test/config-validate.test.js @@ -1,7 +1,8 @@ import { expect } from 'chai'; import { z } from 'zod'; import stripAnsi from 'strip-ansi'; -import { formatConfigError, validateConfig } from '../dist/core/config.js'; +import { formatConfigErrorMessage } from '../dist/core/messages.js'; +import { validateConfig } from '../dist/core/config.js'; describe('Config Validation', () => { it('empty user config is valid', async () => { @@ -22,7 +23,7 @@ describe('Config Validation', () => { it('A validation error can be formatted correctly', async () => { const configError = await validateConfig({ buildOptions: { sitemap: 42 } }, process.cwd()).catch((err) => err); expect(configError instanceof z.ZodError).to.equal(true); - const formattedError = stripAnsi(formatConfigError(configError)); + const formattedError = stripAnsi(formatConfigErrorMessage(configError)); expect(formattedError).to.equal( `[config] Astro found issue(s) with your configuration: ! buildOptions.sitemap Expected boolean, received number.` @@ -37,7 +38,7 @@ describe('Config Validation', () => { }; const configError = await validateConfig(veryBadConfig, process.cwd()).catch((err) => err); expect(configError instanceof z.ZodError).to.equal(true); - const formattedError = stripAnsi(formatConfigError(configError)); + const formattedError = stripAnsi(formatConfigErrorMessage(configError)); expect(formattedError).to.equal( `[config] Astro found issue(s) with your configuration: ! pages Expected string, received object. From 7d29feace103c0cf7c682634d4359b69338c2a1d Mon Sep 17 00:00:00 2001 From: FredKSchott Date: Mon, 28 Mar 2022 23:56:17 +0000 Subject: [PATCH 06/17] [ci] format --- packages/astro/src/core/build/static-build.ts | 2 +- packages/astro/src/core/util.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index 8e1559e97..b166948f1 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -169,7 +169,7 @@ async function clientBuild(opts: StaticBuildOptions, internals: BuildInternals, } // TODO: use vite.mergeConfig() here? - info(opts.logging, null, `\n${bgGreen(black(' building client '))}`); + info(opts.logging, null, `\n${bgGreen(black(' building client '))}`); const out = isBuildingToSSR(astroConfig) ? opts.buildConfig.client : astroConfig.dist; diff --git a/packages/astro/src/core/util.ts b/packages/astro/src/core/util.ts index 373d6cff1..ca98419da 100644 --- a/packages/astro/src/core/util.ts +++ b/packages/astro/src/core/util.ts @@ -43,10 +43,10 @@ export function padMultilineString(source: string, n = 2) { const STATUS_CODE_REGEXP = /^\/?[0-9]{3}$/; -/** +/** * Get the correct output filename for a route, based on your config. * Handles both "/foo" and "foo" `name` formats. - * Handles `/404` and `/` correctly. + * Handles `/404` and `/` correctly. */ export function getOutputFilename(astroConfig: AstroConfig, name: string) { if (name === '/' || name === '') { From 4299ab303b0743349fbd01f85340bea61a1c16a8 Mon Sep 17 00:00:00 2001 From: "Fred K. Schott" Date: Mon, 28 Mar 2022 17:16:06 -0700 Subject: [PATCH 07/17] New Markdown API (#2862) * Implement new markdown plugin with deferred markdown rendering * feat: switch from `getContent()` fn to `` API * update types * Update packages/astro/src/@types/astro.ts Co-authored-by: Nate Moore * update types * Create forty-coins-attend.md Co-authored-by: Nate Moore Co-authored-by: Nate Moore --- .changeset/forty-coins-attend.md | 16 +++ .../src/components/PostPreview.astro | 11 ++- .../src/pages/authors/[author].astro | 20 ++-- .../src/pages/index.astro | 15 +-- .../src/pages/posts/[...page].astro | 16 +-- .../blog/src/components/BlogPostPreview.astro | 6 +- examples/blog/src/pages/index.astro | 8 +- .../src/components/PortfolioPreview/index.jsx | 9 +- examples/portfolio/src/pages/index.astro | 2 +- examples/portfolio/src/pages/projects.astro | 10 +- packages/astro/env.d.ts | 2 +- packages/astro/package.json | 2 + packages/astro/src/@types/astro.ts | 29 +++--- packages/astro/src/core/render/dev/css.ts | 7 +- packages/astro/src/runtime/server/index.ts | 49 ++++------ .../vite-plugin-astro-postprocess/index.ts | 97 ++++++++++--------- .../astro/src/vite-plugin-markdown/index.ts | 94 ++++++++++++++++-- packages/astro/test/astro-global.test.js | 2 +- .../astro-global/src/pages/posts/[page].astro | 6 +- .../src/pages/posts/[slug]/[page].astro | 6 +- .../pages/posts/named-root-page/[page].astro | 2 +- .../posts/optional-root-page/[...page].astro | 2 +- .../src/pages/episodes/[...page].astro | 30 +++--- .../src/pages/posts/[slug].astro | 8 +- .../static build/src/pages/index.astro | 2 +- packages/astro/test/static-build.test.js | 2 +- pnpm-lock.yaml | 21 ++++ 27 files changed, 279 insertions(+), 195 deletions(-) create mode 100644 .changeset/forty-coins-attend.md diff --git a/.changeset/forty-coins-attend.md b/.changeset/forty-coins-attend.md new file mode 100644 index 000000000..467e520fd --- /dev/null +++ b/.changeset/forty-coins-attend.md @@ -0,0 +1,16 @@ +--- +"astro": minor +--- + +Implement RFC [#0017](https://github.com/withastro/rfcs/blob/main/proposals/0017-markdown-content-redesign.md) + +- New Markdown API +- New `Astro.glob()` API +- **BREAKING CHANGE:** Removed `Astro.fetchContent()` (replaced by `Astro.glob()`) + +```diff +// v0.25 +- let allPosts = Astro.fetchContent('./posts/*.md'); +// v0.26+ ++ let allPosts = await Astro.glob('./posts/*.md'); +``` diff --git a/examples/blog-multiple-authors/src/components/PostPreview.astro b/examples/blog-multiple-authors/src/components/PostPreview.astro index 81e80ba6c..5a9808348 100644 --- a/examples/blog-multiple-authors/src/components/PostPreview.astro +++ b/examples/blog-multiple-authors/src/components/PostPreview.astro @@ -4,6 +4,7 @@ export interface Props { author: string; } const { post, author } = Astro.props; +const { frontmatter } = post; function formatDate(date) { return new Date(date).toUTCString().replace(/(\d\d\d\d) .*/, '$1'); // remove everything after YYYY @@ -12,12 +13,12 @@ function formatDate(date) {
-

{post.title}

- {author.name} - +

{frontmatter.title}

+ {author.name} +

- {post.description} - Read + {frontmatter.description} + Read

diff --git a/examples/blog-multiple-authors/src/pages/authors/[author].astro b/examples/blog-multiple-authors/src/pages/authors/[author].astro index 21aab27a5..c2ba49d39 100644 --- a/examples/blog-multiple-authors/src/pages/authors/[author].astro +++ b/examples/blog-multiple-authors/src/pages/authors/[author].astro @@ -2,36 +2,28 @@ import MainHead from '../../components/MainHead.astro'; import Nav from '../../components/Nav.astro'; import PostPreview from '../../components/PostPreview.astro'; -import Pagination from '../../components/Pagination.astro'; import authorData from '../../data/authors.json'; -export function getStaticPaths() { - const allPosts = Astro.fetchContent('../post/*.md'); - let allAuthorsUnique = [...new Set(allPosts.map((p) => p.author))]; +export async function getStaticPaths() { + const allPosts = await Astro.glob('../post/*.md'); + let allAuthorsUnique = [...new Set(allPosts.map((p) => p.frontmatter.author))]; return allAuthorsUnique.map((author) => ({ params: { author }, props: { allPosts } })); } -interface MarkdownFrontmatter { - date: number; - description: string; - title: string; - author: string; -} - const { allPosts } = Astro.props; const { params, canonicalURL } = Astro.request; const title = 'Don’s Blog'; const description = 'An example blog on Astro'; /** filter posts by author, sort by date */ -const posts = allPosts.filter((post) => post.author === params.author).sort((a, b) => new Date(b.date).valueOf() - new Date(a.date).valueOf()); -const author = authorData[posts[0].author]; +const posts = allPosts.filter((post) => post.frontmatter.author === params.author).sort((a, b) => new Date(b.frontmatter.date).valueOf() - new Date(a.frontmatter.date).valueOf()); +const author = authorData[posts[0].frontmatter.author]; --- {title} - +

Item { val }

diff --git a/packages/astro/test/ssr-dynamic.test.js b/packages/astro/test/ssr-dynamic.test.js index 843243425..d938e5c95 100644 --- a/packages/astro/test/ssr-dynamic.test.js +++ b/packages/astro/test/ssr-dynamic.test.js @@ -19,12 +19,23 @@ describe('Dynamic pages in SSR', () => { await fixture.build(); }); - it('Do not have to implement getStaticPaths', async () => { + async function fetchHTML(path) { const app = await fixture.loadTestAdapterApp(); - const request = new Request('http://example.com/123'); + const request = new Request('http://example.com' + path); const response = await app.render(request); const html = await response.text(); + return html; + } + + it('Do not have to implement getStaticPaths', async () => { + const html = await fetchHTML('/123'); const $ = cheerioLoad(html); expect($('h1').text()).to.equal('Item 123'); }); + + it('Includes page styles', async () => { + const html = await fetchHTML('/123'); + const $ = cheerioLoad(html); + expect($('link').length).to.equal(1); + }); }); From 9fa013b4fa04dc65b9abd75d75865bcbfd609170 Mon Sep 17 00:00:00 2001 From: matthewp Date: Tue, 29 Mar 2022 12:19:10 +0000 Subject: [PATCH 14/17] [ci] format --- examples/ssr/server/server.mjs | 4 ++-- examples/ssr/src/models/db.ts | 5 +---- examples/ssr/src/models/session.ts | 1 - examples/ssr/src/pages/api/cart.ts | 10 +++++----- examples/ssr/src/pages/api/products.ts | 2 +- examples/ssr/src/pages/api/products/[id].ts | 4 ++-- packages/astro/src/core/request.ts | 2 +- packages/astro/src/vite-plugin-astro-server/index.ts | 6 +++--- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/examples/ssr/server/server.mjs b/examples/ssr/server/server.mjs index 9838d7ada..d7a0a7a40 100644 --- a/examples/ssr/server/server.mjs +++ b/examples/ssr/server/server.mjs @@ -7,9 +7,9 @@ const clientRoot = new URL('../dist/client/', import.meta.url); async function handle(req, res) { ssrHandler(req, res, async (err) => { - if(err) { + if (err) { res.writeHead(500); - res.end(err.stack) + res.end(err.stack); return; } diff --git a/examples/ssr/src/models/db.ts b/examples/ssr/src/models/db.ts index d9caa8b03..0ec181f9a 100644 --- a/examples/ssr/src/models/db.ts +++ b/examples/ssr/src/models/db.ts @@ -3,7 +3,4 @@ import db from './db.json'; const products = db.products; const productMap = new Map(products.map((product) => [product.id, product])); -export { - products, - productMap -}; +export { products, productMap }; diff --git a/examples/ssr/src/models/session.ts b/examples/ssr/src/models/session.ts index 60ca8f1da..16dce00b4 100644 --- a/examples/ssr/src/models/session.ts +++ b/examples/ssr/src/models/session.ts @@ -1,3 +1,2 @@ - // Normally this would be in a database. export const userCartItems = new Map(); diff --git a/examples/ssr/src/pages/api/cart.ts b/examples/ssr/src/pages/api/cart.ts index 5dbe5acbd..3d7dd6da0 100644 --- a/examples/ssr/src/pages/api/cart.ts +++ b/examples/ssr/src/pages/api/cart.ts @@ -6,15 +6,15 @@ export function get(_params: any, request: Request) { let userId = cookie ? lightcookie.parse(cookie)['user-id'] : '1'; // default for testing if (!userId || !userCartItems.has(userId)) { return { - body: JSON.stringify({ items: [] }) + body: JSON.stringify({ items: [] }), }; } let items = userCartItems.get(userId); let array = Array.from(items.values()); return { - body: JSON.stringify({ items: array }) - } + body: JSON.stringify({ items: array }), + }; } interface AddToCartItem { @@ -41,7 +41,7 @@ export async function post(_params: any, request: Request) { return { body: JSON.stringify({ - ok: true - }) + ok: true, + }), }; } diff --git a/examples/ssr/src/pages/api/products.ts b/examples/ssr/src/pages/api/products.ts index 533bdef23..171291004 100644 --- a/examples/ssr/src/pages/api/products.ts +++ b/examples/ssr/src/pages/api/products.ts @@ -2,6 +2,6 @@ import { products } from '../../models/db'; export function get() { return { - body: JSON.stringify(products) + body: JSON.stringify(products), }; } diff --git a/examples/ssr/src/pages/api/products/[id].ts b/examples/ssr/src/pages/api/products/[id].ts index 6a3a83722..d3cc5e42f 100644 --- a/examples/ssr/src/pages/api/products/[id].ts +++ b/examples/ssr/src/pages/api/products/[id].ts @@ -6,12 +6,12 @@ export function get({ id: idStr }) { const product = productMap.get(id); return { - body: JSON.stringify(product) + body: JSON.stringify(product), }; } else { return new Response(null, { status: 400, - statusText: 'Not found' + statusText: 'Not found', }); } } diff --git a/packages/astro/src/core/request.ts b/packages/astro/src/core/request.ts index 6594621a1..e94f1372b 100644 --- a/packages/astro/src/core/request.ts +++ b/packages/astro/src/core/request.ts @@ -19,7 +19,7 @@ export function createRequest({ url, headers, method = 'GET', body = undefined, const request = new Request(url.toString(), { method: method, headers: headersObj, - body + body, }); Object.defineProperties(request, { diff --git a/packages/astro/src/vite-plugin-astro-server/index.ts b/packages/astro/src/vite-plugin-astro-server/index.ts index 250122d7b..4a5b1a5fc 100644 --- a/packages/astro/src/vite-plugin-astro-server/index.ts +++ b/packages/astro/src/vite-plugin-astro-server/index.ts @@ -129,11 +129,11 @@ async function handleRequest( } let body: ArrayBuffer | undefined = undefined; - if(!(req.method === 'GET' || req.method === 'HEAD')) { + if (!(req.method === 'GET' || req.method === 'HEAD')) { let bytes: string[] = []; - await new Promise(resolve => { + await new Promise((resolve) => { req.setEncoding('utf-8'); - req.on('data', bts => bytes.push(bts)); + req.on('data', (bts) => bytes.push(bts)); req.on('close', resolve); }); body = new TextEncoder().encode(bytes.join('')).buffer; From 7fd49f1887052b4822dc951258840da5d7a9b72b Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Tue, 29 Mar 2022 09:17:49 -0400 Subject: [PATCH 15/17] Make the SSR example infer the origin (#2932) --- examples/ssr/src/api.ts | 29 +++++++++++----------- examples/ssr/src/components/Header.astro | 2 +- examples/ssr/src/pages/cart.astro | 2 +- examples/ssr/src/pages/index.astro | 2 +- examples/ssr/src/pages/products/[id].astro | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/examples/ssr/src/api.ts b/examples/ssr/src/api.ts index 64dfe17d3..8a903b217 100644 --- a/examples/ssr/src/api.ts +++ b/examples/ssr/src/api.ts @@ -17,11 +17,12 @@ interface Cart { }>; } -const { MODE } = import.meta.env; -const origin = MODE === 'development' ? `http://127.0.0.1:3000` : `http://127.0.0.1:8085`; +function getOrigin(request: Request): string { + return new URL(request.url).origin.replace('localhost', '127.0.0.1'); +} -async function get(endpoint: string, cb: (response: Response) => Promise): Promise { - const response = await fetch(`${origin}${endpoint}`, { +async function get(incomingReq: Request, endpoint: string, cb: (response: Response) => Promise): Promise { + const response = await fetch(`${getOrigin(incomingReq)}${endpoint}`, { credentials: 'same-origin', }); if (!response.ok) { @@ -31,36 +32,36 @@ async function get(endpoint: string, cb: (response: Response) => Promise): return cb(response); } -export async function getProducts(): Promise { - return get('/api/products', async (response) => { +export async function getProducts(incomingReq: Request): Promise { + return get(incomingReq, '/api/products', async (response) => { const products: Product[] = await response.json(); return products; }); } -export async function getProduct(id: number): Promise { - return get(`/api/products/${id}`, async (response) => { +export async function getProduct(incomingReq: Request, id: number): Promise { + return get(incomingReq, `/api/products/${id}`, async (response) => { const product: Product = await response.json(); return product; }); } -export async function getUser(): Promise { - return get(`/api/user`, async (response) => { +export async function getUser(incomingReq: Request): Promise { + return get(incomingReq, `/api/user`, async (response) => { const user: User = await response.json(); return user; }); } -export async function getCart(): Promise { - return get(`/api/cart`, async (response) => { +export async function getCart(incomingReq: Request): Promise { + return get(incomingReq, `/api/cart`, async (response) => { const cart: Cart = await response.json(); return cart; }); } -export async function addToUserCart(id: number | string, name: string): Promise { - await fetch(`${origin}/api/cart`, { +export async function addToUserCart( id: number | string, name: string): Promise { + await fetch(`${location.origin}/api/cart`, { credentials: 'same-origin', method: 'POST', mode: 'no-cors', diff --git a/examples/ssr/src/components/Header.astro b/examples/ssr/src/components/Header.astro index c4d925a5f..426fb4be5 100644 --- a/examples/ssr/src/components/Header.astro +++ b/examples/ssr/src/components/Header.astro @@ -3,7 +3,7 @@ import TextDecorationSkip from './TextDecorationSkip.astro'; import Cart from './Cart.svelte'; import { getCart } from '../api'; -const cart = await getCart(); +const cart = await getCart(Astro.request); const cartCount = cart.items.reduce((sum, item) => sum + item.count, 0); ---