From dfde4c2b929c021b168a993aea1aa20c9e21d6c9 Mon Sep 17 00:00:00 2001 From: Olivier Refalo Date: Tue, 18 Jun 2024 16:16:28 +0400 Subject: [PATCH] chore: cosmetics internal changes --- .github/workflows/deploy-ghpages.yml | 2 +- .vscode/settings.json | 6 +- KNOWN-ISSUES.md | 2 +- package.json | 2 +- pnpm-lock.yaml | 86 ++++++++++++++-------------- src/comp/Contents.svelte | 2 +- svelte.config.js | 8 +-- 7 files changed, 51 insertions(+), 57 deletions(-) diff --git a/.github/workflows/deploy-ghpages.yml b/.github/workflows/deploy-ghpages.yml index 8ea336b..1d934b7 100644 --- a/.github/workflows/deploy-ghpages.yml +++ b/.github/workflows/deploy-ghpages.yml @@ -18,7 +18,7 @@ on: # rebuild gh-pages when doc change on master logLevel: description: 'Log level' required: false - + jobs: build-and-deploy: concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession. diff --git a/.vscode/settings.json b/.vscode/settings.json index 08ba573..8b4b498 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,11 +10,7 @@ ".vscode": true, ".husky": true }, - "hide-files.files": [ - "node_modules", - ".vscode", - ".husky" - ], + "hide-files.files": ["node_modules", ".vscode", ".husky"], "files.eol": "\n", "editor.insertSpaces": false, "[typescript]": { diff --git a/KNOWN-ISSUES.md b/KNOWN-ISSUES.md index fdb55d7..353ef68 100644 --- a/KNOWN-ISSUES.md +++ b/KNOWN-ISSUES.md @@ -1,3 +1,3 @@ ### Using @sveltejs/package > 2.3.0 will generate "ts" rather than transpiled outputs, resulting in ts files being pushed to npm. -For now it breaks Svelte preview REPL as it can't compile ts on the fly \ No newline at end of file +For now it breaks Svelte preview REPL as it can't compile ts on the fly diff --git a/package.json b/package.json index 42b127f..da61b68 100644 --- a/package.json +++ b/package.json @@ -86,6 +86,6 @@ "vite": "^5.3.1" }, "peerDependencies": { - "svelte": "5.0.0-next.155" + "svelte": "5.0.0-next.158" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba2017d..79068eb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: svelte: - specifier: 5.0.0-next.155 - version: 5.0.0-next.155 + specifier: 5.0.0-next.158 + version: 5.0.0-next.158 devDependencies: '@commitlint/cli': specifier: ^19.3.0 @@ -23,16 +23,16 @@ importers: version: 1.44.1 '@sveltejs/adapter-static': specifier: ^3.0.2 - version: 3.0.2(@sveltejs/kit@2.5.16(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6))) + version: 3.0.2(@sveltejs/kit@2.5.16(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6))) '@sveltejs/kit': specifier: ^2.5.16 - version: 2.5.16(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) + version: 2.5.16(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) '@sveltejs/package': specifier: 2.3.0 - version: 2.3.0(svelte@5.0.0-next.155)(typescript@5.4.5) + version: 2.3.0(svelte@5.0.0-next.158)(typescript@5.4.5) '@sveltejs/vite-plugin-svelte': specifier: ^4.0.0-next.3 - version: 4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) + version: 4.0.0-next.3(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) '@types/eslint': specifier: ^8.56.10 version: 8.56.10 @@ -68,7 +68,7 @@ importers: version: 0.1.0(eslint@9.5.0) eslint-plugin-svelte: specifier: ^2.40.0 - version: 2.40.0(eslint@9.5.0)(svelte@5.0.0-next.155) + version: 2.40.0(eslint@9.5.0)(svelte@5.0.0-next.158) globals: specifier: ^15.6.0 version: 15.6.0 @@ -83,7 +83,7 @@ importers: version: 3.3.2 prettier-plugin-svelte: specifier: ^3.2.4 - version: 3.2.4(prettier@3.3.2)(svelte@5.0.0-next.155) + version: 3.2.4(prettier@3.3.2)(svelte@5.0.0-next.158) rimraf: specifier: ^5.0.7 version: 5.0.7 @@ -95,13 +95,13 @@ importers: version: 14.2.3 svelte-check: specifier: ^3.8.1 - version: 3.8.1(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.155) + version: 3.8.1(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.158) svelte-highlight: specifier: ^7.6.1 version: 7.6.1 svelte-preprocess: specifier: ^6.0.1 - version: 6.0.1(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.155)(typescript@5.4.5) + version: 6.0.1(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.158)(typescript@5.4.5) tslib: specifier: ^2.6.3 version: 2.6.3 @@ -2361,8 +2361,8 @@ packages: svelte: ^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0 typescript: ^4.9.4 || ^5.0.0 - svelte@5.0.0-next.155: - resolution: {integrity: sha512-4a4EZuiTmg4eQJuQ6LTyK+DxRAZCYm4mXgqSWcZ7TellzLfaC1Je5nxBl1aZP3xdNhvPFIstQ8c7I6d+99FdZQ==} + svelte@5.0.0-next.158: + resolution: {integrity: sha512-QRmXxHByWntyWqLtzjNsBbNT89F2yA7aWPp9M9l9a6/PAE3gmQh6+qoVPgrxMR7iiFgpwh5ZU9Bm25j3IhGicQ==} engines: {node: '>=18'} temp@0.9.4: @@ -2922,13 +2922,13 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.18.0': optional: true - '@sveltejs/adapter-static@3.0.2(@sveltejs/kit@2.5.16(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))': + '@sveltejs/adapter-static@3.0.2(@sveltejs/kit@2.5.16(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))': dependencies: - '@sveltejs/kit': 2.5.16(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) + '@sveltejs/kit': 2.5.16(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) - '@sveltejs/kit@2.5.16(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6))': + '@sveltejs/kit@2.5.16(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6))': dependencies: - '@sveltejs/vite-plugin-svelte': 4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) + '@sveltejs/vite-plugin-svelte': 4.0.0-next.3(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) '@types/cookie': 0.6.0 cookie: 0.6.0 devalue: 5.0.0 @@ -2940,38 +2940,38 @@ snapshots: sade: 1.8.1 set-cookie-parser: 2.6.0 sirv: 2.0.4 - svelte: 5.0.0-next.155 + svelte: 5.0.0-next.158 tiny-glob: 0.2.9 vite: 5.3.1(@types/node@20.14.5)(sass@1.77.6) - '@sveltejs/package@2.3.0(svelte@5.0.0-next.155)(typescript@5.4.5)': + '@sveltejs/package@2.3.0(svelte@5.0.0-next.158)(typescript@5.4.5)': dependencies: chokidar: 3.6.0 kleur: 4.1.5 sade: 1.8.1 semver: 7.6.2 - svelte: 5.0.0-next.155 - svelte2tsx: 0.7.9(svelte@5.0.0-next.155)(typescript@5.4.5) + svelte: 5.0.0-next.158 + svelte2tsx: 0.7.9(svelte@5.0.0-next.158)(typescript@5.4.5) transitivePeerDependencies: - typescript - '@sveltejs/vite-plugin-svelte-inspector@3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6))': + '@sveltejs/vite-plugin-svelte-inspector@3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6))': dependencies: - '@sveltejs/vite-plugin-svelte': 4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) + '@sveltejs/vite-plugin-svelte': 4.0.0-next.3(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) debug: 4.3.5 - svelte: 5.0.0-next.155 + svelte: 5.0.0-next.158 vite: 5.3.1(@types/node@20.14.5)(sass@1.77.6) transitivePeerDependencies: - supports-color - '@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6))': + '@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6))': dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) + '@sveltejs/vite-plugin-svelte-inspector': 3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.0-next.3(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)))(svelte@5.0.0-next.158)(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) debug: 4.3.5 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.10 - svelte: 5.0.0-next.155 + svelte: 5.0.0-next.158 vite: 5.3.1(@types/node@20.14.5)(sass@1.77.6) vitefu: 0.2.5(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)) transitivePeerDependencies: @@ -3711,7 +3711,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-svelte@2.40.0(eslint@9.5.0)(svelte@5.0.0-next.155): + eslint-plugin-svelte@2.40.0(eslint@9.5.0)(svelte@5.0.0-next.158): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.5.0) '@jridgewell/sourcemap-codec': 1.4.15 @@ -3724,9 +3724,9 @@ snapshots: postcss-safe-parser: 6.0.0(postcss@8.4.38) postcss-selector-parser: 6.1.0 semver: 7.6.2 - svelte-eslint-parser: 0.39.1(svelte@5.0.0-next.155) + svelte-eslint-parser: 0.39.1(svelte@5.0.0-next.158) optionalDependencies: - svelte: 5.0.0-next.155 + svelte: 5.0.0-next.158 transitivePeerDependencies: - ts-node @@ -4514,10 +4514,10 @@ snapshots: prelude-ls@1.2.1: {} - prettier-plugin-svelte@3.2.4(prettier@3.3.2)(svelte@5.0.0-next.155): + prettier-plugin-svelte@3.2.4(prettier@3.3.2)(svelte@5.0.0-next.158): dependencies: prettier: 3.3.2 - svelte: 5.0.0-next.155 + svelte: 5.0.0-next.158 prettier@3.3.2: {} @@ -4829,7 +4829,7 @@ snapshots: dependencies: has-flag: 4.0.0 - svelte-check@3.8.1(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.155): + svelte-check@3.8.1(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.158): dependencies: '@jridgewell/trace-mapping': 0.3.25 chokidar: 3.6.0 @@ -4837,8 +4837,8 @@ snapshots: import-fresh: 3.3.0 picocolors: 1.0.1 sade: 1.8.1 - svelte: 5.0.0-next.155 - svelte-preprocess: 5.1.4(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.155)(typescript@5.4.5) + svelte: 5.0.0-next.158 + svelte-preprocess: 5.1.4(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.158)(typescript@5.4.5) typescript: 5.4.5 transitivePeerDependencies: - '@babel/core' @@ -4851,7 +4851,7 @@ snapshots: - stylus - sugarss - svelte-eslint-parser@0.39.1(svelte@5.0.0-next.155): + svelte-eslint-parser@0.39.1(svelte@5.0.0-next.158): dependencies: eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 @@ -4859,45 +4859,45 @@ snapshots: postcss: 8.4.38 postcss-scss: 4.0.9(postcss@8.4.38) optionalDependencies: - svelte: 5.0.0-next.155 + svelte: 5.0.0-next.158 svelte-highlight@7.6.1: dependencies: highlight.js: 11.9.0 - svelte-preprocess@5.1.4(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.155)(typescript@5.4.5): + svelte-preprocess@5.1.4(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.158)(typescript@5.4.5): dependencies: '@types/pug': 2.0.10 detect-indent: 6.1.0 magic-string: 0.30.10 sorcery: 0.11.0 strip-indent: 3.0.0 - svelte: 5.0.0-next.155 + svelte: 5.0.0-next.158 optionalDependencies: postcss: 8.4.38 postcss-load-config: 4.0.2(postcss@8.4.38) sass: 1.77.6 typescript: 5.4.5 - svelte-preprocess@6.0.1(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.155)(typescript@5.4.5): + svelte-preprocess@6.0.1(postcss-load-config@4.0.2(postcss@8.4.38))(postcss@8.4.38)(sass@1.77.6)(svelte@5.0.0-next.158)(typescript@5.4.5): dependencies: detect-indent: 6.1.0 strip-indent: 3.0.0 - svelte: 5.0.0-next.155 + svelte: 5.0.0-next.158 optionalDependencies: postcss: 8.4.38 postcss-load-config: 4.0.2(postcss@8.4.38) sass: 1.77.6 typescript: 5.4.5 - svelte2tsx@0.7.9(svelte@5.0.0-next.155)(typescript@5.4.5): + svelte2tsx@0.7.9(svelte@5.0.0-next.158)(typescript@5.4.5): dependencies: dedent-js: 1.0.1 pascal-case: 3.1.2 - svelte: 5.0.0-next.155 + svelte: 5.0.0-next.158 typescript: 5.4.5 - svelte@5.0.0-next.155: + svelte@5.0.0-next.158: dependencies: '@ampproject/remapping': 2.3.0 '@jridgewell/sourcemap-codec': 1.4.15 diff --git a/src/comp/Contents.svelte b/src/comp/Contents.svelte index a44bdb8..68eefe8 100644 --- a/src/comp/Contents.svelte +++ b/src/comp/Contents.svelte @@ -33,7 +33,7 @@ data-sveltekit-preload-data class="page" aria-current={pathIsCurrent(path, $page) ? 'page' : undefined} - href={base+path} + href={base + path} > {title} diff --git a/svelte.config.js b/svelte.config.js index 83969f5..f9f4c1a 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -9,18 +9,16 @@ const config = { kit: { adapter: adapter({ pages: 'docs', - assets: 'docs', - fallback: '200.html' + assets: 'docs' }), // IMPORTANT: if you update aliases, run `pnpm run dev` for the configuration to update (tsconfig.json) - alias: { 'svelte-virtuallists': path.resolve('.', 'src/lib'), $comp: path.resolve('./src/comp') }, paths: { - base: '', - relative:false + base: process.env.BASE_PATH, + relative: false } } };