merge master -> gh-349

.changeset/pre.json

@@ -54,6 +54,7 @@
     "smart-pears-accept",
     "smooth-rockets-sneeze",
     "spicy-kings-perform",
+    "stale-plums-heal",
     "strange-poems-design",
     "tame-forks-happen",
     "tasty-donkeys-wait",

.changeset/stale-plums-heal.md

@@ -0,0 +1,7 @@
+---
+'create-svelte': patch
+'@sveltejs/kit': patch
+'@sveltejs/snowpack-config': patch
+---
+
+Rename _.config.js to _.config.cjs

.eslintrc.json

@@ -6,6 +6,8 @@
 	},
 	"settings": {
 		"import/ignore": "/template/"
-
+	},
+	"rules": {
+		"@typescript-eslint/no-var-requires": "off"
 	}
 }

README.md

@@ -25,3 +25,7 @@ pnpm build
 ```
 
 You should now be able to run the [examples](examples) by navigating to one of the directories and doing `pnpm dev`.
+
+## Testing
+
+Run `pnpm test` to run the tests from all subpackages. Browser tests live in subpackages of `test/` such as `test/apps/basics/`. To run a single test, open up the file and change `test` to `test.only` for the relevant test.

examples/hn.svelte.dev/package.json

@@ -11,6 +11,6 @@
 		"@sveltejs/adapter-netlify": "workspace:*",
 		"@sveltejs/kit": "workspace:*",
 		"@sveltejs/snowpack-config": "workspace:*",
-		"svelte": "^3.29.0"
+		"svelte": "^3.32.1"
 	}
 }

examples/realworld.svelte.dev/README.md

@@ -16,7 +16,6 @@ npm init svelte@next my-app
 
 > Note: the `@next` is temporary
 
-
 ## Developing
 
 Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
@@ -28,14 +27,13 @@ npm run dev
 npm run dev -- --open
 ```
 
-
 ## Building
 
-Svelte apps are built with *adapters*, which optimise your project for deployment to different environments, like [Begin](https://begin.com), [Netlify](https://www.netlify.com), [Vercel](https://vercel.com) and so on. (You can also create your own adapter — instructions TODO.)
+Svelte apps are built with _adapters_, which optimise your project for deployment to different environments, like [Begin](https://begin.com), [Netlify](https://www.netlify.com), [Vercel](https://vercel.com) and so on. (You can also create your own adapter — instructions TODO.)
 
-By default, `npm run build` will generate a Node app that you can run with `node build`. To use a different adapter, install it and update your `svelte.config.js` accordingly. The following official adapters are available:
+By default, `npm run build` will generate a Node app that you can run with `node build`. To use a different adapter, install it and update your `svelte.config.cjs` accordingly. The following official adapters are available:
 
-* [@sveltejs/adapter-node](https://github.com/sveltejs/kit/tree/master/packages/adapter-node)
-* [@sveltejs/adapter-static](https://github.com/sveltejs/kit/tree/master/packages/adapter-static)
-* [@sveltejs/adapter-netlify](https://github.com/sveltejs/kit/tree/master/packages/adapter-netlify)
-* ...more soon
+- [@sveltejs/adapter-node](https://github.com/sveltejs/kit/tree/master/packages/adapter-node)
+- [@sveltejs/adapter-static](https://github.com/sveltejs/kit/tree/master/packages/adapter-static)
+- [@sveltejs/adapter-netlify](https://github.com/sveltejs/kit/tree/master/packages/adapter-netlify)
+- ...more soon

examples/realworld.svelte.dev/package.json

@@ -11,8 +11,8 @@
 		"@sveltejs/adapter-node": "workspace:*",
 		"@sveltejs/kit": "workspace:*",
 		"@sveltejs/snowpack-config": "workspace:*",
-		"marked": "^1.2.2",
-		"svelte": "^3.29.0"
+		"marked": "^1.2.8",
+		"svelte": "^3.32.1"
 	},
 	"dependencies": {
 		"node-fetch": "^2.6.1"

examples/sandbox/package.json

@@ -11,6 +11,6 @@
 		"@sveltejs/adapter-node": "workspace:*",
 		"@sveltejs/kit": "workspace:*",
 		"@sveltejs/snowpack-config": "workspace:*",
-		"svelte": "^3.29.0"
+		"svelte": "^3.32.1"
 	}
 }

examples/svelte-kit-demo/README.md

@@ -2,4 +2,4 @@
 
 Place to try out [@sveltejs/app](https://github.com/sveltejs/kit). Very basic and incomplete, many things haven't yet been thought through.
 
-To start the app in development mode do `npm run dev`. To build, use `npm run build`. This will use whichever adapter is specified in `svelte.config.js`, which will also need to be installed (or linked).
+To start the app in development mode do `npm run dev`. To build, use `npm run build`. This will use whichever adapter is specified in `svelte.config.cjs`, which will also need to be installed (or linked).

examples/svelte-kit-demo/package.json

@@ -12,6 +12,6 @@
 		"@sveltejs/adapter-static": "workspace:*",
 		"@sveltejs/kit": "workspace:*",
 		"@sveltejs/snowpack-config": "workspace:*",
-		"svelte": "^3.29.0"
+		"svelte": "^3.32.1"
 	}
 }

package.json

@@ -22,20 +22,20 @@
 	},
 	"homepage": "https://github.com/sveltejs/kit#readme",
 	"devDependencies": {
-		"@changesets/cli": "^2.11.1",
-		"@rollup/plugin-commonjs": "^15.1.0",
+		"@changesets/cli": "^2.14.0",
+		"@rollup/plugin-commonjs": "^17.1.0",
 		"@rollup/plugin-json": "^4.1.0",
-		"@rollup/plugin-node-resolve": "^9.0.0",
+		"@rollup/plugin-node-resolve": "^11.1.1",
 		"@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.6.0",
-		"@typescript-eslint/eslint-plugin": "^4.8.2",
-		"@typescript-eslint/parser": "^4.8.2",
-		"eslint": "^7.11.0",
+		"@typescript-eslint/eslint-plugin": "^4.14.2",
+		"@typescript-eslint/parser": "^4.14.2",
+		"eslint": "^7.19.0",
 		"eslint-plugin-import": "^2.22.1",
-		"eslint-plugin-svelte3": "^2.7.3",
-		"playwright": "^1.6.2",
-		"prettier": "2.1.2",
-		"rollup": "^2.32.0",
-		"typescript": "^4.1.2"
+		"eslint-plugin-svelte3": "^3.0.0",
+		"playwright": "^1.8.0",
+		"prettier": "2.2.1",
+		"rollup": "^2.38.3",
+		"typescript": "^4.1.3"
 	},
 	"type": "module"
 }

packages/adapter-node/package.json

@@ -15,7 +15,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/app-utils": "workspace:*",
-		"rollup": "^2.32.0",
-		"sirv": "^1.0.7"
+		"rollup": "^2.38.3",
+		"sirv": "^1.0.11"
 	}
 }

packages/adapter-vercel/package.json

@@ -17,7 +17,7 @@
 		"@sveltejs/app-utils": "workspace:*"
 	},
 	"devDependencies": {
-		"rollup": "^2.32.0",
-		"sirv": "^1.0.7"
+		"rollup": "^2.38.3",
+		"sirv": "^1.0.11"
 	}
 }

packages/app-utils/package.json

@@ -12,17 +12,16 @@
 		"test": "uvu"
 	},
 	"dependencies": {
-		"mime": "^2.4.6"
+		"mime": "^2.5.0"
 	},
 	"devDependencies": {
 		"@types/mime": "^2.0.3",
-		"@types/node": "^14.14.0",
-		"@types/node-fetch": "^2.5.7",
+		"@types/node": "^14.14.22",
+		"@types/node-fetch": "^2.5.8",
 		"devalue": "^2.0.1",
 		"node-fetch": "^2.6.1",
-		"rollup": "^2.32.0",
-		"svelte": "^3.29.0",
-		"uvu": "^0.5.1"
+		"rollup": "^2.38.3",
+		"svelte": "^3.32.1"
 	},
 	"type": "module",
 	"exports": {

packages/create-svelte/CHANGELOG.md

@@ -1,5 +1,11 @@
 # create-svelte
 
+## 2.0.0-next.26
+
+### Patch Changes
+
+- 00cbaf6: Rename _.config.js to _.config.cjs
+
 ## 2.0.0-next.25
 
 ### Patch Changes

packages/create-svelte/cli/modifications/utils.js

@@ -30,7 +30,7 @@ export function update_component(cwd, filepath, replacements) {
 }
 
 /**
- * Adds `svelte-preprocess` to `svelte.config.js`, if there's no preprocessor already.
+ * Adds `svelte-preprocess` to `svelte.config.cjs`, if there's no preprocessor already.
  */
 export function add_svelte_prepocess_to_config(cwd) {
 	const file = path.join(cwd, 'svelte.config.cjs');
@@ -44,9 +44,9 @@ export function add_svelte_prepocess_to_config(cwd) {
 	config = config.replace(
 		'module.exports = {',
 		`module.exports = {
-    // Consult https://github.com/sveltejs/svelte-preprocess
-    // for more information about preprocessors
-    preprocess: sveltePreprocess(),`
+	// Consult https://github.com/sveltejs/svelte-preprocess
+	// for more information about preprocessors
+	preprocess: sveltePreprocess(),`
 	);
 
 	fs.writeFileSync(file, config);

packages/create-svelte/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-svelte",
-	"version": "2.0.0-next.25",
+	"version": "2.0.0-next.26",
 	"bin": "./bin",
 	"devDependencies": {
 		"@rollup/plugin-json": "^4.1.0",
@@ -9,9 +9,9 @@
 		"@sveltejs/kit": "workspace:*",
 		"@sveltejs/snowpack-config": "workspace:*",
 		"gitignore-parser": "^0.0.2",
-		"kleur": "^4.1.3",
-		"prompts": "^2.3.2",
-		"rollup": "^2.32.0",
+		"kleur": "^4.1.4",
+		"prompts": "^2.4.0",
+		"rollup": "^2.38.3",
 		"tiny-glob": "^0.2.8"
 	},
 	"scripts": {

packages/create-svelte/template/README.md

@@ -31,7 +31,7 @@ npm run dev -- --open
 
 Svelte apps are built with _adapters_, which optimise your project for deployment to different environments, like [Begin](https://begin.com), [Netlify](https://www.netlify.com), [Vercel](https://vercel.com) and so on. (You can also create your own adapter — instructions TODO.)
 
-By default, `npm run build` will generate a Node app that you can run with `node build`. To use a different adapter, install it and update your `svelte.config.js` accordingly. The following official adapters are available:
+By default, `npm run build` will generate a Node app that you can run with `node build`. To use a different adapter, install it and update your `svelte.config.cjs` accordingly. The following official adapters are available:
 
 - [@sveltejs/adapter-node](https://github.com/sveltejs/kit/tree/master/packages/adapter-node)
 - [@sveltejs/adapter-static](https://github.com/sveltejs/kit/tree/master/packages/adapter-static)

packages/create-svelte/template/package.json

@@ -11,5 +11,6 @@
 		"@sveltejs/kit": "workspace:*",
 		"@sveltejs/snowpack-config": "workspace:*",
 		"svelte": "^3.29.0"
-	}
+	},
+	"type": "module"
 }

packages/kit/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @sveltejs/kit
 
+## 1.0.0-next.30
+
+### Patch Changes
+
+- 00cbaf6: Rename _.config.js to _.config.cjs
+
 ## 1.0.0-next.29
 
 ### Patch Changes

packages/kit/package.json

@@ -1,40 +1,39 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.0.0-next.29",
+	"version": "1.0.0-next.30",
 	"type": "module",
 	"dependencies": {
-		"cheap-watch": "^1.0.2",
+		"cheap-watch": "^1.0.3",
 		"http-proxy": "^1.18.1",
-		"rollup": "^2.32.0",
+		"rollup": "^2.38.3",
 		"rollup-plugin-css-chunks": "^2.0.2",
 		"rollup-plugin-terser": "^7.0.2",
 		"sade": "^1.7.4",
 		"scorta": "^1.0.0",
-		"snowpack": "^3.0.10",
+		"snowpack": "^3.0.11",
 		"source-map": "^0.7.3"
 	},
 	"devDependencies": {
-		"@sveltejs/app-utils": "*",
-		"@types/node": "^14.11.10",
+		"@sveltejs/app-utils": "workspace:*",
+		"@types/node": "^14.14.22",
 		"@types/rimraf": "^3.0.0",
 		"@types/sade": "^1.7.2",
 		"amphtml-validator": "^1.0.34",
-		"eslint": "^7.14.0",
-		"estree-walker": "^3.0.0",
+		"eslint": "^7.19.0",
+		"estree-walker": "^2.0.2",
 		"is-reference": "^1.2.1",
-		"kleur": "^4.1.3",
+		"kleur": "^4.1.4",
 		"magic-string": "^0.25.7",
-		"meriyah": "^3.0.3",
+		"meriyah": "^3.1.6",
 		"node-fetch": "^2.6.1",
 		"periscopic": "^3.0.0",
-		"port-authority": "^1.1.1",
+		"port-authority": "^1.1.2",
 		"require-relative": "^0.8.7",
 		"rimraf": "^3.0.2",
-		"sirv": "^1.0.7",
+		"sirv": "^1.0.11",
 		"source-map-support": "^0.5.19",
-		"svelte": "^3.29.0",
-		"tiny-glob": "^0.2.8",
-		"uvu": "^0.5.1"
+		"svelte": "^3.32.1",
+		"tiny-glob": "^0.2.8"
 	},
 	"bin": {
 		"svelte-kit": "svelte-kit"