-> v0.24.1

Merge pull request #530 from artemjackson/patch-1
Fixed rel="preload" `as` attribute for styles
2026-01-13 19:45:26 +00:00 · 2018-12-09 10:30:34 -05:00 · 2018-12-09 10:28:39 -05:00 · 2018-12-09 10:28:19 -05:00 · 2018-12-09 18:01:31 +03:00 · 2018-12-09 18:00:55 +03:00
7 changed files with 83 additions and 114 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # sapper changelog

+## 0.24.1
+
+* Include CSS chunks in webpack build info to avoid duplication ([#529](https://github.com/sveltejs/sapper/pull/529))
+* Fix preload `as` for styles ([#530](https://github.com/sveltejs/sapper/pull/530))
+
 ## 0.24.0

 * Handle external URLs in `this.redirect` ([#490](https://github.com/sveltejs/sapper/issues/490))
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "sapper",
-  "version": "0.23.1",
+  "version": "0.24.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1702,12 +1702,6 @@
      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
      "dev": true
    },
-    "duplexer": {
-      "version": "0.1.1",
-      "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-      "dev": true
-    },
    "duplexify": {
      "version": "3.6.1",
      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
@@ -2043,22 +2037,6 @@
      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
      "dev": true
    },
-    "event-stream": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.6.tgz",
-      "integrity": "sha512-dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==",
-      "dev": true,
-      "requires": {
-        "duplexer": "^0.1.1",
-        "flatmap-stream": "^0.1.0",
-        "from": "^0.1.7",
-        "map-stream": "0.0.7",
-        "pause-stream": "^0.0.11",
-        "split": "^1.0.1",
-        "stream-combiner": "^0.2.2",
-        "through": "^2.3.8"
-      }
-    },
    "events": {
      "version": "1.1.1",
      "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
@@ -2281,12 +2259,6 @@
        "write": "^0.2.1"
      }
    },
-    "flatmap-stream": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.1.tgz",
-      "integrity": "sha512-lAq4tLbm3sidmdCN8G3ExaxH7cUCtP5mgDvrYowsx84dcYkJJ4I28N7gkxA6+YlSXzaGLJYIDEi9WGfXzMiXdw==",
-      "dev": true
-    },
    "flush-write-stream": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
@@ -2321,12 +2293,6 @@
        "map-cache": "^0.2.2"
      }
    },
-    "from": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-      "dev": true
-    },
    "from2": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
@@ -2396,12 +2362,14 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@@ -2416,17 +2384,20 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@@ -2543,7 +2514,8 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@@ -2555,6 +2527,7 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@@ -2569,6 +2542,7 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@@ -2576,12 +2550,14 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "minipass": {
          "version": "2.2.4",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.1",
            "yallist": "^3.0.0"
@@ -2600,6 +2576,7 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@@ -2680,7 +2657,8 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@@ -2692,6 +2670,7 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@@ -2813,6 +2792,7 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@@ -3648,12 +3628,6 @@
      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
      "dev": true
    },
-    "map-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-      "dev": true
-    },
    "map-visit": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
@@ -4059,17 +4033,17 @@
      }
    },
    "npm-run-all": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.3.tgz",
-      "integrity": "sha512-aOG0N3Eo/WW+q6sUIdzcV2COS8VnTZCmdji0VQIAZF3b+a3YWb0AD0vFIyjKec18A7beLGbaQ5jFTNI2bPt9Cg==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
+      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
      "dev": true,
      "requires": {
-        "ansi-styles": "^3.2.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.4",
+        "ansi-styles": "^3.2.1",
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
        "memorystream": "^0.3.1",
        "minimatch": "^3.0.4",
-        "ps-tree": "^1.1.0",
+        "pidtree": "^0.3.0",
        "read-pkg": "^3.0.0",
        "shell-quote": "^1.6.1",
        "string.prototype.padend": "^3.0.0"
@@ -4399,15 +4373,6 @@
        "pify": "^2.0.0"
      }
    },
-    "pause-stream": {
-      "version": "0.0.11",
-      "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-      "dev": true,
-      "requires": {
-        "through": "~2.3"
-      }
-    },
    "pbkdf2": {
      "version": "3.0.17",
      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
@@ -4427,6 +4392,12 @@
      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
      "dev": true
    },
+    "pidtree": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz",
+      "integrity": "sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==",
+      "dev": true
+    },
    "pify": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -4539,15 +4510,6 @@
      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
      "dev": true
    },
-    "ps-tree": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz",
-      "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=",
-      "dev": true,
-      "requires": {
-        "event-stream": "~3.3.0"
-      }
-    },
    "pseudomap": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -5665,15 +5627,6 @@
      "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==",
      "dev": true
    },
-    "split": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-      "dev": true,
-      "requires": {
-        "through": "2"
-      }
-    },
    "split-string": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -5729,16 +5682,6 @@
        "readable-stream": "^2.0.2"
      }
    },
