michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support strict dependency install for image integration (#5034)

Browse source
This commit is contained in:
Bjorn Lu 2022-10-10 23:35:48 +08:00 committed by GitHub
parent 19a76882c4
commit 2d9d422167
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/small-laws-dream.md Normal file
View file

@ -0,0 +1,5 @@
---
'@astrojs/image': patch
---
Support strict dependency install

2
packages/integrations/image/package.json
View file

@ -45,6 +45,7 @@
"@altano/tiny-async-pool": "^1.0.2", "@altano/tiny-async-pool": "^1.0.2",
"http-cache-semantics": "^4.1.0", "http-cache-semantics": "^4.1.0",
"image-size": "^1.0.2", "image-size": "^1.0.2",
"kleur": "^4.1.5",
"magic-string": "^0.25.9", "magic-string": "^0.25.9",
"mime": "^3.0.0", "mime": "^3.0.0",
"slash": "^4.0.0" "slash": "^4.0.0"
@ -57,7 +58,6 @@
"astro-scripts": "workspace:*", "astro-scripts": "workspace:*",
"chai": "^4.3.6", "chai": "^4.3.6",
"cheerio": "^1.0.0-rc.11", "cheerio": "^1.0.0-rc.11",
"kleur": "^4.1.4",
"mocha": "^9.2.2", "mocha": "^9.2.2",
"rollup-plugin-copy": "^3.4.0", "rollup-plugin-copy": "^3.4.0",
"sharp": "^0.31.0", "sharp": "^0.31.0",

5
packages/integrations/image/src/index.ts
View file

@ -49,9 +49,6 @@ export default function integration(options: IntegrationOptions = {}): AstroInte
function getViteConfiguration() { function getViteConfiguration() {
return { return {
plugins: [createPlugin(_config, resolvedOptions)], plugins: [createPlugin(_config, resolvedOptions)],
optimizeDeps: {
include: ['image-size'].filter(Boolean),
},
build: { build: {
rollupOptions: { rollupOptions: {
external: ['sharp'], external: ['sharp'],
@ -59,6 +56,8 @@ export default function integration(options: IntegrationOptions = {}): AstroInte
}, },
ssr: { ssr: {
noExternal: ['@astrojs/image', resolvedOptions.serviceEntryPoint], noExternal: ['@astrojs/image', resolvedOptions.serviceEntryPoint],
// CJS dependencies used by `serviceEntryPoint`
external: ['http-cache-semantics', 'image-size', 'mime'],
}, },
assetsInclude: ['**/*.wasm'], assetsInclude: ['**/*.wasm'],
}; };

4
pnpm-lock.yaml
View file

@ -2540,7 +2540,7 @@ importers:
cheerio: ^1.0.0-rc.11 cheerio: ^1.0.0-rc.11
http-cache-semantics: ^4.1.0 http-cache-semantics: ^4.1.0
image-size: ^1.0.2 image-size: ^1.0.2
kleur: ^4.1.4 kleur: ^4.1.5
magic-string: ^0.25.9 magic-string: ^0.25.9
mime: ^3.0.0 mime: ^3.0.0
mocha: ^9.2.2 mocha: ^9.2.2
@ -2553,6 +2553,7 @@ importers:
'@altano/tiny-async-pool': 1.0.2 '@altano/tiny-async-pool': 1.0.2
http-cache-semantics: 4.1.0 http-cache-semantics: 4.1.0
image-size: 1.0.2 image-size: 1.0.2
kleur: 4.1.5
magic-string: 0.25.9 magic-string: 0.25.9
mime: 3.0.0 mime: 3.0.0
slash: 4.0.0 slash: 4.0.0
@ -2564,7 +2565,6 @@ importers:
astro-scripts: link:../../../scripts astro-scripts: link:../../../scripts
chai: 4.3.6 chai: 4.3.6
cheerio: 1.0.0-rc.12 cheerio: 1.0.0-rc.12
kleur: 4.1.5
mocha: 9.2.2 mocha: 9.2.2
rollup-plugin-copy: 3.4.0 rollup-plugin-copy: 3.4.0
sharp: 0.31.1 sharp: 0.31.1