merge master -> gh-349

sveltejs · Feb 10, 2021 · c547829 · c547829
2 parents f156c78 + 1ec8fb9
commit c547829
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 7 deletions.
diff --git a/.changeset/clever-tools-enjoy.md b/.changeset/clever-tools-enjoy.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+app.js -> app.cjs
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -24,6 +24,7 @@
     "calm-pens-prove",
     "chatty-mangos-raise",
     "chilled-starfishes-jog",
+    "clever-tools-enjoy",
     "cyan-roses-act",
     "cyan-seals-trade",
     "dirty-ligers-protect",
@@ -61,6 +62,7 @@
     "thick-meals-attend",
     "thirty-windows-cheer",
     "three-dingos-scream",
+    "tidy-boats-listen",
     "tidy-books-reply",
     "tiny-starfishes-exist",
     "tricky-avocados-smile",

diff --git a/.changeset/tidy-boats-listen.md b/.changeset/tidy-boats-listen.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/snowpack-config': patch
+---
+
+Make `@snowpack/plugin-svelte` use `svelte.config.cjs`
diff --git a/README.md b/README.md
@@ -26,6 +26,10 @@ pnpm build
 
 You should now be able to run the [examples](examples) by navigating to one of the directories and doing `pnpm dev`.
 
+### Version bumps
+
+You can bump the package versions by running `pnpx changeset` followed by `pnpx changeset version`.
+
 ## 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.
diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js
@@ -23,7 +23,7 @@ module.exports = async function adapter(builder) {
 
 	if (!netlify_config.build || !netlify_config.build.publish || !netlify_config.build.functions) {
 		throw new Error(
-			'You must specify build.publish and build.functions in netlify.toml. Consult https://github.com/sveltejs/adapter-netlify#configuration'
+			'You must specify build.publish and build.functions in netlify.toml. Consult https://github.com/sveltejs/kit/tree/master/packages/adapter-netlify#configuration'
 		);
 	}
 

diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/kit
 
+## 1.0.0-next.31
+
+### Patch Changes
+
+- b6c2434: app.js -> app.cjs
+
 ## 1.0.0-next.30
 
 ### Patch Changes

diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.0.0-next.30",
+	"version": "1.0.0-next.31",
 	"type": "module",
 	"dependencies": {
 		"cheap-watch": "^1.0.3",

diff --git a/packages/kit/src/api/build/index.js b/packages/kit/src/api/build/index.js
@@ -386,9 +386,9 @@ export async function build(config) {
 		dir: `${OPTIMIZED}/server`,
 		format: 'esm',
 		exports: 'named',
-		entryFileNames: '[name].js',
-		chunkFileNames: 'chunks/[name].js',
-		assetFileNames: 'assets/[name].js',
+		entryFileNames: '[name].cjs',
+		chunkFileNames: 'chunks/[name].cjs',
+		assetFileNames: 'assets/[name].cjs',
 		sourcemap: true
 	});
 

diff --git a/packages/snowpack-config/CHANGELOG.md b/packages/snowpack-config/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/snowpack-config
 
+## 1.0.0-next.3
+
+### Patch Changes
+
+- 7175368: Make `@snowpack/plugin-svelte` use `svelte.config.cjs`
+
 ## 1.0.0-next.2
 
 ### Patch Changes

diff --git a/packages/snowpack-config/package.json b/packages/snowpack-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/snowpack-config",
-	"version": "1.0.0-next.2",
+	"version": "1.0.0-next.3",
 	"scripts": {
 		"lint": "eslint --ignore-pattern node_modules/ \"**/*.{ts,js,cjs,svelte}\" && npm run check-format",
 		"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",

diff --git a/packages/snowpack-config/snowpack.config.cjs b/packages/snowpack-config/snowpack.config.cjs
@@ -15,7 +15,8 @@ module.exports = {
 			{
 				compilerOptions: {
 					hydratable: true
-				}
+				},
+				configFilePath: 'svelte.config.cjs'
 			}
 		]
 	],
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,8 @@ module.exports = { @@
     			{
     				compilerOptions: {
     					hydratable: true
-    				}
+    				},
+    				configFilePath: 'svelte.config.cjs'
     			}
     		]
     	],
@@ Expand Down @@