Skip to content

fix: migrate button, repl type and upgrade to ^5.0.0 #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 20, 2024
Merged

fix: migrate button, repl type and upgrade to ^5.0.0 #474

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6a045c1
fix: migrate button, repl type and upgrade to ^5.0.0
paoloricciuti Oct 19, 2024
9ea769c
chore: upgrade to 5 allover
paoloricciuti Oct 19, 2024
04f019e
chore run dedupe
paoloricciuti Oct 19, 2024
f255f5e
Merge branch 'main' into fix-migrate-button
Rich-Harris Oct 20, 2024
9bb6549
Merge branch 'main' into fix-migrate-button
Rich-Harris Oct 20, 2024
f8ca8f3
Merge branch 'main' into fix-migrate-button
Rich-Harris Oct 20, 2024
10e6464
fix: untrack current in `link`
paoloricciuti Oct 20, 2024
daae526
fix: update state correctly
paoloricciuti Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/svelte.dev/content/tutorial/+assets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@rollup/wasm-node": "^4.25.0",
"@sveltejs/kit": "^2.5",
"esbuild-wasm": "^0.21.5",
"svelte": "^5.0.0-next.243",
"svelte": "^5.0.0",
"vite": "^5.4"
},
"type": "module"
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"prettier-plugin-svelte": "^3.2.4",
"satori": "^0.10.13",
"satori-html": "^0.3.2",
"svelte": "5.0.0-next.269",
"svelte": "5.0.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe there's more Svelte package references in the repo, best to bump them all

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the rest of the packages and also the tutorial

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also run a pnpm dedupe and make sure everything still works after that. There are a number of dependencies that now exist multiple times in different versions in the tree.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh i need to pay attention to this more. Run dedupe i'll check now that it's deployed

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mmm I think something broke

"svelte-check": "^4.0.0",
"svelte-preprocess": "^5.1.4",
"tiny-glob": "^0.2.9",
Expand Down
31 changes: 11 additions & 20 deletions apps/svelte.dev/scripts/create-tutorial-zip/common/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/svelte.dev/scripts/create-tutorial-zip/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@rollup/wasm-node": "^4.21.0",
"@sveltejs/kit": "^2.5",
"esbuild-wasm": "^0.21.5",
"svelte": "^5.0.0-next.243",
"svelte": "^5.0.0",
"vite": "^5.4"
},
"type": "module"
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/(authed)/playground/[id]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
let { data } = $props();
let repl = $state() as Repl;
let repl = $state() as ReturnType<typeof Repl>;
let name = $state(data.gist.name);
let modified = $state(false);
let version = data.version;
Expand Down
6 changes: 3 additions & 3 deletions packages/editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"!dist/**/*.spec.*"
],
"peerDependencies": {
"svelte": "^5.0.0-next.1"
"svelte": "^5.0.0"
},
"devDependencies": {
"@codemirror/autocomplete": "^6.9.0",
Expand All @@ -50,12 +50,12 @@
"@sveltejs/package": "^2.0.0",
"@sveltejs/repl": "workspace:*",
"@sveltejs/site-kit": "workspace:*",
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.6",
"@sveltejs/vite-plugin-svelte": "^4.0.0",
"codemirror": "^6.0.1",
"prettier": "^3.1.1",
"prettier-plugin-svelte": "^3.1.2",
"publint": "^0.2.0",
"svelte": "^5.0.0-next.1",
"svelte": "^5.0.1",
"svelte-check": "^4.0.0",
"typescript": "^5.0.0",
"vite": "^5.0.11"
Expand Down
23 changes: 12 additions & 11 deletions packages/editor/src/lib/Workspace.svelte.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,13 +300,11 @@ export class Workspace {
this.#view = null;
}

update_file(file: File) {
if (file.name === this.#current.name) {
// TODO this line causes the editor to keep losign
// focus and I have no idea why. It seems important,
// but it also doesn't appear to break anything
// if we comment it out?
// this.#current = file;
update_file(file: File, from_codemirror = false) {
if (file.name === this.#current.name && !from_codemirror) {
// we don't want to update the file if the update comes from
// codemirror or it will loose focus
this.#current = file;
}

this.#files = this.#files.map((old) => {
Expand Down Expand Up @@ -364,10 +362,13 @@ export class Workspace {
if (update.docChanged) {
const state = this.#view!.state!;

this.update_file({
...this.#current,
contents: state.doc.toString()
});
this.update_file(
{
...this.#current,
contents: state.doc.toString()
},
true
);

// preserve undo/redo across files
this.states.set(this.#current.name, state);
Expand Down
4 changes: 2 additions & 2 deletions packages/repl/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/kit": "^2.6.3",
"@sveltejs/package": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "4.0.0-next.6",
"@sveltejs/vite-plugin-svelte": "4.0.0",
"@types/estree": "^1.0.5",
"prettier": "^3.3.2",
"prettier-plugin-svelte": "^3.2.4",
Expand Down Expand Up @@ -84,7 +84,7 @@
"esrap": "^1.2.2",
"marked": "^14.1.2",
"resolve.exports": "^2.0.2",
"svelte": "5.0.0-next.269",
"svelte": "5.0.1",
"zimmerframe": "^1.1.2"
}
}
Loading
Loading