summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bjorn Lu <bjornlu.dev@gmail.com> 2022-10-10 23:35:48 +0800
committerGravatar GitHub <noreply@github.com> 2022-10-10 11:35:48 -0400
commit2d9d42216722334db03adb14e59773db8389b7f9 (patch)
treebf41b9c73d99bcba7e01f36d289eadeb01639d9d
parent19a76882c46f5a6a1c671c84f4156ba8cb5a5244 (diff)
downloadastro-2d9d42216722334db03adb14e59773db8389b7f9.tar.gz
astro-2d9d42216722334db03adb14e59773db8389b7f9.tar.zst
astro-2d9d42216722334db03adb14e59773db8389b7f9.zip
Support strict dependency install for image integration (#5034)
-rw-r--r--.changeset/small-laws-dream.md5
-rw-r--r--packages/integrations/image/package.json2
-rw-r--r--packages/integrations/image/src/index.ts5
-rw-r--r--pnpm-lock.yaml4
4 files changed, 10 insertions, 6 deletions
diff --git a/.changeset/small-laws-dream.md b/.changeset/small-laws-dream.md
new file mode 100644
index 000000000..8061f3ea2
--- /dev/null
+++ b/.changeset/small-laws-dream.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/image': patch
+---
+
+Support strict dependency install
diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json
index 533dadc83..c941d3fba 100644
--- a/packages/integrations/image/package.json
+++ b/packages/integrations/image/package.json
@@ -45,6 +45,7 @@
"@altano/tiny-async-pool": "^1.0.2",
"http-cache-semantics": "^4.1.0",
"image-size": "^1.0.2",
+ "kleur": "^4.1.5",
"magic-string": "^0.25.9",
"mime": "^3.0.0",
"slash": "^4.0.0"
@@ -57,7 +58,6 @@
"astro-scripts": "workspace:*",
"chai": "^4.3.6",
"cheerio": "^1.0.0-rc.11",
- "kleur": "^4.1.4",
"mocha": "^9.2.2",
"rollup-plugin-copy": "^3.4.0",
"sharp": "^0.31.0",
diff --git a/packages/integrations/image/src/index.ts b/packages/integrations/image/src/index.ts
index 9b6a73ebf..3aaf27315 100644
--- a/packages/integrations/image/src/index.ts
+++ b/packages/integrations/image/src/index.ts
@@ -49,9 +49,6 @@ export default function integration(options: IntegrationOptions = {}): AstroInte
function getViteConfiguration() {
return {
plugins: [createPlugin(_config, resolvedOptions)],
- optimizeDeps: {
- include: ['image-size'].filter(Boolean),
- },
build: {
rollupOptions: {
external: ['sharp'],
@@ -59,6 +56,8 @@ export default function integration(options: IntegrationOptions = {}): AstroInte
},
ssr: {
noExternal: ['@astrojs/image', resolvedOptions.serviceEntryPoint],
+ // CJS dependencies used by `serviceEntryPoint`
+ external: ['http-cache-semantics', 'image-size', 'mime'],
},
assetsInclude: ['**/*.wasm'],
};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f1838745a..eeeb106eb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2540,7 +2540,7 @@ importers:
cheerio: ^1.0.0-rc.11
http-cache-semantics: ^4.1.0
image-size: ^1.0.2
- kleur: ^4.1.4
+ kleur: ^4.1.5
magic-string: ^0.25.9
mime: ^3.0.0
mocha: ^9.2.2
@@ -2553,6 +2553,7 @@ importers:
'@altano/tiny-async-pool': 1.0.2
http-cache-semantics: 4.1.0
image-size: 1.0.2
+ kleur: 4.1.5
magic-string: 0.25.9
mime: 3.0.0
slash: 4.0.0
@@ -2564,7 +2565,6 @@ importers:
astro-scripts: link:../../../scripts
chai: 4.3.6
cheerio: 1.0.0-rc.12
- kleur: 4.1.5
mocha: 9.2.2
rollup-plugin-copy: 3.4.0
sharp: 0.31.1