Skip to content

Commit e38e787

Browse files
committed
Merge remote-tracking branch 'sveltejs/main' into update-up-to-20230203
2 parents d87531d + 1c3bebf commit e38e787

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

content/tutorial/01-svelte/06-bindings/05-textarea-inputs/app-a/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"name": "~TODO~",
33
"version": "0.0.1",
4+
"scripts": {
5+
"dev": "./node_modules/vite/bin/vite.js dev",
6+
"build": "./node_modules/vite/bin/vite.js build",
7+
"preview": "./node_modules/vite/bin/vite.js preview"
8+
},
49
"dependencies": {
510
"marked": "^4.0.16"
611
},

content/tutorial/01-svelte/07-lifecycle/03-update/app-a/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"name": "~TODO~",
33
"version": "0.0.1",
4+
"scripts": {
5+
"dev": "./node_modules/vite/bin/vite.js dev",
6+
"build": "./node_modules/vite/bin/vite.js build",
7+
"preview": "./node_modules/vite/bin/vite.js preview"
8+
},
49
"dependencies": {
510
"elizabot": "^0.0.3"
611
},

scripts/create-common-bundle/unzip.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import AdmZip from 'adm-zip';
44
const zip = new AdmZip('common.zip');
55
zip.extractAllTo('.');
66

7-
fs.mkdirSync('node_modules/.bin');
7+
if (!fs.existsSync('node_modules/.bin')) {
8+
fs.mkdirSync('node_modules/.bin');
9+
}
810

911
fs.symlinkSync('../@sveltejs/kit/svelte-kit.js', 'node_modules/.bin/svelte-kit');
1012
fs.chmodSync('node_modules/.bin/svelte-kit', 0o777);

src/lib/client/adapters/webcontainer/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ export async function create(stubs, callback) {
138138
current_stubs.delete(stub.name);
139139
}
140140

141+
// Don't delete the node_modules folder when switching from one exercise to another
142+
// where, as this crashes the dev server.
143+
['/node_modules', '/node_modules/.bin'].forEach((name) => current_stubs.delete(name));
144+
141145
const to_delete = Array.from(current_stubs.keys());
142146
current_stubs = stubs_to_map(stubs);
143147

0 commit comments

Comments
 (0)