Skip to content

Commit b83e321

Browse files
josdejongjosdejong
authoredDec 20, 2023
feat: upgrade to upgrade @sveltejs/kit@2, vite-plugin-svelte@3, vite@5, and vitest@1 (#374)
·
v3.2.0v0.21.0
1 parent 8428ae4 commit b83e321

File tree

9 files changed

+643
-604
lines changed

9 files changed

+643
-604
lines changed
 

‎package-lock.json

+601-518
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+11-9
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
"sideEffects": false,
1616
"license": "ISC",
1717
"exports": {
18-
".": "./index.js",
18+
".": {
19+
"svelte": "./index.js",
20+
"types": "./index.d.ts"
21+
},
1922
"./index.d.ts": "./index.d.ts",
2023
"./index.js": "./index.js",
2124
"./themes/jse-theme-dark.css": "./themes/jse-theme-dark.css",
@@ -110,10 +113,10 @@
110113
"@rollup/plugin-node-resolve": "15.2.3",
111114
"@rollup/plugin-terser": "0.4.4",
112115
"@rollup/plugin-typescript": "11.1.5",
113-
"@sveltejs/adapter-auto": "2.1.1",
114-
"@sveltejs/kit": "1.27.7",
116+
"@sveltejs/adapter-auto": "3.0.0",
117+
"@sveltejs/kit": "2.0.0",
115118
"@sveltejs/package": "2.2.3",
116-
"@sveltejs/vite-plugin-svelte": "2.5.3",
119+
"@sveltejs/vite-plugin-svelte": "3.0.1",
117120
"@testing-library/jest-dom": "6.1.5",
118121
"@testing-library/svelte": "4.0.5",
119122
"@types/cookie": "0.6.0",
@@ -122,7 +125,7 @@
122125
"@types/lodash-es": "4.17.12",
123126
"@typescript-eslint/eslint-plugin": "6.13.2",
124127
"@typescript-eslint/parser": "6.13.2",
125-
"@vitest/coverage-c8": "0.33.0",
128+
"@vitest/coverage-v8": "1.0.4",
126129
"cpy-cli": "5.0.0",
127130
"del-cli": "5.1.0",
128131
"eslint": "8.55.0",
@@ -140,10 +143,9 @@
140143
"rollup-plugin-svelte": "7.1.6",
141144
"standard-version": "9.5.0",
142145
"svelte-check": "3.6.2",
143-
"svelte-preprocess": "5.1.1",
144-
"svelte2tsx": "0.6.27",
146+
"svelte-preprocess": "5.1.3",
145147
"typescript": "5.3.2",
146-
"vite": "4.5.1",
147-
"vitest": "0.34.6"
148+
"vite": "5.0.9",
149+
"vitest": "1.0.4"
148150
}
149151
}

‎src/lib/components/__snapshots__/JSONEditor.test.ts.snap

