Server-side preload check fixes (fixes #575, #594, #598)

Author: Conduitry

package-lock.json

@@ -50,12 +50,12 @@
     "rollup-plugin-replace": "^2.1.0",
     "rollup-plugin-string": "^2.0.2",
     "rollup-plugin-sucrase": "^2.1.0",
-    "rollup-plugin-svelte": "^5.0.1",
+    "rollup-plugin-svelte": "^5.0.3",
     "sade": "^1.4.2",
     "sirv": "^0.2.2",
     "sucrase": "^3.9.5",
-    "svelte": "^3.0.0-alpha27",
-    "svelte-loader": "^2.12.0",
+    "svelte": "^3.0.0-beta.11",
+    "svelte-loader": "^2.13.3",
     "webpack": "^4.29.0",
     "webpack-format-messages": "^2.0.5",
     "yootils": "0.0.14"

package.json

@@ -9,7 +9,8 @@ import { builtinModules } from 'module';
 const external = [].concat(
 	Object.keys(pkg.dependencies),
 	Object.keys(process.binding('natives')),
-	'sapper/core.js'
+	'sapper/core.js',
+	'svelte/compiler'
 );
 
 function template(kind, external) {
@@ -65,4 +66,4 @@ export default [
 			})
 		]
 	}
-];
+];

rollup.config.js

@@ -17,11 +17,8 @@ export default function create_manifest_data(cwd: string): ManifestData {
 
 		if (/preload/.test(source)) {
 			try {
-				const { stats } = svelte.compile(source, {
-					generate: false,
-					onwarn: () => {}
-				});
-				return !!stats.vars.find((variable: any) => variable.module && variable.export_name === 'preload');
+				const { vars } = svelte.compile(source.replace(/<style\b[^>]*>[^]*?<\/style>/g, ''), { generate: false });
+				return vars.some((variable: any) => variable.module && variable.export_name === 'preload');
 			} catch (err) {}
 		}
 
@@ -346,4 +343,4 @@ function get_pattern(segments: Part[][], add_trailing_slash: boolean) {
 		}).join('') +
 		(add_trailing_slash ? '\\\/?$' : '$')
 	);
-}
+}