mirror of
https://github.com/kevin-DL/sapper.git
synced 2026-01-13 19:45:26 +00:00
Compare commits
36 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
6765e534e4 | ||
|
|
160a2e2ede | ||
|
|
3ecc21c0d9 | ||
|
|
3ffb396d87 | ||
|
|
59fccc9e9a | ||
|
|
da9a37e125 | ||
|
|
499b377bfd | ||
|
|
1baeb79d4b | ||
|
|
0cc5ff95d6 | ||
|
|
e90525c1e8 | ||
|
|
6ccae0cd33 | ||
|
|
8b60d568dc | ||
|
|
64c2394c9d | ||
|
|
b28037291a | ||
|
|
bf9cbe2f3b | ||
|
|
2c507b5a2e | ||
|
|
4a92fbbbfa | ||
|
|
b16440ff0f | ||
|
|
64223b572b | ||
|
|
1b6dfd3580 | ||
|
|
c0b833862a | ||
|
|
45f4c47a3e | ||
|
|
48b87edb5b | ||
|
|
f9f283603e | ||
|
|
a56ee6bdb7 | ||
|
|
a18af2a473 | ||
|
|
fe5a8fb1e7 | ||
|
|
57a26e3511 | ||
|
|
bebb0dd595 | ||
|
|
afba0491ed | ||
|
|
350d37e210 | ||
|
|
96fc19e939 | ||
|
|
5be3809d9e | ||
|
|
15cc4bf296 | ||
|
|
c7cce985e3 | ||
|
|
e00b315dec |
28
CHANGELOG.md
28
CHANGELOG.md
@@ -1,5 +1,33 @@
|
|||||||
# sapper changelog
|
# sapper changelog
|
||||||
|
|
||||||
|
## 0.19.3
|
||||||
|
|
||||||
|
* Better unicode route handling ([#347](https://github.com/sveltejs/sapper/issues/347))
|
||||||
|
|
||||||
|
## 0.19.2
|
||||||
|
|
||||||
|
* Ignore editor tmp files ([#220](https://github.com/sveltejs/sapper/issues/220))
|
||||||
|
* Ignore clicks an `<a>` element without `href` ([#235](https://github.com/sveltejs/sapper/issues/235))
|
||||||
|
* Allow routes that are reserved JavaScript words ([#315](https://github.com/sveltejs/sapper/issues/315))
|
||||||
|
* Print out webpack errors ([#403](https://github.com/sveltejs/sapper/issues/403))
|
||||||
|
|
||||||
|
## 0.19.1
|
||||||
|
|
||||||
|
* Don't include local origin in export redirects ([#409](https://github.com/sveltejs/sapper/pull/409))
|
||||||
|
|
||||||
|
## 0.19.0
|
||||||
|
|
||||||
|
* Extract styles out of JS into .css files, for Rollup apps ([#388](https://github.com/sveltejs/sapper/issues/388))
|
||||||
|
* Fix `prefetchRoutes` ([#380](https://github.com/sveltejs/sapper/issues/380))
|
||||||
|
|
||||||
|
## 0.18.7
|
||||||
|
|
||||||
|
* Support differential bundling for Rollup apps via a `--legacy` flag ([#280](https://github.com/sveltejs/sapper/issues/280))
|
||||||
|
|
||||||
|
## 0.18.6
|
||||||
|
|
||||||
|
* Bundle missing dependency
|
||||||
|
|
||||||
## 0.18.5
|
## 0.18.5
|
||||||
|
|
||||||
* Bugfix
|
* Bugfix
|
||||||
|
|||||||
80
package-lock.json
generated
80
package-lock.json
generated
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "sapper",
|
"name": "sapper",
|
||||||
"version": "0.18.3",
|
"version": "0.19.3",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -10,6 +10,15 @@
|
|||||||
"integrity": "sha1-MU+BaPUK5IoDLP2tX9tDb0ZKl6w=",
|
"integrity": "sha1-MU+BaPUK5IoDLP2tX9tDb0ZKl6w=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"@types/blessed": {
|
||||||
|
"version": "0.1.10",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/blessed/-/blessed-0.1.10.tgz",
|
||||||
|
"integrity": "sha512-lCpkGnCq2lj9RBPwh/RH/ZJegYV6JdyyRHmURIW1DwMdtNhRRxYeHllqaMu8K6bDf6zhO7PpHsmEqlYMDPlmhw==",
|
||||||
|
"requires": {
|
||||||
|
"@types/events": "*",
|
||||||
|
"@types/node": "*"
|
||||||
|
}
|
||||||
|
},
|
||||||
"@types/estree": {
|
"@types/estree": {
|
||||||
"version": "0.0.39",
|
"version": "0.0.39",
|
||||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
|
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
|
||||||
@@ -19,8 +28,7 @@
|
|||||||
"@types/events": {
|
"@types/events": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
|
||||||
"integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
|
"integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA=="
|
||||||
"dev": true
|
|
||||||
},
|
},
|
||||||
"@types/glob": {
|
"@types/glob": {
|
||||||
"version": "5.0.35",
|
"version": "5.0.35",
|
||||||
@@ -55,10 +63,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"@types/node": {
|
"@types/node": {
|
||||||
"version": "10.9.3",
|
"version": "10.9.4",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.9.3.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz",
|
||||||
"integrity": "sha512-DOzWZKUnmFYG0KUOs+9HEBju2QhBU6oM2zeluunQNt0vnJvnkHvtDNlQPZDkTrkC5pZrNx1TPqeL137zciXZMQ==",
|
"integrity": "sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw=="
|
||||||
"dev": true
|
|
||||||
},
|
},
|
||||||
"@types/rimraf": {
|
"@types/rimraf": {
|
||||||
"version": "2.0.2",
|
"version": "2.0.2",
|
||||||
@@ -1010,6 +1017,11 @@
|
|||||||
"integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
|
"integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"blessed": {
|
||||||
|
"version": "0.1.81",
|
||||||
|
"resolved": "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz",
|
||||||
|
"integrity": "sha1-+WLWh+wsNpVwrnGvhDJW5tDKESk="
|
||||||
|
},
|
||||||
"bluebird": {
|
"bluebird": {
|
||||||
"version": "3.5.1",
|
"version": "3.5.1",
|
||||||
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
|
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
|
||||||
@@ -1154,7 +1166,7 @@
|
|||||||
},
|
},
|
||||||
"buffer": {
|
"buffer": {
|
||||||
"version": "4.9.1",
|
"version": "4.9.1",
|
||||||
"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
|
"resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
|
||||||
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
|
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -1594,7 +1606,7 @@
|
|||||||
},
|
},
|
||||||
"compare-versions": {
|
"compare-versions": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-2.0.1.tgz",
|
"resolved": "http://registry.npmjs.org/compare-versions/-/compare-versions-2.0.1.tgz",
|
||||||
"integrity": "sha1-Htwfk2h/2XoyXFn1XkWgfbEGrKY=",
|
"integrity": "sha1-Htwfk2h/2XoyXFn1XkWgfbEGrKY=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
@@ -2071,9 +2083,9 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/node": {
|
"@types/node": {
|
||||||
"version": "8.10.28",
|
"version": "8.10.29",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.28.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.29.tgz",
|
||||||
"integrity": "sha512-iHsAzDg3OLH7JP+wipniUULHoDSWLgEDYOvsar6/mpAkTJd9/n23Ap8ikruMlvRTqMv/LXrflH9v/AfiEqaBGg==",
|
"integrity": "sha512-zbteaWZ2mdduacm0byELwtRyhYE40aK+pAanQk415gr1eRuu67x7QGOLmn8jz5zI8LDK7d0WI/oT6r5Trz4rzQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2097,7 +2109,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"minimist": {
|
"minimist": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
||||||
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
||||||
"dev": true
|
"dev": true
|
||||||
}
|
}
|
||||||
@@ -2235,7 +2247,7 @@
|
|||||||
},
|
},
|
||||||
"eslint": {
|
"eslint": {
|
||||||
"version": "4.19.1",
|
"version": "4.19.1",
|
||||||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
|
"resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
|
||||||
"integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
|
"integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -2538,7 +2550,7 @@
|
|||||||
},
|
},
|
||||||
"external-editor": {
|
"external-editor": {
|
||||||
"version": "2.2.0",
|
"version": "2.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
|
"resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
|
||||||
"integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
|
"integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -4270,9 +4282,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"make-error": {
|
"make-error": {
|
||||||
"version": "1.3.4",
|
"version": "1.3.5",
|
||||||
"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
|
||||||
"integrity": "sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==",
|
"integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"mamacro": {
|
"mamacro": {
|
||||||
@@ -4397,7 +4409,7 @@
|
|||||||
},
|
},
|
||||||
"minimist": {
|
"minimist": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
||||||
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
@@ -4537,7 +4549,7 @@
|
|||||||
},
|
},
|
||||||
"minimist": {
|
"minimist": {
|
||||||
"version": "0.0.8",
|
"version": "0.0.8",
|
||||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
|
"resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
|
||||||
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
|
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
@@ -4991,7 +5003,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"minimist": {
|
"minimist": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
||||||
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
@@ -5682,7 +5694,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"minimist": {
|
"minimist": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
||||||
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
||||||
"dev": true
|
"dev": true
|
||||||
}
|
}
|
||||||
@@ -6287,9 +6299,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"shimport": {
|
"shimport": {
|
||||||
"version": "0.0.9",
|
"version": "0.0.10",
|
||||||
"resolved": "https://registry.npmjs.org/shimport/-/shimport-0.0.9.tgz",
|
"resolved": "https://registry.npmjs.org/shimport/-/shimport-0.0.10.tgz",
|
||||||
"integrity": "sha512-y0DHz5ffBuz+iXUQgkqjT3yJRuegeyhHeDdqVdDMVDCeuS0Ex6AFPLFNV228EfPQmkDumraLsN9HBcT1qyLxHw=="
|
"integrity": "sha512-3xPFDLmcLj87sx0OwA60qbloMQUsu6VGF97IG4RqxTf91sGeiaaXOPxM1PoQHbaTm4TOhH8zosokqLAZtuNGnA=="
|
||||||
},
|
},
|
||||||
"signal-exit": {
|
"signal-exit": {
|
||||||
"version": "3.0.2",
|
"version": "3.0.2",
|
||||||
@@ -6505,6 +6517,11 @@
|
|||||||
"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
|
"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"sourcemap-codec": {
|
||||||
|
"version": "1.4.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz",
|
||||||
|
"integrity": "sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA=="
|
||||||
|
},
|
||||||
"spdx-correct": {
|
"spdx-correct": {
|
||||||
"version": "3.0.0",
|
"version": "3.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
|
||||||
@@ -6703,6 +6720,11 @@
|
|||||||
"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
|
"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"string-hash": {
|
||||||
|
"version": "1.1.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
|
||||||
|
"integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs="
|
||||||
|
},
|
||||||
"string-width": {
|
"string-width": {
|
||||||
"version": "2.1.1",
|
"version": "2.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
|
||||||
@@ -7009,7 +7031,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"minimist": {
|
"minimist": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
||||||
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
||||||
"dev": true
|
"dev": true
|
||||||
}
|
}
|
||||||
@@ -7074,9 +7096,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"uglify-js": {
|
"uglify-js": {
|
||||||
"version": "3.4.8",
|
"version": "3.4.9",
|
||||||
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.8.tgz",
|
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
|
||||||
"integrity": "sha512-WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A==",
|
"integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"commander": "~2.17.1",
|
"commander": "~2.17.1",
|
||||||
"source-map": "~0.6.1"
|
"source-map": "~0.6.1"
|
||||||
|
|||||||
10
package.json
10
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "sapper",
|
"name": "sapper",
|
||||||
"version": "0.18.5",
|
"version": "0.19.3",
|
||||||
"description": "Military-grade apps, engineered by Svelte",
|
"description": "Military-grade apps, engineered by Svelte",
|
||||||
"main": "dist/middleware.js",
|
"main": "dist/middleware.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -13,15 +13,19 @@
|
|||||||
"config",
|
"config",
|
||||||
"sapper",
|
"sapper",
|
||||||
"components",
|
"components",
|
||||||
"dist"
|
"dist/*.js"
|
||||||
],
|
],
|
||||||
"directories": {
|
"directories": {
|
||||||
"test": "test"
|
"test": "test"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@types/blessed": "^0.1.10",
|
||||||
|
"blessed": "^0.1.81",
|
||||||
"html-minifier": "^3.5.16",
|
"html-minifier": "^3.5.16",
|
||||||
"shimport": "^0.0.9",
|
"shimport": "^0.0.10",
|
||||||
"source-map-support": "^0.5.6",
|
"source-map-support": "^0.5.6",
|
||||||
|
"sourcemap-codec": "^1.4.1",
|
||||||
|
"string-hash": "^1.1.3",
|
||||||
"tslib": "^1.9.1"
|
"tslib": "^1.9.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -3,17 +3,24 @@ import * as path from 'path';
|
|||||||
import mkdirp from 'mkdirp';
|
import mkdirp from 'mkdirp';
|
||||||
import rimraf from 'rimraf';
|
import rimraf from 'rimraf';
|
||||||
import { EventEmitter } from 'events';
|
import { EventEmitter } from 'events';
|
||||||
|
import * as codec from 'sourcemap-codec';
|
||||||
|
import hash from 'string-hash';
|
||||||
import minify_html from './utils/minify_html';
|
import minify_html from './utils/minify_html';
|
||||||
import { create_compilers, create_main_manifests, create_routes, create_serviceworker_manifest } from '../core';
|
import { create_compilers, create_main_manifests, create_manifest_data, create_serviceworker_manifest } from '../core';
|
||||||
import { Compilers, Compiler } from '../core/create_compilers';
|
|
||||||
import * as events from './interfaces';
|
import * as events from './interfaces';
|
||||||
import validate_bundler from '../cli/utils/validate_bundler';
|
|
||||||
import { copy_shimport } from './utils/copy_shimport';
|
import { copy_shimport } from './utils/copy_shimport';
|
||||||
|
import { Dirs, PageComponent } from '../interfaces';
|
||||||
|
import { CompileResult } from '../core/create_compilers/interfaces';
|
||||||
|
|
||||||
export function build(opts: {}) {
|
type Opts = {
|
||||||
|
legacy: boolean;
|
||||||
|
bundler: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function build(opts: Opts, dirs: Dirs) {
|
||||||
const emitter = new EventEmitter();
|
const emitter = new EventEmitter();
|
||||||
|
|
||||||
execute(emitter, opts).then(
|
execute(emitter, opts, dirs).then(
|
||||||
() => {
|
() => {
|
||||||
emitter.emit('done', <events.DoneEvent>{}); // TODO do we need to pass back any info?
|
emitter.emit('done', <events.DoneEvent>{}); // TODO do we need to pass back any info?
|
||||||
},
|
},
|
||||||
@@ -27,21 +34,14 @@ export function build(opts: {}) {
|
|||||||
return emitter;
|
return emitter;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function execute(emitter: EventEmitter, {
|
async function execute(emitter: EventEmitter, opts: Opts, dirs: Dirs) {
|
||||||
dest = 'build',
|
rimraf.sync(path.join(dirs.dest, '**/*'));
|
||||||
app = 'app',
|
mkdirp.sync(`${dirs.dest}/client`);
|
||||||
bundler,
|
copy_shimport(dirs.dest);
|
||||||
webpack = 'webpack',
|
|
||||||
rollup = 'rollup',
|
|
||||||
routes = 'routes'
|
|
||||||
} = {}) {
|
|
||||||
rimraf.sync(path.join(dest, '**/*'));
|
|
||||||
mkdirp.sync(`${dest}/client`);
|
|
||||||
copy_shimport(dest);
|
|
||||||
|
|
||||||
// minify app/template.html
|
// minify app/template.html
|
||||||
// TODO compile this to a function? could be quicker than str.replace(...).replace(...).replace(...)
|
// TODO compile this to a function? could be quicker than str.replace(...).replace(...).replace(...)
|
||||||
const template = fs.readFileSync(`${app}/template.html`, 'utf-8');
|
const template = fs.readFileSync(`${dirs.app}/template.html`, 'utf-8');
|
||||||
|
|
||||||
// remove this in a future version
|
// remove this in a future version
|
||||||
if (template.indexOf('%sapper.base%') === -1) {
|
if (template.indexOf('%sapper.base%') === -1) {
|
||||||
@@ -50,14 +50,14 @@ async function execute(emitter: EventEmitter, {
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
fs.writeFileSync(`${dest}/template.html`, minify_html(template));
|
fs.writeFileSync(`${dirs.dest}/template.html`, minify_html(template));
|
||||||
|
|
||||||
const route_objects = create_routes();
|
const manifest_data = create_manifest_data();
|
||||||
|
|
||||||
// create app/manifest/client.js and app/manifest/server.js
|
// create app/manifest/client.js and app/manifest/server.js
|
||||||
create_main_manifests({ bundler, routes: route_objects });
|
create_main_manifests({ bundler: opts.bundler, manifest_data });
|
||||||
|
|
||||||
const { client, server, serviceworker } = create_compilers(validate_bundler(bundler), { webpack, rollup });
|
const { client, server, serviceworker } = create_compilers(opts.bundler, dirs);
|
||||||
|
|
||||||
const client_result = await client.compile();
|
const client_result = await client.compile();
|
||||||
emitter.emit('build', <events.BuildEvent>{
|
emitter.emit('build', <events.BuildEvent>{
|
||||||
@@ -66,11 +66,25 @@ async function execute(emitter: EventEmitter, {
|
|||||||
result: client_result
|
result: client_result
|
||||||
});
|
});
|
||||||
|
|
||||||
fs.writeFileSync(path.join(dest, 'build.json'), JSON.stringify({
|
const build_info = client_result.to_json(manifest_data, dirs);
|
||||||
bundler,
|
|
||||||
shimport: bundler === 'rollup' && require('shimport/package.json').version,
|
if (opts.legacy) {
|
||||||
assets: client_result.assets
|
process.env.SAPPER_LEGACY_BUILD = 'true';
|
||||||
}));
|
const { client } = create_compilers(opts.bundler, dirs);
|
||||||
|
|
||||||
|
const client_result = await client.compile();
|
||||||
|
|
||||||
|
emitter.emit('build', <events.BuildEvent>{
|
||||||
|
type: 'client (legacy)',
|
||||||
|
// TODO duration/warnings
|
||||||
|
result: client_result
|
||||||
|
});
|
||||||
|
|
||||||
|
build_info.legacy_assets = client_result.assets;
|
||||||
|
delete process.env.SAPPER_LEGACY_BUILD;
|
||||||
|
}
|
||||||
|
|
||||||
|
fs.writeFileSync(path.join(dirs.dest, 'build.json'), JSON.stringify(build_info));
|
||||||
|
|
||||||
const server_stats = await server.compile();
|
const server_stats = await server.compile();
|
||||||
emitter.emit('build', <events.BuildEvent>{
|
emitter.emit('build', <events.BuildEvent>{
|
||||||
@@ -83,8 +97,8 @@ async function execute(emitter: EventEmitter, {
|
|||||||
|
|
||||||
if (serviceworker) {
|
if (serviceworker) {
|
||||||
create_serviceworker_manifest({
|
create_serviceworker_manifest({
|
||||||
routes: route_objects,
|
manifest_data,
|
||||||
client_files: client_result.chunks.map((file: string) => `client/${file}`)
|
client_files: client_result.chunks.map(chunk => `client/${chunk.file}`)
|
||||||
});
|
});
|
||||||
|
|
||||||
serviceworker_stats = await serviceworker.compile();
|
serviceworker_stats = await serviceworker.compile();
|
||||||
|
|||||||
@@ -7,12 +7,14 @@ import mkdirp from 'mkdirp';
|
|||||||
import rimraf from 'rimraf';
|
import rimraf from 'rimraf';
|
||||||
import { locations } from '../config';
|
import { locations } from '../config';
|
||||||
import { EventEmitter } from 'events';
|
import { EventEmitter } from 'events';
|
||||||
import { create_routes, create_main_manifests, create_compilers, create_serviceworker_manifest } from '../core';
|
import { create_manifest_data, create_main_manifests, create_compilers, create_serviceworker_manifest } from '../core';
|
||||||
import { Compiler, Compilers, CompileResult, CompileError } from '../core/create_compilers';
|
import { Compiler, Compilers } from '../core/create_compilers';
|
||||||
|
import { CompileResult, CompileError } from '../core/create_compilers/interfaces';
|
||||||
import Deferred from './utils/Deferred';
|
import Deferred from './utils/Deferred';
|
||||||
import * as events from './interfaces';
|
import * as events from './interfaces';
|
||||||
import validate_bundler from '../cli/utils/validate_bundler';
|
import validate_bundler from '../cli/utils/validate_bundler';
|
||||||
import { copy_shimport } from './utils/copy_shimport';
|
import { copy_shimport } from './utils/copy_shimport';
|
||||||
|
import { ManifestData } from '../interfaces';
|
||||||
|
|
||||||
export function dev(opts) {
|
export function dev(opts) {
|
||||||
return new Watcher(opts);
|
return new Watcher(opts);
|
||||||
@@ -127,9 +129,11 @@ class Watcher extends EventEmitter {
|
|||||||
|
|
||||||
if (!this.dev_port) this.dev_port = await ports.find(10000);
|
if (!this.dev_port) this.dev_port = await ports.find(10000);
|
||||||
|
|
||||||
|
let manifest_data: ManifestData;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const routes = create_routes();
|
manifest_data = create_manifest_data();
|
||||||
create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
|
create_main_manifests({ bundler: this.bundler, manifest_data, dev_port: this.dev_port });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
this.emit('fatal', <events.FatalEvent>{
|
this.emit('fatal', <events.FatalEvent>{
|
||||||
message: err.message
|
message: err.message
|
||||||
@@ -149,12 +153,11 @@ class Watcher extends EventEmitter {
|
|||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
const routes = create_routes();
|
|
||||||
create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const routes = create_routes();
|
const new_manifest_data = create_manifest_data();
|
||||||
create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
|
create_main_manifests({ bundler: this.bundler, manifest_data, dev_port: this.dev_port });
|
||||||
|
|
||||||
|
manifest_data = new_manifest_data;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
this.emit('error', <events.ErrorEvent>{
|
this.emit('error', <events.ErrorEvent>{
|
||||||
message: err.message
|
message: err.message
|
||||||
@@ -173,10 +176,7 @@ class Watcher extends EventEmitter {
|
|||||||
let deferred = new Deferred();
|
let deferred = new Deferred();
|
||||||
|
|
||||||
// TODO watch the configs themselves?
|
// TODO watch the configs themselves?
|
||||||
const compilers: Compilers = create_compilers(this.bundler, {
|
const compilers: Compilers = create_compilers(this.bundler, this.dirs);
|
||||||
webpack: this.dirs.webpack,
|
|
||||||
rollup: this.dirs.rollup
|
|
||||||
});
|
|
||||||
|
|
||||||
let log = '';
|
let log = '';
|
||||||
|
|
||||||
@@ -200,6 +200,8 @@ class Watcher extends EventEmitter {
|
|||||||
handle_result: (result: CompileResult) => {
|
handle_result: (result: CompileResult) => {
|
||||||
deferred.promise.then(() => {
|
deferred.promise.then(() => {
|
||||||
const restart = () => {
|
const restart = () => {
|
||||||
|
this.emit('restart');
|
||||||
|
|
||||||
log = '';
|
log = '';
|
||||||
this.crashed = false;
|
this.crashed = false;
|
||||||
|
|
||||||
@@ -282,16 +284,17 @@ class Watcher extends EventEmitter {
|
|||||||
},
|
},
|
||||||
|
|
||||||
handle_result: (result: CompileResult) => {
|
handle_result: (result: CompileResult) => {
|
||||||
fs.writeFileSync(path.join(dest, 'build.json'), JSON.stringify({
|
fs.writeFileSync(
|
||||||
bundler: this.bundler,
|
path.join(dest, 'build.json'),
|
||||||
shimport: this.bundler === 'rollup' && require('shimport/package.json').version,
|
|
||||||
assets: result.assets
|
|
||||||
}, null, ' '));
|
|
||||||
|
|
||||||
const client_files = result.chunks.map((file: string) => `client/${file}`);
|
// TODO should be more explicit that to_json has effects
|
||||||
|
JSON.stringify(result.to_json(manifest_data, this.dirs), null, ' ')
|
||||||
|
);
|
||||||
|
|
||||||
|
const client_files = result.chunks.map(chunk => `client/${chunk.file}`);
|
||||||
|
|
||||||
create_serviceworker_manifest({
|
create_serviceworker_manifest({
|
||||||
routes: create_routes(),
|
manifest_data,
|
||||||
client_files
|
client_files
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -170,7 +170,7 @@ async function execute(emitter: EventEmitter, opts: Opts) {
|
|||||||
const location = r.headers.get('Location');
|
const location = r.headers.get('Location');
|
||||||
|
|
||||||
type = 'text/html';
|
type = 'text/html';
|
||||||
body = `<script>window.location.href = "${location}"</script>`;
|
body = `<script>window.location.href = "${location.replace(origin, '')}"</script>`;
|
||||||
|
|
||||||
await handle(resolve(root.href, location));
|
await handle(resolve(root.href, location));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { locations } from '../config';
|
import { locations } from '../config';
|
||||||
import { create_routes } from '../core';
|
import { create_manifest_data } from '../core';
|
||||||
|
|
||||||
export function find_page(pathname: string, cwd = locations.routes()) {
|
export function find_page(pathname: string, cwd = locations.routes()) {
|
||||||
const { pages } = create_routes(cwd);
|
const { pages } = create_manifest_data(cwd);
|
||||||
|
|
||||||
for (let i = 0; i < pages.length; i += 1) {
|
for (let i = 0; i < pages.length; i += 1) {
|
||||||
const page = pages[i];
|
const page = pages[i];
|
||||||
|
|||||||
@@ -42,4 +42,4 @@ export type FailureEvent = {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export type DoneEvent = {}
|
export type DoneEvent = {};
|
||||||
13
src/cli.ts
13
src/cli.ts
@@ -15,13 +15,15 @@ prog.command('dev')
|
|||||||
.option('--hot', 'Use hot module replacement (requires webpack)', true)
|
.option('--hot', 'Use hot module replacement (requires webpack)', true)
|
||||||
.option('--live', 'Reload on changes if not using --hot', true)
|
.option('--live', 'Reload on changes if not using --hot', true)
|
||||||
.option('--bundler', 'Specify a bundler (rollup or webpack)')
|
.option('--bundler', 'Specify a bundler (rollup or webpack)')
|
||||||
|
.option('--stream', 'Stream logs, instead of boxing them', false)
|
||||||
.action(async (opts: {
|
.action(async (opts: {
|
||||||
port: number,
|
port: number,
|
||||||
open: boolean,
|
open: boolean,
|
||||||
'dev-port': number,
|
'dev-port': number,
|
||||||
live: boolean,
|
live: boolean,
|
||||||
hot: boolean,
|
hot: boolean,
|
||||||
bundler?: string
|
bundler?: string,
|
||||||
|
stream: boolean
|
||||||
}) => {
|
}) => {
|
||||||
const { dev } = await import('./cli/dev');
|
const { dev } = await import('./cli/dev');
|
||||||
dev(opts);
|
dev(opts);
|
||||||
@@ -31,8 +33,13 @@ prog.command('build [dest]')
|
|||||||
.describe('Create a production-ready version of your app')
|
.describe('Create a production-ready version of your app')
|
||||||
.option('-p, --port', 'Default of process.env.PORT', '3000')
|
.option('-p, --port', 'Default of process.env.PORT', '3000')
|
||||||
.option('--bundler', 'Specify a bundler (rollup or webpack, blank for auto)')
|
.option('--bundler', 'Specify a bundler (rollup or webpack, blank for auto)')
|
||||||
|
.option('--legacy', 'Create separate legacy build')
|
||||||
.example(`build custom-dir -p 4567`)
|
.example(`build custom-dir -p 4567`)
|
||||||
.action(async (dest = 'build', opts: { port: string, bundler?: string }) => {
|
.action(async (dest = 'build', opts: {
|
||||||
|
port: string,
|
||||||
|
legacy: boolean,
|
||||||
|
bundler?: string
|
||||||
|
}) => {
|
||||||
console.log(`> Building...`);
|
console.log(`> Building...`);
|
||||||
|
|
||||||
process.env.NODE_ENV = process.env.NODE_ENV || 'production';
|
process.env.NODE_ENV = process.env.NODE_ENV || 'production';
|
||||||
@@ -78,9 +85,11 @@ prog.command('export [dest]')
|
|||||||
.option('--build-dir', 'Specify a custom temporary build directory', '.sapper/prod')
|
.option('--build-dir', 'Specify a custom temporary build directory', '.sapper/prod')
|
||||||
.option('--basepath', 'Specify a base path')
|
.option('--basepath', 'Specify a base path')
|
||||||
.option('--timeout', 'Milliseconds to wait for a page (--no-timeout to disable)', 5000)
|
.option('--timeout', 'Milliseconds to wait for a page (--no-timeout to disable)', 5000)
|
||||||
|
.option('--legacy', 'Create separate legacy build')
|
||||||
.option('--bundler', 'Specify a bundler (rollup or webpack, blank for auto)')
|
.option('--bundler', 'Specify a bundler (rollup or webpack, blank for auto)')
|
||||||
.action(async (dest = 'export', opts: {
|
.action(async (dest = 'export', opts: {
|
||||||
build: boolean,
|
build: boolean,
|
||||||
|
legacy: boolean,
|
||||||
bundler?: string,
|
bundler?: string,
|
||||||
'build-dir': string,
|
'build-dir': string,
|
||||||
basepath?: string,
|
basepath?: string,
|
||||||
|
|||||||
@@ -4,16 +4,22 @@ import { locations } from '../config';
|
|||||||
import validate_bundler from './utils/validate_bundler';
|
import validate_bundler from './utils/validate_bundler';
|
||||||
import { repeat } from '../utils';
|
import { repeat } from '../utils';
|
||||||
|
|
||||||
export function build(opts: { bundler?: string }) {
|
export function build(opts: { bundler?: string, legacy?: boolean }) {
|
||||||
const bundler = validate_bundler(opts.bundler);
|
const bundler = validate_bundler(opts.bundler);
|
||||||
|
|
||||||
|
if (opts.legacy && bundler === 'webpack') {
|
||||||
|
throw new Error(`Legacy builds are not supported for projects using webpack`);
|
||||||
|
}
|
||||||
|
|
||||||
return new Promise((fulfil, reject) => {
|
return new Promise((fulfil, reject) => {
|
||||||
try {
|
try {
|
||||||
const emitter = _build({
|
const emitter = _build({
|
||||||
|
legacy: opts.legacy,
|
||||||
|
bundler
|
||||||
|
}, {
|
||||||
dest: locations.dest(),
|
dest: locations.dest(),
|
||||||
app: locations.app(),
|
app: locations.app(),
|
||||||
routes: locations.routes(),
|
routes: locations.routes(),
|
||||||
bundler,
|
|
||||||
webpack: 'webpack',
|
webpack: 'webpack',
|
||||||
rollup: 'rollup'
|
rollup: 'rollup'
|
||||||
});
|
});
|
||||||
|
|||||||
237
src/cli/dev.ts
237
src/cli/dev.ts
@@ -1,80 +1,263 @@
|
|||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
import colors from 'kleur';
|
import colors from 'kleur';
|
||||||
import * as child_process from 'child_process';
|
import * as child_process from 'child_process';
|
||||||
|
import * as blessed from 'blessed';
|
||||||
import prettyMs from 'pretty-ms';
|
import prettyMs from 'pretty-ms';
|
||||||
import { dev as _dev } from '../api/dev';
|
import { dev as _dev } from '../api/dev';
|
||||||
import * as events from '../api/interfaces';
|
import * as events from '../api/interfaces';
|
||||||
|
|
||||||
export function dev(opts: { port: number, open: boolean, bundler?: string }) {
|
function boxed_output() {
|
||||||
|
const screen = blessed.screen({
|
||||||
|
smartCSR: true
|
||||||
|
});
|
||||||
|
|
||||||
|
function box(opts) {
|
||||||
|
opts = Object.assign({
|
||||||
|
width: '100%',
|
||||||
|
height: '50%',
|
||||||
|
scrollable: true,
|
||||||
|
style: {
|
||||||
|
scrollbar: {
|
||||||
|
bg: 'black'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
scrollbar: {},
|
||||||
|
input: true,
|
||||||
|
mouse: true,
|
||||||
|
keys: true,
|
||||||
|
scrollOnInput: false
|
||||||
|
}, opts);
|
||||||
|
|
||||||
|
return blessed.box(opts);
|
||||||
|
}
|
||||||
|
|
||||||
|
const status_box = box({});
|
||||||
|
const log_box = box({
|
||||||
|
bottom: '0'
|
||||||
|
});
|
||||||
|
|
||||||
|
let mouse_is_down = false;
|
||||||
|
let dragging = false;
|
||||||
|
let did_drag = false;
|
||||||
|
|
||||||
|
let divider_is_horizontal = true;
|
||||||
|
|
||||||
|
function update_split(x: number, y: number) {
|
||||||
|
if (divider_is_horizontal) {
|
||||||
|
horizontal_divider.top = y;
|
||||||
|
status_box.width = log_box.width = '100%';
|
||||||
|
status_box.height = y;
|
||||||
|
log_box.height = screen.height - (y + 1);
|
||||||
|
log_box.top = y + 1;
|
||||||
|
log_box.left = 0;
|
||||||
|
} else {
|
||||||
|
vertical_divider.left = x;
|
||||||
|
status_box.height = log_box.height = '100%';
|
||||||
|
status_box.width = x;
|
||||||
|
log_box.width = screen.width - (x + 1);
|
||||||
|
log_box.left = x + 1;
|
||||||
|
log_box.top = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
screen.render();
|
||||||
|
}
|
||||||
|
|
||||||
|
screen.on('mousedown', data => {
|
||||||
|
if (mouse_is_down) {
|
||||||
|
if (dragging) {
|
||||||
|
update_split(data.x, data.y);
|
||||||
|
did_drag = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (data.y === horizontal_divider.top) {
|
||||||
|
dragging = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
mouse_is_down = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
screen.on('mouseup', data => {
|
||||||
|
mouse_is_down = false;
|
||||||
|
dragging = false;
|
||||||
|
did_drag = false;
|
||||||
|
});
|
||||||
|
|
||||||
|
const horizontal_divider = blessed.line({
|
||||||
|
top: '50%',
|
||||||
|
orientation: 'horizontal'
|
||||||
|
});
|
||||||
|
|
||||||
|
const vertical_divider = blessed.line({
|
||||||
|
left: '50%',
|
||||||
|
orientation: 'vertical'
|
||||||
|
});
|
||||||
|
|
||||||
|
horizontal_divider.on('click', event => {
|
||||||
|
if (!did_drag) {
|
||||||
|
horizontal_divider.hide();
|
||||||
|
vertical_divider.show();
|
||||||
|
divider_is_horizontal = false;
|
||||||
|
update_split(event.x, event.y);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
vertical_divider.on('click', event => {
|
||||||
|
if (!did_drag) {
|
||||||
|
vertical_divider.hide();
|
||||||
|
horizontal_divider.show();
|
||||||
|
divider_is_horizontal = true;
|
||||||
|
update_split(event.x, event.y);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
vertical_divider.hide();
|
||||||
|
|
||||||
|
screen.append(status_box);
|
||||||
|
screen.append(log_box);
|
||||||
|
screen.append(horizontal_divider);
|
||||||
|
screen.append(vertical_divider);
|
||||||
|
|
||||||
|
update_split(process.stdout.columns >> 1, process.stdout.rows >> 1);
|
||||||
|
|
||||||
|
screen.key(['escape', 'q', 'C-c'], function(ch, key) {
|
||||||
|
return process.exit(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
const append_log = (data: Buffer | string) => {
|
||||||
|
log_box.setContent(log_box.content + data);
|
||||||
|
screen.render();
|
||||||
|
};
|
||||||
|
|
||||||
|
const append_status = (data: Buffer | string) => {
|
||||||
|
status_box.setContent(status_box.content + data);
|
||||||
|
screen.render();
|
||||||
|
};
|
||||||
|
|
||||||
|
let first = true;
|
||||||
|
|
||||||
|
return {
|
||||||
|
stdout: append_log,
|
||||||
|
|
||||||
|
stderr: append_log,
|
||||||
|
|
||||||
|
clear_logs: () => {
|
||||||
|
let content = `${colors.inverse(` server log • ${new Date().toISOString()}\n`)} \n`;
|
||||||
|
if (first) {
|
||||||
|
content += colors.gray(`> Click/drag the divider to adjust the split\n\n`);
|
||||||
|
first = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
log_box.setContent(content);
|
||||||
|
screen.render();
|
||||||
|
},
|
||||||
|
|
||||||
|
log: (line: string) => {
|
||||||
|
append_status(line + '\n');
|
||||||
|
},
|
||||||
|
|
||||||
|
append: append_status,
|
||||||
|
|
||||||
|
clear: () => {
|
||||||
|
status_box.setContent(`${colors.inverse(` build log • ${new Date().toISOString()}\n`)} \n`);
|
||||||
|
screen.render();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function streamed_output() {
|
||||||
|
return {
|
||||||
|
stdout: process.stdout.write.bind(process.stdout),
|
||||||
|
|
||||||
|
stderr: process.stderr.write.bind(process.stderr),
|
||||||
|
|
||||||
|
clear_logs: () => {},
|
||||||
|
|
||||||
|
log: (line: string) => {
|
||||||
|
console.log(line);
|
||||||
|
},
|
||||||
|
|
||||||
|
append: (data: Buffer | string) => {
|
||||||
|
process.stdout.write(data);
|
||||||
|
},
|
||||||
|
|
||||||
|
clear: () => {}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function dev(opts: { port: number, open: boolean, bundler?: string, stream: boolean }) {
|
||||||
|
const output = opts.stream
|
||||||
|
? streamed_output()
|
||||||
|
: boxed_output();
|
||||||
|
|
||||||
|
output.clear();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const watcher = _dev(opts);
|
const watcher = _dev(opts);
|
||||||
|
|
||||||
let first = true;
|
let first = true;
|
||||||
|
|
||||||
watcher.on('ready', (event: events.ReadyEvent) => {
|
watcher.on('ready', (event: events.ReadyEvent) => {
|
||||||
|
output.log(colors.bold.cyan(`> Listening on http://localhost:${event.port}`));
|
||||||
|
|
||||||
if (first) {
|
if (first) {
|
||||||
console.log(colors.bold.cyan(`> Listening on http://localhost:${event.port}`));
|
|
||||||
if (opts.open) child_process.exec(`open http://localhost:${event.port}`);
|
if (opts.open) child_process.exec(`open http://localhost:${event.port}`);
|
||||||
first = false;
|
first = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO clear screen?
|
|
||||||
|
|
||||||
event.process.stdout.on('data', data => {
|
|
||||||
process.stdout.write(data);
|
|
||||||
});
|
|
||||||
|
|
||||||
event.process.stderr.on('data', data => {
|
|
||||||
process.stderr.write(data);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
watcher.on('restart', output.clear_logs);
|
||||||
|
watcher.on('stdout', output.stdout);
|
||||||
|
watcher.on('stderr', output.stderr);
|
||||||
|
|
||||||
watcher.on('invalid', (event: events.InvalidEvent) => {
|
watcher.on('invalid', (event: events.InvalidEvent) => {
|
||||||
const changed = event.changed.map(filename => path.relative(process.cwd(), filename)).join(', ');
|
const changed = event.changed.map(filename => path.relative(process.cwd(), filename)).join(', ');
|
||||||
console.log(`\n${colors.bold.cyan(changed)} changed. rebuilding...`);
|
|
||||||
|
output.clear();
|
||||||
|
output.log(`${colors.bold.cyan(changed)} changed. rebuilding...`);
|
||||||
});
|
});
|
||||||
|
|
||||||
watcher.on('error', (event: events.ErrorEvent) => {
|
watcher.on('error', (event: events.ErrorEvent) => {
|
||||||
console.log(colors.red(`✗ ${event.type}`));
|
output.log(colors.red(`✗ ${event.type}`));
|
||||||
console.log(colors.red(event.message));
|
output.log(colors.red(event.message));
|
||||||
});
|
});
|
||||||
|
|
||||||
watcher.on('fatal', (event: events.FatalEvent) => {
|
watcher.on('fatal', (event: events.FatalEvent) => {
|
||||||
console.log(colors.bold.red(`> ${event.message}`));
|
output.log(colors.bold.red(`> ${event.message}`));
|
||||||
if (event.log) console.log(event.log);
|
if (event.log) output.log(event.log);
|
||||||
});
|
});
|
||||||
|
|
||||||
watcher.on('build', (event: events.BuildEvent) => {
|
watcher.on('build', (event: events.BuildEvent) => {
|
||||||
if (event.errors.length) {
|
if (event.errors.length) {
|
||||||
console.log(colors.bold.red(`✗ ${event.type}`));
|
output.log(colors.bold.red(`✗ ${event.type}`));
|
||||||
|
|
||||||
event.errors.filter(e => !e.duplicate).forEach(error => {
|
event.errors.filter(e => !e.duplicate).forEach(error => {
|
||||||
if (error.file) console.log(colors.bold(error.file));
|
if (error.file) output.log(colors.bold(error.file));
|
||||||
console.log(error.message);
|
output.log(error.message);
|
||||||
});
|
});
|
||||||
|
|
||||||
const hidden = event.errors.filter(e => e.duplicate).length;
|
const hidden = event.errors.filter(e => e.duplicate).length;
|
||||||
if (hidden > 0) {
|
if (hidden > 0) {
|
||||||
console.log(`${hidden} duplicate ${hidden === 1 ? 'error' : 'errors'} hidden\n`);
|
output.log(`${hidden} duplicate ${hidden === 1 ? 'error' : 'errors'} hidden\n`);
|
||||||
}
|
}
|
||||||
} else if (event.warnings.length) {
|
} else if (event.warnings.length) {
|
||||||
console.log(colors.bold.yellow(`• ${event.type}`));
|
output.log(colors.bold.yellow(`• ${event.type}`));
|
||||||
|
|
||||||
event.warnings.filter(e => !e.duplicate).forEach(warning => {
|
event.warnings.filter(e => !e.duplicate).forEach(warning => {
|
||||||
if (warning.file) console.log(colors.bold(warning.file));
|
if (warning.file) output.log(colors.bold(warning.file));
|
||||||
console.log(warning.message);
|
output.log(warning.message);
|
||||||
});
|
});
|
||||||
|
|
||||||
const hidden = event.warnings.filter(e => e.duplicate).length;
|
const hidden = event.warnings.filter(e => e.duplicate).length;
|
||||||
if (hidden > 0) {
|
if (hidden > 0) {
|
||||||
console.log(`${hidden} duplicate ${hidden === 1 ? 'warning' : 'warnings'} hidden\n`);
|
output.log(`${hidden} duplicate ${hidden === 1 ? 'warning' : 'warnings'} hidden\n`);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log(`${colors.bold.green(`✔ ${event.type}`)} ${colors.gray(`(${prettyMs(event.duration)})`)}`);
|
output.log(`${colors.bold.green(`✔ ${event.type}`)} ${colors.gray(`(${prettyMs(event.duration)})`)}`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log(colors.bold.red(`> ${err.message}`));
|
output.log(colors.bold.red(`> ${err.message}`));
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
export * from './core/create_manifests';
|
export * from './core/create_manifests';
|
||||||
export { default as create_compilers } from './core/create_compilers';
|
export { default as create_compilers } from './core/create_compilers/index';
|
||||||
export { default as create_routes } from './core/create_routes';
|
export { default as create_manifest_data } from './core/create_manifest_data';
|
||||||
@@ -1,378 +0,0 @@
|
|||||||
import * as fs from 'fs';
|
|
||||||
import * as path from 'path';
|
|
||||||
import colors from 'kleur';
|
|
||||||
import pb from 'pretty-bytes';
|
|
||||||
import relative from 'require-relative';
|
|
||||||
import { left_pad } from '../utils';
|
|
||||||
|
|
||||||
let r: any;
|
|
||||||
let wp: any;
|
|
||||||
|
|
||||||
export class CompileError {
|
|
||||||
file: string;
|
|
||||||
message: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class CompileResult {
|
|
||||||
duration: number;
|
|
||||||
errors: CompileError[];
|
|
||||||
warnings: CompileError[];
|
|
||||||
chunks: string[];
|
|
||||||
assets: Record<string, string>;
|
|
||||||
}
|
|
||||||
|
|
||||||
class RollupResult extends CompileResult {
|
|
||||||
summary: string;
|
|
||||||
|
|
||||||
constructor(duration: number, compiler: RollupCompiler) {
|
|
||||||
super();
|
|
||||||
|
|
||||||
this.duration = duration;
|
|
||||||
|
|
||||||
this.errors = compiler.errors.map(munge_rollup_warning_or_error);
|
|
||||||
this.warnings = compiler.warnings.map(munge_rollup_warning_or_error); // TODO emit this as they happen
|
|
||||||
|
|
||||||
this.chunks = compiler.chunks.map(chunk => chunk.fileName);
|
|
||||||
|
|
||||||
// TODO populate this properly. We don't have namedcompiler. chunks, as in
|
|
||||||
// webpack, but we can have a route -> [chunk] map or something
|
|
||||||
this.assets = {};
|
|
||||||
|
|
||||||
compiler.chunks.forEach(chunk => {
|
|
||||||
if (compiler.input in chunk.modules) {
|
|
||||||
this.assets.main = chunk.fileName;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
this.summary = compiler.chunks.map(chunk => {
|
|
||||||
const size_color = chunk.code.length > 150000 ? colors.bold.red : chunk.code.length > 50000 ? colors.bold.yellow : colors.bold.white;
|
|
||||||
const size_label = left_pad(pb(chunk.code.length), 10);
|
|
||||||
|
|
||||||
const lines = [size_color(`${size_label} ${chunk.fileName}`)];
|
|
||||||
|
|
||||||
const deps = Object.keys(chunk.modules)
|
|
||||||
.map(file => {
|
|
||||||
return {
|
|
||||||
file: path.relative(process.cwd(), file),
|
|
||||||
size: chunk.modules[file].renderedLength
|
|
||||||
};
|
|
||||||
})
|
|
||||||
.filter(dep => dep.size > 0)
|
|
||||||
.sort((a, b) => b.size - a.size);
|
|
||||||
|
|
||||||
const total_unminified = deps.reduce((t, d) => t + d.size, 0);
|
|
||||||
|
|
||||||
deps.forEach((dep, i) => {
|
|
||||||
const c = i === deps.length - 1 ? '└' : '│';
|
|
||||||
let line = ` ${c} ${dep.file}`;
|
|
||||||
|
|
||||||
if (deps.length > 1) {
|
|
||||||
const p = (100 * dep.size / total_unminified).toFixed(1);
|
|
||||||
line += ` (${p}%)`;
|
|
||||||
}
|
|
||||||
|
|
||||||
lines.push(colors.gray(line));
|
|
||||||
});
|
|
||||||
|
|
||||||
return lines.join('\n');
|
|
||||||
}).join('\n');
|
|
||||||
}
|
|
||||||
|
|
||||||
print() {
|
|
||||||
const blocks: string[] = this.warnings.map(warning => {
|
|
||||||
return warning.file
|
|
||||||
? `> ${colors.bold(warning.file)}\n${warning.message}`
|
|
||||||
: `> ${warning.message}`;
|
|
||||||
});
|
|
||||||
|
|
||||||
blocks.push(this.summary);
|
|
||||||
|
|
||||||
return blocks.join('\n\n');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class WebpackResult extends CompileResult {
|
|
||||||
stats: any;
|
|
||||||
|
|
||||||
constructor(stats: any) {
|
|
||||||
super();
|
|
||||||
|
|
||||||
this.stats = stats;
|
|
||||||
|
|
||||||
const info = stats.toJson();
|
|
||||||
|
|
||||||
// TODO use import()
|
|
||||||
const format_messages = require('webpack-format-messages');
|
|
||||||
const messages = format_messages(stats);
|
|
||||||
|
|
||||||
this.errors = messages.errors.map(munge_webpack_warning_or_error);
|
|
||||||
this.warnings = messages.warnings.map(munge_webpack_warning_or_error);
|
|
||||||
|
|
||||||
this.duration = info.time;
|
|
||||||
|
|
||||||
this.chunks = info.assets.map((chunk: { name: string }) => chunk.name);
|
|
||||||
this.assets = info.assetsByChunkName;
|
|
||||||
}
|
|
||||||
|
|
||||||
print() {
|
|
||||||
return this.stats.toString({ colors: true });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class RollupCompiler {
|
|
||||||
_: Promise<any>;
|
|
||||||
_oninvalid: (filename: string) => void;
|
|
||||||
_start: number;
|
|
||||||
input: string;
|
|
||||||
warnings: any[];
|
|
||||||
errors: any[];
|
|
||||||
chunks: any[]; // TODO types
|
|
||||||
|
|
||||||
constructor(config: any) {
|
|
||||||
this._ = this.get_config(path.resolve(config));
|
|
||||||
this.input = null;
|
|
||||||
this.warnings = [];
|
|
||||||
this.errors = [];
|
|
||||||
this.chunks = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
async get_config(input: string) {
|
|
||||||
const bundle = await r.rollup({
|
|
||||||
input,
|
|
||||||
external: (id: string) => {
|
|
||||||
return (id[0] !== '.' && !path.isAbsolute(id)) || id.slice(-5, id.length) === '.json';
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const { code } = await bundle.generate({ format: 'cjs' });
|
|
||||||
|
|
||||||
// temporarily override require
|
|
||||||
const defaultLoader = require.extensions['.js'];
|
|
||||||
require.extensions['.js'] = (module: any, filename: string) => {
|
|
||||||
if (filename === input) {
|
|
||||||
module._compile(code, filename);
|
|
||||||
} else {
|
|
||||||
defaultLoader(module, filename);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const mod: any = require(input);
|
|
||||||
delete require.cache[input];
|
|
||||||
|
|
||||||
(mod.plugins || (mod.plugins = [])).push({
|
|
||||||
name: 'sapper-internal',
|
|
||||||
options: (opts: any) => {
|
|
||||||
this.input = opts.input;
|
|
||||||
},
|
|
||||||
renderChunk: (code: string, chunk: any) => {
|
|
||||||
if (chunk.isEntry) {
|
|
||||||
this.chunks.push(chunk);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const onwarn = mod.onwarn || ((warning: any, handler: (warning: any) => void) => {
|
|
||||||
handler(warning);
|
|
||||||
});
|
|
||||||
|
|
||||||
mod.onwarn = (warning: any) => {
|
|
||||||
onwarn(warning, (warning: any) => {
|
|
||||||
this.warnings.push(warning);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
return mod;
|
|
||||||
}
|
|
||||||
|
|
||||||
oninvalid(cb: (filename: string) => void) {
|
|
||||||
this._oninvalid = cb;
|
|
||||||
}
|
|
||||||
|
|
||||||
async compile(): Promise<CompileResult> {
|
|
||||||
const config = await this._;
|
|
||||||
|
|
||||||
const start = Date.now();
|
|
||||||
|
|
||||||
try {
|
|
||||||
const bundle = await r.rollup(config);
|
|
||||||
await bundle.write(config.output);
|
|
||||||
|
|
||||||
return new RollupResult(Date.now() - start, this);
|
|
||||||
} catch (err) {
|
|
||||||
if (err.filename) {
|
|
||||||
// TODO this is a bit messy. Also, can
|
|
||||||
// Rollup emit other kinds of error?
|
|
||||||
err.message = [
|
|
||||||
`Failed to build — error in ${err.filename}: ${err.message}`,
|
|
||||||
err.frame
|
|
||||||
].filter(Boolean).join('\n');
|
|
||||||
}
|
|
||||||
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async watch(cb: (err?: Error, stats?: any) => void) {
|
|
||||||
const config = await this._;
|
|
||||||
|
|
||||||
const watcher = r.watch(config);
|
|
||||||
|
|
||||||
watcher.on('change', (id: string) => {
|
|
||||||
this.chunks = [];
|
|
||||||
this.warnings = [];
|
|
||||||
this.errors = [];
|
|
||||||
this._oninvalid(id);
|
|
||||||
});
|
|
||||||
|
|
||||||
watcher.on('event', (event: any) => {
|
|
||||||
switch (event.code) {
|
|
||||||
case 'FATAL':
|
|
||||||
// TODO kill the process?
|
|
||||||
if (event.error.filename) {
|
|
||||||
// TODO this is a bit messy. Also, can
|
|
||||||
// Rollup emit other kinds of error?
|
|
||||||
event.error.message = [
|
|
||||||
`Failed to build — error in ${event.error.filename}: ${event.error.message}`,
|
|
||||||
event.error.frame
|
|
||||||
].filter(Boolean).join('\n');
|
|
||||||
}
|
|
||||||
|
|
||||||
cb(event.error);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'ERROR':
|
|
||||||
this.errors.push(event.error);
|
|
||||||
cb(null, new RollupResult(Date.now() - this._start, this));
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'START':
|
|
||||||
case 'END':
|
|
||||||
// TODO is there anything to do with this info?
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'BUNDLE_START':
|
|
||||||
this._start = Date.now();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'BUNDLE_END':
|
|
||||||
cb(null, new RollupResult(Date.now() - this._start, this));
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
console.log(`Unexpected event ${event.code}`);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class WebpackCompiler {
|
|
||||||
_: any;
|
|
||||||
|
|
||||||
constructor(config: any) {
|
|
||||||
this._ = wp(require(path.resolve(config)));
|
|
||||||
}
|
|
||||||
|
|
||||||
oninvalid(cb: (filename: string) => void) {
|
|
||||||
this._.hooks.invalid.tap('sapper', cb);
|
|
||||||
}
|
|
||||||
|
|
||||||
compile(): Promise<CompileResult> {
|
|
||||||
return new Promise((fulfil, reject) => {
|
|
||||||
this._.run((err: Error, stats: any) => {
|
|
||||||
if (err) {
|
|
||||||
reject(err);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = new WebpackResult(stats);
|
|
||||||
|
|
||||||
if (result.errors.length) {
|
|
||||||
// TODO print errors
|
|
||||||
// console.error(stats.toString({ colors: true }));
|
|
||||||
reject(new Error(`Encountered errors while building app`));
|
|
||||||
}
|
|
||||||
|
|
||||||
else {
|
|
||||||
fulfil(result);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(cb: (err?: Error, stats?: any) => void) {
|
|
||||||
this._.watch({}, (err?: Error, stats?: any) => {
|
|
||||||
cb(err, stats && new WebpackResult(stats));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export type Compiler = RollupCompiler | WebpackCompiler;
|
|
||||||
|
|
||||||
export type Compilers = {
|
|
||||||
client: Compiler;
|
|
||||||
server: Compiler;
|
|
||||||
serviceworker?: Compiler;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function create_compilers(bundler: string, { webpack, rollup }: { webpack: string, rollup: string }): Compilers {
|
|
||||||
if (bundler === 'rollup') {
|
|
||||||
if (!r) r = relative('rollup', process.cwd());
|
|
||||||
|
|
||||||
const sw = `${rollup}/service-worker.config.js`;
|
|
||||||
|
|
||||||
return {
|
|
||||||
client: new RollupCompiler(`${rollup}/client.config.js`),
|
|
||||||
server: new RollupCompiler(`${rollup}/server.config.js`),
|
|
||||||
serviceworker: fs.existsSync(sw) && new RollupCompiler(sw)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bundler === 'webpack') {
|
|
||||||
if (!wp) wp = relative('webpack', process.cwd());
|
|
||||||
|
|
||||||
const sw = `${webpack}/service-worker.config.js`;
|
|
||||||
|
|
||||||
return {
|
|
||||||
client: new WebpackCompiler(`${webpack}/client.config.js`),
|
|
||||||
server: new WebpackCompiler(`${webpack}/server.config.js`),
|
|
||||||
serviceworker: fs.existsSync(sw) && new WebpackCompiler(sw)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// this shouldn't be possible...
|
|
||||||
throw new Error(`Invalid bundler option '${bundler}'`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const locPattern = /\((\d+):(\d+)\)$/;
|
|
||||||
|
|
||||||
function munge_webpack_warning_or_error(message: string) {
|
|
||||||
// TODO this is all a bit rube goldberg...
|
|
||||||
const lines = message.split('\n');
|
|
||||||
|
|
||||||
const file = lines.shift()
|
|
||||||
.replace('[7m', '') // careful — there is a special character at the beginning of this string
|
|
||||||
.replace('[27m', '')
|
|
||||||
.replace('./', '');
|
|
||||||
|
|
||||||
let line = null;
|
|
||||||
let column = null;
|
|
||||||
|
|
||||||
const match = locPattern.exec(lines[0]);
|
|
||||||
if (match) {
|
|
||||||
lines[0] = lines[0].replace(locPattern, '');
|
|
||||||
line = +match[1];
|
|
||||||
column = +match[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
file,
|
|
||||||
message: lines.join('\n')
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function munge_rollup_warning_or_error(warning_or_error: any) {
|
|
||||||
return {
|
|
||||||
file: warning_or_error.filename,
|
|
||||||
message: [warning_or_error.message, warning_or_error.frame].filter(Boolean).join('\n')
|
|
||||||
};
|
|
||||||
}
|
|
||||||
160
src/core/create_compilers/RollupCompiler.ts
Normal file
160
src/core/create_compilers/RollupCompiler.ts
Normal file
@@ -0,0 +1,160 @@
|
|||||||
|
import * as path from 'path';
|
||||||
|
import relative from 'require-relative';
|
||||||
|
import { CompileResult } from './interfaces';
|
||||||
|
import RollupResult from './RollupResult';
|
||||||
|
|
||||||
|
let rollup: any;
|
||||||
|
|
||||||
|
export default class RollupCompiler {
|
||||||
|
_: Promise<any>;
|
||||||
|
_oninvalid: (filename: string) => void;
|
||||||
|
_start: number;
|
||||||
|
input: string;
|
||||||
|
warnings: any[];
|
||||||
|
errors: any[];
|
||||||
|
chunks: any[];
|
||||||
|
css_files: Array<{ id: string, code: string }>;
|
||||||
|
|
||||||
|
constructor(config: string) {
|
||||||
|
this._ = this.get_config(path.resolve(config));
|
||||||
|
this.input = null;
|
||||||
|
this.warnings = [];
|
||||||
|
this.errors = [];
|
||||||
|
this.chunks = [];
|
||||||
|
this.css_files = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
async get_config(input: string) {
|
||||||
|
if (!rollup) rollup = relative('rollup', process.cwd());
|
||||||
|
|
||||||
|
const bundle = await rollup.rollup({
|
||||||
|
input,
|
||||||
|
external: (id: string) => {
|
||||||
|
return (id[0] !== '.' && !path.isAbsolute(id)) || id.slice(-5, id.length) === '.json';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const { code } = await bundle.generate({ format: 'cjs' });
|
||||||
|
|
||||||
|
// temporarily override require
|
||||||
|
const defaultLoader = require.extensions['.js'];
|
||||||
|
require.extensions['.js'] = (module: any, filename: string) => {
|
||||||
|
if (filename === input) {
|
||||||
|
module._compile(code, filename);
|
||||||
|
} else {
|
||||||
|
defaultLoader(module, filename);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const mod: any = require(input);
|
||||||
|
delete require.cache[input];
|
||||||
|
|
||||||
|
(mod.plugins || (mod.plugins = [])).push({
|
||||||
|
name: 'sapper-internal',
|
||||||
|
options: (opts: any) => {
|
||||||
|
this.input = opts.input;
|
||||||
|
},
|
||||||
|
renderChunk: (code: string, chunk: any) => {
|
||||||
|
this.chunks.push(chunk);
|
||||||
|
},
|
||||||
|
transform: (code: string, id: string) => {
|
||||||
|
if (/\.css$/.test(id)) {
|
||||||
|
this.css_files.push({ id, code });
|
||||||
|
return ``;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const onwarn = mod.onwarn || ((warning: any, handler: (warning: any) => void) => {
|
||||||
|
handler(warning);
|
||||||
|
});
|
||||||
|
|
||||||
|
mod.onwarn = (warning: any) => {
|
||||||
|
onwarn(warning, (warning: any) => {
|
||||||
|
this.warnings.push(warning);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return mod;
|
||||||
|
}
|
||||||
|
|
||||||
|
oninvalid(cb: (filename: string) => void) {
|
||||||
|
this._oninvalid = cb;
|
||||||
|
}
|
||||||
|
|
||||||
|
async compile(): Promise<CompileResult> {
|
||||||
|
const config = await this._;
|
||||||
|
|
||||||
|
const start = Date.now();
|
||||||
|
|
||||||
|
try {
|
||||||
|
const bundle = await rollup.rollup(config);
|
||||||
|
await bundle.write(config.output);
|
||||||
|
|
||||||
|
return new RollupResult(Date.now() - start, this);
|
||||||
|
} catch (err) {
|
||||||
|
if (err.filename) {
|
||||||
|
// TODO this is a bit messy. Also, can
|
||||||
|
// Rollup emit other kinds of error?
|
||||||
|
err.message = [
|
||||||
|
`Failed to build — error in ${err.filename}: ${err.message}`,
|
||||||
|
err.frame
|
||||||
|
].filter(Boolean).join('\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async watch(cb: (err?: Error, stats?: any) => void) {
|
||||||
|
const config = await this._;
|
||||||
|
|
||||||
|
const watcher = rollup.watch(config);
|
||||||
|
|
||||||
|
watcher.on('change', (id: string) => {
|
||||||
|
this.chunks = [];
|
||||||
|
this.warnings = [];
|
||||||
|
this.errors = [];
|
||||||
|
this._oninvalid(id);
|
||||||
|
});
|
||||||
|
|
||||||
|
watcher.on('event', (event: any) => {
|
||||||
|
switch (event.code) {
|
||||||
|
case 'FATAL':
|
||||||
|
// TODO kill the process?
|
||||||
|
if (event.error.filename) {
|
||||||
|
// TODO this is a bit messy. Also, can
|
||||||
|
// Rollup emit other kinds of error?
|
||||||
|
event.error.message = [
|
||||||
|
`Failed to build — error in ${event.error.filename}: ${event.error.message}`,
|
||||||
|
event.error.frame
|
||||||
|
].filter(Boolean).join('\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
cb(event.error);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'ERROR':
|
||||||
|
this.errors.push(event.error);
|
||||||
|
cb(null, new RollupResult(Date.now() - this._start, this));
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'START':
|
||||||
|
case 'END':
|
||||||
|
// TODO is there anything to do with this info?
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'BUNDLE_START':
|
||||||
|
this._start = Date.now();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'BUNDLE_END':
|
||||||
|
cb(null, new RollupResult(Date.now() - this._start, this));
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
console.log(`Unexpected event ${event.code}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
111
src/core/create_compilers/RollupResult.ts
Normal file
111
src/core/create_compilers/RollupResult.ts
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
import * as path from 'path';
|
||||||
|
import colors from 'kleur';
|
||||||
|
import pb from 'pretty-bytes';
|
||||||
|
import RollupCompiler from './RollupCompiler';
|
||||||
|
import extract_css from './extract_css';
|
||||||
|
import { left_pad } from '../../utils';
|
||||||
|
import { CompileResult, BuildInfo, CompileError, Chunk, CssFile } from './interfaces';
|
||||||
|
import { ManifestData, Dirs, PageComponent } from '../../interfaces';
|
||||||
|
|
||||||
|
export default class RollupResult implements CompileResult {
|
||||||
|
duration: number;
|
||||||
|
errors: CompileError[];
|
||||||
|
warnings: CompileError[];
|
||||||
|
chunks: Chunk[];
|
||||||
|
assets: Record<string, string>;
|
||||||
|
css_files: CssFile[];
|
||||||
|
css: {
|
||||||
|
main: string,
|
||||||
|
chunks: Record<string, string[]>
|
||||||
|
};
|
||||||
|
summary: string;
|
||||||
|
|
||||||
|
constructor(duration: number, compiler: RollupCompiler) {
|
||||||
|
this.duration = duration;
|
||||||
|
|
||||||
|
this.errors = compiler.errors.map(munge_warning_or_error);
|
||||||
|
this.warnings = compiler.warnings.map(munge_warning_or_error); // TODO emit this as they happen
|
||||||
|
|
||||||
|
this.chunks = compiler.chunks.map(chunk => ({
|
||||||
|
file: chunk.fileName,
|
||||||
|
imports: chunk.imports.filter(Boolean),
|
||||||
|
modules: Object.keys(chunk.modules)
|
||||||
|
}));
|
||||||
|
|
||||||
|
this.css_files = compiler.css_files;
|
||||||
|
|
||||||
|
// TODO populate this properly. We don't have named chunks, as in
|
||||||
|
// webpack, but we can have a route -> [chunk] map or something
|
||||||
|
this.assets = {};
|
||||||
|
|
||||||
|
compiler.chunks.forEach(chunk => {
|
||||||
|
if (compiler.input in chunk.modules) {
|
||||||
|
this.assets.main = chunk.fileName;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
this.summary = compiler.chunks.map(chunk => {
|
||||||
|
const size_color = chunk.code.length > 150000 ? colors.bold.red : chunk.code.length > 50000 ? colors.bold.yellow : colors.bold.white;
|
||||||
|
const size_label = left_pad(pb(chunk.code.length), 10);
|
||||||
|
|
||||||
|
const lines = [size_color(`${size_label} ${chunk.fileName}`)];
|
||||||
|
|
||||||
|
const deps = Object.keys(chunk.modules)
|
||||||
|
.map(file => {
|
||||||
|
return {
|
||||||
|
file: path.relative(process.cwd(), file),
|
||||||
|
size: chunk.modules[file].renderedLength
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.filter(dep => dep.size > 0)
|
||||||
|
.sort((a, b) => b.size - a.size);
|
||||||
|
|
||||||
|
const total_unminified = deps.reduce((t, d) => t + d.size, 0);
|
||||||
|
|
||||||
|
deps.forEach((dep, i) => {
|
||||||
|
const c = i === deps.length - 1 ? '└' : '│';
|
||||||
|
let line = ` ${c} ${dep.file}`;
|
||||||
|
|
||||||
|
if (deps.length > 1) {
|
||||||
|
const p = (100 * dep.size / total_unminified).toFixed(1);
|
||||||
|
line += ` (${p}%)`;
|
||||||
|
}
|
||||||
|
|
||||||
|
lines.push(colors.gray(line));
|
||||||
|
});
|
||||||
|
|
||||||
|
return lines.join('\n');
|
||||||
|
}).join('\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
to_json(manifest_data: ManifestData, dirs: Dirs): BuildInfo {
|
||||||
|
// TODO extract_css has side-effects that don't belong
|
||||||
|
// in a method called to_json
|
||||||
|
return {
|
||||||
|
bundler: 'rollup',
|
||||||
|
shimport: require('shimport/package.json').version,
|
||||||
|
assets: this.assets,
|
||||||
|
css: extract_css(this, manifest_data.components, dirs)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
print() {
|
||||||
|
const blocks: string[] = this.warnings.map(warning => {
|
||||||
|
return warning.file
|
||||||
|
? `> ${colors.bold(warning.file)}\n${warning.message}`
|
||||||
|
: `> ${warning.message}`;
|
||||||
|
});
|
||||||
|
|
||||||
|
blocks.push(this.summary);
|
||||||
|
|
||||||
|
return blocks.join('\n\n');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function munge_warning_or_error(warning_or_error: any) {
|
||||||
|
return {
|
||||||
|
file: warning_or_error.filename,
|
||||||
|
message: [warning_or_error.message, warning_or_error.frame].filter(Boolean).join('\n')
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
47
src/core/create_compilers/WebpackCompiler.ts
Normal file
47
src/core/create_compilers/WebpackCompiler.ts
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
import * as path from 'path';
|
||||||
|
import relative from 'require-relative';
|
||||||
|
import { CompileResult } from './interfaces';
|
||||||
|
import WebpackResult from './WebpackResult';
|
||||||
|
|
||||||
|
let webpack: any;
|
||||||
|
|
||||||
|
export class WebpackCompiler {
|
||||||
|
_: any;
|
||||||
|
|
||||||
|
constructor(config: string) {
|
||||||
|
if (!webpack) webpack = relative('webpack', process.cwd());
|
||||||
|
this._ = webpack(require(path.resolve(config)));
|
||||||
|
}
|
||||||
|
|
||||||
|
oninvalid(cb: (filename: string) => void) {
|
||||||
|
this._.hooks.invalid.tap('sapper', cb);
|
||||||
|
}
|
||||||
|
|
||||||
|
compile(): Promise<CompileResult> {
|
||||||
|
return new Promise((fulfil, reject) => {
|
||||||
|
this._.run((err: Error, stats: any) => {
|
||||||
|
if (err) {
|
||||||
|
reject(err);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = new WebpackResult(stats);
|
||||||
|
|
||||||
|
if (result.errors.length) {
|
||||||
|
console.error(stats.toString({ colors: true }));
|
||||||
|
reject(new Error(`Encountered errors while building app`));
|
||||||
|
}
|
||||||
|
|
||||||
|
else {
|
||||||
|
fulfil(result);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(cb: (err?: Error, stats?: any) => void) {
|
||||||
|
this._.watch({}, (err?: Error, stats?: any) => {
|
||||||
|
cb(err, stats && new WebpackResult(stats));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
73
src/core/create_compilers/WebpackResult.ts
Normal file
73
src/core/create_compilers/WebpackResult.ts
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
import format_messages from 'webpack-format-messages';
|
||||||
|
import { CompileResult, BuildInfo, CompileError, Chunk, CssFile } from './interfaces';
|
||||||
|
import { ManifestData, Dirs } from '../../interfaces';
|
||||||
|
|
||||||
|
const locPattern = /\((\d+):(\d+)\)$/;
|
||||||
|
|
||||||
|
function munge_warning_or_error(message: string) {
|
||||||
|
// TODO this is all a bit rube goldberg...
|
||||||
|
const lines = message.split('\n');
|
||||||
|
|
||||||
|
const file = lines.shift()
|
||||||
|
.replace('[7m', '') // careful — there is a special character at the beginning of this string
|
||||||
|
.replace('[27m', '')
|
||||||
|
.replace('./', '');
|
||||||
|
|
||||||
|
let line = null;
|
||||||
|
let column = null;
|
||||||
|
|
||||||
|
const match = locPattern.exec(lines[0]);
|
||||||
|
if (match) {
|
||||||
|
lines[0] = lines[0].replace(locPattern, '');
|
||||||
|
line = +match[1];
|
||||||
|
column = +match[2];
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
file,
|
||||||
|
message: lines.join('\n')
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default class WebpackResult implements CompileResult {
|
||||||
|
duration: number;
|
||||||
|
errors: CompileError[];
|
||||||
|
warnings: CompileError[];
|
||||||
|
chunks: Chunk[];
|
||||||
|
assets: Record<string, string>;
|
||||||
|
css_files: CssFile[];
|
||||||
|
stats: any;
|
||||||
|
|
||||||
|
constructor(stats: any) {
|
||||||
|
this.stats = stats;
|
||||||
|
|
||||||
|
const info = stats.toJson();
|
||||||
|
|
||||||
|
const messages = format_messages(stats);
|
||||||
|
|
||||||
|
this.errors = messages.errors.map(munge_warning_or_error);
|
||||||
|
this.warnings = messages.warnings.map(munge_warning_or_error);
|
||||||
|
|
||||||
|
this.duration = info.time;
|
||||||
|
|
||||||
|
this.chunks = info.assets.map((chunk: { name: string }) => ({ file: chunk.name }));
|
||||||
|
this.assets = info.assetsByChunkName;
|
||||||
|
}
|
||||||
|
|
||||||
|
to_json(manifest_data: ManifestData, dirs: Dirs): BuildInfo {
|
||||||
|
return {
|
||||||
|
bundler: 'webpack',
|
||||||
|
shimport: null, // webpack has its own loader
|
||||||
|
assets: this.assets,
|
||||||
|
css: {
|
||||||
|
// TODO
|
||||||
|
main: null,
|
||||||
|
chunks: {}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
print() {
|
||||||
|
return this.stats.toString({ colors: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
230
src/core/create_compilers/extract_css.ts
Normal file
230
src/core/create_compilers/extract_css.ts
Normal file
@@ -0,0 +1,230 @@
|
|||||||
|
import * as fs from 'fs';
|
||||||
|
import * as path from 'path';
|
||||||
|
import hash from 'string-hash';
|
||||||
|
import * as codec from 'sourcemap-codec';
|
||||||
|
import { PageComponent, Dirs } from '../../interfaces';
|
||||||
|
import { CompileResult } from './interfaces';
|
||||||
|
|
||||||
|
const inline_sourcemap_header = 'data:application/json;charset=utf-8;base64,';
|
||||||
|
|
||||||
|
function extract_sourcemap(raw: string, id: string) {
|
||||||
|
let raw_map: string;
|
||||||
|
let map = null;
|
||||||
|
|
||||||
|
const code = raw.replace(/\/\*#\s+sourceMappingURL=(.+)\s+\*\//g, (m, url) => {
|
||||||
|
if (raw_map) {
|
||||||
|
// TODO should not happen!
|
||||||
|
throw new Error(`Found multiple sourcemaps in single CSS file (${id})`);
|
||||||
|
}
|
||||||
|
|
||||||
|
raw_map = url;
|
||||||
|
return '';
|
||||||
|
}).trim();
|
||||||
|
|
||||||
|
if (raw_map) {
|
||||||
|
if (raw_map.startsWith(inline_sourcemap_header)) {
|
||||||
|
const json = Buffer.from(raw_map.slice(inline_sourcemap_header.length), 'base64').toString();
|
||||||
|
map = JSON.parse(json);
|
||||||
|
} else {
|
||||||
|
// TODO do we want to handle non-inline sourcemaps? could be a rabbit hole
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
code,
|
||||||
|
map
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
type SourceMap = {
|
||||||
|
version: 3;
|
||||||
|
file: string;
|
||||||
|
sources: string[];
|
||||||
|
sourcesContent: string[];
|
||||||
|
names: string[];
|
||||||
|
mappings: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function extract_css(client_result: CompileResult, components: PageComponent[], dirs: Dirs) {
|
||||||
|
const result: {
|
||||||
|
main: string | null;
|
||||||
|
chunks: Record<string, string[]>
|
||||||
|
} = {
|
||||||
|
main: null,
|
||||||
|
chunks: {}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!client_result.css_files) return; // Rollup-only for now
|
||||||
|
|
||||||
|
const unaccounted_for = new Set();
|
||||||
|
|
||||||
|
const css_map = new Map();
|
||||||
|
client_result.css_files.forEach(css => {
|
||||||
|
unaccounted_for.add(css.id);
|
||||||
|
css_map.set(css.id, css.code);
|
||||||
|
});
|
||||||
|
|
||||||
|
const chunk_map = new Map();
|
||||||
|
client_result.chunks.forEach(chunk => {
|
||||||
|
chunk_map.set(chunk.file, chunk);
|
||||||
|
});
|
||||||
|
|
||||||
|
const chunks_with_css = new Set();
|
||||||
|
|
||||||
|
// figure out which chunks belong to which components...
|
||||||
|
const component_owners = new Map();
|
||||||
|
client_result.chunks.forEach(chunk => {
|
||||||
|
chunk.modules.forEach(module => {
|
||||||
|
const component = path.relative(dirs.routes, module);
|
||||||
|
component_owners.set(component, chunk);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const chunks_depended_upon_by_component = new Map();
|
||||||
|
|
||||||
|
// ...so we can figure out which chunks don't belong
|
||||||
|
components.forEach(component => {
|
||||||
|
const chunk = component_owners.get(component.file);
|
||||||
|
if (!chunk) {
|
||||||
|
// this should never happen!
|
||||||
|
throw new Error(`Could not find chunk that owns ${component.file}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const chunks = new Set([chunk]);
|
||||||
|
chunks.forEach(chunk => {
|
||||||
|
chunk.imports.forEach((file: string) => {
|
||||||
|
const chunk = chunk_map.get(file);
|
||||||
|
if (chunk) chunks.add(chunk);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
chunks.forEach(chunk => {
|
||||||
|
chunk.modules.forEach((module: string) => {
|
||||||
|
unaccounted_for.delete(module);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
chunks_depended_upon_by_component.set(
|
||||||
|
component,
|
||||||
|
chunks
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
function get_css_from_modules(modules: string[]) {
|
||||||
|
const parts: string[] = [];
|
||||||
|
const mappings: number[][][] = [];
|
||||||
|
|
||||||
|
const combined_map: SourceMap = {
|
||||||
|
version: 3,
|
||||||
|
file: null,
|
||||||
|
sources: [],
|
||||||
|
sourcesContent: [],
|
||||||
|
names: [],
|
||||||
|
mappings: null
|
||||||
|
};
|
||||||
|
|
||||||
|
modules.forEach(module => {
|
||||||
|
if (!/\.css$/.test(module)) return;
|
||||||
|
|
||||||
|
const css = css_map.get(module);
|
||||||
|
|
||||||
|
const { code, map } = extract_sourcemap(css, module);
|
||||||
|
|
||||||
|
parts.push(code);
|
||||||
|
|
||||||
|
if (map) {
|
||||||
|
const lines = codec.decode(map.mappings);
|
||||||
|
|
||||||
|
if (combined_map.sources.length > 0 || combined_map.names.length > 0) {
|
||||||
|
lines.forEach(line => {
|
||||||
|
line.forEach(segment => {
|
||||||
|
// adjust source index
|
||||||
|
segment[1] += combined_map.sources.length;
|
||||||
|
|
||||||
|
// adjust name index
|
||||||
|
if (segment[4]) segment[4] += combined_map.names.length;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
combined_map.sources.push(...map.sources);
|
||||||
|
combined_map.sourcesContent.push(...map.sourcesContent);
|
||||||
|
combined_map.names.push(...map.names);
|
||||||
|
|
||||||
|
mappings.push(...lines);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (parts.length > 0) {
|
||||||
|
combined_map.mappings = codec.encode(mappings);
|
||||||
|
|
||||||
|
combined_map.sources = combined_map.sources.map(source => path.relative(`${dirs.dest}/client`, source));
|
||||||
|
|
||||||
|
return {
|
||||||
|
code: parts.join('\n'),
|
||||||
|
map: combined_map
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const main = client_result.assets.main;
|
||||||
|
const entry = fs.readFileSync(`${dirs.dest}/client/${main}`, 'utf-8');
|
||||||
|
|
||||||
|
const replacements = new Map();
|
||||||
|
|
||||||
|
chunks_depended_upon_by_component.forEach((chunks, component) => {
|
||||||
|
const chunks_with_css = Array.from(chunks).filter(chunk => {
|
||||||
|
const css = get_css_from_modules(chunk.modules);
|
||||||
|
|
||||||
|
if (css) {
|
||||||
|
const { code, map } = css;
|
||||||
|
|
||||||
|
const output_file_name = chunk.file.replace(/\.js$/, '.css');
|
||||||
|
|
||||||
|
map.file = output_file_name;
|
||||||
|
map.sources = map.sources.map(source => path.relative(`${dirs.dest}/client`, source));
|
||||||
|
|
||||||
|
fs.writeFileSync(`${dirs.dest}/client/${output_file_name}`, `${code}\n/* sourceMappingURL=client/${output_file_name}.map */`);
|
||||||
|
fs.writeFileSync(`${dirs.dest}/client/${output_file_name}.map`, JSON.stringify(map, null, ' '));
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const files = chunks_with_css.map(chunk => chunk.file.replace(/\.js$/, '.css'));
|
||||||
|
|
||||||
|
replacements.set(
|
||||||
|
component.file,
|
||||||
|
files
|
||||||
|
);
|
||||||
|
|
||||||
|
result.chunks[component.file] = files;
|
||||||
|
});
|
||||||
|
|
||||||
|
const replaced = entry.replace(/["']__SAPPER_CSS_PLACEHOLDER:(.+?)__["']/g, (m, route) => {
|
||||||
|
return JSON.stringify(replacements.get(route));
|
||||||
|
});
|
||||||
|
|
||||||
|
fs.writeFileSync(`${dirs.dest}/client/${main}`, replaced);
|
||||||
|
|
||||||
|
const leftover = get_css_from_modules(Array.from(unaccounted_for));
|
||||||
|
if (leftover) {
|
||||||
|
const { code, map } = leftover;
|
||||||
|
|
||||||
|
const main_hash = hash(code);
|
||||||
|
|
||||||
|
const output_file_name = `main.${main_hash}.css`;
|
||||||
|
|
||||||
|
map.file = output_file_name;
|
||||||
|
map.sources = map.sources.map(source => path.relative(`${dirs.dest}/client`, source));
|
||||||
|
|
||||||
|
fs.writeFileSync(`${dirs.dest}/client/${output_file_name}`, `${code}\n/* sourceMappingURL=client/${output_file_name}.map */`);
|
||||||
|
fs.writeFileSync(`${dirs.dest}/client/${output_file_name}.map`, JSON.stringify(map, null, ' '));
|
||||||
|
|
||||||
|
result.main = output_file_name;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
37
src/core/create_compilers/index.ts
Normal file
37
src/core/create_compilers/index.ts
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import * as fs from 'fs';
|
||||||
|
import { Dirs } from '../../interfaces';
|
||||||
|
import RollupCompiler from './RollupCompiler';
|
||||||
|
import { WebpackCompiler } from './WebpackCompiler';
|
||||||
|
|
||||||
|
export type Compiler = RollupCompiler | WebpackCompiler;
|
||||||
|
|
||||||
|
export type Compilers = {
|
||||||
|
client: Compiler;
|
||||||
|
server: Compiler;
|
||||||
|
serviceworker?: Compiler;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function create_compilers(bundler: string, dirs: Dirs): Compilers {
|
||||||
|
if (bundler === 'rollup') {
|
||||||
|
const sw = `${dirs.rollup}/service-worker.config.js`;
|
||||||
|
|
||||||
|
return {
|
||||||
|
client: new RollupCompiler(`${dirs.rollup}/client.config.js`),
|
||||||
|
server: new RollupCompiler(`${dirs.rollup}/server.config.js`),
|
||||||
|
serviceworker: fs.existsSync(sw) && new RollupCompiler(sw)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bundler === 'webpack') {
|
||||||
|
const sw = `${dirs.webpack}/service-worker.config.js`;
|
||||||
|
|
||||||
|
return {
|
||||||
|
client: new WebpackCompiler(`${dirs.webpack}/client.config.js`),
|
||||||
|
server: new WebpackCompiler(`${dirs.webpack}/server.config.js`),
|
||||||
|
serviceworker: fs.existsSync(sw) && new WebpackCompiler(sw)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// this shouldn't be possible...
|
||||||
|
throw new Error(`Invalid bundler option '${bundler}'`);
|
||||||
|
}
|
||||||
39
src/core/create_compilers/interfaces.ts
Normal file
39
src/core/create_compilers/interfaces.ts
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
import { ManifestData, Dirs } from '../../interfaces';
|
||||||
|
|
||||||
|
export type Chunk = {
|
||||||
|
file: string;
|
||||||
|
imports: string[];
|
||||||
|
modules: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CssFile = {
|
||||||
|
id: string;
|
||||||
|
code: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export class CompileError {
|
||||||
|
file: string;
|
||||||
|
message: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CompileResult {
|
||||||
|
duration: number;
|
||||||
|
errors: CompileError[];
|
||||||
|
warnings: CompileError[];
|
||||||
|
chunks: Chunk[];
|
||||||
|
assets: Record<string, string>;
|
||||||
|
css_files: CssFile[];
|
||||||
|
|
||||||
|
to_json: (manifest_data: ManifestData, dirs: Dirs) => BuildInfo
|
||||||
|
}
|
||||||
|
|
||||||
|
export type BuildInfo = {
|
||||||
|
bundler: string;
|
||||||
|
shimport: string;
|
||||||
|
assets: Record<string, string>;
|
||||||
|
legacy_assets?: Record<string, string>;
|
||||||
|
css: {
|
||||||
|
main: string | null,
|
||||||
|
chunks: Record<string, string[]>
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
import * as fs from 'fs';
|
import * as fs from 'fs';
|
||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
import { locations } from '../config';
|
import { locations } from '../config';
|
||||||
import { Page, PageComponent, ServerRoute } from '../interfaces';
|
import { Page, PageComponent, ServerRoute, ManifestData } from '../interfaces';
|
||||||
import { posixify } from './utils';
|
import { posixify, reserved_words } from './utils';
|
||||||
|
|
||||||
export default function create_routes(cwd = locations.routes()) {
|
export default function create_manifest_data(cwd = locations.routes()): ManifestData {
|
||||||
const components: PageComponent[] = [];
|
const components: PageComponent[] = [];
|
||||||
const pages: Page[] = [];
|
const pages: Page[] = [];
|
||||||
const server_routes: ServerRoute[] = [];
|
const server_routes: ServerRoute[] = [];
|
||||||
@@ -30,13 +30,16 @@ export default function create_routes(cwd = locations.routes()) {
|
|||||||
const file = path.relative(cwd, resolved);
|
const file = path.relative(cwd, resolved);
|
||||||
const is_dir = fs.statSync(resolved).isDirectory();
|
const is_dir = fs.statSync(resolved).isDirectory();
|
||||||
|
|
||||||
|
const ext = path.extname(basename);
|
||||||
|
if (!is_dir && !/^\.[a-z]+$/i.test(ext)) return null; // filter out tmp files etc
|
||||||
|
|
||||||
const segment = is_dir
|
const segment = is_dir
|
||||||
? basename
|
? basename
|
||||||
: basename.slice(0, -path.extname(basename).length);
|
: basename.slice(0, -path.extname(basename).length);
|
||||||
|
|
||||||
const parts = get_parts(segment);
|
const parts = get_parts(segment);
|
||||||
const is_index = is_dir ? false : basename.startsWith('index.');
|
const is_index = is_dir ? false : basename.startsWith('index.');
|
||||||
const is_page = path.extname(basename) === '.html';
|
const is_page = ext === '.html';
|
||||||
|
|
||||||
parts.forEach(part => {
|
parts.forEach(part => {
|
||||||
if (/\]\[/.test(part.content)) {
|
if (/\]\[/.test(part.content)) {
|
||||||
@@ -57,6 +60,7 @@ export default function create_routes(cwd = locations.routes()) {
|
|||||||
is_page
|
is_page
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
.filter(Boolean)
|
||||||
.sort(comparator);
|
.sort(comparator);
|
||||||
|
|
||||||
items.forEach(item => {
|
items.forEach(item => {
|
||||||
@@ -265,7 +269,7 @@ function get_parts(part: string): Part[] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function get_slug(file: string) {
|
function get_slug(file: string) {
|
||||||
return file
|
let name = file
|
||||||
.replace(/[\\\/]index/, '')
|
.replace(/[\\\/]index/, '')
|
||||||
.replace(/_default([\/\\index])?\.html$/, 'index')
|
.replace(/_default([\/\\index])?\.html$/, 'index')
|
||||||
.replace(/[\/\\]/g, '_')
|
.replace(/[\/\\]/g, '_')
|
||||||
@@ -274,6 +278,9 @@ function get_slug(file: string) {
|
|||||||
.replace(/[^a-zA-Z0-9_$]/g, c => {
|
.replace(/[^a-zA-Z0-9_$]/g, c => {
|
||||||
return c === '.' ? '_' : `$${c.charCodeAt(0)}`
|
return c === '.' ? '_' : `$${c.charCodeAt(0)}`
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (reserved_words.has(name)) name += '_';
|
||||||
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_pattern(segments: Part[][], add_trailing_slash: boolean) {
|
function get_pattern(segments: Part[][], add_trailing_slash: boolean) {
|
||||||
@@ -3,11 +3,11 @@ import * as path from 'path';
|
|||||||
import glob from 'tiny-glob/sync.js';
|
import glob from 'tiny-glob/sync.js';
|
||||||
import { posixify, write_if_changed } from './utils';
|
import { posixify, write_if_changed } from './utils';
|
||||||
import { dev, locations } from '../config';
|
import { dev, locations } from '../config';
|
||||||
import { Page, PageComponent, ServerRoute } from '../interfaces';
|
import { Page, PageComponent, ServerRoute, ManifestData } from '../interfaces';
|
||||||
|
|
||||||
export function create_main_manifests({ bundler, routes, dev_port }: {
|
export function create_main_manifests({ bundler, manifest_data, dev_port }: {
|
||||||
bundler: string,
|
bundler: string,
|
||||||
routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] };
|
manifest_data: ManifestData;
|
||||||
dev_port?: number;
|
dev_port?: number;
|
||||||
}) {
|
}) {
|
||||||
const manifest_dir = path.join(locations.app(), 'manifest');
|
const manifest_dir = path.join(locations.app(), 'manifest');
|
||||||
@@ -15,8 +15,8 @@ export function create_main_manifests({ bundler, routes, dev_port }: {
|
|||||||
|
|
||||||
const path_to_routes = path.relative(manifest_dir, locations.routes());
|
const path_to_routes = path.relative(manifest_dir, locations.routes());
|
||||||
|
|
||||||
const client_manifest = generate_client(routes, path_to_routes, bundler, dev_port);
|
const client_manifest = generate_client(manifest_data, path_to_routes, bundler, dev_port);
|
||||||
const server_manifest = generate_server(routes, path_to_routes);
|
const server_manifest = generate_server(manifest_data, path_to_routes);
|
||||||
|
|
||||||
write_if_changed(
|
write_if_changed(
|
||||||
`${manifest_dir}/default-layout.html`,
|
`${manifest_dir}/default-layout.html`,
|
||||||
@@ -26,8 +26,8 @@ export function create_main_manifests({ bundler, routes, dev_port }: {
|
|||||||
write_if_changed(`${manifest_dir}/server.js`, server_manifest);
|
write_if_changed(`${manifest_dir}/server.js`, server_manifest);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function create_serviceworker_manifest({ routes, client_files }: {
|
export function create_serviceworker_manifest({ manifest_data, client_files }: {
|
||||||
routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] };
|
manifest_data: ManifestData;
|
||||||
client_files: string[];
|
client_files: string[];
|
||||||
}) {
|
}) {
|
||||||
const assets = glob('**', { cwd: 'assets', filesOnly: true });
|
const assets = glob('**', { cwd: 'assets', filesOnly: true });
|
||||||
@@ -40,44 +40,47 @@ export function create_serviceworker_manifest({ routes, client_files }: {
|
|||||||
|
|
||||||
export const shell = [\n\t${client_files.map((x: string) => `"${x}"`).join(',\n\t')}\n];
|
export const shell = [\n\t${client_files.map((x: string) => `"${x}"`).join(',\n\t')}\n];
|
||||||
|
|
||||||
export const routes = [\n\t${routes.pages.map((r: Page) => `{ pattern: ${r.pattern} }`).join(',\n\t')}\n];
|
export const routes = [\n\t${manifest_data.pages.map((r: Page) => `{ pattern: ${r.pattern} }`).join(',\n\t')}\n];
|
||||||
`.replace(/^\t\t/gm, '').trim();
|
`.replace(/^\t\t/gm, '').trim();
|
||||||
|
|
||||||
write_if_changed(`${locations.app()}/manifest/service-worker.js`, code);
|
write_if_changed(`${locations.app()}/manifest/service-worker.js`, code);
|
||||||
}
|
}
|
||||||
|
|
||||||
function generate_client(
|
function generate_client(
|
||||||
routes: { root: PageComponent, components: PageComponent[], pages: Page[], server_routes: ServerRoute[] },
|
manifest_data: ManifestData,
|
||||||
path_to_routes: string,
|
path_to_routes: string,
|
||||||
bundler: string,
|
bundler: string,
|
||||||
dev_port?: number
|
dev_port?: number
|
||||||
) {
|
) {
|
||||||
const page_ids = new Set(routes.pages.map(page =>
|
const page_ids = new Set(manifest_data.pages.map(page =>
|
||||||
page.pattern.toString()));
|
page.pattern.toString()));
|
||||||
|
|
||||||
const server_routes_to_ignore = routes.server_routes.filter(route =>
|
const server_routes_to_ignore = manifest_data.server_routes.filter(route =>
|
||||||
!page_ids.has(route.pattern.toString()));
|
!page_ids.has(route.pattern.toString()));
|
||||||
|
|
||||||
let code = `
|
let code = `
|
||||||
// This file is generated by Sapper — do not edit it!
|
// This file is generated by Sapper — do not edit it!
|
||||||
import root from '${get_file(path_to_routes, routes.root)}';
|
import root from '${get_file(path_to_routes, manifest_data.root)}';
|
||||||
import error from '${posixify(`${path_to_routes}/_error.html`)}';
|
import error from '${posixify(`${path_to_routes}/_error.html`)}';
|
||||||
|
|
||||||
${routes.components.map(component => {
|
${manifest_data.components.map(component => {
|
||||||
const annotation = bundler === 'webpack'
|
const annotation = bundler === 'webpack'
|
||||||
? `/* webpackChunkName: "${component.name}" */ `
|
? `/* webpackChunkName: "${component.name}" */ `
|
||||||
: '';
|
: '';
|
||||||
|
|
||||||
const source = get_file(path_to_routes, component);
|
const source = get_file(path_to_routes, component);
|
||||||
|
|
||||||
return `const ${component.name} = () => import(${annotation}'${source}');`;
|
return `const ${component.name} = {
|
||||||
|
js: () => import(${annotation}'${source}'),
|
||||||
|
css: "__SAPPER_CSS_PLACEHOLDER:${component.file}__"
|
||||||
|
};`;
|
||||||
}).join('\n')}
|
}).join('\n')}
|
||||||
|
|
||||||
export const manifest = {
|
export const manifest = {
|
||||||
ignore: [${server_routes_to_ignore.map(route => route.pattern).join(', ')}],
|
ignore: [${server_routes_to_ignore.map(route => route.pattern).join(', ')}],
|
||||||
|
|
||||||
pages: [
|
pages: [
|
||||||
${routes.pages.map(page => `{
|
${manifest_data.pages.map(page => `{
|
||||||
// ${page.parts[page.parts.length - 1].component.file}
|
// ${page.parts[page.parts.length - 1].component.file}
|
||||||
pattern: ${page.pattern},
|
pattern: ${page.pattern},
|
||||||
parts: [
|
parts: [
|
||||||
@@ -119,15 +122,15 @@ function generate_client(
|
|||||||
}
|
}
|
||||||
|
|
||||||
function generate_server(
|
function generate_server(
|
||||||
routes: { root: PageComponent, components: PageComponent[], pages: Page[], server_routes: ServerRoute[] },
|
manifest_data: ManifestData,
|
||||||
path_to_routes: string
|
path_to_routes: string
|
||||||
) {
|
) {
|
||||||
const imports = [].concat(
|
const imports = [].concat(
|
||||||
routes.server_routes.map(route =>
|
manifest_data.server_routes.map(route =>
|
||||||
`import * as ${route.name} from '${posixify(`${path_to_routes}/${route.file}`)}';`),
|
`import * as ${route.name} from '${posixify(`${path_to_routes}/${route.file}`)}';`),
|
||||||
routes.components.map(component =>
|
manifest_data.components.map(component =>
|
||||||
`import ${component.name} from '${get_file(path_to_routes, component)}';`),
|
`import ${component.name} from '${get_file(path_to_routes, component)}';`),
|
||||||
`import root from '${get_file(path_to_routes, routes.root)}';`,
|
`import root from '${get_file(path_to_routes, manifest_data.root)}';`,
|
||||||
`import error from '${posixify(`${path_to_routes}/_error.html`)}';`
|
`import error from '${posixify(`${path_to_routes}/_error.html`)}';`
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -137,7 +140,7 @@ function generate_server(
|
|||||||
|
|
||||||
export const manifest = {
|
export const manifest = {
|
||||||
server_routes: [
|
server_routes: [
|
||||||
${routes.server_routes.map(route => `{
|
${manifest_data.server_routes.map(route => `{
|
||||||
// ${route.file}
|
// ${route.file}
|
||||||
pattern: ${route.pattern},
|
pattern: ${route.pattern},
|
||||||
handlers: ${route.name},
|
handlers: ${route.name},
|
||||||
@@ -148,7 +151,7 @@ function generate_server(
|
|||||||
],
|
],
|
||||||
|
|
||||||
pages: [
|
pages: [
|
||||||
${routes.pages.map(page => `{
|
${manifest_data.pages.map(page => `{
|
||||||
// ${page.parts[page.parts.length - 1].component.file}
|
// ${page.parts[page.parts.length - 1].component.file}
|
||||||
pattern: ${page.pattern},
|
pattern: ${page.pattern},
|
||||||
parts: [
|
parts: [
|
||||||
@@ -157,6 +160,7 @@ function generate_server(
|
|||||||
|
|
||||||
const props = [
|
const props = [
|
||||||
`name: "${part.component.name}"`,
|
`name: "${part.component.name}"`,
|
||||||
|
`file: "${part.component.file}"`,
|
||||||
`component: ${part.component.name}`
|
`component: ${part.component.name}`
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -22,4 +22,55 @@ export function fudge_mtime(file: string) {
|
|||||||
new Date(atime.getTime() - 999999),
|
new Date(atime.getTime() - 999999),
|
||||||
new Date(mtime.getTime() - 999999)
|
new Date(mtime.getTime() - 999999)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const reserved_words = new Set([
|
||||||
|
'arguments',
|
||||||
|
'await',
|
||||||
|
'break',
|
||||||
|
'case',
|
||||||
|
'catch',
|
||||||
|
'class',
|
||||||
|
'const',
|
||||||
|
'continue',
|
||||||
|
'debugger',
|
||||||
|
'default',
|
||||||
|
'delete',
|
||||||
|
'do',
|
||||||
|
'else',
|
||||||
|
'enum',
|
||||||
|
'eval',
|
||||||
|
'export',
|
||||||
|
'extends',
|
||||||
|
'false',
|
||||||
|
'finally',
|
||||||
|
'for',
|
||||||
|
'function',
|
||||||
|
'if',
|
||||||
|
'implements',
|
||||||
|
'import',
|
||||||
|
'in',
|
||||||
|
'instanceof',
|
||||||
|
'interface',
|
||||||
|
'let',
|
||||||
|
'new',
|
||||||
|
'null',
|
||||||
|
'package',
|
||||||
|
'private',
|
||||||
|
'protected',
|
||||||
|
'public',
|
||||||
|
'return',
|
||||||
|
'static',
|
||||||
|
'super',
|
||||||
|
'switch',
|
||||||
|
'this',
|
||||||
|
'throw',
|
||||||
|
'true',
|
||||||
|
'try',
|
||||||
|
'typeof',
|
||||||
|
'var',
|
||||||
|
'void',
|
||||||
|
'while',
|
||||||
|
'with',
|
||||||
|
'yield',
|
||||||
|
]);
|
||||||
@@ -39,4 +39,19 @@ export type ServerRoute = {
|
|||||||
pattern: RegExp;
|
pattern: RegExp;
|
||||||
file: string;
|
file: string;
|
||||||
params: string[];
|
params: string[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export type Dirs = {
|
||||||
|
dest: string,
|
||||||
|
app: string,
|
||||||
|
routes: string,
|
||||||
|
webpack: string,
|
||||||
|
rollup: string
|
||||||
|
};
|
||||||
|
|
||||||
|
export type ManifestData = {
|
||||||
|
root: PageComponent;
|
||||||
|
components: PageComponent[];
|
||||||
|
pages: Page[];
|
||||||
|
server_routes: ServerRoute[];
|
||||||
};
|
};
|
||||||
@@ -185,7 +185,8 @@ function serve({ prefix, pathname, cache_control }: {
|
|||||||
const type = lookup(req.path);
|
const type = lookup(req.path);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const data = read(req.path.slice(1));
|
const file = decodeURIComponent(req.path.slice(1));
|
||||||
|
const data = read(file);
|
||||||
|
|
||||||
res.setHeader('Content-Type', type);
|
res.setHeader('Content-Type', type);
|
||||||
res.setHeader('Cache-Control', cache_control);
|
res.setHeader('Cache-Control', cache_control);
|
||||||
@@ -306,7 +307,8 @@ function get_page_handler(
|
|||||||
const build_info: {
|
const build_info: {
|
||||||
bundler: 'rollup' | 'webpack',
|
bundler: 'rollup' | 'webpack',
|
||||||
shimport: string | null,
|
shimport: string | null,
|
||||||
assets: Record<string, string | string[]>
|
assets: Record<string, string | string[]>,
|
||||||
|
legacy_assets?: Record<string, string>
|
||||||
} = get_build_info();
|
} = get_build_info();
|
||||||
|
|
||||||
res.setHeader('Content-Type', 'text/html');
|
res.setHeader('Content-Type', 'text/html');
|
||||||
@@ -472,14 +474,7 @@ function get_page_handler(
|
|||||||
store
|
store
|
||||||
});
|
});
|
||||||
|
|
||||||
const file = [].concat(build_info.assets.main).filter(file => file && /\.js$/.test(file))[0];
|
let script = `__SAPPER__={${[
|
||||||
const main = `${req.baseUrl}/client/${file}`;
|
|
||||||
|
|
||||||
const script = build_info.bundler === 'rollup'
|
|
||||||
? `<script>try{new Function("import('${main}')")();}catch(e){var s=document.createElement("script");s.src="${req.baseUrl}/client/shimport@${build_info.shimport}.js";s.setAttribute("data-main","${main}");document.head.appendChild(s);}</script>`
|
|
||||||
: `<script src="${main}"></script>`;
|
|
||||||
|
|
||||||
let inline_script = `__SAPPER__={${[
|
|
||||||
error && `error:1`,
|
error && `error:1`,
|
||||||
`baseUrl:"${req.baseUrl}"`,
|
`baseUrl:"${req.baseUrl}"`,
|
||||||
serialized.preloaded && `preloaded:${serialized.preloaded}`,
|
serialized.preloaded && `preloaded:${serialized.preloaded}`,
|
||||||
@@ -488,15 +483,53 @@ function get_page_handler(
|
|||||||
|
|
||||||
const has_service_worker = fs.existsSync(path.join(locations.dest(), 'service-worker.js'));
|
const has_service_worker = fs.existsSync(path.join(locations.dest(), 'service-worker.js'));
|
||||||
if (has_service_worker) {
|
if (has_service_worker) {
|
||||||
inline_script += `if ('serviceWorker' in navigator) navigator.serviceWorker.register('${req.baseUrl}/service-worker.js');`;
|
script += `if('serviceWorker' in navigator)navigator.serviceWorker.register('${req.baseUrl}/service-worker.js');`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const file = [].concat(build_info.assets.main).filter(file => file && /\.js$/.test(file))[0];
|
||||||
|
const main = `${req.baseUrl}/client/${file}`;
|
||||||
|
|
||||||
|
if (build_info.bundler === 'rollup') {
|
||||||
|
if (build_info.legacy_assets) {
|
||||||
|
const legacy_main = `${req.baseUrl}/client/legacy/${build_info.legacy_assets.main}`;
|
||||||
|
script += `(function(){try{eval("async function x(){}");var main="${main}"}catch(e){main="${legacy_main}"};try{new Function("import('"+main+"')")();}catch(e){var s=document.createElement("script");s.src="${req.baseUrl}/client/shimport@${build_info.shimport}.js";s.setAttribute("data-main",main);document.head.appendChild(s);}}());`;
|
||||||
|
} else {
|
||||||
|
script += `try{new Function("import('${main}')")();}catch(e){var s=document.createElement("script");s.src="${req.baseUrl}/client/shimport@${build_info.shimport}.js";s.setAttribute("data-main","${main}");document.head.appendChild(s);}`;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
script += `</script><script src="${main}">`;
|
||||||
|
}
|
||||||
|
|
||||||
|
let styles: string;
|
||||||
|
|
||||||
|
// TODO make this consistent across apps
|
||||||
|
if (build_info.css && build_info.css.main) {
|
||||||
|
const css_chunks = new Set();
|
||||||
|
if (build_info.css.main) css_chunks.add(build_info.css.main);
|
||||||
|
page.parts.forEach(part => {
|
||||||
|
if (!part) return;
|
||||||
|
const css_chunks_for_part = build_info.css.chunks[part.file];
|
||||||
|
|
||||||
|
if (css_chunks_for_part) {
|
||||||
|
css_chunks_for_part.forEach(file => {
|
||||||
|
css_chunks.add(file);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
styles = Array.from(css_chunks)
|
||||||
|
.map(href => `<link rel="stylesheet" href="client/${href}">`)
|
||||||
|
.join('')
|
||||||
|
} else {
|
||||||
|
styles = (css && css.code ? `<style>${css.code}</style>` : '');
|
||||||
}
|
}
|
||||||
|
|
||||||
const body = template()
|
const body = template()
|
||||||
.replace('%sapper.base%', () => `<base href="${req.baseUrl}/">`)
|
.replace('%sapper.base%', () => `<base href="${req.baseUrl}/">`)
|
||||||
.replace('%sapper.scripts%', () => `<script>${inline_script}</script>${script}`)
|
.replace('%sapper.scripts%', () => `<script>${script}</script>`)
|
||||||
.replace('%sapper.html%', () => html)
|
.replace('%sapper.html%', () => html)
|
||||||
.replace('%sapper.head%', () => `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
|
.replace('%sapper.head%', () => `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
|
||||||
.replace('%sapper.styles%', () => (css && css.code ? `<style>${css.code}</style>` : ''));
|
.replace('%sapper.styles%', () => styles);
|
||||||
|
|
||||||
res.statusCode = status;
|
res.statusCode = status;
|
||||||
res.end(body);
|
res.end(body);
|
||||||
|
|||||||
@@ -9,11 +9,15 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
output: () => {
|
output: () => {
|
||||||
|
let dir = `${locations.dest()}/client`;
|
||||||
|
if (process.env.SAPPER_LEGACY_BUILD) dir += `/legacy`;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
dir: `${locations.dest()}/client`,
|
dir,
|
||||||
entryFileNames: '[name].[hash].js',
|
entryFileNames: '[name].[hash].js',
|
||||||
chunkFileNames: '[name].[hash].js',
|
chunkFileNames: '[name].[hash].js',
|
||||||
format: 'esm'
|
format: 'esm',
|
||||||
|
sourcemap: dev()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { detach, findAnchor, scroll_state, which } from './utils';
|
import { detach, findAnchor, scroll_state, which } from './utils';
|
||||||
import { Component, ComponentConstructor, Params, Query, Redirect, Manifest, RouteData, ScrollPosition, Store, Target } from './interfaces';
|
import { Component, ComponentConstructor, Params, Query, Redirect, Manifest, RouteData, ScrollPosition, Store, Target, ComponentLoader } from './interfaces';
|
||||||
|
|
||||||
const initial_data = typeof window !== 'undefined' && window.__SAPPER__;
|
const initial_data = typeof window !== 'undefined' && window.__SAPPER__;
|
||||||
|
|
||||||
@@ -131,6 +131,30 @@ function changed(a: Record<string, string | true>, b: Record<string, string | tr
|
|||||||
let root_preload: Promise<any>;
|
let root_preload: Promise<any>;
|
||||||
let root_data: any;
|
let root_data: any;
|
||||||
|
|
||||||
|
function load_css(chunk: string) {
|
||||||
|
const href = `${initial_data.baseUrl}client/${chunk}`;
|
||||||
|
if (document.querySelector(`link[href="${href}"]`)) return;
|
||||||
|
|
||||||
|
return new Promise((fulfil, reject) => {
|
||||||
|
const link = document.createElement('link');
|
||||||
|
link.rel = 'stylesheet';
|
||||||
|
link.href = href;
|
||||||
|
|
||||||
|
link.onload = () => fulfil();
|
||||||
|
link.onerror = reject;
|
||||||
|
|
||||||
|
document.head.appendChild(link);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function load_component(component: ComponentLoader): Promise<ComponentConstructor> {
|
||||||
|
// TODO this is temporary — once placeholders are
|
||||||
|
// always rewritten, scratch the ternary
|
||||||
|
const promises: Array<Promise<any>> = (typeof component.css === 'string' ? [] : component.css.map(load_css));
|
||||||
|
promises.unshift(component.js());
|
||||||
|
return Promise.all(promises).then(values => values[0].default);
|
||||||
|
}
|
||||||
|
|
||||||
function prepare_page(target: Target): Promise<{
|
function prepare_page(target: Target): Promise<{
|
||||||
redirect?: Redirect;
|
redirect?: Redirect;
|
||||||
data?: any;
|
data?: any;
|
||||||
@@ -177,7 +201,8 @@ function prepare_page(target: Target): Promise<{
|
|||||||
if (i < changed_from) return null;
|
if (i < changed_from) return null;
|
||||||
if (!part) return null;
|
if (!part) return null;
|
||||||
|
|
||||||
const { default: Component } = await part.component();
|
const Component = await load_component(part.component);
|
||||||
|
|
||||||
const req = {
|
const req = {
|
||||||
path,
|
path,
|
||||||
query,
|
query,
|
||||||
@@ -311,6 +336,8 @@ function handle_click(event: MouseEvent) {
|
|||||||
const a: HTMLAnchorElement | SVGAElement = <HTMLAnchorElement | SVGAElement>findAnchor(<Node>event.target);
|
const a: HTMLAnchorElement | SVGAElement = <HTMLAnchorElement | SVGAElement>findAnchor(<Node>event.target);
|
||||||
if (!a) return;
|
if (!a) return;
|
||||||
|
|
||||||
|
if (!a.href) return;
|
||||||
|
|
||||||
// check if link is inside an svg
|
// check if link is inside an svg
|
||||||
// in this case, both href and target are always inside an object
|
// in this case, both href and target are always inside an object
|
||||||
const svg = typeof a.href === 'object' && a.href.constructor.name === 'SVGAnimatedString';
|
const svg = typeof a.href === 'object' && a.href.constructor.name === 'SVGAnimatedString';
|
||||||
@@ -468,9 +495,9 @@ export function prefetchRoutes(pathnames: string[]) {
|
|||||||
if (!pathnames) return true;
|
if (!pathnames) return true;
|
||||||
return pathnames.some(pathname => route.pattern.test(pathname));
|
return pathnames.some(pathname => route.pattern.test(pathname));
|
||||||
})
|
})
|
||||||
.reduce((promise: Promise<any>, route) => {
|
.reduce((promise: Promise<any>, route) => promise.then(() => {
|
||||||
return promise.then(route.load);
|
return Promise.all(route.parts.map(part => part && load_component(part.component)));
|
||||||
}, Promise.resolve());
|
}), Promise.resolve());
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove this in 0.9
|
// remove this in 0.9
|
||||||
|
|||||||
@@ -15,10 +15,15 @@ export interface Component {
|
|||||||
destroy: () => void;
|
destroy: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type ComponentLoader = {
|
||||||
|
js: () => Promise<{ default: ComponentConstructor }>,
|
||||||
|
css: string[]
|
||||||
|
};
|
||||||
|
|
||||||
export type Page = {
|
export type Page = {
|
||||||
pattern: RegExp;
|
pattern: RegExp;
|
||||||
parts: Array<{
|
parts: Array<{
|
||||||
component: () => Promise<{ default: ComponentConstructor }>;
|
component: ComponentLoader;
|
||||||
params?: (match: RegExpExecArray) => Record<string, string>;
|
params?: (match: RegExpExecArray) => Record<string, string>;
|
||||||
}>;
|
}>;
|
||||||
};
|
};
|
||||||
|
|||||||
1
test/app/routes/const.html
Normal file
1
test/app/routes/const.html
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<h1>reserved words are okay as routes</h1>
|
||||||
@@ -1 +1,11 @@
|
|||||||
<h1>I'm afraid I just blue myself</h1>
|
<h1>{phrase}</h1>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
preload() {
|
||||||
|
return this.fetch('fünke.json').then(r => r.json()).then(phrase => {
|
||||||
|
return { phrase };
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
9
test/app/routes/fünke.json.js
Normal file
9
test/app/routes/fünke.json.js
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
export function get(req, res) {
|
||||||
|
res.writeHead(200, {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
});
|
||||||
|
|
||||||
|
res.end(JSON.stringify(
|
||||||
|
"I'm afraid I just blue myself"
|
||||||
|
));
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@
|
|||||||
<a href='blog/throw-an-error'>error link</a>
|
<a href='blog/throw-an-error'>error link</a>
|
||||||
<a href='credentials?creds=include'>credentials</a>
|
<a href='credentials?creds=include'>credentials</a>
|
||||||
<a rel=prefetch class='{page === "blog" ? "selected" : ""}' href='blog'>blog</a>
|
<a rel=prefetch class='{page === "blog" ? "selected" : ""}' href='blog'>blog</a>
|
||||||
|
<a href="const">const</a>
|
||||||
|
|
||||||
<div class='hydrate-test'></div>
|
<div class='hydrate-test'></div>
|
||||||
|
|
||||||
|
|||||||
@@ -743,6 +743,14 @@ function run({ mode, basepath = '' }) {
|
|||||||
assert.equal(title, 'root preload function ran: true');
|
assert.equal(title, 'root preload function ran: true');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('allows reserved words as route names', () => {
|
||||||
|
return nightmare.goto(`${base}/const`).init()
|
||||||
|
.page.title()
|
||||||
|
.then(title => {
|
||||||
|
assert.equal(title, 'reserved words are okay as routes');
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('headers', () => {
|
describe('headers', () => {
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
import * as assert from 'assert';
|
import * as assert from 'assert';
|
||||||
import create_routes from '../../../src/core/create_routes';
|
import create_manifest_data from '../../../src/core/create_manifest_data';
|
||||||
|
|
||||||
describe('create_routes', () => {
|
describe('manifest_data', () => {
|
||||||
it('creates routes', () => {
|
it('creates routes', () => {
|
||||||
const { components, pages, server_routes } = create_routes(path.join(__dirname, 'samples/basic'));
|
const { components, pages, server_routes } = create_manifest_data(path.join(__dirname, 'samples/basic'));
|
||||||
|
|
||||||
const index = { name: 'index', file: 'index.html' };
|
const index = { name: 'index', file: 'index.html' };
|
||||||
const about = { name: 'about', file: 'about.html' };
|
const about = { name: 'about', file: 'about.html' };
|
||||||
@@ -68,7 +68,7 @@ describe('create_routes', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('encodes invalid characters', () => {
|
it('encodes invalid characters', () => {
|
||||||
const { components, pages } = create_routes(path.join(__dirname, 'samples/encoding'));
|
const { components, pages } = create_manifest_data(path.join(__dirname, 'samples/encoding'));
|
||||||
|
|
||||||
// had to remove ? and " because windows
|
// had to remove ? and " because windows
|
||||||
|
|
||||||
@@ -90,7 +90,7 @@ describe('create_routes', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('allows regex qualifiers', () => {
|
it('allows regex qualifiers', () => {
|
||||||
const { pages } = create_routes(path.join(__dirname, 'samples/qualifiers'));
|
const { pages } = create_manifest_data(path.join(__dirname, 'samples/qualifiers'));
|
||||||
|
|
||||||
assert.deepEqual(pages.map(p => p.pattern), [
|
assert.deepEqual(pages.map(p => p.pattern), [
|
||||||
/^\/([0-9-a-z]{3,})\/?$/,
|
/^\/([0-9-a-z]{3,})\/?$/,
|
||||||
@@ -100,7 +100,7 @@ describe('create_routes', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('sorts routes correctly', () => {
|
it('sorts routes correctly', () => {
|
||||||
const { pages } = create_routes(path.join(__dirname, 'samples/sorting'));
|
const { pages } = create_manifest_data(path.join(__dirname, 'samples/sorting'));
|
||||||
|
|
||||||
assert.deepEqual(pages.map(p => p.parts.map(part => part && part.component.file)), [
|
assert.deepEqual(pages.map(p => p.parts.map(part => part && part.component.file)), [
|
||||||
['index.html'],
|
['index.html'],
|
||||||
@@ -116,7 +116,7 @@ describe('create_routes', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('ignores files and directories with leading underscores', () => {
|
it('ignores files and directories with leading underscores', () => {
|
||||||
const { server_routes } = create_routes(path.join(__dirname, 'samples/hidden-underscore'));
|
const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/hidden-underscore'));
|
||||||
|
|
||||||
assert.deepEqual(server_routes.map(r => r.file), [
|
assert.deepEqual(server_routes.map(r => r.file), [
|
||||||
'index.js',
|
'index.js',
|
||||||
@@ -125,7 +125,7 @@ describe('create_routes', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('ignores files and directories with leading dots except .well-known', () => {
|
it('ignores files and directories with leading dots except .well-known', () => {
|
||||||
const { server_routes } = create_routes(path.join(__dirname, 'samples/hidden-dot'));
|
const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/hidden-dot'));
|
||||||
|
|
||||||
assert.deepEqual(server_routes.map(r => r.file), [
|
assert.deepEqual(server_routes.map(r => r.file), [
|
||||||
'.well-known/dnt-policy.txt.js'
|
'.well-known/dnt-policy.txt.js'
|
||||||
@@ -134,24 +134,35 @@ describe('create_routes', () => {
|
|||||||
|
|
||||||
it('fails on clashes', () => {
|
it('fails on clashes', () => {
|
||||||
assert.throws(() => {
|
assert.throws(() => {
|
||||||
const { pages } = create_routes(path.join(__dirname, 'samples/clash-pages'));
|
const { pages } = create_manifest_data(path.join(__dirname, 'samples/clash-pages'));
|
||||||
}, /The \[bar\]\/index\.html and \[foo\]\.html pages clash/);
|
}, /The \[bar\]\/index\.html and \[foo\]\.html pages clash/);
|
||||||
|
|
||||||
assert.throws(() => {
|
assert.throws(() => {
|
||||||
const { server_routes } = create_routes(path.join(__dirname, 'samples/clash-routes'));
|
const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/clash-routes'));
|
||||||
console.log(server_routes);
|
console.log(server_routes);
|
||||||
}, /The \[bar\]\/index\.js and \[foo\]\.js routes clash/);
|
}, /The \[bar\]\/index\.js and \[foo\]\.js routes clash/);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('fails if dynamic params are not separated', () => {
|
it('fails if dynamic params are not separated', () => {
|
||||||
assert.throws(() => {
|
assert.throws(() => {
|
||||||
create_routes(path.join(__dirname, 'samples/invalid-params'));
|
create_manifest_data(path.join(__dirname, 'samples/invalid-params'));
|
||||||
}, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/);
|
}, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('errors when trying to use reserved characters in route regexp', () => {
|
it('errors when trying to use reserved characters in route regexp', () => {
|
||||||
assert.throws(() => {
|
assert.throws(() => {
|
||||||
create_routes(path.join(__dirname, 'samples/invalid-qualifier'));
|
create_manifest_data(path.join(__dirname, 'samples/invalid-qualifier'));
|
||||||
}, /Invalid route \[foo\(\[a-z\]\(\[0-9\]\)\)\].js — cannot use \(, \), \? or \: in route qualifiers/);
|
}, /Invalid route \[foo\(\[a-z\]\(\[0-9\]\)\)\].js — cannot use \(, \), \? or \: in route qualifiers/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('ignores things that look like lockfiles' , () => {
|
||||||
|
const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/lockfiles'));
|
||||||
|
|
||||||
|
assert.deepEqual(server_routes, [{
|
||||||
|
file: 'foo.js',
|
||||||
|
name: 'route_foo',
|
||||||
|
params: [],
|
||||||
|
pattern: /^\/foo$/
|
||||||
|
}]);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
Reference in New Issue
Block a user