From 15dc53dba7d35ef434323ec49b25c3ddb1fb78f0 Mon Sep 17 00:00:00 2001 From: Olivier Refalo Date: Tue, 18 Jun 2024 13:30:19 +0400 Subject: [PATCH] chore: revert to "@sveltejs/package": "2.3.0" as new versions release ts to npm --- .github/workflows/deploy-ghpages.yml | 6 ++ .vscode/settings.json | 11 +++- KNOWN-ISSUES.md | 3 + package.json | 6 +- pnpm-lock.yaml | 86 ++++++++++++++-------------- svelte.config.js | 13 +---- 6 files changed, 65 insertions(+), 60 deletions(-) create mode 100644 KNOWN-ISSUES.md diff --git a/.github/workflows/deploy-ghpages.yml b/.github/workflows/deploy-ghpages.yml index 8126b3d..592b6cf 100644 --- a/.github/workflows/deploy-ghpages.yml +++ b/.github/workflows/deploy-ghpages.yml @@ -12,6 +12,12 @@ on: # rebuild gh-pages when doc change on master - '!src/lib/**' release: types: [published] + + workflow_dispatch: + inputs: + logLevel: + description: 'Log level' + required: false jobs: build-and-deploy: diff --git a/.vscode/settings.json b/.vscode/settings.json index 034d673..08ba573 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,9 +5,16 @@ "**/.hg": true, "**/CVS": true, "**/.DS_Store": true, - "**/Thumbs.db": true + "**/Thumbs.db": true, + "node_modules": true, + ".vscode": true, + ".husky": true }, - "hide-files.files": [], + "hide-files.files": [ + "node_modules", + ".vscode", + ".husky" + ], "files.eol": "\n", "editor.insertSpaces": false, "[typescript]": { diff --git a/KNOWN-ISSUES.md b/KNOWN-ISSUES.md new file mode 100644 index 0000000..fdb55d7 --- /dev/null +++ b/KNOWN-ISSUES.md @@ -0,0 +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 diff --git a/package.json b/package.json index c81a072..7cd4085 100644 --- a/package.json +++ b/package.json @@ -55,10 +55,10 @@ "@playwright/test": "^1.44.1", "@sveltejs/adapter-static": "^3.0.2", "@sveltejs/kit": "^2.5.16", - "@sveltejs/package": "^2.3.2", + "@sveltejs/package": "2.3.0", "@sveltejs/vite-plugin-svelte": "^4.0.0-next.3", "@types/eslint": "^8.56.10", - "@types/node": "^20.14.4", + "@types/node": "^20.14.5", "@typescript-eslint/eslint-plugin": "^7.13.1", "@typescript-eslint/parser": "^7.13.1", "badge-maker": "^3.3.1", @@ -69,7 +69,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-gitignore": "^0.1.0", "eslint-plugin-svelte": "^2.40.0", - "globals": "^15.5.0", + "globals": "^15.6.0", "highlight.js": "^11.9.0", "husky": "^9.0.11", "prettier": "^3.3.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8492383..ba2017d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,7 +14,7 @@ importers: devDependencies: '@commitlint/cli': specifier: ^19.3.0 - version: 19.3.0(@types/node@20.14.4)(typescript@5.4.5) + version: 19.3.0(@types/node@20.14.5)(typescript@5.4.5) '@commitlint/config-conventional': specifier: ^19.2.2 version: 19.2.2 @@ -23,22 +23,22 @@ 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.4)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.4)(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.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': 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.4)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.4)(sass@1.77.6)) + 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)) '@sveltejs/package': - specifier: ^2.3.2 - version: 2.3.2(svelte@5.0.0-next.155)(typescript@5.4.5) + specifier: 2.3.0 + version: 2.3.0(svelte@5.0.0-next.155)(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.4)(sass@1.77.6)) + 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)) '@types/eslint': specifier: ^8.56.10 version: 8.56.10 '@types/node': - specifier: ^20.14.4 - version: 20.14.4 + specifier: ^20.14.5 + version: 20.14.5 '@typescript-eslint/eslint-plugin': specifier: ^7.13.1 version: 7.13.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint@9.5.0)(typescript@5.4.5) @@ -70,8 +70,8 @@ importers: specifier: ^2.40.0 version: 2.40.0(eslint@9.5.0)(svelte@5.0.0-next.155) globals: - specifier: ^15.5.0 - version: 15.5.0 + specifier: ^15.6.0 + version: 15.6.0 highlight.js: specifier: ^11.9.0 version: 11.9.0 @@ -113,7 +113,7 @@ importers: version: 8.0.0-alpha.30(eslint@9.5.0)(typescript@5.4.5) vite: specifier: ^5.3.1 - version: 5.3.1(@types/node@20.14.4)(sass@1.77.6) + version: 5.3.1(@types/node@20.14.5)(sass@1.77.6) packages: @@ -514,8 +514,8 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.3 - '@sveltejs/package@2.3.2': - resolution: {integrity: sha512-6M8/Te7iXRG7SiH92wugqfyoJpuepjn78L433LnXicUeMso9M/N4vdL9DPK3MfTkVVY4klhNRptVqme3p4oZWA==} + '@sveltejs/package@2.3.0': + resolution: {integrity: sha512-wmtwEfi3gQnmtotAjygRHR6cmLfpblQl1dU764f3N2I5DPe34llFs44bHOYcuk91Bp2sSq6bWUmNwxGlYCchOA==} engines: {node: ^16.14 || >=18} hasBin: true peerDependencies: @@ -551,8 +551,8 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/node@20.14.4': - resolution: {integrity: sha512-1ChboN+57suCT2t/f8lwtPY/k3qTpuD/qnqQuYoBg6OQOcPyaw7PiZVdGpaZYAvhDDtqrt0oAaM8+oSu1xsUGw==} + '@types/node@20.14.5': + resolution: {integrity: sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA==} '@types/pug@2.0.10': resolution: {integrity: sha512-Sk/uYFOBAB7mb74XcpizmH0KOR2Pv3D2Hmrh1Dmy5BmK3MpdSa5kqZcg6EKBdklU0bFXX9gCfzvpnyUehrPIuA==} @@ -1347,8 +1347,8 @@ packages: resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} engines: {node: '>=18'} - globals@15.5.0: - resolution: {integrity: sha512-r7/9tQj5RylGxt/BKGv0D2SvehYvRFYg4ukSNk+EuZxvWI7uK/MJFmOCLq8aKvgh3EVBYFbBlOMAtaITXZr80w==} + globals@15.6.0: + resolution: {integrity: sha512-UzcJi88Hw//CurUIRa9Jxb0vgOCcuD/MNjwmXp633cyaRKkCWACkoqHCtfZv43b1kqXGg/fpOa8bwgacCeXsVg==} engines: {node: '>=18'} globalthis@1.0.4: @@ -2610,11 +2610,11 @@ snapshots: js-tokens: 4.0.0 picocolors: 1.0.1 - '@commitlint/cli@19.3.0(@types/node@20.14.4)(typescript@5.4.5)': + '@commitlint/cli@19.3.0(@types/node@20.14.5)(typescript@5.4.5)': dependencies: '@commitlint/format': 19.3.0 '@commitlint/lint': 19.2.2 - '@commitlint/load': 19.2.0(@types/node@20.14.4)(typescript@5.4.5) + '@commitlint/load': 19.2.0(@types/node@20.14.5)(typescript@5.4.5) '@commitlint/read': 19.2.1 '@commitlint/types': 19.0.3 execa: 8.0.1 @@ -2661,7 +2661,7 @@ snapshots: '@commitlint/rules': 19.0.3 '@commitlint/types': 19.0.3 - '@commitlint/load@19.2.0(@types/node@20.14.4)(typescript@5.4.5)': + '@commitlint/load@19.2.0(@types/node@20.14.5)(typescript@5.4.5)': dependencies: '@commitlint/config-validator': 19.0.3 '@commitlint/execute-rule': 19.0.0 @@ -2669,7 +2669,7 @@ snapshots: '@commitlint/types': 19.0.3 chalk: 5.3.0 cosmiconfig: 9.0.0(typescript@5.4.5) - cosmiconfig-typescript-loader: 5.0.0(@types/node@20.14.4)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5) + cosmiconfig-typescript-loader: 5.0.0(@types/node@20.14.5)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -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.4)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.4)(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.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)))': 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.4)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.4)(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.155)(vite@5.3.1(@types/node@20.14.4)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.4)(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))': dependencies: - '@sveltejs/vite-plugin-svelte': 4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.4)(sass@1.77.6)) + '@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)) '@types/cookie': 0.6.0 cookie: 0.6.0 devalue: 5.0.0 @@ -2942,9 +2942,9 @@ snapshots: sirv: 2.0.4 svelte: 5.0.0-next.155 tiny-glob: 0.2.9 - vite: 5.3.1(@types/node@20.14.4)(sass@1.77.6) + vite: 5.3.1(@types/node@20.14.5)(sass@1.77.6) - '@sveltejs/package@2.3.2(svelte@5.0.0-next.155)(typescript@5.4.5)': + '@sveltejs/package@2.3.0(svelte@5.0.0-next.155)(typescript@5.4.5)': dependencies: chokidar: 3.6.0 kleur: 4.1.5 @@ -2955,31 +2955,31 @@ snapshots: 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.4)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.4)(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.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))': dependencies: - '@sveltejs/vite-plugin-svelte': 4.0.0-next.3(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.4)(sass@1.77.6)) + '@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)) debug: 4.3.5 svelte: 5.0.0-next.155 - vite: 5.3.1(@types/node@20.14.4)(sass@1.77.6) + 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.4)(sass@1.77.6))': + '@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))': 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.4)(sass@1.77.6)))(svelte@5.0.0-next.155)(vite@5.3.1(@types/node@20.14.4)(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.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)) debug: 4.3.5 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.10 svelte: 5.0.0-next.155 - vite: 5.3.1(@types/node@20.14.4)(sass@1.77.6) - vitefu: 0.2.5(vite@5.3.1(@types/node@20.14.4)(sass@1.77.6)) + 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: - supports-color '@types/conventional-commits-parser@5.0.0': dependencies: - '@types/node': 20.14.4 + '@types/node': 20.14.5 '@types/cookie@0.6.0': {} @@ -2992,7 +2992,7 @@ snapshots: '@types/json-schema@7.0.15': {} - '@types/node@20.14.4': + '@types/node@20.14.5': dependencies: undici-types: 5.26.5 @@ -3463,9 +3463,9 @@ snapshots: core-util-is@1.0.3: {} - cosmiconfig-typescript-loader@5.0.0(@types/node@20.14.4)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5): + cosmiconfig-typescript-loader@5.0.0(@types/node@20.14.5)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5): dependencies: - '@types/node': 20.14.4 + '@types/node': 20.14.5 cosmiconfig: 9.0.0(typescript@5.4.5) jiti: 1.21.6 typescript: 5.4.5 @@ -3985,7 +3985,7 @@ snapshots: globals@14.0.0: {} - globals@15.5.0: {} + globals@15.6.0: {} globalthis@1.0.4: dependencies: @@ -5033,19 +5033,19 @@ snapshots: vary@1.1.2: {} - vite@5.3.1(@types/node@20.14.4)(sass@1.77.6): + vite@5.3.1(@types/node@20.14.5)(sass@1.77.6): dependencies: esbuild: 0.21.5 postcss: 8.4.38 rollup: 4.18.0 optionalDependencies: - '@types/node': 20.14.4 + '@types/node': 20.14.5 fsevents: 2.3.3 sass: 1.77.6 - vitefu@0.2.5(vite@5.3.1(@types/node@20.14.4)(sass@1.77.6)): + vitefu@0.2.5(vite@5.3.1(@types/node@20.14.5)(sass@1.77.6)): optionalDependencies: - vite: 5.3.1(@types/node@20.14.4)(sass@1.77.6) + vite: 5.3.1(@types/node@20.14.5)(sass@1.77.6) which-boxed-primitive@1.0.2: dependencies: diff --git a/svelte.config.js b/svelte.config.js index df639ab..eba21c4 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -2,18 +2,6 @@ import adapter from '@sveltejs/adapter-static'; import { sveltePreprocess } from 'svelte-preprocess'; import path from 'path'; -import { readPackageJSON } from './scripts/read-package-json.js'; -const packageJson = readPackageJSON(); - -// IMPORTANTL if you update aliases, run `pnpm run dev` for the configuration to update (tsconfig.json) -const alias = { - $comp: path.resolve('./src/lib/comp') -}; - -// alias used by our vite plugin to resolve file, it's the pkg name! -// alias: package name -> src/lib -alias[packageJson.name] = path.resolve('.', 'src/lib'); - /** @type {import('@sveltejs/kit').Config} */ const config = { preprocess: sveltePreprocess(), @@ -24,6 +12,7 @@ const config = { assets: 'docs', fallback: '200.html' }), + // IMPORTANT: if you update aliases, run `pnpm run dev` for the configuration to update (tsconfig.json) alias: { 'svelte-virtuallists': path.resolve('.', 'src/lib'),