-    "stream-combiner": {
-      "version": "0.2.2",
-      "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
-      "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
-      "dev": true,
-      "requires": {
-        "duplexer": "~0.1.1",
-        "through": "~2.3.4"
-      }
-    },
    "stream-each": {
      "version": "1.2.3",
      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sapper",
-  "version": "0.24.0",
+  "version": "0.24.1",
  "description": "Military-grade apps, engineered by Svelte",
  "bin": {
    "sapper": "./sapper"
@@ -40,7 +40,7 @@
    "mkdirp": "^0.5.1",
    "mocha": "^5.2.0",
    "node-fetch": "^2.2.0",
-    "npm-run-all": "^4.1.3",
+    "npm-run-all": "^4.1.5",
    "polka": "^0.5.1",
    "port-authority": "^1.0.5",
    "pretty-bytes": "^5.1.0",
--- a/src/core/create_compilers/WebpackResult.ts
+++ b/src/core/create_compilers/WebpackResult.ts
@@ -55,14 +55,25 @@ export default class WebpackResult implements CompileResult {
 	}

 	to_json(manifest_data: ManifestData, dirs: Dirs): BuildInfo {
+		const extract_css = (assets: string[] | string) => {
+			assets = Array.isArray(assets) ? assets : [assets];
+			return assets.find(asset => /\.css$/.test(asset));
+		};
+
 		return {
 			bundler: 'webpack',
 			shimport: null, // webpack has its own loader
 			assets: this.assets,
 			css: {
-				// TODO
-				main: null,
-				chunks: {}
+				main: extract_css(this.assets.main),
+				chunks: Object
+					.keys(this.assets)
+					.filter(chunkName => chunkName !== 'main')
+					.reduce((chunks: { [key: string]: string }, chukName) => {
+						const assets = this.assets[chukName];
+						chunks[chukName] = extract_css(assets);
+						return chunks;
+					}, {})
 			}
 		};
 	}
--- a/templates/src/server/middleware/get_page_handler.ts
+++ b/templates/src/server/middleware/get_page_handler.ts
@@ -67,7 +67,10 @@ export function get_page_handler(
 		} else {
 			const link = preloaded_chunks
 				.filter(file => file && !file.match(/\.map$/))
-				.map(file => `<${req.baseUrl}/client/${file}>;rel="preload";as="script"`)
+				.map((file) => {
+					const as = /\.css$/.test(file) ? 'style' : 'script';
+					return `<${req.baseUrl}/client/${file}>;rel="preload";as="${as}"`;
+				})
 				.join(', ');

 			res.setHeader('Link', link);
@@ -335,4 +338,4 @@ function escape_html(html: string) {
 	};

 	return html.replace(/["'&<>]/g, c => `&${chars[c]};`);
-}
+}
--- a/test/apps/AppRunner.ts
+++ b/test/apps/AppRunner.ts
@@ -8,6 +8,10 @@ declare const prefetchRoutes: () => Promise<void>;
 declare const prefetch: (href: string) => Promise<void>;
 declare const goto: (href: string) => Promise<void>;

+type StartOpts = {
+	requestInterceptor?: (interceptedRequst: puppeteer.Request) => any
+};
+
 export class AppRunner {
 	cwd: string;
 	entry: string;
@@ -24,7 +28,7 @@ export class AppRunner {
 		this.messages = [];
 	}

-	async start() {
+	async start({ requestInterceptor }: StartOpts = {}) {
 		this.port = await ports.find(3000);

 		this.proc = fork(this.entry, [], {
@@ -50,19 +54,10 @@ export class AppRunner {
 			}
 		});

-		await this.page.setRequestInterception(true);
-
-		this.page.on('request', interceptedRequest => {
-			if (/example\.com/.test(interceptedRequest.url())) {
-				interceptedRequest.respond({
-					status: 200,
-					contentType: 'text/html',
-					body: `<h1>external</h1>`
-				});
-			} else {
-				interceptedRequest.continue();
-			}
-		});
+		if (requestInterceptor) {
+			await this.page.setRequestInterception(true);
+			this.page.on('request', requestInterceptor);
+		}

 		return {
 			page: this.page,
--- a/test/apps/redirects/test.ts
+++ b/test/apps/redirects/test.ts
@@ -21,7 +21,19 @@ describe('redirects', function() {
 		await build({ cwd: __dirname });

 		runner = new AppRunner(__dirname, '__sapper__/build/server/server.js');
-		({ base, page, start, prefetchRoutes, title } = await runner.start());
+		({ base, page, start, prefetchRoutes, title } = await runner.start({
+			requestInterceptor: (interceptedRequest) => {
+				if (/example\.com/.test(interceptedRequest.url())) {
+					interceptedRequest.respond({
+						status: 200,
+						contentType: 'text/html',
+						body: `<h1>external</h1>`
+					});
+				} else {
+					interceptedRequest.continue();
+				}
+			}
+		}));
 	});

 	after(() => runner.end());
Author	SHA1	Message	Date
Rich Harris	02cef046aa	-> v0.24.1	2018-12-09 10:30:34 -05:00
Rich Harris	c2aeac34b6	Merge pull request #530 from artemjackson/patch-1 Fixed rel="preload" `as` attribute for styles	2018-12-09 10:28:39 -05:00
Rich Harris	abd2f7fd39	Merge pull request #529 from artemjackson/master Added css build info for webpack apps	2018-12-09 10:28:19 -05:00
Artyom Stepanishchev	e7cf9bf1b6	Merge branch 'master' of github.com:sveltejs/sapper	2018-12-09 18:01:31 +03:00
Artyom Stepanishchev	1fdd0e3ad2	Merge branch 'master' of github.com:sveltejs/sapper into patch-1	2018-12-09 18:00:55 +03:00
Rich Harris	af0a7e04f9	Merge pull request #531 from artemjackson/bugfix/tests Fixed tests for node 6	2018-12-09 09:57:12 -05:00
Artyom Stepanishchev	ed19a19fed	Fixed tests for node 6	2018-12-09 17:28:59 +03:00
Artyom Stepanishchev	8ebfcc9a54	Fixed rel="preload" `as` attribute for styles	2018-12-07 23:59:51 +03:00
Artyom Stepanishchev	af2a792508	Added css build info for webpack apps	2018-12-07 23:28:28 +03:00
Conduitry	14e809af6e	update npm-run-all to remove malicious flatmap-stream@0.1.1	2018-12-06 07:02:04 -05:00