Skip to content

Commit f0652c0

Browse files
committed
Merge branch 'main' into svelte-html-update
2 parents 9be2d95 + 6f1f006 commit f0652c0

File tree

87 files changed

+2192
-2175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+2192
-2175
lines changed

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
"access": "public",
88
"baseBranch": "main",
99
"updateInternalDependencies": "patch",
10-
"ignore": [ "!(sv|svelte-migrate)" ]
10+
"ignore": [ "@sveltejs/*", "community-addon-template" ]
1111
}

.github/workflows/docs-preview-create-request.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/docs-preview-delete-request.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/preview-release.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,27 @@ jobs:
1919
node-version: 20
2020
cache: pnpm
2121

22-
- name: Run changed-files
23-
id: changed-files
24-
uses: tj-actions/changed-files@v44
25-
with:
26-
separator: ' '
27-
dir_names: 'true'
28-
dir_names_max_depth: '2' # truncates the path to packages/package-name
29-
files: |
30-
packages/**
22+
# Disabled due to https://github.com/tj-actions/changed-files/issues/2463
23+
# - name: Run changed-files
24+
# id: changed-files
25+
# uses: tj-actions/changed-files@v44
26+
# with:
27+
# separator: ' '
28+
# dir_names: 'true'
29+
# dir_names_max_depth: '2' # truncates the path to packages/package-name
30+
# files: |
31+
# packages/**
3132

3233
- name: install dependencies
3334
run: pnpm install
3435

3536
- name: build
3637
run: pnpm build
3738

38-
- name: publish preview
39-
if: ${{ steps.changed-files.outputs.all_changed_files_count > 0 }}
40-
env:
41-
CHANGED_DIRS: ${{ steps.changed-files.outputs.all_changed_files }}
42-
# run: |
43-
# node scripts/get-deps-to-publish.js
44-
run: pnpm dlx [email protected] publish --pnpm './packages/*'
39+
# - name: publish preview
40+
# if: ${{ steps.changed-files.outputs.all_changed_files_count > 0 }}
41+
# env:
42+
# CHANGED_DIRS: ${{ steps.changed-files.outputs.all_changed_files }}
43+
# # run: |
44+
# # node scripts/get-deps-to-publish.js
45+
# run: pnpm dlx [email protected] publish --pnpm './packages/*'

.github/workflows/sync-request.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

community-addon-template/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"@sveltejs/cli-core": "workspace:*"
1919
},
2020
"devDependencies": {
21-
"@playwright/test": "^1.48.2",
21+
"@playwright/test": "^1.49.1",
2222
"sv": "workspace:*",
23-
"vitest": "^2.1.4"
23+
"vitest": "^3.0.5"
2424
},
2525
"keywords": [
2626
"svelte-add-on",

community-addon-template/tests/setup/suite.ts

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ import path from 'node:path';
33
import { execSync } from 'node:child_process';
44
import * as vitest from 'vitest';
55
import { installAddon, type AddonMap, type OptionMap } from 'sv';
6-
import { createProject, startPreview, type CreateProject, type ProjectVariant } from 'sv/testing';
6+
import {
7+
addPnpmBuildDependendencies,
8+
createProject,
9+
startPreview,
10+
type CreateProject,
11+
type ProjectVariant
12+
} from 'sv/testing';
713
import { chromium, type Browser, type Page } from '@playwright/test';
814
import { fileURLToPath } from 'node:url';
915

@@ -40,9 +46,18 @@ export function setupTest<Addons extends AddonMap>(addons: Addons) {
4046
// creates a pnpm workspace in each addon dir
4147
fs.writeFileSync(
4248
path.resolve(cwd, testName, 'pnpm-workspace.yaml'),
43-
`packages:\n - '**/*'`,
49+
"packages:\n - '**/*'",
4450
'utf8'
4551
);
52+
53+
// creates a barebones package.json in each addon dir
54+
fs.writeFileSync(
55+
path.resolve(cwd, testName, 'package.json'),
56+
JSON.stringify({
57+
name: `${testName}-workspace-root`,
58+
private: true
59+
})
60+
);
4661
});
4762

4863
// runs before each test case
@@ -57,7 +72,13 @@ export function setupTest<Addons extends AddonMap>(addons: Addons) {
5772
fs.writeFileSync(metaPath, JSON.stringify({ variant, options }, null, '\t'), 'utf8');
5873

5974
// run addon
60-
await installAddon({ cwd, addons, options, packageManager: 'pnpm' });
75+
const { pnpmBuildDependencies } = await installAddon({
76+
cwd,
77+
addons,
78+
options,
79+
packageManager: 'pnpm'
80+
});
81+
addPnpmBuildDependendencies(cwd, 'pnpm', ['esbuild', ...pnpmBuildDependencies]);
6182

6283
return cwd;
6384
};

documentation/docs/20-commands/30-sv-check.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ The first row is of type `START` and contains the workspace folder (wrapped in q
121121
1590680325583 START "/home/user/language-tools/packages/language-server/test/plugins/typescript/testfiles"
122122
```
123123

124-
Any number of `ERROR` or `WARNING` records may follow. Their structure is identical and depends on the output argoument.
124+
Any number of `ERROR` or `WARNING` records may follow. Their structure is identical and depends on the output argument.
125125

126126
If the argument is `machine` it will tell us the filename, the starting line and column numbers, and the error message. The filename is relative to the workspace directory. The filename and the message are both wrapped in quotes. Example:
127127

documentation/docs/20-commands/40-sv-migrate.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ Some migrations may annotate your codebase with tasks for completion that you ca
88

99
## Usage
1010

11+
```bash
12+
npx sv migrate
13+
```
14+
15+
You can also specify a migration directly via the CLI:
1116
```bash
1217
npx sv migrate [migration]
1318
```
@@ -16,7 +21,7 @@ npx sv migrate [migration]
1621

1722
### `app-state`
1823

19-
Migrates `$app/store` usage to `$app/state` in `.svelte` files. See the [migration guide](/docs/kit/migrating-to-sveltekit-2#SvelteKit-2.12:-$app-stores-deprecated) for more details.
24+
Migrates `$app/stores` usage to `$app/state` in `.svelte` files. See the [migration guide](/docs/kit/migrating-to-sveltekit-2#SvelteKit-2.12:-$app-stores-deprecated) for more details.
2025

2126
### `svelte-5`
2227

eslint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default [
3131
'**/.test-output/*',
3232
'**/dist/*',
3333
'packages/**/tests/**/{output,input}.ts',
34-
'rollup.config.js',
34+
'rolldown.config.js',
3535
'community-addon-template/tests/*'
3636
]
3737
}

0 commit comments

Comments
 (0)