summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.changeset/friendly-colts-rush.md5
-rw-r--r--packages/astro/src/vite-plugin-build-css/index.ts2
-rw-r--r--packages/astro/test/fixtures/fontsource-package/package.json1
-rw-r--r--packages/astro/test/fixtures/fontsource-package/src/pages/index.astro1
-rw-r--r--pnpm-lock.yaml15
5 files changed, 23 insertions, 1 deletions
diff --git a/.changeset/friendly-colts-rush.md b/.changeset/friendly-colts-rush.md
new file mode 100644
index 000000000..9dc584228
--- /dev/null
+++ b/.changeset/friendly-colts-rush.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Handle importing multiple CSS packages in same bundle
diff --git a/packages/astro/src/vite-plugin-build-css/index.ts b/packages/astro/src/vite-plugin-build-css/index.ts
index 830904ba7..b01ef265e 100644
--- a/packages/astro/src/vite-plugin-build-css/index.ts
+++ b/packages/astro/src/vite-plugin-build-css/index.ts
@@ -175,7 +175,7 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[]
facadeModuleId: imp,
code: `/* Pure CSS chunk ${imp} */ ${bindings.map(
(b) => `export const ${b} = {};`
- )}`,
+ ).join('')}`,
dynamicImports: [],
implicitlyLoadedBefore: [],
importedBindings: {},
diff --git a/packages/astro/test/fixtures/fontsource-package/package.json b/packages/astro/test/fixtures/fontsource-package/package.json
index 2056d8447..d7fef6b67 100644
--- a/packages/astro/test/fixtures/fontsource-package/package.json
+++ b/packages/astro/test/fixtures/fontsource-package/package.json
@@ -4,6 +4,7 @@
"private": true,
"dependencies": {
"@fontsource/montserrat": "4.5.11",
+ "@fontsource/monofett": "4.5.7",
"astro": "workspace:*"
}
}
diff --git a/packages/astro/test/fixtures/fontsource-package/src/pages/index.astro b/packages/astro/test/fixtures/fontsource-package/src/pages/index.astro
index 9c57bf10d..454d7dfba 100644
--- a/packages/astro/test/fixtures/fontsource-package/src/pages/index.astro
+++ b/packages/astro/test/fixtures/fontsource-package/src/pages/index.astro
@@ -1,5 +1,6 @@
---
import "@fontsource/montserrat";
+import "@fontsource/monofett";
---
<html lang="en">
<head>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 07937a4ae..0fcf96460 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1369,9 +1369,11 @@ importers:
packages/astro/test/fixtures/fontsource-package:
specifiers:
+ '@fontsource/monofett': 4.5.7
'@fontsource/montserrat': 4.5.11
astro: workspace:*
dependencies:
+ '@fontsource/monofett': 4.5.7
'@fontsource/montserrat': 4.5.11
astro: link:../../..
@@ -3934,6 +3936,10 @@ packages:
- supports-color
dev: true
+ /@fontsource/monofett/4.5.7:
+ resolution: {integrity: sha512-30KS+Sn2NxN+I7kzmHyPEJIpunILmtk4wIMz8WdlFlFgrookmdcnetRyOgyR22LRMnzQuWYuQnFfvARo1Qo2nA==}
+ dev: false
+
/@fontsource/montserrat/4.5.11:
resolution: {integrity: sha512-XAYZmprnZDVSLIeEiB3evVG2JD+yoR9aT+I6LCOcwZFQ6ro9UPpopDncqoqwv+j5M0/UjyAP6ov70+L/fmP8Gg==}
dev: false
@@ -8134,6 +8140,11 @@ packages:
/debug/3.2.7:
resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+ peerDependencies:
+ supports-color: '*'
+ peerDependenciesMeta:
+ supports-color:
+ optional: true
dependencies:
ms: 2.1.3
dev: false
@@ -11027,6 +11038,8 @@ packages:
debug: 3.2.7
iconv-lite: 0.4.24
sax: 1.2.4
+ transitivePeerDependencies:
+ - supports-color
dev: false
/netmask/2.0.2:
@@ -11110,6 +11123,8 @@ packages:
rimraf: 2.7.1
semver: 5.7.1
tar: 4.4.19
+ transitivePeerDependencies:
+ - supports-color
dev: false
/node-releases/2.0.5: