Skip to content

Commit 1a6ba47

Browse files
authored
refactor: remove unnecessary data-language null check, unused import type (#213)
* refactor: remove unnecessary `data-language` null check * refactor(highlight-svelte): remove unused Language type * style(demo): increase code font size * style(demo): remove max-width, lower CSS specificity * docs: decrease CSS specificity for styling language tags * chore(examples): bump deps
1 parent 865d88c commit 1a6ba47

File tree

14 files changed

+75
-79
lines changed

14 files changed

+75
-79
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ This is also compatible with custom languages.
137137
See the [Languages page](SUPPORTED_LANGUAGES.md) for a list of supported languages.
138138

139139
```css
140-
pre[data-language="css"] {
140+
[data-language="css"] {
141141
/* custom style rules */
142142
}
143143
```
@@ -171,7 +171,7 @@ Defaults:
171171
```
172172

173173
```css
174-
pre[data-language="css"] {
174+
[data-language="css"] {
175175
--hljs-background: linear-gradient(135deg, #2996cf, 80%, white);
176176
--hljs-foreground: #fff;
177177
--hljs-radius: 8px;

demo/app.css

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
.hljs {
22
overflow-x: auto;
3-
font-size: 0.8125rem;
4-
font-family: Menlo;
5-
line-height: 1.5;
6-
}
7-
8-
pre {
9-
max-width: 44rem;
3+
font-size: 0.875rem;
4+
font-family: Menlo, monospace;
5+
line-height: 1.6;
106
}
117

12-
pre[data-language="css"] {
8+
[data-language="css"] {
139
--hljs-background: linear-gradient(135deg, #2996cf, 80%, white);
1410
--hljs-foreground: #fff;
1511
--hljs-radius: 8px;
1612
}
1713

18-
pre[data-language="svelte"] {
14+
[data-language="svelte"] {
1915
--hljs-foreground: #fff;
2016
}
2117

demo/routes/index.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
</Column>
232232
<Column noGutter xlg={12}>
233233
<HighlightAuto
234-
code={'pre[data-language="css"] {\n /* custom style rules */\n}'}
234+
code={'[data-language="css"] {\n /* custom style rules */\n}'}
235235
class="atomOneDark"
236236
/>
237237
</Column>
@@ -285,7 +285,7 @@
285285
langtag={true}
286286
/>
287287
<HighlightAuto
288-
code={`pre[data-language="css"] {
288+
code={`[data-language="css"] {
289289
--hljs-background: linear-gradient(135deg, #2996cf, 80%, white);
290290
--hljs-foreground: #fff;
291291
--hljs-radius: 8px;

examples/rollup-typescript/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
"validate": "svelte-check"
77
},
88
"devDependencies": {
9-
"@rollup/plugin-commonjs": "^22.0.0",
9+
"@rollup/plugin-commonjs": "^22.0.1",
1010
"@rollup/plugin-node-resolve": "^13.3.0",
1111
"@rollup/plugin-typescript": "^8.3.3",
1212
"@tsconfig/svelte": "^3.0.0",
13-
"rollup": "^2.70.2",
13+
"rollup": "^2.75.7",
1414
"rollup-plugin-svelte": "^7.0.0",
1515
"rollup-plugin-terser": "^7.0.2",
1616
"svelte": "^3.48.0",
17-
"svelte-check": "2.7.2",
17+
"svelte-check": "2.8.0",
1818
"svelte-highlight": "^6.1.0",
1919
"svelte-preprocess": "^4.10.7",
2020
"tslib": "^2.4.0",
21-
"typescript": "^4.7.3"
21+
"typescript": "^4.7.4"
2222
}
2323
}

examples/rollup-typescript/yarn.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@
6262
"@nodelib/fs.scandir" "2.1.5"
6363
fastq "^1.6.0"
6464

65-
"@rollup/plugin-commonjs@^22.0.0":
66-
version "22.0.0"
67-
resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.0.tgz#f4d87016e2fbf187a593ab9f46626fe05b59e8bd"
68-
integrity sha512-Ktvf2j+bAO+30awhbYoCaXpBcyPmJbaEUYClQns/+6SNCYFURbvBiNbWgHITEsIgDDWCDUclWRKEuf8cwZCFoQ==
65+
"@rollup/plugin-commonjs@^22.0.1":
66+
version "22.0.1"
67+
resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.1.tgz#f7cb777d20de3eeeaf994f39080115c336bef810"
68+
integrity sha512-dGfEZvdjDHObBiP5IvwTKMVeq/tBZGMBHZFMdIV1ClMM/YoWS34xrHFGfag9SN2ZtMgNZRFruqvxZQEa70O6nQ==
6969
dependencies:
7070
"@rollup/pluginutils" "^3.1.0"
7171
commondir "^1.0.1"
@@ -633,10 +633,10 @@ rollup-pluginutils@^2.8.2:
633633
dependencies:
634634
estree-walker "^0.6.1"
635635

636-
rollup@^2.70.2:
637-
version "2.70.2"
638-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.2.tgz#808d206a8851628a065097b7ba2053bd83ba0c0d"
639-
integrity sha512-EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg==
636+
rollup@^2.75.7:
637+
version "2.75.7"
638+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.75.7.tgz#221ff11887ae271e37dcc649ba32ce1590aaa0b9"
639+
integrity sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==
640640
optionalDependencies:
641641
fsevents "~2.3.2"
642642

@@ -735,10 +735,10 @@ supports-preserve-symlinks-flag@^1.0.0:
735735
resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
736736
integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
737737

738-
svelte-check@2.7.2:
739-
version "2.7.2"
740-
resolved "https://registry.yarnpkg.com/svelte-check/-/svelte-check-2.7.2.tgz#0e31e4d3d766ca41f38812cfb1c3257654c93e34"
741-
integrity sha512-TuVX4YtXHbRM8sVuK5Jk+mKWdm3f0d6hvAC6qCTp8yUszGZewpEBCo2V5fRWZCiz+0J4OCiDHOS+DFMxv39rJA==
738+
svelte-check@2.8.0:
739+
version "2.8.0"
740+
resolved "https://registry.yarnpkg.com/svelte-check/-/svelte-check-2.8.0.tgz#cfe1354e72545839c47f0f022c2c007454cd4095"
741+
integrity sha512-HRL66BxffMAZusqe5I5k26mRWQ+BobGd9Rxm3onh7ZVu0nTk8YTKJ9vu3LVPjUGLU9IX7zS+jmwPVhJYdXJ8vg==
742742
dependencies:
743743
"@jridgewell/trace-mapping" "^0.3.9"
744744
chokidar "^3.4.1"
@@ -812,10 +812,10 @@ typescript@*:
812812
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
813813
integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
814814

815-
typescript@^4.7.3:
816-
version "4.7.3"
817-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
818-
integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
815+
typescript@^4.7.4:
816+
version "4.7.4"
817+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
818+
integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
819819

820820
wrappy@1:
821821
version "1.0.2"

examples/rollup/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"build": "rollup -c"
66
},
77
"devDependencies": {
8-
"@rollup/plugin-commonjs": "^22.0.0",
8+
"@rollup/plugin-commonjs": "^22.0.1",
99
"@rollup/plugin-node-resolve": "^13.3.0",
10-
"rollup": "^2.75.6",
10+
"rollup": "^2.75.7",
1111
"rollup-plugin-svelte": "^7.1.0",
1212
"rollup-plugin-terser": "^7.0.2",
1313
"svelte": "^3.48.0",

examples/rollup/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
chalk "^2.0.0"
2424
js-tokens "^4.0.0"
2525

26-
"@rollup/plugin-commonjs@^22.0.0":
27-
version "22.0.0"
28-
resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.0.tgz#f4d87016e2fbf187a593ab9f46626fe05b59e8bd"
29-
integrity sha512-Ktvf2j+bAO+30awhbYoCaXpBcyPmJbaEUYClQns/+6SNCYFURbvBiNbWgHITEsIgDDWCDUclWRKEuf8cwZCFoQ==
26+
"@rollup/plugin-commonjs@^22.0.1":
27+
version "22.0.1"
28+
resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.1.tgz#f7cb777d20de3eeeaf994f39080115c336bef810"
29+
integrity sha512-dGfEZvdjDHObBiP5IvwTKMVeq/tBZGMBHZFMdIV1ClMM/YoWS34xrHFGfag9SN2ZtMgNZRFruqvxZQEa70O6nQ==
3030
dependencies:
3131
"@rollup/pluginutils" "^3.1.0"
3232
commondir "^1.0.1"
@@ -358,10 +358,10 @@ rollup-pluginutils@^2.8.2:
358358
dependencies:
359359
estree-walker "^0.6.1"
360360

361-
rollup@^2.75.6:
362-
version "2.75.6"
363-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.75.6.tgz#ac4dc8600f95942a0180f61c7c9d6200e374b439"
364-
integrity sha512-OEf0TgpC9vU6WGROJIk1JA3LR5vk/yvqlzxqdrE2CzzXnqKXNzbAwlWUXis8RS3ZPe7LAq+YUxsRa0l3r27MLA==
361+
rollup@^2.75.7:
362+
version "2.75.7"
363+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.75.7.tgz#221ff11887ae271e37dcc649ba32ce1590aaa0b9"
364+
integrity sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==
365365
optionalDependencies:
366366
fsevents "~2.3.2"
367367

examples/sveltekit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"devDependencies": {
1010
"@sveltejs/adapter-node": "1.0.0-next.78",
11-
"@sveltejs/kit": "1.0.0-next.350",
11+
"@sveltejs/kit": "1.0.0-next.354",
1212
"svelte": "^3.48.0",
1313
"svelte-highlight": "^6.1.0"
1414
}

examples/sveltekit/yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
dependencies:
1818
tiny-glob "^0.2.9"
1919

20-
"@sveltejs/[email protected].350":
21-
version "1.0.0-next.350"
22-
resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.350.tgz#b90fc2f337b518837664b47c0fe77a978d00c1ce"
23-
integrity sha512-qkZNjp7yIj6t91+wMhmMtGJH0Lb89OaKdVXUDy92CS5/4OHRTKcQPdfOKs4no/upkS3RiFb+rEpOkYqTMcPUXg==
20+
"@sveltejs/[email protected].354":
21+
version "1.0.0-next.354"
22+
resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.354.tgz#e1786892b6fec93e78d270497231081174dffc55"
23+
integrity sha512-dTfFT0c3sxztFpiw6H4bQnPd+PtHgEZG6j6ssT9sWLONfzUgWRX0S7H/WoPEjr7u65o2HNazoj8jmEq3ZTwb9g==
2424
dependencies:
25-
"@sveltejs/vite-plugin-svelte" "^1.0.0-next.46"
25+
"@sveltejs/vite-plugin-svelte" "^1.0.0-next.48"
2626
chokidar "^3.5.3"
2727
sade "^1.8.1"
2828
vite "^2.9.10"
2929

30-
"@sveltejs/vite-plugin-svelte@^1.0.0-next.46":
30+
"@sveltejs/vite-plugin-svelte@^1.0.0-next.48":
3131
version "1.0.0-next.49"
3232
resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.0-next.49.tgz#44cc00a19c6c23002516b66c5ab90ee66720df57"
3333
integrity sha512-AKh0Ka8EDgidnxWUs8Hh2iZLZovkETkefO99XxZ4sW4WGJ7VFeBx5kH/NIIGlaNHLcrIvK3CK0HkZwC3Cici0A==

examples/webpack/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"devDependencies": {
88
"css-loader": "^6.7.1",
99
"html-webpack-plugin": "5.5.0",
10-
"mini-css-extract-plugin": "^2.6.0",
10+
"mini-css-extract-plugin": "^2.6.1",
1111
"svelte": "^3.48.0",
1212
"svelte-highlight": "^6.1.0",
1313
"svelte-loader": "^3.1.3",
1414
"webpack": "^5.73.0",
15-
"webpack-cli": "^4.9.2",
15+
"webpack-cli": "^4.10.0",
1616
"webpack-dev-server": "^4.9.2"
1717
}
1818
}

0 commit comments

Comments
 (0)