Merge pull request #441 from silentworks/bugfix/legacy-manifest

Fix for legacy manifest file
sveltejs · Sep 19, 2018 · 91182ad · ispyinternet · Sep 19, 2018 · Rich-Harris
2 parents 8c07d9d + 467041a
commit 91182ad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -74,6 +74,7 @@
     "test": "mocha --opts mocha.opts",
     "pretest": "npm run build",
     "build": "rm -rf dist && rollup -c",
+    "prepare": "npm run build",
     "dev": "rollup -cw",
     "prepublishOnly": "npm test",
     "update_mime_types": "curl http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types | grep -e \"^[^#]\" > src/middleware/mime-types.md"

diff --git a/src/api/build.ts b/src/api/build.ts
@@ -79,7 +79,8 @@ async function execute(emitter: EventEmitter, opts: Opts, dirs: Dirs) {
 			// TODO duration/warnings
 			result: client_result
 		});
-
+
+		client_result.to_json(manifest_data, dirs);
 		build_info.legacy_assets = client_result.assets;
 		delete process.env.SAPPER_LEGACY_BUILD;
 	}

diff --git a/src/core/create_compilers/extract_css.ts b/src/core/create_compilers/extract_css.ts
@@ -170,6 +170,7 @@ export default function extract_css(client_result: CompileResult, components: Pa
 	}
 
 	const main = client_result.assets.main;
+	if (process.env.SAPPER_LEGACY_BUILD) main = `legacy/${main}`;
 	const entry = fs.readFileSync(`${dirs.dest}/client/${main}`, 'utf-8');
 
 	const replacements = new Map();