diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f2bf98c7..826b8223d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,13 +48,11 @@ jobs: with: message: 'Bump package version [skip ci]' default_author: github_actions - - name: Remove svelte.config.js # prevents `svelte-kit sync` from running - run: rm svelte.config.js - name: Install dependencies run: pnpm install --frozen-lockfile - name: Package run: pnpm package - name: Publish - run: pnpm publish --no-git-checks --tag alpha + run: pnpm publish package --no-git-checks --tag alpha env: NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.vscode/settings.json b/.vscode/settings.json index d5a0e184e..2b97a1f8b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,9 @@ { "prettier.endOfLine": "lf", - "cSpell.words": ["unplugin"], + "cSpell.words": [ + "undici", + "unplugin" + ], "gitlens.showWelcomeOnInstall": false, "gitlens.showWhatsNewAfterUpgrades": false, "gitlens.plusFeatures.enabled": false, diff --git a/package.json b/package.json index 480d658c4..64bec6038 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "svelte-kit dev", "build": "svelte-kit build", - "package": "sed -i 's|\\./|\\./src/|g' src/index.ts && cp src/index.ts index.js && cp src/index.ts index.d.ts", + "package": "svelte-kit package", "preview": "svelte-kit preview", "prepare": "svelte-kit sync", "check": "svelte-check --tsconfig ./tsconfig.json", @@ -30,17 +30,10 @@ "url": "https://github.com/modrinth/omorphia/issues" }, "homepage": "https://omorphia.modrinth.com", - "exports": { - ".": "./index.js", - "./utils": "./src/utils/index.ts", - "./styles.postcss": "./src/styles.postcss", - "./plugins": "./src/plugins/index.js", - "./config/postcss": "./src/config/postcss.cjs", - "./config/svelte": "./src/config/svelte.js" - }, "devDependencies": { "@sveltejs/adapter-static": "^1.0.0-next.29", "@sveltejs/kit": "next", + "@types/cli-progress": "^3.11.0", "@types/marked": "^4.0.3", "@typescript-eslint/eslint-plugin": "^5.10.1", "@typescript-eslint/parser": "^5.10.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 646d2a017..1c2111756 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,6 +10,7 @@ specifiers: '@poppanator/sveltekit-svg': ^0.3.1 '@sveltejs/adapter-static': ^1.0.0-next.29 '@sveltejs/kit': next + '@types/cli-progress': ^3.11.0 '@types/marked': ^4.0.3 '@typescript-eslint/eslint-plugin': ^5.10.1 '@typescript-eslint/parser': ^5.10.1 @@ -85,7 +86,8 @@ dependencies: devDependencies: '@sveltejs/adapter-static': 1.0.0-next.29 - '@sveltejs/kit': 1.0.0-next.350_svelte@3.48.0 + '@sveltejs/kit': 1.0.0-next.354_svelte@3.48.0 + '@types/cli-progress': 3.11.0 '@types/marked': 4.0.3 '@typescript-eslint/eslint-plugin': 5.14.0_4p27j37cxves4nxlnqogdhp4ta '@typescript-eslint/parser': 5.14.0_e6rt7vlgxfprtuallp2t3cvyi4 @@ -1076,14 +1078,14 @@ packages: tiny-glob: 0.2.9 dev: true - /@sveltejs/kit/1.0.0-next.350_svelte@3.48.0: - resolution: {integrity: sha512-qkZNjp7yIj6t91+wMhmMtGJH0Lb89OaKdVXUDy92CS5/4OHRTKcQPdfOKs4no/upkS3RiFb+rEpOkYqTMcPUXg==} + /@sveltejs/kit/1.0.0-next.354_svelte@3.48.0: + resolution: {integrity: sha512-dTfFT0c3sxztFpiw6H4bQnPd+PtHgEZG6j6ssT9sWLONfzUgWRX0S7H/WoPEjr7u65o2HNazoj8jmEq3ZTwb9g==} engines: {node: '>=16.7'} hasBin: true peerDependencies: svelte: ^3.44.0 dependencies: - '@sveltejs/vite-plugin-svelte': 1.0.0-next.47_svelte@3.48.0+vite@2.9.10 + '@sveltejs/vite-plugin-svelte': 1.0.0-next.49_svelte@3.48.0+vite@2.9.10 chokidar: 3.5.3 sade: 1.8.1 svelte: 3.48.0 @@ -1096,8 +1098,8 @@ packages: - supports-color dev: true - /@sveltejs/vite-plugin-svelte/1.0.0-next.47_svelte@3.48.0+vite@2.9.10: - resolution: {integrity: sha512-J6n8UN51aq/TEZGQ89/EtdXTtca3cRcTJGzi6fi+xK8LkgsHQLCZhRj+PJ+swktRSWTX9IOmQS55SqVg6bz5fA==} + /@sveltejs/vite-plugin-svelte/1.0.0-next.49_svelte@3.48.0+vite@2.9.10: + resolution: {integrity: sha512-AKh0Ka8EDgidnxWUs8Hh2iZLZovkETkefO99XxZ4sW4WGJ7VFeBx5kH/NIIGlaNHLcrIvK3CK0HkZwC3Cici0A==} engines: {node: ^14.13.1 || >= 16} peerDependencies: diff-match-patch: ^1.0.5 @@ -1131,6 +1133,12 @@ packages: engines: {node: '>=10.13.0'} dev: false + /@types/cli-progress/3.11.0: + resolution: {integrity: sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg==} + dependencies: + '@types/node': 17.0.21 + dev: true + /@types/estree/0.0.39: resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==} dev: true diff --git a/src/components/FileUpload.svelte b/src/components/FileUpload.svelte index d45ee3f3a..7c72b1c0d 100644 --- a/src/components/FileUpload.svelte +++ b/src/components/FileUpload.svelte @@ -1,6 +1,7 @@