Skip to content

Commit 19c4bee

Browse files
ildellaildella
authored
Merge pull request #1 from ildella/fix-svelte5-warning
removed old code for svelte4 like dispatchers and also some unclear c…
2 parents 23d9b88 + c3afebb commit 19c4bee

File tree

6 files changed

+55
-66
lines changed

6 files changed

+55
-66
lines changed

‎eslint.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default [
77
{languageOptions: { globals: globals.browser }},
88
pluginJs.configs.recommended,
99
{
10-
name: 'Frankie WebApp',
10+
name: 'Svelte Marked',
1111
ignores: [
1212
'vite.config.js.*',
1313
'more.eslint.config.js',

‎package.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
{
22
"name": "svelte-marked",
33
"description": "A markdown renderer for Svelte.",
4-
"version": "0.7.1",
4+
"version": "0.8.0",
55
"packageManager": "yarn@4.6.0",
6-
"engines": {
7-
"node": ">=18"
8-
},
96
"main": "dist/sveltemarkdown.js",
107
"module": "dist/sveltemarkdown.es.js",
118
"jsnext:main": "dist/sveltemarkdown.es.js",
@@ -25,6 +22,10 @@
2522
],
2623
"license": "MIT",
2724
"author": "Pablo Berganza <pablo@berganza.dev>",
25+
"contributors": {
26+
"name": "Daniele Dellafiore",
27+
"url": "https://linktr.ee/ildella/"
28+
},
2829
"repository": {
2930
"type": "git",
3031
"url": "git+https://github.com/ildella/svelte-marked.git"
@@ -38,17 +39,17 @@
3839
"test:watch": "vitest watch"
3940
},
4041
"devDependencies": {
41-
"@eslint/js": "9.19.0",
42-
"@stylistic/eslint-plugin-js": "3.0.1",
42+
"@eslint/js": "9.20.0",
43+
"@stylistic/eslint-plugin-js": "3.1.0",
4344
"@sveltejs/vite-plugin-svelte": "5.0.3",
4445
"@testing-library/jest-dom": "6.6.3",
4546
"@testing-library/svelte": "5.2.6",
46-
"eslint": "9.19.0",
47+
"eslint": "9.20.0",
4748
"eslint-plugin-svelte": "2.46.1",
4849
"eslint-plugin-vitest": "0.5.4",
4950
"globals": "15.14.0",
5051
"jsdom": "26.0.0",
51-
"prettier": "3.4.2",
52+
"prettier": "3.5.0",
5253
"rollup-plugin-analyzer": "4.0.0",
5354
"rollup-plugin-filesize": "10.0.0",
5455
"rollup-plugin-terser": "7.0.2",
@@ -61,7 +62,7 @@
6162
"dependencies": {
6263
"@types/marked": "6.0.0",
6364
"github-slugger": "2.0.0",
64-
"marked": "15.0.6"
65+
"marked": "15.0.7"
6566
},
6667
"peerDependencies": {
6768
"svelte": "^5"

‎src/SvelteMarkdown.svelte‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,40 @@
11
<script>
2-
import { run } from 'svelte/legacy';
3-
4-
import { setContext, createEventDispatcher, onMount } from 'svelte'
2+
import { setContext } from 'svelte'
53
import { marked } from 'marked'
64
import Slugger from 'github-slugger'
75
86
import Parser from './Parser.svelte'
97
import { defaultOptions, defaultRenderers } from './markdown-parser'
108
import { key } from './context'
119
12-
/**
13-
* @typedef {Object} Props
14-
* @property {any} [source]
15-
* @property {any} [renderers]
16-
* @property {any} [options]
17-
* @property {boolean} [isInline]
18-
*/
19-
20-
/** @type {Props} */
2110
let {
2211
source = [],
2312
renderers = {},
2413
options = {},
2514
isInline = false
26-
} = $props();
27-
28-
const dispatch = createEventDispatcher()
15+
} = $props()
2916
3017
let tokens = $state()
31-
let mounted = $state()
3218
3319
let preprocessed = $derived(Array.isArray(source))
3420
let slugger = $derived(source ? new Slugger : undefined)
3521
let combinedOptions = $derived({ ...defaultOptions, ...options })
36-
run(() => {
22+
let combinedRenderers = $derived({ ...defaultRenderers, ...renderers })
23+
24+
$effect(() => {
3725
if (preprocessed) {
3826
tokens = source
3927
} else {
4028
const lexer = new marked.Lexer(combinedOptions)
4129
tokens = isInline ? lexer.inlineTokens(source) : lexer.lex(source)
42-
dispatch('parsed', { tokens })
4330
}
44-
});
45-
let combinedRenderers = $derived({ ...defaultRenderers, ...renderers })
46-
run(() => {
47-
mounted && !preprocessed && dispatch('parsed', { tokens })
48-
});
31+
})
4932
5033
setContext(key, {
5134
slug: (val) => slugger ? slugger.slug(val) : '',
5235
getOptions: () => combinedOptions
5336
})
5437
55-
onMount(() => {
56-
mounted = true
57-
})
5838
</script>
5939

6040
<Parser {tokens} renderers={combinedRenderers} />

‎src/renderers/Text.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<script>
2-
let { text, raw, children } = $props();
2+
let { children } = $props();
33
</script>
44
{@render children?.()}

‎vite.config.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import pkg from './package.json'
1010
const removeDist = (p) => p.replace('dist/', '')
1111

1212
export default defineConfig({
13-
plugins: [svelte({ hot: !process.env.VITEST })],
14-
// plugins: [svelte()],
13+
plugins: [svelte()],
1514
test: {
1615
globals: true,
1716
environment: 'jsdom',

‎yarn.lock‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,15 @@ __metadata:
332332
languageName: node
333333
linkType: hard
334334

335+
"@eslint/core@npm:^0.11.0":
336+
version: 0.11.0
337+
resolution: "@eslint/core@npm:0.11.0"
338+
dependencies:
339+
"@types/json-schema": "npm:^7.0.15"
340+
checksum: 10c0/1e0671d035c908175f445864a7864cf6c6a8b67a5dfba8c47b2ac91e2d3ed36e8c1f2fd81d98a73264f8677055559699d4adb0f97d86588e616fc0dc9a4b86c9
341+
languageName: node
342+
linkType: hard
343+
335344
"@eslint/eslintrc@npm:^3.2.0":
336345
version: 3.2.0
337346
resolution: "@eslint/eslintrc@npm:3.2.0"
@@ -349,10 +358,10 @@ __metadata:
349358
languageName: node
350359
linkType: hard
351360

352-
"@eslint/js@npm:9.19.0":
353-
version: 9.19.0
354-
resolution: "@eslint/js@npm:9.19.0"
355-
checksum: 10c0/45dc544c8803984f80a438b47a8e578fae4f6e15bc8478a703827aaf05e21380b42a43560374ce4dad0d5cb6349e17430fc9ce1686fed2efe5d1ff117939ff90
361+
"@eslint/js@npm:9.20.0":
362+
version: 9.20.0
363+
resolution: "@eslint/js@npm:9.20.0"
364+
checksum: 10c0/10e7b5b9e628b5192e8fc6b0ecd27cf48322947e83e999ff60f9f9e44ac8d499138bcb9383cbfa6e51e780d53b4e76ccc2d1753b108b7173b8404fd484d37328
356365
languageName: node
357366
linkType: hard
358367

@@ -794,15 +803,15 @@ __metadata:
794803
languageName: node
795804
linkType: hard
796805

797-
"@stylistic/eslint-plugin-js@npm:3.0.1":
798-
version: 3.0.1
799-
resolution: "@stylistic/eslint-plugin-js@npm:3.0.1"
806+
"@stylistic/eslint-plugin-js@npm:3.1.0":
807+
version: 3.1.0
808+
resolution: "@stylistic/eslint-plugin-js@npm:3.1.0"
800809
dependencies:
801810
eslint-visitor-keys: "npm:^4.2.0"
802811
espree: "npm:^10.3.0"
803812
peerDependencies:
804813
eslint: ">=8.40.0"
805-
checksum: 10c0/e4f3a60189395198773ad223773458708035555a1835dcf4f6736c0a25a2951f72c9489f5ab115bad57802c55bcbc5a7be58a899cfd0c2952f163b9b4e5d1402
814+
checksum: 10c0/9842e943e17f37f5e163f1994466346bd9302bb95a754764cf5255b102b099c6eabf8c44c257a94fa9cb5df68c766d36ec4a0b0b27e404ce223fef995441da71
806815
languageName: node
807816
linkType: hard
808817

@@ -2075,16 +2084,16 @@ __metadata:
20752084
languageName: node
20762085
linkType: hard
20772086

2078-
"eslint@npm:9.19.0":
2079-
version: 9.19.0
2080-
resolution: "eslint@npm:9.19.0"
2087+
"eslint@npm:9.20.0":
2088+
version: 9.20.0
2089+
resolution: "eslint@npm:9.20.0"
20812090
dependencies:
20822091
"@eslint-community/eslint-utils": "npm:^4.2.0"
20832092
"@eslint-community/regexpp": "npm:^4.12.1"
20842093
"@eslint/config-array": "npm:^0.19.0"
2085-
"@eslint/core": "npm:^0.10.0"
2094+
"@eslint/core": "npm:^0.11.0"
20862095
"@eslint/eslintrc": "npm:^3.2.0"
2087-
"@eslint/js": "npm:9.19.0"
2096+
"@eslint/js": "npm:9.20.0"
20882097
"@eslint/plugin-kit": "npm:^0.2.5"
20892098
"@humanfs/node": "npm:^0.16.6"
20902099
"@humanwhocodes/module-importer": "npm:^1.0.1"
@@ -2120,7 +2129,7 @@ __metadata:
21202129
optional: true
21212130
bin:
21222131
eslint: bin/eslint.js
2123-
checksum: 10c0/3b0dfaeff6a831de086884a3e2432f18468fe37c69f35e1a0a9a2833d9994a65b6dd2a524aaee28f361c849035ad9d15e3841029b67d261d0abd62c7de6d51f5
2132+
checksum: 10c0/5eb2d9b5ed85a0b022871d19719417d110afb07a4abfedd856ad03d9a821def5f6bc31d7c407ca27f56e5e66e39375300fd2b877017245eb99c44060d6c983bd
21242133
languageName: node
21252134
linkType: hard
21262135

@@ -3139,12 +3148,12 @@ __metadata:
31393148
languageName: node
31403149
linkType: hard
31413150

3142-
"marked@npm:15.0.6":
3143-
version: 15.0.6
3144-
resolution: "marked@npm:15.0.6"
3151+
"marked@npm:15.0.7":
3152+
version: 15.0.7
3153+
resolution: "marked@npm:15.0.7"
31453154
bin:
31463155
marked: bin/marked.js
3147-
checksum: 10c0/8f30972ac5fdf879353484bdd7717409c241d15031a58bbc483070dedb58e4b314c41c0b59b78e536658907c02ee149eaf4b9be221f198df97beae703f529d40
3156+
checksum: 10c0/0b9d07bace37bbf0548bae356c4184765afa4d2296ed0be4418aa4bb0ce703f323dc1a475125d536581f9fe264797e6265dd0b57499d97c0fe0f29bc6d016343
31483157
languageName: node
31493158
linkType: hard
31503159

@@ -3827,12 +3836,12 @@ __metadata:
38273836
languageName: node
38283837
linkType: hard
38293838

3830-
"prettier@npm:3.4.2":
3831-
version: 3.4.2
3832-
resolution: "prettier@npm:3.4.2"
3839+
"prettier@npm:3.5.0":
3840+
version: 3.5.0
3841+
resolution: "prettier@npm:3.5.0"
38333842
bin:
38343843
prettier: bin/prettier.cjs
3835-
checksum: 10c0/99e076a26ed0aba4ebc043880d0f08bbb8c59a4c6641cdee6cdadf2205bdd87aa1d7823f50c3aea41e015e99878d37c58d7b5f0e663bba0ef047f94e36b96446
3844+
checksum: 10c0/6c355d74c377f5622953229d92477e8b9779162e848db90fd7e06c431deb73585d31fafc4516cf5868917825b97b9ec7c87c8d8b8e03ccd9fc9c0b7699d1a650
38363845
languageName: node
38373846
linkType: hard
38383847

@@ -4515,20 +4524,20 @@ __metadata:
45154524
version: 0.0.0-use.local
45164525
resolution: "svelte-marked@workspace:."
45174526
dependencies:
4518-
"@eslint/js": "npm:9.19.0"
4519-
"@stylistic/eslint-plugin-js": "npm:3.0.1"
4527+
"@eslint/js": "npm:9.20.0"
4528+
"@stylistic/eslint-plugin-js": "npm:3.1.0"
45204529
"@sveltejs/vite-plugin-svelte": "npm:5.0.3"
45214530
"@testing-library/jest-dom": "npm:6.6.3"
45224531
"@testing-library/svelte": "npm:5.2.6"
45234532
"@types/marked": "npm:6.0.0"
4524-
eslint: "npm:9.19.0"
4533+
eslint: "npm:9.20.0"
45254534
eslint-plugin-svelte: "npm:2.46.1"
45264535
eslint-plugin-vitest: "npm:0.5.4"
45274536
github-slugger: "npm:2.0.0"
45284537
globals: "npm:15.14.0"
45294538
jsdom: "npm:26.0.0"
4530-
marked: "npm:15.0.6"
4531-
prettier: "npm:3.4.2"
4539+
marked: "npm:15.0.7"
4540+
prettier: "npm:3.5.0"
45324541
rollup-plugin-analyzer: "npm:4.0.0"
45334542
rollup-plugin-filesize: "npm:10.0.0"
45344543
rollup-plugin-terser: "npm:7.0.2"

0 commit comments

Comments
 (0)