Skip to content

Commit e75ba13

Browse files
committed
Merge branch 'feature/svelte5'
* feature/svelte5: 5.0.0-svelte5.5 v5.0.0-svelte5.5 chore: Updated some core packages and regenrerated some test snapshots removed SvelteComponent from component module 5.0.0-svelte5.4 Update svg.d.ts to use new Component type instead of the deprecated ComponentType type 5.0.0-svelte5.3 fix(package): Fix Svelte peerDependency to explicitly allow for pre-release versions 5.0.0-svelte5.2 fix: Remove query string from sources in sourcemap sources array chore: Regenerated lock files chore: Updated snapshots 5.0.0-svelte5.1 5.0.0-svelte5.0 chore: Updated changelog "Experimental" support for Svelte 5
2 parents da52531 + b0662ac commit e75ba13

13 files changed

+1437
-1189
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
- _(empty)_
99

10+
## [5.0.0-svelte5.0] 2024-01-13
11+
12+
### Added
13+
14+
- Support for Svelte 5 (Experimental)
15+
1016
## [4.2.1] 2024-01-14
1117

1218
### Changed

package-lock.json

Lines changed: 635 additions & 630 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@poppanator/sveltekit-svg",
3-
"version": "4.2.1",
3+
"version": "5.0.0-svelte5.5",
44
"description": "Import SVG files as Svelte components",
55
"private": false,
66
"keywords": [
@@ -73,26 +73,25 @@
7373
"homepage": "https://github.com/poppa/sveltekit-svg#readme",
7474
"devDependencies": {
7575
"@playwright/test": "^1.40.1",
76-
"@types/node": "^15.14.9",
76+
"@types/node": "^20.10.7",
7777
"@typescript-eslint/eslint-plugin": "^6.5.0",
7878
"@typescript-eslint/parser": "^6.5.0",
7979
"cross-env": "^7.0.3",
8080
"eslint": "^8.56.0",
8181
"eslint-config-prettier": "^8.10.0",
8282
"eslint-plugin-prettier": "^5.1.2",
83-
"rimraf": "^5.0.5",
84-
"svelte": "^4.2.8",
83+
"svelte": "^5.0.0-next.184",
8584
"svelte-check": "^3.6.2",
86-
"svelte-preprocess": "^5.1.3",
87-
"svgo": "^3.1.0",
85+
"svelte-preprocess": "^5.1.4",
86+
"svgo": "^3.2.0",
8887
"tslib": "^2.6.2",
8988
"typescript": "^5.3.3",
90-
"vite": "^4.4.9"
89+
"vite": "^5.3.3"
9190
},
9291
"peerDependencies": {
93-
"svelte": ">=4.x",
92+
"svelte": ">=5.x || ^5.0.0-next.0",
9493
"svgo": ">=3.x",
95-
"vite": ">=4.x"
94+
"vite": ">=5.x"
9695
},
9796
"dependencies": {
9897
"@rollup/pluginutils": "^5.1.0"

src/index.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,21 @@ function readSvg(options: Options = { type: 'component' }): Plugin {
300300
const comp = toComponent(opt.data)
301301
opt.data = hook ? hook(opt.data, comp) : comp.component
302302
const { js } = compile(opt.data, {
303-
css: 'none',
303+
css: 'external',
304304
filename: id,
305-
hydratable: !isBuild,
306305
namespace: 'svg',
307-
generate: isBuild ? 'ssr' : 'dom',
306+
generate: isBuild ? 'server' : 'client',
307+
})
308+
309+
// Remove query string from sources
310+
js.map.sources.forEach((v, idx, a) => {
311+
if (v.includes('?')) {
312+
const t = v.split('?')[0]
313+
314+
if (t) {
315+
a[idx] = t
316+
}
317+
}
308318
})
309319

310320
return js

svg.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
declare module '*.svg?component' {
2-
import type { ComponentType, SvelteComponent } from 'svelte'
2+
import type { Component, SvelteComponent } from 'svelte'
33
import type { SVGAttributes } from 'svelte/elements'
44

5-
const content: ComponentType<SvelteComponent<SVGAttributes<SVGSVGElement>>>
5+
const content: Component<SVGAttributes<SVGSVGElement>>
66

77
export default content
88
}

0 commit comments

Comments
 (0)