+16-48
Original file line numberDiff line numberDiff line change
@@ -1476,8 +1476,8 @@ exports[`JSONEditor > render tree mode 1`] = `
14761476
data-jsoneditor-scrollable-contents="true"
14771477
>
14781478
<div
1479-
aria-selected="true"
1480-
class="jse-json-node jse-expanded s-BfIc3EpAoT-Y jse-root jse-selected-value"
1479+
aria-selected="false"
1480+
class="jse-json-node jse-expanded s-BfIc3EpAoT-Y jse-root"
14811481
data-path=""
14821482
role="treeitem"
14831483
style="--level: 0;"
@@ -1544,38 +1544,6 @@ exports[`JSONEditor > render tree mode 1`] = `
15441544
</div>
15451545
</div>
15461546
1547-
<div
1548-
class="jse-context-menu-pointer-anchor s-BfIc3EpAoT-Y"
1549-
>
1550-
<button
1551-
class="jse-context-menu-pointer s-g41Za8tY_tFa jse-selected"
1552-
title="Open context menu (Click here, right click on the selection, or use the context menu button or Ctrl+Q)"
1553-
type="button"
1554-
>
1555-
<svg
1556-
aria-label=""
1557-
class="fa-icon s-T5YyQewRBd7n"
1558-
height="16"
1559-
role="presentation"
1560-
style=""
1561-
version="1.1"
1562-
viewBox="0 0 320 512"
1563-
width="10"
1564-
>
1565-
<path
1566-
d="M137.4 374.6c12.5 12.5 32.8 12.5 45.3 0l128-128c9.2-9.2 11.9-22.9 6.9-34.9s-16.6-19.8-29.6-19.8L32 192c-12.9 0-24.6 7.8-29.6 19.8s-2.2 25.7 6.9 34.9l128 128z"
1567-
/>
1568-
1569-
1570-
1571-
1572-
1573-
</svg>
1574-
<!--&lt;Svg&gt;-->
1575-
<!--&lt;Icon&gt;-->
1576-
</button>
1577-
<!--&lt;ContextMenuPointer&gt;-->
1578-
</div>
15791547
</div>
15801548
15811549
@@ -1593,8 +1561,8 @@ exports[`JSONEditor > render tree mode 1`] = `
15931561
15941562
15951563
<div
1596-
aria-selected="true"
1597-
class="jse-json-node jse-expanded s-BfIc3EpAoT-Y jse-selected-value"
1564+
aria-selected="false"
1565+
class="jse-json-node jse-expanded s-BfIc3EpAoT-Y"
15981566
data-path="%2F0"
15991567
role="treeitem"
16001568
style="--level: 1;"
@@ -1681,8 +1649,8 @@ exports[`JSONEditor > render tree mode 1`] = `
16811649
>
16821650
16831651
<div
1684-
aria-selected="true"
1685-
class="jse-json-node s-BfIc3EpAoT-Y jse-selected-value"
1652+
aria-selected="false"
1653+
class="jse-json-node s-BfIc3EpAoT-Y"
16861654
data-path="%2F0%2Fid"
16871655
role="treeitem"
16881656
style="--level: 2;"
@@ -1771,8 +1739,8 @@ exports[`JSONEditor > render tree mode 1`] = `
17711739
<!--&lt;JSONNode&gt;-->
17721740
17731741
<div
1774-
aria-selected="true"
1775-
class="jse-json-node jse-expanded s-BfIc3EpAoT-Y jse-selected-value"
1742+
aria-selected="false"
1743+
class="jse-json-node jse-expanded s-BfIc3EpAoT-Y"
17761744
data-path="%2F1"
17771745
role="treeitem"
17781746
style="--level: 1;"
@@ -1859,8 +1827,8 @@ exports[`JSONEditor > render tree mode 1`] = `
18591827
>
18601828
18611829
<div
1862-
aria-selected="true"
1863-
class="jse-json-node s-BfIc3EpAoT-Y jse-selected-value"
1830+
aria-selected="false"
1831+
class="jse-json-node s-BfIc3EpAoT-Y"
18641832
data-path="%2F1%2Fid"
18651833
role="treeitem"
18661834
style="--level: 2;"
@@ -1922,8 +1890,8 @@ exports[`JSONEditor > render tree mode 1`] = `
19221890
</div>
19231891
<!--&lt;JSONNode&gt;-->
19241892
<div
1925-
aria-selected="true"
1926-
class="jse-json-node s-BfIc3EpAoT-Y jse-selected-value"
1893+
aria-selected="false"
1894+
class="jse-json-node s-BfIc3EpAoT-Y"
19271895
data-path="%2F1%2Fname"
19281896
role="treeitem"
19291897
style="--level: 2;"
@@ -2012,8 +1980,8 @@ exports[`JSONEditor > render tree mode 1`] = `
20121980
<!--&lt;JSONNode&gt;-->
20131981
20141982
<div
2015-
aria-selected="true"
2016-
class="jse-json-node jse-expanded s-BfIc3EpAoT-Y jse-selected-value"
1983+
aria-selected="false"
1984+
class="jse-json-node jse-expanded s-BfIc3EpAoT-Y"
20171985
data-path="%2F2"
20181986
role="treeitem"
20191987
style="--level: 1;"
@@ -2100,8 +2068,8 @@ exports[`JSONEditor > render tree mode 1`] = `
21002068
>
21012069
21022070
<div
2103-
aria-selected="true"
2104-
class="jse-json-node s-BfIc3EpAoT-Y jse-selected-value"
2071+
aria-selected="false"
2072+
class="jse-json-node s-BfIc3EpAoT-Y"
21052073
data-path="%2F2%2Fid"
21062074
role="treeitem"
21072075
style="--level: 2;"

‎src/lib/components/modes/tablemode/TableMode.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@
432432
if (!isEqual(documentState.selection, externalSelection)) {
433433
debug('applyExternalSelection', externalSelection)
434434
435-
if (isJSONSelection(externalSelection)) {
435+
if (isJSONSelection(externalSelection) || externalSelection === null) {
436436
updateSelection(externalSelection)
437437
}
438438
}

‎src/lib/components/modes/treemode/TreeMode.svelte

+3-1
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,8 @@
265265
escapeUnicodeCharacters
266266
})
267267
268+
$: debug('selection', documentState.selection)
269+
268270
let pastedJson: PastedJson
269271
270272
let showSearch = false
@@ -609,7 +611,7 @@
609611
if (!isEqual(documentState.selection, externalSelection)) {
610612
debug('applyExternalSelection', externalSelection)
611613
612-
if (isJSONSelection(externalSelection)) {
614+
if (isJSONSelection(externalSelection) || externalSelection === null) {
613615
updateSelection(externalSelection)
614616
}
615617
}

‎src/lib/logic/documentState.ts

+1-6
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import type {
4242
Section,
4343
VisibleSection
4444
} from '$lib/types'
45-
import { SelectionType } from '$lib/types.js'
4645
import { CaretType } from '$lib/types.js'
4746
import { int } from '../utils/numberUtils.js'
4847
import { isLargeContent } from '$lib/utils/jsonUtils.js'
@@ -60,11 +59,7 @@ export function createDocumentState(props?: CreateDocumentStateProps): DocumentS
6059
expandedMap: {},
6160
enforceStringMap: {},
6261
visibleSectionsMap: {},
63-
selection: {
64-
type: SelectionType.value,
65-
path: [],
66-
edit: false
67-
},
62+
selection: null,
6863
sortedColumn: null
6964
}
7065

‎svelte.config.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import adapter from '@sveltejs/adapter-auto'
2-
import preprocess from 'svelte-preprocess'
2+
import sveltePreprocess from 'svelte-preprocess'
33

44
/** @type {import('@sveltejs/kit').Config} */
55
const config = {
66
// Consult https://github.com/sveltejs/svelte-preprocess
77
// for more information about preprocessors
8-
preprocess: preprocess(),
8+
preprocess: sveltePreprocess(),
99

1010
kit: {
11-
adapter: adapter()
11+
adapter: adapter(),
12+
alias: {
13+
'svelte-jsoneditor': 'src/lib'
14+
}
1215
}
1316
}
1417

‎tools/createVanillaPackageJson.js

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const vanillaPackage = {
2727
browser: './standalone.js',
2828
exports: {
2929
...pkg.exports,
30+
'.': './index.js', // we don't create an object here, see https://github.com/josdejong/svelte-jsoneditor/issues/334
3031
'./index.js.map': './index.js.map',
3132
'./standalone.js': './standalone.js',
3233
'./standalone.js.map': './standalone.js.map'

‎tsconfig.json

+3-18
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,16 @@
55
"module": "es2020",
66
"lib": ["es2020", "dom"],
77
"target": "es2020",
8-
/**
9-
svelte-preprocess cannot figure out whether you have a value or a type, so tell TypeScript
10-
to enforce using \`import type\` instead of \`import\` for Types.
11-
*/
12-
"importsNotUsedAsValues": "error",
138
"isolatedModules": true,
149
"resolveJsonModule": true,
15-
/**
16-
To have warnings/errors of the Svelte compiler at the correct position,
17-
enable source maps by default.
18-
*/
19-
"sourceMap": true,
10+
"sourceMap": true, // To have warnings/errors of the Svelte compiler at the correct position, enable source maps
2011
"esModuleInterop": true,
2112
"skipLibCheck": true,
2213
"forceConsistentCasingInFileNames": true,
23-
"baseUrl": ".",
2414
"strict": true,
2515
"noImplicitAny": true,
26-
"allowJs": false, // turned off (temporarily?) because else Mocha tests fail to run in WebStorm, see https://youtrack.jetbrains.com/issue/WEB-50130
27-
"checkJs": false,
28-
"paths": {
29-
"$lib": ["src/lib"],
30-
"$lib/*": ["src/lib/*"],
31-
"svelte-jsoneditor": ["src/lib"]
32-
}
16+
"allowJs": false,
17+
"checkJs": false
3318
},
3419
"include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.ts", "src/**/*.svelte"]
3520
}

0 commit comments

Comments
 (0)
Please sign in to comment.