Skip to content
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.

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

Implement #5748 #5778

Merged
merged 192 commits into from
Aug 15, 2022
Merged
Changes from 1 commit
Commits
Show all changes
192 commits
Select commit Hold shift + click to select a range
47076c1
skeleton
dummdidumm Jul 29, 2022
5b49486
add moved info to files to be able to rewrite imports later
dummdidumm Jul 29, 2022
9f83032
add magic-string, start load extraction and manipulation logic
dummdidumm Jul 29, 2022
c10febb
Merge branch 'master' into migration-script
Rich-Harris Jul 31, 2022
5410a5b
Merge branch 'master' into migration-script
Rich-Harris Jul 31, 2022
ccb5059
move migration logic into new svelte-migrate package
Rich-Harris Jul 31, 2022
4387b2c
remove commented code
Rich-Harris Jul 31, 2022
08906cc
lockfile
Rich-Harris Jul 31, 2022
dd7fdd4
move components, extract load
Rich-Harris Jul 31, 2022
07ca11f
+page.server.js and +server.js
Rich-Harris Jul 31, 2022
836227b
remove unused code
Rich-Harris Jul 31, 2022
4c1334a
uncomment prompt
Rich-Harris Jul 31, 2022
2243175
add some errors
Rich-Harris Jul 31, 2022
f08c6cd
fix detection
Rich-Harris Jul 31, 2022
3a119b5
consistent casing
Rich-Harris Jul 31, 2022
f3a2d7c
not sure if typescript will ever fail to parse, but in any case its h…
Rich-Harris Jul 31, 2022
d9b988f
handle error with module context
Rich-Harris Aug 1, 2022
c3a2987
add some comments
Rich-Harris Aug 1, 2022
471dd17
update demo app
Rich-Harris Aug 1, 2022
84177d4
update skeleton app
Rich-Harris Aug 1, 2022
6640599
migrate kit.svelte.dev
Rich-Harris Aug 1, 2022
16b312c
fix dynamic import on windows, fix js/ts file ending, handle index.js…
dummdidumm Aug 1, 2022
02ab096
extract imports into Svelte migration task for QOL, don't adjust impo…
dummdidumm Aug 1, 2022
f85deee
Merge branch 'migration-script' into migrate-tests
dummdidumm Aug 1, 2022
1246ac3
migrate amp app
dummdidumm Aug 1, 2022
2d01f30
show message either way, could be other things gone wrong
dummdidumm Aug 1, 2022
27ee53c
Merge branch 'migration-script' into migrate-tests
dummdidumm Aug 1, 2022
4f88ead
windooows
dummdidumm Aug 1, 2022
3657ebd
Merge branch 'migration-script' into migrate-tests
dummdidumm Aug 1, 2022
8ccb1f9
more sophisticated auto migrations
dummdidumm Aug 1, 2022
e647683
Merge branch 'migration-script' into migrate-tests
dummdidumm Aug 1, 2022
b066076
migrate test/apps/basics
dummdidumm Aug 2, 2022
6c9489d
fix regex, dont show props message on error page, more sophisticated …
dummdidumm Aug 2, 2022
d69ea50
pretend to make this more readable
dummdidumm Aug 2, 2022
cc32bd1
Merge branch 'migration-script' into migrate-tests
dummdidumm Aug 2, 2022
305caee
adjust import location for error and redirect
dummdidumm Aug 2, 2022
740bcdc
Merge branch 'migration-script' into migrate-tests
dummdidumm Aug 2, 2022
cbd67cb
update tests
dummdidumm Aug 2, 2022
9ad6691
only show short automigration message on success, only migrate where …
dummdidumm Aug 2, 2022
88b46ea
Merge branch 'migration-script' into migrate-tests
dummdidumm Aug 2, 2022
5e37428
shorten redirect/error if no second argument given
dummdidumm Aug 2, 2022
d9da6f7
Merge branch 'migration-script' into migrate-tests
dummdidumm Aug 2, 2022
de773cc
use git mv if available
dummdidumm Aug 2, 2022
ac90010
Merge branch 'migration-script' into migrate-tests
dummdidumm Aug 2, 2022
eca83af
merge master
Rich-Harris Aug 4, 2022
5500e3e
update options tests
Rich-Harris Aug 4, 2022
b90be49
update options-2 tests
Rich-Harris Aug 4, 2022
d406f13
update writes tests
Rich-Harris Aug 4, 2022
624b77f
Merge branch 'master' into migrate-tests
Rich-Harris Aug 4, 2022
62300fa
migrate (most) prerendering/basics tests
Rich-Harris Aug 4, 2022
9b09310
migrate more tests
Rich-Harris Aug 4, 2022
2a3195c
update adapter-static tests
Rich-Harris Aug 4, 2022
31b686c
it begins (#5782)
Rich-Harris Aug 8, 2022
82d858a
merge master
Rich-Harris Aug 8, 2022
d278c22
Docs for the new API (#5810)
dummdidumm Aug 8, 2022
e345d3f
enable all tests
Rich-Harris Aug 8, 2022
f9b2f75
Unbundling (#5853)
Rich-Harris Aug 8, 2022
26649f3
format
Rich-Harris Aug 8, 2022
fdcf7d8
replace some TODOs
Rich-Harris Aug 8, 2022
e2acd9d
only add param tag if param exists
Rich-Harris Aug 8, 2022
fde7fd0
fix some type stuff
Rich-Harris Aug 8, 2022
0cc87d3
fix some type stuff
Rich-Harris Aug 8, 2022
b57a83e
more type fixes
Rich-Harris Aug 8, 2022
3db17b0
reuse load_data
Rich-Harris Aug 8, 2022
8d32846
fix imports. damn you vscode, you dont have to be like this
Rich-Harris Aug 8, 2022
745ce43
fix some stuff
Rich-Harris Aug 8, 2022
d62d041
remove unused import
Rich-Harris Aug 9, 2022
4142daa
fix prefetchRoutes
Rich-Harris Aug 9, 2022
85d9998
fix a handful more tests
Rich-Harris Aug 9, 2022
641107a
comment out likely obsolete setHeaders in test
dummdidumm Aug 9, 2022
f8bb1c1
fix write_client_manifest
dummdidumm Aug 9, 2022
868d2f4
fix off-by-one error for client error page rendering
dummdidumm Aug 9, 2022
5b23201
update page store when only data changed
dummdidumm Aug 9, 2022
d2790a6
handle page endpoint without get
dummdidumm Aug 9, 2022
437f163
reenable tests
dummdidumm Aug 9, 2022
129c460
fix windows/vite path issue
dummdidumm Aug 9, 2022
1c052b0
pass serialized server data to client
dummdidumm Aug 9, 2022
263fd53
fix uses tracking for page endpoints in client
dummdidumm Aug 9, 2022
6625a82
unfix the buggy drive letter fix
dummdidumm Aug 9, 2022
b5c6dad
set headers/etag for page endpoints
dummdidumm Aug 9, 2022
03b8205
add HttpError identifier to serialized version and make connection vi…
dummdidumm Aug 10, 2022
4edfb32
call handle_error in json request
dummdidumm Aug 10, 2022
e709d3f
fix test
dummdidumm Aug 10, 2022
f781756
omit json-data when ssr but no hydration
dummdidumm Aug 10, 2022
4d8e64e
remove obsolete caching logic from client, adjust test
dummdidumm Aug 10, 2022
9f535b1
add migration link
dummdidumm Aug 10, 2022
d969dbc
make typescript non-required again by lazy-loading it, fix package.files
dummdidumm Aug 10, 2022
331a7ca
only create proxy if something was modified
dummdidumm Aug 10, 2022
89ed6f6
update pnpm lock
dummdidumm Aug 10, 2022
aeb21a4
always bundle @sveltejs/kit
Rich-Harris Aug 10, 2022
502456c
fix some write_types stuff
Rich-Harris Aug 10, 2022
2c290bb
this took waaaay too long to figure out
Rich-Harris Aug 10, 2022
aeb2fcb
prettier
Rich-Harris Aug 10, 2022
4617a53
fix a bunch of typescript stuff
Rich-Harris Aug 10, 2022
6ee351a
shrug
Rich-Harris Aug 10, 2022
31195f3
probably no point generating types if no ts?
Rich-Harris Aug 11, 2022
253efcf
refactor write_types to support addition of layout types
Rich-Harris Aug 11, 2022
a2b7f90
rename Data to PageData and LayoutData
Rich-Harris Aug 11, 2022
0321525
fix manifest generation with named layouts
Rich-Harris Aug 11, 2022
f632c35
update tests
Rich-Harris Aug 11, 2022
4f9ef19
generate LayoutLoad and LayoutData types
Rich-Harris Aug 11, 2022
c185017
windows fix, deduplicate, use AwaitedProperties
dummdidumm Aug 11, 2022
f79fb3b
write Errors type
dummdidumm Aug 11, 2022
11774a9
fix AwaitedProperties type, add AwaitedErrors type
dummdidumm Aug 11, 2022
d0ea483
fix test
dummdidumm Aug 11, 2022
ef6dd1b
fix test
dummdidumm Aug 11, 2022
d8fc3d4
trying an env fix, not sure if that works on linux
dummdidumm Aug 11, 2022
a89eee3
mhm
dummdidumm Aug 11, 2022
102b093
temporary run only env test on CI
dummdidumm Aug 11, 2022
9348d92
fix type reference in create-svelte
dummdidumm Aug 11, 2022
5af956c
getting desperate
dummdidumm Aug 11, 2022
2de6338
even more scoped test execution
dummdidumm Aug 11, 2022
4f8d206
check why posixify doesnt work
dummdidumm Aug 11, 2022
2702a79
Data -> PageData
Rich-Harris Aug 11, 2022
42e2ceb
merge
Rich-Harris Aug 11, 2022
401a3ca
wtf, does this work now or not?
dummdidumm Aug 11, 2022
f07f039
remove unnecessary migration warnings, add error for props -> data
Rich-Harris Aug 11, 2022
64f50f4
Merge branch 'migrate-tests' of github.com:sveltejs/kit into migrate-…
Rich-Harris Aug 11, 2022
1f91c43
omg works, reenable all tests
dummdidumm Aug 11, 2022
f7e5e43
some docs progress
Rich-Harris Aug 11, 2022
7c5181f
Merge branch 'migrate-tests' of github.com:sveltejs/kit into migrate-…
Rich-Harris Aug 11, 2022
df6aa26
fix file ending issue in write_types
dummdidumm Aug 11, 2022
cb88d56
fix path resolution in write_types
dummdidumm Aug 11, 2022
17db555
fix type error in generated d.ts file
dummdidumm Aug 11, 2022
e51ce3b
updates
Rich-Harris Aug 11, 2022
6226c92
ooh it works
Rich-Harris Aug 11, 2022
1a95ee4
Merge branch 'migrate-tests' of github.com:sveltejs/kit into migrate-…
Rich-Harris Aug 11, 2022
b3c9875
sprinkle some types
Rich-Harris Aug 11, 2022
590cdbd
add checkJs
Rich-Harris Aug 11, 2022
5ba0761
get some pages building
Rich-Harris Aug 11, 2022
16b09a4
.ts -> .js
Rich-Harris Aug 11, 2022
b42a1a1
simplify write_types
Rich-Harris Aug 11, 2022
c1fb616
more docs types stuff
Rich-Harris Aug 11, 2022
350aab8
rename node.module to node.shared, which is more descriptive
Rich-Harris Aug 11, 2022
5479864
rename route.page to route.leaf
Rich-Harris Aug 11, 2022
b9f8be6
return all route data with __data.json, not just the leaf
Rich-Harris Aug 11, 2022
1ad7a75
load all server data in one go on the client. this should probably ha…
Rich-Harris Aug 11, 2022
f4e3e09
update types on file edit
dummdidumm Aug 12, 2022
daca0bc
only write types that have changed
dummdidumm Aug 12, 2022
77fa27e
debounce updates to manifest
dummdidumm Aug 12, 2022
330960e
add parent data type inference. introduce a breaking change to the Lo…
dummdidumm Aug 12, 2022
3881094
rename/tidy up some stuff
Rich-Harris Aug 12, 2022
f4b4fca
fix
Rich-Harris Aug 12, 2022
a110a52
fix some stuff
Rich-Harris Aug 12, 2022
ef03838
set cookies on __data.json requests
Rich-Harris Aug 12, 2022
7d3921c
fix some stuff
Rich-Harris Aug 12, 2022
bf87bb7
only load data from server if we have some
Rich-Harris Aug 12, 2022
be5f47f
remove obsolete todo
Rich-Harris Aug 12, 2022
1d42f05
update test
Rich-Harris Aug 12, 2022
18fe83e
lint
Rich-Harris Aug 12, 2022
5842b76
fix prerendered __data.json
Rich-Harris Aug 12, 2022
b78a879
add json helper
Rich-Harris Aug 13, 2022
719929a
use json helper in migration
Rich-Harris Aug 13, 2022
831b8f6
fixes
Rich-Harris Aug 13, 2022
dc92d20
center routing documentation on + files
Rich-Harris Aug 13, 2022
76e101d
get docs building again
Rich-Harris Aug 14, 2022
ec30024
update example
Rich-Harris Aug 14, 2022
79b9565
tidy up
Rich-Harris Aug 15, 2022
da7659c
update load docs
Rich-Harris Aug 15, 2022
5c93626
document promise unwrapping
Rich-Harris Aug 15, 2022
41f8f8f
typo
Rich-Harris Aug 15, 2022
49fbb0f
remove obsolete logic which is now handled elsewhere
dummdidumm Aug 15, 2022
23f31be
implement invalidate()
dummdidumm Aug 15, 2022
3931be6
invalidate() should also loads without dependencies
dummdidumm Aug 15, 2022
8ad3f89
Update documentation/docs/05-load.md
Rich-Harris Aug 15, 2022
3e47589
Update documentation/docs/03-routing.md
Rich-Harris Aug 15, 2022
ce4cbc8
inject $types.d.ts files into code snippets where possible
Rich-Harris Aug 15, 2022
c1e2086
add a note about shared state. not 100% sure this is the best place f…
Rich-Harris Aug 15, 2022
07f008b
Update documentation/docs/05-load.md
Rich-Harris Aug 15, 2022
7fd96dc
document set-cookie exception
Rich-Harris Aug 15, 2022
190cbc2
Merge branch 'migrate-tests' of github.com:sveltejs/kit into migrate-…
Rich-Harris Aug 15, 2022
4ae261f
tweaks
Rich-Harris Aug 15, 2022
d59cd43
tweaks
Rich-Harris Aug 15, 2022
b64288d
more tweaks
Rich-Harris Aug 15, 2022
86f8e2b
cheat
Rich-Harris Aug 15, 2022
1a75afa
GET->load
dummdidumm Aug 15, 2022
d31da9f
more tweaks
Rich-Harris Aug 15, 2022
071bddd
fix create-svelte
dummdidumm Aug 15, 2022
e8795b6
more tweaks
Rich-Harris Aug 15, 2022
b8cdcb5
merge
Rich-Harris Aug 15, 2022
22b8804
Update documentation/docs/05-load.md
Rich-Harris Aug 15, 2022
343b72c
fixes
Rich-Harris Aug 15, 2022
6ee6b76
remove outdated Get reference
Rich-Harris Aug 15, 2022
40d1579
actions
Rich-Harris Aug 15, 2022
f262495
rewrite type names
Rich-Harris Aug 15, 2022
c9d8254
rename Load to PageLoad or LayoutLoad etc
Rich-Harris Aug 15, 2022
e2dbce1
include filename in migration scripts
Rich-Harris Aug 15, 2022
47e4b7c
updates
Rich-Harris Aug 15, 2022
6d4c24d
fix search
Rich-Harris Aug 15, 2022
4435a75
mention export let errors
Rich-Harris Aug 15, 2022
51900fc
changesets
Rich-Harris Aug 15, 2022
99690ae
fix types in create-svelte template
Rich-Harris Aug 15, 2022
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
Prev Previous commit
Next Next commit
fix dynamic import on windows, fix js/ts file ending, handle index.js…
…on.js endpoint case
  • Loading branch information
dummdidumm committed Aug 1, 2022
commit 16b312cc4253b2fce386a07e1f730144cdcda0ae
24 changes: 18 additions & 6 deletions packages/migrate/migrations/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import glob from 'tiny-glob/sync.js';
import prompts from 'prompts';
import ts from 'typescript';
import MagicString from 'magic-string';
import { pathToFileURL } from 'url';

/** @param {string} message */
function bail(message) {
Expand Down Expand Up @@ -38,7 +39,7 @@ export async function migrate() {
bail('Please re-run this script in a directory with a svelte.config.js');
}

const { default: config } = await import(path.resolve('svelte.config.js'));
const { default: config } = await import(pathToFileURL(path.resolve('svelte.config.js')).href);

const routes = path.resolve(config.kit?.files?.routes ?? 'src/routes');

Expand Down Expand Up @@ -78,7 +79,8 @@ export async function migrate() {
const response = await prompts({
type: 'confirm',
name: 'value',
message: 'This will overwrite files in the current directory. Continue?',
message:
'This will overwrite files in the current directory. We advise you to use Git and commit any pending changes. Continue?',
initial: false
});

Expand Down Expand Up @@ -162,7 +164,7 @@ export async function migrate() {

// if component has a <script context="module">, move it to a sibling .js file
if (module) {
const ext = /<script[^>]+lang=['"](ts|typescript)['"][^]*>/.test(module) ? '.js' : '.ts';
const ext = /<script[^>]+lang=['"](ts|typescript)['"][^]*>/.test(module) ? '.ts' : '.js';
const injected = /load/.test(module)
? `${error('Update load function', '3292693')}\n\n`
: '';
Expand All @@ -188,9 +190,19 @@ export async function migrate() {
const type = is_page_endpoint ? '+page.server' : '+server';

const move_to_directory = name !== 'index';
const renamed =
file.slice(0, -basename.length) +
(move_to_directory ? `${name}/${type}${module_ext}` : `${type}${module_ext}`);

let renamed = '';
if (!is_page_endpoint && name.startsWith('index.')) {
// handle <folder>/index.json.js -> <folder>.json/+server.js
const dir = path.dirname(file);
renamed =
// prettier-ignore
`${file.slice(0, -(basename.length + dir.length + 1))}${dir + name.slice('index'.length)}/+server${module_ext}`;
} else if (move_to_directory) {
renamed = `${file.slice(0, -basename.length)}${name}/${type}${module_ext}`;
} else {
renamed = `${file.slice(0, -basename.length)}${type}${module_ext}`;
}

const injected = error(`Update ${type}.js`, is_page_endpoint ? '3292699' : '3292701');
const edited = `${injected}\n\n${move_to_directory ? adjust_imports(content) : content}`;
Expand Down