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

bump typescript #7669

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/cool-seahorses-cross.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'create-svelte': patch
---

Bump TypeScript version and use `satisfies` operator
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"svelte": "^3.52.0",
"tiny-glob": "^0.2.9",
"turbo": "^1.6.1",
"typescript": "^4.8.4"
"typescript": "^4.9.3"
},
"packageManager": "pnpm@7.14.1",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-auto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"devDependencies": {
"@types/node": "^16.11.68",
"typescript": "^4.8.4"
"typescript": "^4.9.3"
},
"dependencies": {
"import-meta-resolve": "^2.1.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-cloudflare-workers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"devDependencies": {
"@cloudflare/kv-asset-handler": "^0.2.0",
"@types/node": "^16.11.68",
"typescript": "^4.8.4"
"typescript": "^4.9.3"
}
}
2 changes: 1 addition & 1 deletion packages/adapter-cloudflare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"devDependencies": {
"@types/node": "^16.11.68",
"@types/ws": "^8.5.3",
"typescript": "^4.8.4"
"typescript": "^4.9.3"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-netlify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@types/set-cookie-parser": "^2.4.2",
"rimraf": "^3.0.2",
"rollup": "^2.79.1",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"uvu": "^0.5.6"
}
}
2 changes: 1 addition & 1 deletion packages/adapter-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"polka": "^1.0.0-next.22",
"rimraf": "^3.0.2",
"sirv": "^2.0.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"uvu": "^0.5.6"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-static/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@types/node": "^16.11.68",
"sirv": "^2.0.2",
"svelte": "^3.52.0",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"uvu": "^0.5.6",
"vite": "^3.2.1"
}
Expand Down
6 changes: 5 additions & 1 deletion packages/adapter-vercel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,11 @@ const redirects = {
};

/** @type {import('.').default} **/
export default function ({ external = [], edge, split } = {}) {
export default function ({
Copy link
Member

Choose a reason for hiding this comment

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

don't need to duplicate the types here. just declare the function as a const and then export it later

external = /** @type {string[]} */ ([]),
edge = false,
split = false
} = {}) {
return {
name: '@sveltejs/adapter-vercel',

Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-vercel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
"devDependencies": {
"@sveltejs/kit": "workspace:*",
"@types/node": "^16.11.68",
"typescript": "^4.8.4"
"typescript": "^4.9.3"
}
}
2 changes: 1 addition & 1 deletion packages/create-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"gitignore-parser": "^0.0.2",
"prettier": "^2.7.1",
"prettier-plugin-svelte": "^2.8.0",
"sucrase": "^3.28.0",
"sucrase": "^3.29.0",
"svelte": "^3.52.0",
"svelte-preprocess": "^4.10.7",
"tiny-glob": "^0.2.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-svelte/shared/+checkjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch"
},
"devDependencies": {
"typescript": "^4.7.4",
"typescript": "^4.9.3",
"svelte-check": "^2.7.1"
}
}
2 changes: 1 addition & 1 deletion packages/create-svelte/shared/+typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
},
"devDependencies": {
"typescript": "^4.7.4",
"typescript": "^4.9.3",
"tslib": "^2.3.1",
"svelte-check": "^2.7.1",
"svelte-preprocess": "^4.10.6"
Expand Down
2 changes: 1 addition & 1 deletion packages/create-svelte/templates/default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-preprocess": "^4.10.7",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { words, allowed } from './words.server';
import type { PageServerLoad, Actions } from './$types';

/** @type {import('./$types').PageServerLoad} */
export const load: PageServerLoad = ({ cookies }) => {
export const load = (({ cookies }) => {
const game = new Game(cookies.get('sverdle'));

return {
Expand All @@ -23,10 +23,10 @@ export const load: PageServerLoad = ({ cookies }) => {
*/
answer: game.answers.length >= 6 ? game.answer : null
};
};
}) satisfies PageServerLoad;

/** @type {import('./$types').Actions} */
export const actions: Actions = {
export const actions = {
/**
* Modify game state in reaction to a keypress. If client-side JavaScript
* is available, this will happen in the browser instead of here
Expand Down Expand Up @@ -68,7 +68,7 @@ export const actions: Actions = {
restart: async ({ cookies }) => {
cookies.delete('sverdle');
}
};
} satisfies Actions;

class Game {
index: number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@sveltejs/package": "workspace:*",
"svelte": "^3.44.0",
"tslib": "^2.3.1",
"typescript": "^4.8.2",
"typescript": "^4.9.3",
"vite": "^3.1.0"
},
"type": "module"
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"rollup": "^2.79.1",
"svelte": "^3.52.0",
"svelte-preprocess": "^4.10.7",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"uvu": "^0.5.6",
"vite": "^3.2.1"
},
Expand Down
24 changes: 24 additions & 0 deletions packages/kit/src/core/sync/write_types/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -265,4 +265,28 @@ test('Rewrites action types for a TypeScript module', () => {
);
});

test('Leaves satisfies operator untouched', () => {
const source = `
import type { Actions, PageServerLoad, RequestEvent } from './$types';

export function load({ params }) {
return {
a: 1
};
} satisfies PageServerLoad

export const actions = {
a: () => {},
b: (param: RequestEvent) => {},
c: (param) => {},
} satisfies Actions
`;

const rewritten = tweak_types(source, true);

assert.equal(rewritten?.exports, ['load', 'actions']);
assert.equal(rewritten?.modified, false);
assert.equal(rewritten?.code, source);
});

test.run();
2 changes: 1 addition & 1 deletion packages/kit/test/apps/amp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"purify-css": "^1.2.5",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/test/apps/basics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"rimraf": "^3.0.2",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/test/apps/dev-only/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"rimraf": "^3.0.2",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/test/apps/options-2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"cross-env": "^7.0.3",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/test/apps/options/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"cross-env": "^7.0.3",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/test/apps/writes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"rimraf": "^3.0.2",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"check": "svelte-kit sync && tsc && svelte-check"
},
"devDependencies": {
"@sveltejs/kit": "workspace:*",
"@sveltejs/adapter-auto": "workspace:*",
"@sveltejs/kit": "workspace:*",
"svelte": "^3.48.0",
"svelte-check": "^2.7.1",
"typescript": "^4.8.2",
"typescript": "^4.9.3",
"vite": "^3.1.1"
},
"type": "module"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"cross-env": "^7.0.3",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"vite": "^3.2.1"
},
"type": "module"
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/test/prerendering/basics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"uvu": "^0.5.6",
"vite": "^3.2.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/test/prerendering/fallback/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"uvu": "^0.5.6",
"vite": "^3.2.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/test/prerendering/options/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"uvu": "^0.5.6",
"vite": "^3.2.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/test/prerendering/paths-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"uvu": "^0.5.6",
"vite": "^3.2.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/test/prerendering/trailing-slash/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@sveltejs/kit": "workspace:*",
"svelte": "^3.52.0",
"svelte-check": "^2.9.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"uvu": "^0.5.6",
"vite": "^3.2.1"
},
Expand Down
Loading