From 7d95bd9baaf755239fd7d35e4813861b2dbccf42 Mon Sep 17 00:00:00 2001
From: Arsh <69170106+lilnasy@users.noreply.github.com>
Date: Tue, 5 Sep 2023 23:31:15 +0530
Subject: [PATCH 01/10] Allow vite to refer to inlined CSS (#8351)
* fix(client build): keep inlined stylesheets
* add changesets
* appease linter
* eslint: allow variables beginning with an underscore to be unused
* remove eslint-ignore that's no longer needed
* ready for review
---
.changeset/chatty-walls-happen.md | 5 +++
.changeset/fair-countries-admire.md | 5 +++
.eslintrc.cjs | 2 +-
packages/astro/src/core/app/index.ts | 2 --
.../src/core/build/plugins/plugin-css.ts | 4 +--
.../test/css-dangling-references.test.js | 36 +++++++++++++++++++
.../css-dangling-references/astro.config.ts | 8 +++++
.../css-dangling-references/package.json | 11 ++++++
.../DynamicallyImportedComponent1.svelte | 6 ++++
.../DynamicallyImportedComponent2.svelte | 6 ++++
.../src/components/Wrapper.svelte | 15 ++++++++
.../src/pages/glob-import-1.astro | 4 +++
.../src/pages/glob-import-2.astro | 5 +++
.../css-inline-stylesheets/package.json | 2 +-
packages/integrations/svelte/src/index.ts | 3 +-
pnpm-lock.yaml | 12 +++++++
16 files changed, 118 insertions(+), 8 deletions(-)
create mode 100644 .changeset/chatty-walls-happen.md
create mode 100644 .changeset/fair-countries-admire.md
create mode 100644 packages/astro/test/css-dangling-references.test.js
create mode 100644 packages/astro/test/fixtures/css-dangling-references/astro.config.ts
create mode 100644 packages/astro/test/fixtures/css-dangling-references/package.json
create mode 100644 packages/astro/test/fixtures/css-dangling-references/src/components/DynamicallyImportedComponent1.svelte
create mode 100644 packages/astro/test/fixtures/css-dangling-references/src/components/DynamicallyImportedComponent2.svelte
create mode 100644 packages/astro/test/fixtures/css-dangling-references/src/components/Wrapper.svelte
create mode 100644 packages/astro/test/fixtures/css-dangling-references/src/pages/glob-import-1.astro
create mode 100644 packages/astro/test/fixtures/css-dangling-references/src/pages/glob-import-2.astro
diff --git a/.changeset/chatty-walls-happen.md b/.changeset/chatty-walls-happen.md
new file mode 100644
index 000000000..58fe5e6ed
--- /dev/null
+++ b/.changeset/chatty-walls-happen.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixed a case where dynamic imports tried to preload inlined stylesheets.
diff --git a/.changeset/fair-countries-admire.md b/.changeset/fair-countries-admire.md
new file mode 100644
index 000000000..1868ab016
--- /dev/null
+++ b/.changeset/fair-countries-admire.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/svelte': patch
+---
+
+Removed vite warnings.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 2e31d2fa7..9a6436767 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -13,7 +13,7 @@ module.exports = {
rules: {
// These off/configured-differently-by-default rules fit well for us
'@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
- '@typescript-eslint/no-unused-vars': ['error', { ignoreRestSiblings: true }],
+ '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: "^_", ignoreRestSiblings: true }],
'no-only-tests/no-only-tests': 'error',
'@typescript-eslint/no-shadow': ['error'],
'no-console': 'warn',
diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts
index a3af4bcdd..1c0b13148 100644
--- a/packages/astro/src/core/app/index.ts
+++ b/packages/astro/src/core/app/index.ts
@@ -121,8 +121,6 @@ export class App {
}
return pathname;
}
- // Disable no-unused-vars to avoid breaking signature change
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
match(request: Request, _opts: MatchOptions = {}): RouteData | undefined {
const url = new URL(request.url);
// ignore requests matching public assets
diff --git a/packages/astro/src/core/build/plugins/plugin-css.ts b/packages/astro/src/core/build/plugins/plugin-css.ts
index 87b52cbdb..b72acd27e 100644
--- a/packages/astro/src/core/build/plugins/plugin-css.ts
+++ b/packages/astro/src/core/build/plugins/plugin-css.ts
@@ -200,7 +200,7 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
const inlineConfig = settings.config.build.inlineStylesheets;
const { assetsInlineLimit = 4096 } = settings.config.vite?.build ?? {};
- Object.entries(bundle).forEach(([id, stylesheet]) => {
+ Object.entries(bundle).forEach(([_, stylesheet]) => {
if (
stylesheet.type !== 'asset' ||
stylesheet.name?.endsWith('.css') !== true ||
@@ -217,8 +217,6 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
? false
: assetSize <= assetsInlineLimit;
- if (toBeInlined) delete bundle[id];
-
// there should be a single js object for each stylesheet,
// allowing the single reference to be shared and checked for duplicates
const sheet: StylesheetAsset = toBeInlined
diff --git a/packages/astro/test/css-dangling-references.test.js b/packages/astro/test/css-dangling-references.test.js
new file mode 100644
index 000000000..4f3c6e77d
--- /dev/null
+++ b/packages/astro/test/css-dangling-references.test.js
@@ -0,0 +1,36 @@
+import { expect } from 'chai';
+import { loadFixture } from './test-utils.js';
+
+const cssAssetReferenceRegExp = /_astro\/[A-Za-z0-9\-]+\.[a0-9a-f]{8}\.css/g
+
+describe("When Vite's preloadModule polyfill is used", async () => {
+
+ let fixture;
+
+ before(async () => {
+ fixture = await loadFixture({
+ root: './fixtures/css-dangling-references/'
+ });
+ await fixture.build();
+ });
+
+ it('there are no references to deleted CSS chunks', async () => {
+
+ const fileNames = await fixture.readdir('/_astro/')
+ const filePaths = fileNames.map(filename => '_astro/' + filename)
+
+ const expectations =
+ filePaths
+ .filter(filePath => filePath.endsWith('js'))
+ .map(async filePath => {
+ const contents = await fixture.readFile(filePath)
+ const cssReferences = contents.match(cssAssetReferenceRegExp)
+
+ if (cssReferences === null) return
+
+ expect(filePaths).to.contain.members(cssReferences, filePath + ' contains a reference to a deleted css asset: ' + cssReferences)
+ })
+
+ await Promise.all(expectations)
+ })
+})
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/css-dangling-references/astro.config.ts b/packages/astro/test/fixtures/css-dangling-references/astro.config.ts
new file mode 100644
index 000000000..5c49c2fd0
--- /dev/null
+++ b/packages/astro/test/fixtures/css-dangling-references/astro.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from 'astro/config';
+import svelte from '@astrojs/svelte';
+
+// https://astro.build/config
+export default defineConfig({
+ integrations: [svelte()],
+});
+
diff --git a/packages/astro/test/fixtures/css-dangling-references/package.json b/packages/astro/test/fixtures/css-dangling-references/package.json
new file mode 100644
index 000000000..9ac28d282
--- /dev/null
+++ b/packages/astro/test/fixtures/css-dangling-references/package.json
@@ -0,0 +1,11 @@
+{
+ "name": "@test/css-dangling-references",
+ "version": "0.0.0",
+ "private": true,
+ "dependencies": {
+ "astro": "workspace:*",
+ "@astrojs/svelte": "workspace:*",
+ "svelte": "4"
+ }
+ }
+
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/css-dangling-references/src/components/DynamicallyImportedComponent1.svelte b/packages/astro/test/fixtures/css-dangling-references/src/components/DynamicallyImportedComponent1.svelte
new file mode 100644
index 000000000..3ac8a03af
--- /dev/null
+++ b/packages/astro/test/fixtures/css-dangling-references/src/components/DynamicallyImportedComponent1.svelte
@@ -0,0 +1,6 @@
+
+This sentence should have a gold background.
diff --git a/packages/astro/test/fixtures/css-dangling-references/src/components/DynamicallyImportedComponent2.svelte b/packages/astro/test/fixtures/css-dangling-references/src/components/DynamicallyImportedComponent2.svelte
new file mode 100644
index 000000000..7c344f93d
--- /dev/null
+++ b/packages/astro/test/fixtures/css-dangling-references/src/components/DynamicallyImportedComponent2.svelte
@@ -0,0 +1,6 @@
+
+This sentence should have a lavender background color.
diff --git a/packages/astro/test/fixtures/css-dangling-references/src/components/Wrapper.svelte b/packages/astro/test/fixtures/css-dangling-references/src/components/Wrapper.svelte
new file mode 100644
index 000000000..083040742
--- /dev/null
+++ b/packages/astro/test/fixtures/css-dangling-references/src/components/Wrapper.svelte
@@ -0,0 +1,15 @@
+
+
+{#await AppModule() then Mod}
+
+{/await}
diff --git a/packages/astro/test/fixtures/css-dangling-references/src/pages/glob-import-1.astro b/packages/astro/test/fixtures/css-dangling-references/src/pages/glob-import-1.astro
new file mode 100644
index 000000000..847f9fddb
--- /dev/null
+++ b/packages/astro/test/fixtures/css-dangling-references/src/pages/glob-import-1.astro
@@ -0,0 +1,4 @@
+---
+import Wrapper from "../components/Wrapper.svelte"
+---
+
diff --git a/packages/astro/test/fixtures/css-dangling-references/src/pages/glob-import-2.astro b/packages/astro/test/fixtures/css-dangling-references/src/pages/glob-import-2.astro
new file mode 100644
index 000000000..b98c4ef41
--- /dev/null
+++ b/packages/astro/test/fixtures/css-dangling-references/src/pages/glob-import-2.astro
@@ -0,0 +1,5 @@
+---
+import Wrapper from "../components/Wrapper.svelte"
+---
+
+
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/package.json b/packages/astro/test/fixtures/css-inline-stylesheets/package.json
index 0d4a8617d..36ae34050 100644
--- a/packages/astro/test/fixtures/css-inline-stylesheets/package.json
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/package.json
@@ -1,5 +1,5 @@
{
- "name": "@test/css-inline-stylesheets-always",
+ "name": "@test/css-inline-stylesheets",
"version": "0.0.0",
"private": true,
"dependencies": {
diff --git a/packages/integrations/svelte/src/index.ts b/packages/integrations/svelte/src/index.ts
index ab87a59b2..a9d4f37c9 100644
--- a/packages/integrations/svelte/src/index.ts
+++ b/packages/integrations/svelte/src/index.ts
@@ -17,7 +17,8 @@ async function svelteConfigHasPreprocess(root: URL) {
for (const file of svelteConfigFiles) {
const filePath = fileURLToPath(new URL(file, root));
try {
- const config = (await import(filePath)).default;
+ // Suppress warnings by vite: "The above dynamic import cannot be analyzed by Vite."
+ const config = (await import(/* @vite-ignore */ filePath)).default;
return !!config.preprocess;
} catch {}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9efde9900..43b0c149e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2437,6 +2437,18 @@ importers:
packages/astro/test/fixtures/css-assets/packages/font-awesome: {}
+ packages/astro/test/fixtures/css-dangling-references:
+ dependencies:
+ '@astrojs/svelte':
+ specifier: workspace:*
+ version: link:../../../../integrations/svelte
+ astro:
+ specifier: workspace:*
+ version: link:../../..
+ svelte:
+ specifier: '4'
+ version: 4.2.0
+
packages/astro/test/fixtures/css-import-as-inline:
dependencies:
astro:
From cde0cc409383e2e3fcb6b2bded432bad8d7c40ab Mon Sep 17 00:00:00 2001
From: lilnasy
Date: Tue, 5 Sep 2023 18:03:21 +0000
Subject: [PATCH 02/10] [ci] format
---
.eslintrc.cjs | 5 +-
.../test/css-dangling-references.test.js | 50 +++++++++----------
2 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 9a6436767..ad881979b 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -13,7 +13,10 @@ module.exports = {
rules: {
// These off/configured-differently-by-default rules fit well for us
'@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
- '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: "^_", ignoreRestSiblings: true }],
+ '@typescript-eslint/no-unused-vars': [
+ 'error',
+ { argsIgnorePattern: '^_', ignoreRestSiblings: true },
+ ],
'no-only-tests/no-only-tests': 'error',
'@typescript-eslint/no-shadow': ['error'],
'no-console': 'warn',
diff --git a/packages/astro/test/css-dangling-references.test.js b/packages/astro/test/css-dangling-references.test.js
index 4f3c6e77d..c38aa854d 100644
--- a/packages/astro/test/css-dangling-references.test.js
+++ b/packages/astro/test/css-dangling-references.test.js
@@ -1,36 +1,36 @@
import { expect } from 'chai';
import { loadFixture } from './test-utils.js';
-const cssAssetReferenceRegExp = /_astro\/[A-Za-z0-9\-]+\.[a0-9a-f]{8}\.css/g
+const cssAssetReferenceRegExp = /_astro\/[A-Za-z0-9\-]+\.[a0-9a-f]{8}\.css/g;
describe("When Vite's preloadModule polyfill is used", async () => {
-
- let fixture;
+ let fixture;
before(async () => {
fixture = await loadFixture({
- root: './fixtures/css-dangling-references/'
- });
+ root: './fixtures/css-dangling-references/',
+ });
await fixture.build();
});
- it('there are no references to deleted CSS chunks', async () => {
-
- const fileNames = await fixture.readdir('/_astro/')
- const filePaths = fileNames.map(filename => '_astro/' + filename)
-
- const expectations =
- filePaths
- .filter(filePath => filePath.endsWith('js'))
- .map(async filePath => {
- const contents = await fixture.readFile(filePath)
- const cssReferences = contents.match(cssAssetReferenceRegExp)
-
- if (cssReferences === null) return
-
- expect(filePaths).to.contain.members(cssReferences, filePath + ' contains a reference to a deleted css asset: ' + cssReferences)
- })
-
- await Promise.all(expectations)
- })
-})
\ No newline at end of file
+ it('there are no references to deleted CSS chunks', async () => {
+ const fileNames = await fixture.readdir('/_astro/');
+ const filePaths = fileNames.map((filename) => '_astro/' + filename);
+
+ const expectations = filePaths
+ .filter((filePath) => filePath.endsWith('js'))
+ .map(async (filePath) => {
+ const contents = await fixture.readFile(filePath);
+ const cssReferences = contents.match(cssAssetReferenceRegExp);
+
+ if (cssReferences === null) return;
+
+ expect(filePaths).to.contain.members(
+ cssReferences,
+ filePath + ' contains a reference to a deleted css asset: ' + cssReferences
+ );
+ });
+
+ await Promise.all(expectations);
+ });
+});
From 8935b3b4672d6c54c7b79e6c4575298f75eeb9f4 Mon Sep 17 00:00:00 2001
From: Martin Trapp <94928215+martrapp@users.noreply.github.com>
Date: Tue, 5 Sep 2023 21:05:55 +0200
Subject: [PATCH 03/10] Fix scroll position when navigating back from page w/o
ViewTransitions (#8332)
Co-authored-by: Justin Beaty <51970393+justinbeaty@users.noreply.github.com>
Co-authored-by: Nate Moore
---
.changeset/weak-kids-roll.md | 5 +++++
.../astro/components/ViewTransitions.astro | 9 +++++---
.../src/pages/long-page.astro | 2 ++
packages/astro/e2e/view-transitions.test.js | 21 +++++++++++++++++++
4 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644 .changeset/weak-kids-roll.md
diff --git a/.changeset/weak-kids-roll.md b/.changeset/weak-kids-roll.md
new file mode 100644
index 000000000..7d6d61f42
--- /dev/null
+++ b/.changeset/weak-kids-roll.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix scroll position when navigating back from page w/o ViewTransitions
diff --git a/packages/astro/components/ViewTransitions.astro b/packages/astro/components/ViewTransitions.astro
index 6cf0a5ccd..c0735c330 100644
--- a/packages/astro/components/ViewTransitions.astro
+++ b/packages/astro/components/ViewTransitions.astro
@@ -30,9 +30,11 @@ const { fallback = 'animate' } = Astro.props as Props;
// The History API does not tell you if navigation is forward or back, so
// you can figure it using an index. On pushState the index is incremented so you
// can use that to determine popstate if going forward or back.
- let currentHistoryIndex = history.state?.index || 0;
- if (!history.state && transitionEnabledOnThisPage()) {
- persistState({ index: currentHistoryIndex, scrollY: 0 });
+ let currentHistoryIndex = 0;
+ if (history.state) {
+ // we reloaded a page with history state (e.g. back button or browser reload)
+ currentHistoryIndex = history.state.index;
+ scrollTo({ left: 0, top: history.state.scrollY });
}
const throttle = (cb: (...args: any[]) => any, delay: number) => {
@@ -352,6 +354,7 @@ const { fallback = 'animate' } = Astro.props as Props;
// The current page doesn't haven't View Transitions,
// respect that with a full page reload
// -- but only for transition managed by us (ev.state is set)
+ history.scrollRestoration && (history.scrollRestoration = "manual")
location.reload();
return;
}
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro
index 8cd1d9de2..ebe918c68 100644
--- a/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro
@@ -32,6 +32,8 @@ import Layout from '../components/Layout.astro';
+
+
Morbi tristique senectus et netus et. Neque aliquam vestibulum morbi blandit cursus risus. Pharetra pharetra massa massa ultricies mi quis. Sit amet aliquam id diam maecenas ultricies mi eget mauris. Ultrices mi tempus imperdiet nulla malesuada. At consectetur lorem donec massa sapien faucibus et molestie. Non sodales neque sodales ut etiam. Eget nunc lobortis mattis aliquam faucibus purus in massa tempor. Viverra suspendisse potenti nullam ac tortor vitae purus faucibus. Pellentesque eu tincidunt tortor aliquam nulla facilisi cras fermentum. Diam vulputate ut pharetra sit. Felis donec et odio pellentesque diam. Mollis aliquam ut porttitor leo. Vitae nunc sed velit dignissim sodales. Facilisis mauris sit amet massa vitae tortor condimentum lacinia quis.
Aliquet enim tortor at auctor urna nunc id cursus. Bibendum at varius vel pharetra vel turpis nunc eget. Mattis molestie a iaculis at erat. Vel turpis nunc eget lorem dolor sed viverra ipsum nunc. Aliquam malesuada bibendum arcu vitae elementum curabitur vitae nunc sed. Nunc congue nisi vitae suscipit. Donec massa sapien faucibus et molestie ac. Nec feugiat nisl pretium fusce. At imperdiet dui accumsan sit amet nulla facilisi. Sed viverra tellus in hac.
diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js
index 944d40343..4b4d64915 100644
--- a/packages/astro/e2e/view-transitions.test.js
+++ b/packages/astro/e2e/view-transitions.test.js
@@ -502,3 +502,24 @@ test.describe('View Transitions', () => {
await downloadPromise;
});
});
+
+test('Scroll position is restored on back navigation from page w/o ViewTransitions', async ({
+ page,
+ astro,
+}) => {
+ // Go to middle of long page
+ await page.goto(astro.resolveUrl('/long-page#click-external'));
+
+ let locator = page.locator('#click-external');
+ await expect(locator).toBeInViewport();
+
+ // Go to a page that has not enabled ViewTransistions
+ await page.click('#click-external');
+ locator = page.locator('#three');
+ await expect(locator).toHaveText('Page 3');
+
+ // Scroll back to long page
+ await page.goBack();
+ locator = page.locator('#click-external');
+ await expect(locator).toBeInViewport();
+});
From 837ad164918c433526ffb47dc58c8f552a9c4de9 Mon Sep 17 00:00:00 2001
From: Bjorn Lu
Date: Wed, 6 Sep 2023 03:35:41 +0800
Subject: [PATCH 04/10] Skip cloudflare CLI tests if fail to start (#8417)
* Skip cloudflare CLI tests if fail to start
* Fix port
---------
Co-authored-by: Nate Moore
---
packages/integrations/cloudflare/test/basics.test.js | 8 ++++++--
packages/integrations/cloudflare/test/cf.test.js | 12 ++++++++----
.../integrations/cloudflare/test/runtime.test.js | 8 ++++++--
.../cloudflare/test/with-solid-js.test.js | 8 ++++++--
4 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/packages/integrations/cloudflare/test/basics.test.js b/packages/integrations/cloudflare/test/basics.test.js
index c27b6be6c..726a19fc6 100644
--- a/packages/integrations/cloudflare/test/basics.test.js
+++ b/packages/integrations/cloudflare/test/basics.test.js
@@ -8,14 +8,18 @@ describe('Basic app', () => {
/** @type {import('./test-utils').WranglerCLI} */
let cli;
- before(async () => {
+ before(async function () {
fixture = await loadFixture({
root: './fixtures/basics/',
});
await fixture.build();
cli = await runCLI('./fixtures/basics/', { silent: true, port: 8789 });
- await cli.ready;
+ await cli.ready.catch((e) => {
+ console.log(e);
+ // if fail to start, skip for now as it's very flaky
+ this.skip();
+ });
});
after(async () => {
diff --git a/packages/integrations/cloudflare/test/cf.test.js b/packages/integrations/cloudflare/test/cf.test.js
index ec0e52c97..64c406d12 100644
--- a/packages/integrations/cloudflare/test/cf.test.js
+++ b/packages/integrations/cloudflare/test/cf.test.js
@@ -9,7 +9,7 @@ describe('Cf metadata and caches', () => {
/** @type {import('./test-utils').WranglerCLI} */
let cli;
- before(async () => {
+ before(async function () {
fixture = await loadFixture({
root: './fixtures/cf/',
output: 'server',
@@ -17,8 +17,12 @@ describe('Cf metadata and caches', () => {
});
await fixture.build();
- cli = await runCLI('./fixtures/cf/', { silent: false, port: 8788 });
- await cli.ready;
+ cli = await runCLI('./fixtures/cf/', { silent: true, port: 8786 });
+ await cli.ready.catch((e) => {
+ console.log(e);
+ // if fail to start, skip for now as it's very flaky
+ this.skip();
+ });
});
after(async () => {
@@ -26,7 +30,7 @@ describe('Cf metadata and caches', () => {
});
it('Load cf and caches API', async () => {
- let res = await fetch(`http://127.0.0.1:8788/`);
+ let res = await fetch(`http://127.0.0.1:8786/`);
expect(res.status).to.equal(200);
let html = await res.text();
let $ = cheerio.load(html);
diff --git a/packages/integrations/cloudflare/test/runtime.test.js b/packages/integrations/cloudflare/test/runtime.test.js
index be14718e8..8bb38d7e5 100644
--- a/packages/integrations/cloudflare/test/runtime.test.js
+++ b/packages/integrations/cloudflare/test/runtime.test.js
@@ -9,7 +9,7 @@ describe('Runtime Locals', () => {
/** @type {import('./test-utils.js').WranglerCLI} */
let cli;
- before(async () => {
+ before(async function () {
fixture = await loadFixture({
root: './fixtures/runtime/',
output: 'server',
@@ -18,7 +18,11 @@ describe('Runtime Locals', () => {
await fixture.build();
cli = await runCLI('./fixtures/runtime/', { silent: true, port: 8793 });
- await cli.ready;
+ await cli.ready.catch((e) => {
+ console.log(e);
+ // if fail to start, skip for now as it's very flaky
+ this.skip();
+ });
});
after(async () => {
diff --git a/packages/integrations/cloudflare/test/with-solid-js.test.js b/packages/integrations/cloudflare/test/with-solid-js.test.js
index c091d04b3..c644163b0 100644
--- a/packages/integrations/cloudflare/test/with-solid-js.test.js
+++ b/packages/integrations/cloudflare/test/with-solid-js.test.js
@@ -8,14 +8,18 @@ describe('With SolidJS', () => {
/** @type {import('./test-utils').WranglerCLI} */
let cli;
- before(async () => {
+ before(async function () {
fixture = await loadFixture({
root: './fixtures/with-solid-js/',
});
await fixture.build();
cli = await runCLI('./fixtures/with-solid-js/', { silent: true, port: 8790 });
- await cli.ready;
+ await cli.ready.catch((e) => {
+ console.log(e);
+ // if fail to start, skip for now as it's very flaky
+ this.skip();
+ });
});
after(async () => {
From 923a443cb060a0e936a0e1cc87c0360232f77914 Mon Sep 17 00:00:00 2001
From: Bjorn Lu
Date: Wed, 6 Sep 2023 03:35:56 +0800
Subject: [PATCH 05/10] Fix markdown page HMR (#8418)
Co-authored-by: Nate Moore
---
.changeset/twelve-cars-tell.md | 5 +++++
packages/astro/src/vite-plugin-markdown/index.ts | 5 ++---
packages/astro/test/astro-pages.test.js | 5 +++++
3 files changed, 12 insertions(+), 3 deletions(-)
create mode 100644 .changeset/twelve-cars-tell.md
diff --git a/.changeset/twelve-cars-tell.md b/.changeset/twelve-cars-tell.md
new file mode 100644
index 000000000..a1812d637
--- /dev/null
+++ b/.changeset/twelve-cars-tell.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix markdown page HMR
diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts
index cc86d1fc1..deaccebef 100644
--- a/packages/astro/src/vite-plugin-markdown/index.ts
+++ b/packages/astro/src/vite-plugin-markdown/index.ts
@@ -107,7 +107,7 @@ export default function markdown({ settings, logger }: AstroPluginOptions): Plug
}
const code = escapeViteEnvReferences(`
- import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent } from ${JSON.stringify(
+ import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent, maybeRenderHead } from ${JSON.stringify(
astroServerRuntimeModulePath
)};
import { AstroError, AstroErrorData } from ${JSON.stringify(astroErrorModulePath)};
@@ -180,10 +180,9 @@ export default function markdown({ settings, logger }: AstroPluginOptions): Plug
}, {
'default': () => render\`\${unescapeHTML(html)}\`
})}\`;`
- : `render\`\${unescapeHTML(html)}\`;`
+ : `render\`\${maybeRenderHead(result)}\${unescapeHTML(html)}\`;`
}
});
- Content[Symbol.for('astro.needsHeadRendering')] = ${layout ? 'false' : 'true'};
export default Content;
`);
diff --git a/packages/astro/test/astro-pages.test.js b/packages/astro/test/astro-pages.test.js
index 70f391be7..3d17b521d 100644
--- a/packages/astro/test/astro-pages.test.js
+++ b/packages/astro/test/astro-pages.test.js
@@ -49,5 +49,10 @@ describe('Pages', () => {
expect($('#testing').length).to.be.greaterThan(0);
});
+
+ it('should have Vite client in dev', async () => {
+ const html = await fixture.fetch('/').then((res) => res.text());
+ expect(html).to.include('/@vite/client', 'Markdown page does not have Vite client for HMR');
+ });
});
});
From 61ad70fdc52035964c43ecdb4cf7468f6c2b61e7 Mon Sep 17 00:00:00 2001
From: Matteo Manfredi
Date: Wed, 6 Sep 2023 02:28:00 +0200
Subject: [PATCH 06/10] fix: fix remote `astro:assets` caching logic (#8424)
---
.changeset/empty-rings-bow.md | 5 +++++
packages/astro/src/assets/build/generate.ts | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 .changeset/empty-rings-bow.md
diff --git a/.changeset/empty-rings-bow.md b/.changeset/empty-rings-bow.md
new file mode 100644
index 000000000..fd928d548
--- /dev/null
+++ b/.changeset/empty-rings-bow.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes remote assets caching logic to not use expired assets
diff --git a/packages/astro/src/assets/build/generate.ts b/packages/astro/src/assets/build/generate.ts
index b2004fad0..71903e994 100644
--- a/packages/astro/src/assets/build/generate.ts
+++ b/packages/astro/src/assets/build/generate.ts
@@ -75,7 +75,7 @@ export async function generateImage(
const JSONData = JSON.parse(readFileSync(cachedFileURL, 'utf-8')) as RemoteCacheEntry;
// If the cache entry is not expired, use it
- if (JSONData.expires < Date.now()) {
+ if (JSONData.expires > Date.now()) {
await fs.promises.writeFile(finalFileURL, Buffer.from(JSONData.data, 'base64'));
return {
From 9ffa1a84e81f52d55ffe07826b8b1f10fc023ee9 Mon Sep 17 00:00:00 2001
From: Slawek Kolodziej
Date: Wed, 6 Sep 2023 06:43:53 +0200
Subject: [PATCH 07/10] fix: include route prefix in vercel func names, fix
#8401 (#8408)
* fix: include route prefix in vercel func names
* chore: add changeset
* chore: update pnpm lockfile
* refactor: simplify logic that generates vercel func names
* fix: properly remove entryFile prefix from func name
* refactor: change how vercel function names are generated
---------
Co-authored-by: Nate Moore
---
.changeset/modern-guests-float.md | 5 ++++
.../vercel/src/serverless/adapter.ts | 23 ++++++++++++++-----
.../astro.config.mjs | 10 ++++++++
.../included.js | 1 +
.../package.json | 9 ++++++++
.../src/pages/[id]/index.astro | 12 ++++++++++
.../src/pages/api/[id].js | 7 ++++++
.../src/pages/index.astro | 12 ++++++++++
.../serverless-with-dynamic-routes.test.js | 22 ++++++++++++++++++
pnpm-lock.yaml | 9 ++++++++
10 files changed, 104 insertions(+), 6 deletions(-)
create mode 100644 .changeset/modern-guests-float.md
create mode 100644 packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/astro.config.mjs
create mode 100644 packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/included.js
create mode 100644 packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json
create mode 100644 packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/[id]/index.astro
create mode 100644 packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/api/[id].js
create mode 100644 packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro
create mode 100644 packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js
diff --git a/.changeset/modern-guests-float.md b/.changeset/modern-guests-float.md
new file mode 100644
index 000000000..cda74642a
--- /dev/null
+++ b/.changeset/modern-guests-float.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': patch
+---
+
+Fix serverless function naming conflicts for routes with identical filenames but different directory structures
diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
index a7178b3e3..32735da03 100644
--- a/packages/integrations/vercel/src/serverless/adapter.ts
+++ b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -207,14 +207,25 @@ You can set functionPerRoute: false to prevent surpassing the limit.`
// Multiple entrypoint support
if (_entryPoints.size) {
- for (const [route, entryFile] of _entryPoints) {
- const func = basename(entryFile.toString()).replace(/\.mjs$/, '');
+ const getRouteFuncName = (route: RouteData) =>
+ route.component.replace('src/pages/', '')
+
+ const getFallbackFuncName = (entryFile: URL) =>
+ basename(entryFile.toString())
+ .replace('entry.', '')
+ .replace(/\.mjs$/, '');
+
+ for (const [route, entryFile] of _entryPoints) {
+ const func = route.component.startsWith('src/pages/')
+ ? getRouteFuncName(route)
+ : getFallbackFuncName(entryFile)
+
await createFunctionFolder(func, entryFile, filesToInclude, logger);
routeDefinitions.push({
- src: route.pattern.source,
- dest: func,
- });
- }
+ src: route.pattern.source,
+ dest: func,
+ });
+ }
} else {
await createFunctionFolder(
'render',
diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/astro.config.mjs b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/astro.config.mjs
new file mode 100644
index 000000000..f5a86e609
--- /dev/null
+++ b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/astro.config.mjs
@@ -0,0 +1,10 @@
+import { defineConfig } from 'astro/config';
+import vercel from '@astrojs/vercel/serverless';
+
+export default defineConfig({
+ adapter: vercel({
+ // Pass some value to make sure it doesn't error out
+ includeFiles: ['included.js'],
+ }),
+ output: 'server'
+});
diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/included.js b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/included.js
new file mode 100644
index 000000000..4e64b2d61
--- /dev/null
+++ b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/included.js
@@ -0,0 +1 @@
+'works'
\ No newline at end of file
diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json
new file mode 100644
index 000000000..e22a7e932
--- /dev/null
+++ b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json
@@ -0,0 +1,9 @@
+{
+ "name": "@test/astro-vercel-serverless-with-dynamic-routes",
+ "version": "0.0.0",
+ "private": true,
+ "dependencies": {
+ "@astrojs/vercel": "workspace:*",
+ "astro": "workspace:*"
+ }
+}
diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/[id]/index.astro b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/[id]/index.astro
new file mode 100644
index 000000000..4eab5952d
--- /dev/null
+++ b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/[id]/index.astro
@@ -0,0 +1,12 @@
+---
+export const prerender = false;
+---
+
+
+
+ testing {Astro.params.id}
+
+
+ testing {Astro.params.id}
+
+
diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/api/[id].js b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/api/[id].js
new file mode 100644
index 000000000..f54e673a8
--- /dev/null
+++ b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/api/[id].js
@@ -0,0 +1,7 @@
+export const prerender = false;
+
+export async function GET({ params }) {
+ return Response.json({
+ id: params.id
+ });
+}
diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro
new file mode 100644
index 000000000..b6b833e53
--- /dev/null
+++ b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro
@@ -0,0 +1,12 @@
+---
+export const prerender = import.meta.env.PRERENDER;
+---
+
+
+
+ testing
+
+
+ testing
+
+
diff --git a/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js b/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js
new file mode 100644
index 000000000..325f9c5b0
--- /dev/null
+++ b/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js
@@ -0,0 +1,22 @@
+import { expect } from 'chai';
+import { loadFixture } from './test-utils.js';
+
+describe('Serverless with dynamic routes', () => {
+ /** @type {import('./test-utils.js').Fixture} */
+ let fixture;
+
+ before(async () => {
+ process.env.PRERENDER = true;
+ fixture = await loadFixture({
+ root: './fixtures/serverless-with-dynamic-routes/',
+ output: 'hybrid',
+ });
+ await fixture.build();
+ });
+
+ it('build successful', async () => {
+ expect(await fixture.readFile('../.vercel/output/static/index.html')).to.be.ok;
+ expect(await fixture.readFile('../.vercel/output/functions/[id]/index.astro.func/.vc-config.json')).to.be.ok;
+ expect(await fixture.readFile('../.vercel/output/functions/api/[id].js.func/.vc-config.json')).to.be.ok;
+ });
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 43b0c149e..ff3a57a4c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4812,6 +4812,15 @@ importers:
specifier: workspace:*
version: link:../../../../../astro
+ packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes:
+ dependencies:
+ '@astrojs/vercel':
+ specifier: workspace:*
+ version: link:../../..
+ astro:
+ specifier: workspace:*
+ version: link:../../../../../astro
+
packages/integrations/vercel/test/fixtures/static-assets:
dependencies:
'@astrojs/vercel':
From eb8c4cc2fc578095e73f80c712615f323c7cbc61 Mon Sep 17 00:00:00 2001
From: ematipico
Date: Wed, 6 Sep 2023 04:46:18 +0000
Subject: [PATCH 08/10] [ci] format
---
.../vercel/src/serverless/adapter.ts | 27 +++++++++----------
.../serverless-with-dynamic-routes.test.js | 7 +++--
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
index 32735da03..a1d8b18bf 100644
--- a/packages/integrations/vercel/src/serverless/adapter.ts
+++ b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -207,25 +207,24 @@ You can set functionPerRoute: false to prevent surpassing the limit.`
// Multiple entrypoint support
if (_entryPoints.size) {
- const getRouteFuncName = (route: RouteData) =>
- route.component.replace('src/pages/', '')
+ const getRouteFuncName = (route: RouteData) => route.component.replace('src/pages/', '');
- const getFallbackFuncName = (entryFile: URL) =>
- basename(entryFile.toString())
- .replace('entry.', '')
- .replace(/\.mjs$/, '');
+ const getFallbackFuncName = (entryFile: URL) =>
+ basename(entryFile.toString())
+ .replace('entry.', '')
+ .replace(/\.mjs$/, '');
- for (const [route, entryFile] of _entryPoints) {
- const func = route.component.startsWith('src/pages/')
+ for (const [route, entryFile] of _entryPoints) {
+ const func = route.component.startsWith('src/pages/')
? getRouteFuncName(route)
- : getFallbackFuncName(entryFile)
-
+ : getFallbackFuncName(entryFile);
+
await createFunctionFolder(func, entryFile, filesToInclude, logger);
routeDefinitions.push({
- src: route.pattern.source,
- dest: func,
- });
- }
+ src: route.pattern.source,
+ dest: func,
+ });
+ }
} else {
await createFunctionFolder(
'render',
diff --git a/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js b/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js
index 325f9c5b0..fae3aef95 100644
--- a/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js
+++ b/packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js
@@ -16,7 +16,10 @@ describe('Serverless with dynamic routes', () => {
it('build successful', async () => {
expect(await fixture.readFile('../.vercel/output/static/index.html')).to.be.ok;
- expect(await fixture.readFile('../.vercel/output/functions/[id]/index.astro.func/.vc-config.json')).to.be.ok;
- expect(await fixture.readFile('../.vercel/output/functions/api/[id].js.func/.vc-config.json')).to.be.ok;
+ expect(
+ await fixture.readFile('../.vercel/output/functions/[id]/index.astro.func/.vc-config.json')
+ ).to.be.ok;
+ expect(await fixture.readFile('../.vercel/output/functions/api/[id].js.func/.vc-config.json'))
+ .to.be.ok;
});
});
From d2f2a11cdb42b0de79be21c798eda8e7e7b2a277 Mon Sep 17 00:00:00 2001
From: Jacob Lamb
Date: Wed, 6 Sep 2023 02:15:10 -0700
Subject: [PATCH 09/10] Improve Package Detection (#8306)
---
.changeset/friendly-clocks-act.md | 6 +++++
packages/astro/package.json | 4 ++--
packages/astro/src/cli/add/index.ts | 2 ++
packages/astro/src/cli/install-package.ts | 2 ++
packages/astro/src/cli/telemetry/index.ts | 5 ++++-
packages/astro/src/core/messages.ts | 4 ++--
packages/create-astro/src/actions/context.ts | 6 ++---
.../create-astro/src/actions/dependencies.ts | 14 ++++++------
.../create-astro/src/actions/next-steps.ts | 17 ++++++++------
.../create-astro/test/dependencies.test.js | 10 ++++-----
packages/create-astro/test/next.test.js | 4 ++--
pnpm-lock.yaml | 22 +++++++++++++------
12 files changed, 60 insertions(+), 36 deletions(-)
create mode 100644 .changeset/friendly-clocks-act.md
diff --git a/.changeset/friendly-clocks-act.md b/.changeset/friendly-clocks-act.md
new file mode 100644
index 000000000..43c694880
--- /dev/null
+++ b/.changeset/friendly-clocks-act.md
@@ -0,0 +1,6 @@
+---
+'create-astro': patch
+'astro': patch
+---
+
+Support detecting Bun when logging messages with package manager information.
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 528f27d28..a2cddd217 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -156,7 +156,7 @@
"ora": "^7.0.1",
"p-limit": "^4.0.0",
"path-to-regexp": "^6.2.1",
- "preferred-pm": "^3.0.3",
+ "preferred-pm": "^3.1.2",
"prompts": "^2.4.2",
"rehype": "^12.0.1",
"resolve": "^1.22.4",
@@ -172,7 +172,7 @@
"vfile": "^5.3.7",
"vite": "^4.4.9",
"vitefu": "^0.2.4",
- "which-pm": "^2.0.0",
+ "which-pm": "^2.1.1",
"yargs-parser": "^21.1.1",
"zod": "3.21.1"
},
diff --git a/packages/astro/src/cli/add/index.ts b/packages/astro/src/cli/add/index.ts
index 07fc7b1a8..62cec7a71 100644
--- a/packages/astro/src/cli/add/index.ts
+++ b/packages/astro/src/cli/add/index.ts
@@ -620,6 +620,8 @@ async function getInstallIntegrationsCommand({
return { pm: 'yarn', command: 'add', flags: [], dependencies };
case 'pnpm':
return { pm: 'pnpm', command: 'add', flags: [], dependencies };
+ case 'bun':
+ return { pm: 'bun', command: 'add', flags: [], dependencies };
default:
return null;
}
diff --git a/packages/astro/src/cli/install-package.ts b/packages/astro/src/cli/install-package.ts
index f6af1d346..689f81e3e 100644
--- a/packages/astro/src/cli/install-package.ts
+++ b/packages/astro/src/cli/install-package.ts
@@ -67,6 +67,8 @@ function getInstallCommand(packages: string[], packageManager: string) {
return { pm: 'yarn', command: 'add', flags: [], dependencies: packages };
case 'pnpm':
return { pm: 'pnpm', command: 'add', flags: [], dependencies: packages };
+ case 'bun':
+ return { pm: 'bun', command: 'add', flags: [], dependencies: packages };
default:
return null;
}
diff --git a/packages/astro/src/cli/telemetry/index.ts b/packages/astro/src/cli/telemetry/index.ts
index b702a5baa..a6ebd09c3 100644
--- a/packages/astro/src/cli/telemetry/index.ts
+++ b/packages/astro/src/cli/telemetry/index.ts
@@ -2,14 +2,17 @@
import type yargs from 'yargs-parser';
import * as msg from '../../core/messages.js';
import { telemetry } from '../../events/index.js';
+import whichPm from 'which-pm';
interface TelemetryOptions {
flags: yargs.Arguments;
}
+
export async function notify() {
+ const packageManager = (await whichPm(process.cwd())).name ?? 'npm';
await telemetry.notify(() => {
- console.log(msg.telemetryNotice() + '\n');
+ console.log(msg.telemetryNotice(packageManager) + '\n');
return true;
});
}
diff --git a/packages/astro/src/core/messages.ts b/packages/astro/src/core/messages.ts
index 974bf79bf..758f5e581 100644
--- a/packages/astro/src/core/messages.ts
+++ b/packages/astro/src/core/messages.ts
@@ -105,10 +105,10 @@ export function serverStart({
.join('\n');
}
-export function telemetryNotice() {
+export function telemetryNotice(packageManager = 'npm') {
const headline = `${cyan('◆')} Astro collects completely anonymous usage data.`;
const why = dim(' This optional program helps shape our roadmap.');
- const disable = dim(' Run `npm run astro telemetry disable` to opt-out.');
+ const disable = dim(` Run \`${packageManager} run astro telemetry disable\` to opt-out.`);
const details = ` Details: ${underline('https://astro.build/telemetry')}`;
return [headline, why, disable, details].map((v) => ' ' + v).join('\n');
}
diff --git a/packages/create-astro/src/actions/context.ts b/packages/create-astro/src/actions/context.ts
index 5c2c0e9c0..c91a0caae 100644
--- a/packages/create-astro/src/actions/context.ts
+++ b/packages/create-astro/src/actions/context.ts
@@ -9,7 +9,7 @@ export interface Context {
help: boolean;
prompt: typeof prompt;
cwd: string;
- pkgManager: string;
+ packageManager: string;
username: string;
version: string;
skipHouston: boolean;
@@ -51,7 +51,7 @@ export async function getContext(argv: string[]): Promise {
{ argv, permissive: true }
);
- const pkgManager = detectPackageManager()?.name ?? 'npm';
+ const packageManager = detectPackageManager()?.name ?? 'npm';
const [username, version] = await Promise.all([getName(), getVersion()]);
let cwd = flags['_'][0];
let {
@@ -85,7 +85,7 @@ export async function getContext(argv: string[]): Promise {
const context: Context = {
help,
prompt,
- pkgManager,
+ packageManager,
username,
version,
skipHouston,
diff --git a/packages/create-astro/src/actions/dependencies.ts b/packages/create-astro/src/actions/dependencies.ts
index 339e3379f..f05e9e93a 100644
--- a/packages/create-astro/src/actions/dependencies.ts
+++ b/packages/create-astro/src/actions/dependencies.ts
@@ -6,7 +6,7 @@ import { shell } from '../shell.js';
import type { Context } from './context';
export async function dependencies(
- ctx: Pick
+ ctx: Pick
) {
let deps = ctx.install ?? ctx.yes;
if (deps === undefined) {
@@ -25,15 +25,15 @@ export async function dependencies(
await info('--dry-run', `Skipping dependency installation`);
} else if (deps) {
await spinner({
- start: `Installing dependencies with ${ctx.pkgManager}...`,
+ start: `Installing dependencies with ${ctx.packageManager}...`,
end: 'Dependencies installed',
while: () => {
- return install({ pkgManager: ctx.pkgManager, cwd: ctx.cwd }).catch((e) => {
+ return install({ packageManager: ctx.packageManager, cwd: ctx.cwd }).catch((e) => {
error('error', e);
error(
'error',
`Dependencies failed to install, please run ${color.bold(
- ctx.pkgManager + ' install'
+ ctx.packageManager + ' install'
)} to install them manually after setup.`
);
});
@@ -47,9 +47,9 @@ export async function dependencies(
}
}
-async function install({ pkgManager, cwd }: { pkgManager: string; cwd: string }) {
- if (pkgManager === 'yarn') await ensureYarnLock({ cwd });
- return shell(pkgManager, ['install'], { cwd, timeout: 90_000, stdio: 'ignore' });
+async function install({ packageManager, cwd }: { packageManager: string; cwd: string }) {
+ if (packageManager === 'yarn') await ensureYarnLock({ cwd });
+ return shell(packageManager, ['install'], { cwd, timeout: 90_000, stdio: 'ignore' });
}
async function ensureYarnLock({ cwd }: { cwd: string }) {
diff --git a/packages/create-astro/src/actions/next-steps.ts b/packages/create-astro/src/actions/next-steps.ts
index 01c1963d9..c79a80525 100644
--- a/packages/create-astro/src/actions/next-steps.ts
+++ b/packages/create-astro/src/actions/next-steps.ts
@@ -3,14 +3,17 @@ import type { Context } from './context';
import { nextSteps, say } from '../messages.js';
-export async function next(ctx: Pick) {
+export async function next(ctx: Pick) {
let projectDir = path.relative(process.cwd(), ctx.cwd);
- const devCmd =
- ctx.pkgManager === 'npm'
- ? 'npm run dev'
- : ctx.pkgManager === 'bun'
- ? 'bun run dev'
- : `${ctx.pkgManager} dev`;
+
+ const commandMap: { [key: string]: string } = {
+ npm: 'npm run dev',
+ bun: 'bun run dev',
+ yarn: 'yarn dev',
+ pnpm: 'pnpm dev',
+ };
+
+ const devCmd = commandMap[ctx.packageManager as keyof typeof commandMap] || 'npm run dev';
await nextSteps({ projectDir, devCmd });
if (!ctx.skipHouston) {
diff --git a/packages/create-astro/test/dependencies.test.js b/packages/create-astro/test/dependencies.test.js
index 88e43597b..705cf8354 100644
--- a/packages/create-astro/test/dependencies.test.js
+++ b/packages/create-astro/test/dependencies.test.js
@@ -10,7 +10,7 @@ describe('dependencies', () => {
const context = {
cwd: '',
yes: true,
- pkgManager: 'npm',
+ packageManager: 'npm',
dryRun: true,
prompt: () => ({ deps: true }),
};
@@ -21,7 +21,7 @@ describe('dependencies', () => {
it('prompt yes', async () => {
const context = {
cwd: '',
- pkgManager: 'npm',
+ packageManager: 'npm',
dryRun: true,
prompt: () => ({ deps: true }),
install: undefined,
@@ -34,7 +34,7 @@ describe('dependencies', () => {
it('prompt no', async () => {
const context = {
cwd: '',
- pkgManager: 'npm',
+ packageManager: 'npm',
dryRun: true,
prompt: () => ({ deps: false }),
install: undefined,
@@ -48,7 +48,7 @@ describe('dependencies', () => {
const context = {
cwd: '',
install: true,
- pkgManager: 'npm',
+ packageManager: 'npm',
dryRun: true,
prompt: () => ({ deps: false }),
};
@@ -61,7 +61,7 @@ describe('dependencies', () => {
const context = {
cwd: '',
install: false,
- pkgManager: 'npm',
+ packageManager: 'npm',
dryRun: true,
prompt: () => ({ deps: false }),
};
diff --git a/packages/create-astro/test/next.test.js b/packages/create-astro/test/next.test.js
index efc0e6728..07de90d50 100644
--- a/packages/create-astro/test/next.test.js
+++ b/packages/create-astro/test/next.test.js
@@ -7,14 +7,14 @@ describe('next steps', () => {
const fixture = setup();
it('no arguments', async () => {
- await next({ skipHouston: false, cwd: './it/fixtures/not-empty', pkgManager: 'npm' });
+ await next({ skipHouston: false, cwd: './it/fixtures/not-empty', packageManager: 'npm' });
expect(fixture.hasMessage('Liftoff confirmed.')).to.be.true;
expect(fixture.hasMessage('npm run dev')).to.be.true;
expect(fixture.hasMessage('Good luck out there, astronaut!')).to.be.true;
});
it('--skip-houston', async () => {
- await next({ skipHouston: true, cwd: './it/fixtures/not-empty', pkgManager: 'npm' });
+ await next({ skipHouston: true, cwd: './it/fixtures/not-empty', packageManager: 'npm' });
expect(fixture.hasMessage('Good luck out there, astronaut!')).to.be.false;
});
});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ff3a57a4c..c2f3c68e7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -594,8 +594,8 @@ importers:
specifier: ^6.2.1
version: 6.2.1
preferred-pm:
- specifier: ^3.0.3
- version: 3.0.3
+ specifier: ^3.1.2
+ version: 3.1.2
prompts:
specifier: ^2.4.2
version: 2.4.2
@@ -642,8 +642,8 @@ importers:
specifier: ^0.2.4
version: 0.2.4(vite@4.4.9)
which-pm:
- specifier: ^2.0.0
- version: 2.0.0
+ specifier: ^2.1.1
+ version: 2.1.1
yargs-parser:
specifier: ^21.1.1
version: 21.1.1
@@ -6816,7 +6816,7 @@ packages:
meow: 6.1.1
outdent: 0.5.0
p-limit: 2.3.0
- preferred-pm: 3.0.3
+ preferred-pm: 3.1.2
resolve-from: 5.0.0
semver: 7.5.4
spawndamnit: 2.0.0
@@ -15166,8 +15166,8 @@ packages:
tar-fs: 2.1.1
tunnel-agent: 0.6.0
- /preferred-pm@3.0.3:
- resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==}
+ /preferred-pm@3.1.2:
+ resolution: {integrity: sha512-nk7dKrcW8hfCZ4H6klWcdRknBOXWzNQByJ0oJyX97BOupsYD+FzLS4hflgEu/uPUEHZCuRfMxzCBsuWd7OzT8Q==}
engines: {node: '>=10'}
dependencies:
find-up: 5.0.0
@@ -17860,6 +17860,14 @@ packages:
load-yaml-file: 0.2.0
path-exists: 4.0.0
+ /which-pm@2.1.1:
+ resolution: {integrity: sha512-xzzxNw2wMaoCWXiGE8IJ9wuPMU+EYhFksjHxrRT8kMT5SnocBPRg69YAMtyV4D12fP582RA+k3P8H9J5EMdIxQ==}
+ engines: {node: '>=8.15'}
+ dependencies:
+ load-yaml-file: 0.2.0
+ path-exists: 4.0.0
+ dev: false
+
/which-typed-array@1.1.11:
resolution: {integrity: sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==}
engines: {node: '>= 0.4'}
From 35dff8246d5f53fa3fd72e401ce80a403d95f9bb Mon Sep 17 00:00:00 2001
From: bluwy
Date: Wed, 6 Sep 2023 09:17:34 +0000
Subject: [PATCH 10/10] [ci] format
---
packages/astro/src/cli/telemetry/index.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/packages/astro/src/cli/telemetry/index.ts b/packages/astro/src/cli/telemetry/index.ts
index a6ebd09c3..dffb18bd9 100644
--- a/packages/astro/src/cli/telemetry/index.ts
+++ b/packages/astro/src/cli/telemetry/index.ts
@@ -1,14 +1,13 @@
/* eslint-disable no-console */
+import whichPm from 'which-pm';
import type yargs from 'yargs-parser';
import * as msg from '../../core/messages.js';
import { telemetry } from '../../events/index.js';
-import whichPm from 'which-pm';
interface TelemetryOptions {
flags: yargs.Arguments;
}
-
export async function notify() {
const packageManager = (await whichPm(process.cwd())).name ?? 'npm';
await telemetry.notify(() => {