diff --git a/.changeset/config.json b/.changeset/config.json index 5b775d360..20ee91818 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -7,7 +7,7 @@ "commit": false, "linked": [], "access": "public", - "baseBranch": "main", + "baseBranch": "v4", "bumpVersionsWithWorkspaceProtocolOnly": true, "updateInternalDependencies": "minor", "ignore": ["!(@sveltejs/*)"] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd61c310a..8bcfa0e07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - v4 pull_request: branches: - main + - v4 env: # we call `pnpm playwright install` instead PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cda2d1774..7aa138be6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - v4 permissions: {} jobs: diff --git a/package.json b/package.json index 6be8e9829..c4a7342f7 100644 --- a/package.json +++ b/package.json @@ -16,13 +16,13 @@ "lint": "pnpm check:lint --fix", "format": "pnpm check:format --write", "fixup": "run-s lint format", - "release": "pnpm changeset publish", + "release": "pnpm changeset publish --tag version-4", "prepare": "husky", "playwright": "playwright-core", "generate:types": "pnpm --filter \"./packages/*\" --parallel generate:types" }, "devDependencies": { - "@changesets/cli": "^2.27.9", + "@changesets/cli": "^2.27.10", "@eslint/eslintrc": "^3.1.0", "@eslint/js": "^9.14.0", "@stylistic/eslint-plugin-js": "^2.10.1", diff --git a/packages/e2e-tests/import-queries/svelte.config.js b/packages/e2e-tests/import-queries/svelte.config.js index 4abe56d7f..34b0f6028 100644 --- a/packages/e2e-tests/import-queries/svelte.config.js +++ b/packages/e2e-tests/import-queries/svelte.config.js @@ -4,7 +4,7 @@ export default { preprocess: [vitePreprocess()], onwarn(warning, defaultHandler) { // import query test generates one of these - if (warning.code === 'custom-element-no-tag') return; + if (warning.code === 'options_missing_custom_element') return; defaultHandler(warning); } }; diff --git a/packages/vite-plugin-svelte/CHANGELOG.md b/packages/vite-plugin-svelte/CHANGELOG.md index 3c72a1383..47a7f2a2f 100644 --- a/packages/vite-plugin-svelte/CHANGELOG.md +++ b/packages/vite-plugin-svelte/CHANGELOG.md @@ -1,5 +1,23 @@ # @sveltejs/vite-plugin-svelte +## 4.0.4 +### Patch Changes + + +- fix errorhandling to work with errors that don't have a code property ([`1a91581`](https://github.com/sveltejs/vite-plugin-svelte/commit/1a915816d13fb7d9c1e6cf51f3801e1c5be4effe)) + +## 4.0.3 +### Patch Changes + + +- adapt internal handling of warning and error `code` property to changes in svelte5 ([#1046](https://github.com/sveltejs/vite-plugin-svelte/pull/1046)) + +## 4.0.2 +### Patch Changes + + +- Allow script tags to span multiple lines ([`5309d7b`](https://github.com/sveltejs/vite-plugin-svelte/commit/5309d7bda16eeea740c0e1e94b878e8d0f248b82)) + ## 4.0.1 ### Patch Changes diff --git a/packages/vite-plugin-svelte/package.json b/packages/vite-plugin-svelte/package.json index ddd5ef251..717ee69db 100644 --- a/packages/vite-plugin-svelte/package.json +++ b/packages/vite-plugin-svelte/package.json @@ -1,6 +1,6 @@ { "name": "@sveltejs/vite-plugin-svelte", - "version": "4.0.1", + "version": "4.0.4", "license": "MIT", "author": "dominikg", "files": [ diff --git a/packages/vite-plugin-svelte/src/utils/compile.js b/packages/vite-plugin-svelte/src/utils/compile.js index 83f2c840d..4c0e524c9 100644 --- a/packages/vite-plugin-svelte/src/utils/compile.js +++ b/packages/vite-plugin-svelte/src/utils/compile.js @@ -14,7 +14,7 @@ import { enhanceCompileError } from './error.js'; // which is closer to the other regexes in at least not falling into commented script // but ideally would be shared exactly with svelte and other tools that use it const scriptLangRE = - /|