mirror of
https://github.com/kevin-DL/sapper.git
synced 2026-01-15 20:34:44 +00:00
Compare commits
41 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99e5a9601c | ||
|
|
4c9c1dccf5 | ||
|
|
2cddd5afa0 | ||
|
|
8c6a0c4773 | ||
|
|
af5063552d | ||
|
|
419d154794 | ||
|
|
abda059be5 | ||
|
|
444908cac5 | ||
|
|
c6da26e1a0 | ||
|
|
aad87857ce | ||
|
|
666c113297 | ||
|
|
84a58f34a0 | ||
|
|
75f5b5c721 | ||
|
|
a176a3b79b | ||
|
|
1627a5767a | ||
|
|
6ff3a9e9ab | ||
|
|
3ce2bd30f9 | ||
|
|
de4f99807f | ||
|
|
eae8351f77 | ||
|
|
d386308301 | ||
|
|
13afbc84d7 | ||
|
|
31327b3780 | ||
|
|
81f483d7b8 | ||
|
|
1bcf20511b | ||
|
|
003fa8ab2c | ||
|
|
d1fcd07c92 | ||
|
|
47a6d6f662 | ||
|
|
4b2b6440d0 | ||
|
|
fc855f30f8 | ||
|
|
4a75fff4ec | ||
|
|
7b7b695938 | ||
|
|
2fca2e295f | ||
|
|
eae991d369 | ||
|
|
c2b393d3fd | ||
|
|
566addd406 | ||
|
|
3d77dacbd6 | ||
|
|
51b4f9cbbf | ||
|
|
1d611be83e | ||
|
|
1782904994 | ||
|
|
e3ddbfc181 | ||
|
|
8e3830b646 |
@@ -18,4 +18,4 @@ addons:
|
|||||||
install:
|
install:
|
||||||
- export DISPLAY=':99.0'
|
- export DISPLAY=':99.0'
|
||||||
- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
|
- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
|
||||||
- npm install
|
- npm ci || npm i
|
||||||
|
|||||||
24
CHANGELOG.md
24
CHANGELOG.md
@@ -1,5 +1,29 @@
|
|||||||
# sapper changelog
|
# sapper changelog
|
||||||
|
|
||||||
|
## 0.15.7
|
||||||
|
|
||||||
|
* Strip leading slash from redirects ([#291](https://github.com/sveltejs/sapper/issues/291))
|
||||||
|
* Pass `(req, res)` to store getter ([#344](https://github.com/sveltejs/sapper/issues/344))
|
||||||
|
|
||||||
|
## 0.15.6
|
||||||
|
|
||||||
|
* Fix exporting with custom basepath ([#342](https://github.com/sveltejs/sapper/pull/342))
|
||||||
|
|
||||||
|
## 0.15.5
|
||||||
|
|
||||||
|
* Faster `export` with more explanatory output ([#335](https://github.com/sveltejs/sapper/pull/335))
|
||||||
|
* Only blur `activeElement` if it exists ([#332](https://github.com/sveltejs/sapper/issues/332))
|
||||||
|
* Don't emit `client_info.json` or `server_info.json` ([#318](https://github.com/sveltejs/sapper/issues/318))
|
||||||
|
|
||||||
|
## 0.15.4
|
||||||
|
|
||||||
|
* Add `ignore` option ([#326](https://github.com/sveltejs/sapper/pull/326))
|
||||||
|
|
||||||
|
## 0.15.3
|
||||||
|
|
||||||
|
* Crawl pages in parallel when exporting ([#329](https://github.com/sveltejs/sapper/pull/329))
|
||||||
|
* Don't minify inline JS when exporting ([#328](https://github.com/sveltejs/sapper/pull/328))
|
||||||
|
|
||||||
## 0.15.2
|
## 0.15.2
|
||||||
|
|
||||||
* Collapse component chains where no intermediate layout component is specified ([#312](https://github.com/sveltejs/sapper/issues/312))
|
* Collapse component chains where no intermediate layout component is specified ([#312](https://github.com/sveltejs/sapper/issues/312))
|
||||||
|
|||||||
38
README.md
38
README.md
@@ -31,6 +31,44 @@ npm run build
|
|||||||
npm start
|
npm start
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Development
|
||||||
|
|
||||||
|
Pull requests are encouraged and always welcome. [Pick an issue](https://github.com/sveltejs/sapper/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) and help us out!
|
||||||
|
|
||||||
|
To install and work on Sapper locally:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone git@github.com:sveltejs/sapper.git
|
||||||
|
cd sapper
|
||||||
|
npm install
|
||||||
|
npm run dev
|
||||||
|
```
|
||||||
|
|
||||||
|
### Linking to a Live Project
|
||||||
|
|
||||||
|
You can make changes locally to Sapper and test it against a local Sapper project. For a quick project that takes almost no setup, use the default [sapper-template](https://github.com/sveltejs/sapper-template) project. Instruction on setup are found in that project repository.
|
||||||
|
|
||||||
|
To link Sapper to your project, from the root of your local Sapper git checkout:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd sapper
|
||||||
|
npm link
|
||||||
|
```
|
||||||
|
|
||||||
|
Then, to link from `sapper-template` (or any other given project):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd sapper-template
|
||||||
|
npm link sapper
|
||||||
|
```
|
||||||
|
|
||||||
|
You should be good to test changes locally.
|
||||||
|
|
||||||
|
### Running Tests
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run test
|
||||||
|
```
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ environment:
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
- ps: Install-Product node $env:nodejs_version
|
- ps: Install-Product node $env:nodejs_version
|
||||||
- npm install
|
- npm ci
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
- node --version && npm --version
|
- node --version && npm --version
|
||||||
|
|||||||
7172
package-lock.json
generated
Normal file
7172
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "sapper",
|
"name": "sapper",
|
||||||
"version": "0.15.2",
|
"version": "0.15.7",
|
||||||
"description": "Military-grade apps, engineered by Svelte",
|
"description": "Military-grade apps, engineered by Svelte",
|
||||||
"main": "dist/middleware.ts.js",
|
"main": "dist/middleware.ts.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -23,12 +23,12 @@
|
|||||||
"cheerio": "^1.0.0-rc.2",
|
"cheerio": "^1.0.0-rc.2",
|
||||||
"chokidar": "^2.0.3",
|
"chokidar": "^2.0.3",
|
||||||
"cookie": "^0.3.1",
|
"cookie": "^0.3.1",
|
||||||
"devalue": "^1.0.1",
|
"devalue": "^1.0.4",
|
||||||
"glob": "^7.1.2",
|
"glob": "^7.1.2",
|
||||||
"html-minifier": "^3.5.16",
|
"html-minifier": "^3.5.16",
|
||||||
"mkdirp": "^0.5.1",
|
"mkdirp": "^0.5.1",
|
||||||
"node-fetch": "^2.1.1",
|
"node-fetch": "^2.1.1",
|
||||||
"port-authority": "^1.0.2",
|
"port-authority": "^1.0.5",
|
||||||
"pretty-bytes": "^5.0.0",
|
"pretty-bytes": "^5.0.0",
|
||||||
"pretty-ms": "^3.1.0",
|
"pretty-ms": "^3.1.0",
|
||||||
"require-relative": "^0.8.7",
|
"require-relative": "^0.8.7",
|
||||||
|
|||||||
@@ -4,8 +4,7 @@ import mkdirp from 'mkdirp';
|
|||||||
import rimraf from 'rimraf';
|
import rimraf from 'rimraf';
|
||||||
import { EventEmitter } from 'events';
|
import { EventEmitter } from 'events';
|
||||||
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_routes, create_serviceworker_manifest } from '../core';
|
||||||
import { locations } from '../config';
|
|
||||||
import * as events from './interfaces';
|
import * as events from './interfaces';
|
||||||
|
|
||||||
export function build(opts: {}) {
|
export function build(opts: {}) {
|
||||||
@@ -62,7 +61,6 @@ async function execute(emitter: EventEmitter, {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const client_info = client_stats.toJson();
|
const client_info = client_stats.toJson();
|
||||||
fs.writeFileSync(path.join(dest, 'client_info.json'), JSON.stringify(client_info));
|
|
||||||
fs.writeFileSync(path.join(dest, 'client_assets.json'), JSON.stringify(client_info.assetsByChunkName));
|
fs.writeFileSync(path.join(dest, 'client_assets.json'), JSON.stringify(client_info.assetsByChunkName));
|
||||||
|
|
||||||
const server_stats = await compile(server);
|
const server_stats = await compile(server);
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import format_messages from 'webpack-format-messages';
|
|||||||
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_routes, create_main_manifests, create_compilers, create_serviceworker_manifest } from '../core';
|
||||||
|
import Deferred from './utils/Deferred';
|
||||||
import * as events from './interfaces';
|
import * as events from './interfaces';
|
||||||
|
|
||||||
export function dev(opts) {
|
export function dev(opts) {
|
||||||
@@ -168,8 +169,6 @@ class Watcher extends EventEmitter {
|
|||||||
},
|
},
|
||||||
|
|
||||||
result: info => {
|
result: info => {
|
||||||
fs.writeFileSync(path.join(dest, 'server_info.json'), JSON.stringify(info, null, ' '));
|
|
||||||
|
|
||||||
this.deferreds.client.promise.then(() => {
|
this.deferreds.client.promise.then(() => {
|
||||||
const restart = () => {
|
const restart = () => {
|
||||||
log = '';
|
log = '';
|
||||||
@@ -252,7 +251,6 @@ class Watcher extends EventEmitter {
|
|||||||
},
|
},
|
||||||
|
|
||||||
result: info => {
|
result: info => {
|
||||||
fs.writeFileSync(path.join(dest, 'client_info.json'), JSON.stringify(info));
|
|
||||||
fs.writeFileSync(path.join(dest, 'client_assets.json'), JSON.stringify(info.assetsByChunkName, null, ' '));
|
fs.writeFileSync(path.join(dest, 'client_assets.json'), JSON.stringify(info.assetsByChunkName, null, ' '));
|
||||||
this.deferreds.client.fulfil();
|
this.deferreds.client.fulfil();
|
||||||
|
|
||||||
@@ -401,19 +399,6 @@ function mungeWebpackError(message: string, duplicate: boolean) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
class Deferred {
|
|
||||||
promise: Promise<any>;
|
|
||||||
fulfil: (value?: any) => void;
|
|
||||||
reject: (error: Error) => void;
|
|
||||||
|
|
||||||
constructor() {
|
|
||||||
this.promise = new Promise((fulfil, reject) => {
|
|
||||||
this.fulfil = fulfil;
|
|
||||||
this.reject = reject;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const INTERVAL = 10000;
|
const INTERVAL = 10000;
|
||||||
|
|
||||||
class DevServer {
|
class DevServer {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import fetch from 'node-fetch';
|
|||||||
import * as ports from 'port-authority';
|
import * as ports from 'port-authority';
|
||||||
import { EventEmitter } from 'events';
|
import { EventEmitter } from 'events';
|
||||||
import { minify_html } from './utils/minify_html';
|
import { minify_html } from './utils/minify_html';
|
||||||
import { locations } from '../config';
|
import Deferred from './utils/Deferred';
|
||||||
import * as events from './interfaces';
|
import * as events from './interfaces';
|
||||||
|
|
||||||
export function exporter(opts: {}) {
|
export function exporter(opts: {}) {
|
||||||
@@ -51,6 +51,11 @@ async function execute(emitter: EventEmitter, {
|
|||||||
const port = await ports.find(3000);
|
const port = await ports.find(3000);
|
||||||
|
|
||||||
const origin = `http://localhost:${port}`;
|
const origin = `http://localhost:${port}`;
|
||||||
|
const root = new URL(basepath || '', origin);
|
||||||
|
|
||||||
|
emitter.emit('info', {
|
||||||
|
message: `Crawling ${root.href}`
|
||||||
|
});
|
||||||
|
|
||||||
const proc = child_process.fork(path.resolve(`${build}/server.js`), [], {
|
const proc = child_process.fork(path.resolve(`${build}/server.js`), [], {
|
||||||
cwd: process.cwd(),
|
cwd: process.cwd(),
|
||||||
@@ -64,11 +69,23 @@ async function execute(emitter: EventEmitter, {
|
|||||||
|
|
||||||
const seen = new Set();
|
const seen = new Set();
|
||||||
const saved = new Set();
|
const saved = new Set();
|
||||||
|
const deferreds = new Map();
|
||||||
|
|
||||||
|
function get_deferred(pathname: string) {
|
||||||
|
pathname = pathname.replace(root.pathname, '');
|
||||||
|
|
||||||
|
if (!deferreds.has(pathname)) {
|
||||||
|
deferreds.set(pathname, new Deferred());
|
||||||
|
}
|
||||||
|
|
||||||
|
return deferreds.get(pathname);
|
||||||
|
}
|
||||||
|
|
||||||
proc.on('message', message => {
|
proc.on('message', message => {
|
||||||
if (!message.__sapper__ || message.event !== 'file') return;
|
if (!message.__sapper__ || message.event !== 'file') return;
|
||||||
|
|
||||||
let file = new URL(message.url, origin).pathname.slice(1);
|
const pathname = new URL(message.url, origin).pathname;
|
||||||
|
let file = pathname.slice(1);
|
||||||
let { body } = message;
|
let { body } = message;
|
||||||
|
|
||||||
if (saved.has(file)) return;
|
if (saved.has(file)) return;
|
||||||
@@ -83,24 +100,26 @@ async function execute(emitter: EventEmitter, {
|
|||||||
|
|
||||||
emitter.emit('file', <events.FileEvent>{
|
emitter.emit('file', <events.FileEvent>{
|
||||||
file,
|
file,
|
||||||
size: body.length
|
size: body.length,
|
||||||
|
status: message.status
|
||||||
});
|
});
|
||||||
|
|
||||||
sander.writeFileSync(export_dir, file, body);
|
sander.writeFileSync(export_dir, file, body);
|
||||||
|
|
||||||
|
get_deferred(pathname).fulfil();
|
||||||
});
|
});
|
||||||
|
|
||||||
async function handle(url: URL) {
|
async function handle(url: URL) {
|
||||||
|
const pathname = (url.pathname.replace(root.pathname, '') || '/');
|
||||||
|
|
||||||
|
if (seen.has(pathname)) return;
|
||||||
|
seen.add(pathname);
|
||||||
|
|
||||||
|
const deferred = get_deferred(pathname);
|
||||||
|
|
||||||
const r = await fetch(url.href);
|
const r = await fetch(url.href);
|
||||||
const range = ~~(r.status / 100);
|
const range = ~~(r.status / 100);
|
||||||
|
|
||||||
if (range >= 4) {
|
|
||||||
emitter.emit('failure', <events.FailureEvent>{
|
|
||||||
status: r.status,
|
|
||||||
pathname: url.pathname
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (range === 2) {
|
if (range === 2) {
|
||||||
if (r.headers.get('Content-Type') === 'text/html') {
|
if (r.headers.get('Content-Type') === 'text/html') {
|
||||||
const body = await r.text();
|
const body = await r.text();
|
||||||
@@ -111,21 +130,20 @@ async function execute(emitter: EventEmitter, {
|
|||||||
|
|
||||||
$('a[href]').each((i: number, $a) => {
|
$('a[href]').each((i: number, $a) => {
|
||||||
const url = new URL($a.attribs.href, base.href);
|
const url = new URL($a.attribs.href, base.href);
|
||||||
|
if (url.origin === origin) urls.push(url);
|
||||||
if (url.origin === origin && !seen.has(url.pathname)) {
|
|
||||||
seen.add(url.pathname);
|
|
||||||
urls.push(url);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
for (const url of urls) {
|
await Promise.all(urls.map(handle));
|
||||||
await handle(url);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await deferred.promise;
|
||||||
}
|
}
|
||||||
|
|
||||||
return ports.wait(port)
|
return ports.wait(port)
|
||||||
.then(() => handle(new URL(`/${basepath}`, origin))) // TODO all static routes
|
.then(() => {
|
||||||
|
// TODO all static routes
|
||||||
|
return handle(root);
|
||||||
|
})
|
||||||
.then(() => proc.kill());
|
.then(() => proc.kill());
|
||||||
}
|
}
|
||||||
|
|||||||
12
src/api/utils/Deferred.ts
Normal file
12
src/api/utils/Deferred.ts
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
export default class Deferred {
|
||||||
|
promise: Promise<any>;
|
||||||
|
fulfil: (value?: any) => void;
|
||||||
|
reject: (error: Error) => void;
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.promise = new Promise((fulfil, reject) => {
|
||||||
|
this.fulfil = fulfil;
|
||||||
|
this.reject = reject;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,7 +8,7 @@ export function minify_html(html: string) {
|
|||||||
decodeEntities: true,
|
decodeEntities: true,
|
||||||
html5: true,
|
html5: true,
|
||||||
minifyCSS: true,
|
minifyCSS: true,
|
||||||
minifyJS: true,
|
minifyJS: false,
|
||||||
removeAttributeQuotes: true,
|
removeAttributeQuotes: true,
|
||||||
removeComments: true,
|
removeComments: true,
|
||||||
removeOptionalTags: true,
|
removeOptionalTags: true,
|
||||||
|
|||||||
20
src/cli.ts
20
src/cli.ts
@@ -1,11 +1,8 @@
|
|||||||
import * as fs from 'fs';
|
import * as fs from 'fs';
|
||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
import * as child_process from 'child_process';
|
|
||||||
import sade from 'sade';
|
import sade from 'sade';
|
||||||
import * as colors from 'ansi-colors';
|
import * as colors from 'ansi-colors';
|
||||||
import prettyMs from 'pretty-ms';
|
import prettyMs from 'pretty-ms';
|
||||||
// import upgrade from './cli/upgrade';
|
|
||||||
import * as ports from 'port-authority';
|
|
||||||
import * as pkg from '../package.json';
|
import * as pkg from '../package.json';
|
||||||
|
|
||||||
const prog = sade('sapper').version(pkg.version);
|
const prog = sade('sapper').version(pkg.version);
|
||||||
@@ -65,19 +62,22 @@ prog.command('start [dir]')
|
|||||||
|
|
||||||
prog.command('export [dest]')
|
prog.command('export [dest]')
|
||||||
.describe('Export your app as static files (if possible)')
|
.describe('Export your app as static files (if possible)')
|
||||||
|
.option('--build', '(Re)build app before exporting', true)
|
||||||
|
.option('--build-dir', 'Specify a custom temporary build directory', '.sapper/prod')
|
||||||
.option('--basepath', 'Specify a base path')
|
.option('--basepath', 'Specify a base path')
|
||||||
.action(async (dest = 'export', opts: { basepath?: string }) => {
|
.action(async (dest = 'export', opts: { build: boolean, 'build-dir': string, basepath?: string }) => {
|
||||||
console.log(`> Building...`);
|
|
||||||
|
|
||||||
process.env.NODE_ENV = 'production';
|
process.env.NODE_ENV = 'production';
|
||||||
process.env.SAPPER_DEST = '.sapper/.export';
|
process.env.SAPPER_DEST = opts['build-dir'];
|
||||||
|
|
||||||
const start = Date.now();
|
const start = Date.now();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { build } = await import('./cli/build');
|
if (opts.build) {
|
||||||
await build();
|
console.log(`> Building...`);
|
||||||
console.error(`\n> Built in ${elapsed(start)}. Crawling site...`);
|
const { build } = await import('./cli/build');
|
||||||
|
await build();
|
||||||
|
console.error(`\n> Built in ${elapsed(start)}`);
|
||||||
|
}
|
||||||
|
|
||||||
const { exporter } = await import('./cli/export');
|
const { exporter } = await import('./cli/export');
|
||||||
await exporter(dest, opts);
|
await exporter(dest, opts);
|
||||||
|
|||||||
@@ -3,6 +3,11 @@ import * as colors from 'ansi-colors';
|
|||||||
import prettyBytes from 'pretty-bytes';
|
import prettyBytes from 'pretty-bytes';
|
||||||
import { locations } from '../config';
|
import { locations } from '../config';
|
||||||
|
|
||||||
|
function left_pad(str: string, len: number) {
|
||||||
|
while (str.length < len) str = ` ${str}`;
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
|
||||||
export function exporter(export_dir: string, { basepath = '' }) {
|
export function exporter(export_dir: string, { basepath = '' }) {
|
||||||
return new Promise((fulfil, reject) => {
|
return new Promise((fulfil, reject) => {
|
||||||
try {
|
try {
|
||||||
@@ -13,11 +18,19 @@ export function exporter(export_dir: string, { basepath = '' }) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
emitter.on('file', event => {
|
emitter.on('file', event => {
|
||||||
console.log(`${colors.bold.cyan(event.file)} ${colors.gray(`(${prettyBytes(event.size)})`)}`);
|
const pb = prettyBytes(event.size);
|
||||||
|
const size_color = event.size > 150000 ? colors.bold.red : event.size > 50000 ? colors.bold.yellow : colors.bold.gray;
|
||||||
|
const size_label = size_color(left_pad(prettyBytes(event.size), 10));
|
||||||
|
|
||||||
|
const file_label = event.status === 200
|
||||||
|
? event.file
|
||||||
|
: colors.bold[event.status >= 400 ? 'red' : 'yellow'](`(${event.status}) ${event.file}`);
|
||||||
|
|
||||||
|
console.log(`${size_label} ${file_label}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
emitter.on('failure', event => {
|
emitter.on('info', event => {
|
||||||
console.log(`${colors.red(`> Received ${event.status} response when fetching ${event.pathname}`)}`);
|
console.log(colors.bold.cyan(`> ${event.message}`));
|
||||||
});
|
});
|
||||||
|
|
||||||
emitter.on('error', event => {
|
emitter.on('error', event => {
|
||||||
|
|||||||
@@ -6,5 +6,5 @@ export const locations = {
|
|||||||
base: () => path.resolve(process.env.SAPPER_BASE || ''),
|
base: () => path.resolve(process.env.SAPPER_BASE || ''),
|
||||||
app: () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_APP || 'app'),
|
app: () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_APP || 'app'),
|
||||||
routes: () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_ROUTES || 'routes'),
|
routes: () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_ROUTES || 'routes'),
|
||||||
dest: () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_DEST || '.sapper')
|
dest: () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_DEST || `.sapper/${dev() ? 'dev' : 'prod'}`)
|
||||||
};
|
};
|
||||||
@@ -73,9 +73,18 @@ interface Component {
|
|||||||
preload: (data: any) => any | Promise<any>
|
preload: (data: any) => any | Promise<any>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const IGNORE = '__SAPPER__IGNORE__';
|
||||||
|
function toIgnore(uri: string, val: any) {
|
||||||
|
if (Array.isArray(val)) return val.some(x => toIgnore(uri, x));
|
||||||
|
if (val instanceof RegExp) return val.test(uri);
|
||||||
|
if (typeof val === 'function') return val(uri);
|
||||||
|
return uri.startsWith(val.charCodeAt(0) === 47 ? val : `/${val}`);
|
||||||
|
}
|
||||||
|
|
||||||
export default function middleware(opts: {
|
export default function middleware(opts: {
|
||||||
manifest: Manifest,
|
manifest: Manifest,
|
||||||
store: (req: Req) => Store,
|
store: (req: Req, res: ServerResponse) => Store,
|
||||||
|
ignore?: any,
|
||||||
routes?: any // legacy
|
routes?: any // legacy
|
||||||
}) {
|
}) {
|
||||||
if (opts.routes) {
|
if (opts.routes) {
|
||||||
@@ -84,12 +93,19 @@ export default function middleware(opts: {
|
|||||||
|
|
||||||
const output = locations.dest();
|
const output = locations.dest();
|
||||||
|
|
||||||
const { manifest, store } = opts;
|
const { manifest, store, ignore } = opts;
|
||||||
|
|
||||||
let emitted_basepath = false;
|
let emitted_basepath = false;
|
||||||
|
|
||||||
const middleware = compose_handlers([
|
const middleware = compose_handlers([
|
||||||
|
ignore && ((req: Req, res: ServerResponse, next: () => void) => {
|
||||||
|
req[IGNORE] = toIgnore(req.path, ignore);
|
||||||
|
next();
|
||||||
|
}),
|
||||||
|
|
||||||
(req: Req, res: ServerResponse, next: () => void) => {
|
(req: Req, res: ServerResponse, next: () => void) => {
|
||||||
|
if (req[IGNORE]) return next();
|
||||||
|
|
||||||
if (req.baseUrl === undefined) {
|
if (req.baseUrl === undefined) {
|
||||||
let { originalUrl } = req;
|
let { originalUrl } = req;
|
||||||
if (req.url === '/' && originalUrl[originalUrl.length - 1] !== '/') {
|
if (req.url === '/' && originalUrl[originalUrl.length - 1] !== '/') {
|
||||||
@@ -163,6 +179,8 @@ function serve({ prefix, pathname, cache_control }: {
|
|||||||
: (file: string) => (cache.has(file) ? cache : cache.set(file, fs.readFileSync(path.resolve(output, file)))).get(file)
|
: (file: string) => (cache.has(file) ? cache : cache.set(file, fs.readFileSync(path.resolve(output, file)))).get(file)
|
||||||
|
|
||||||
return (req: Req, res: ServerResponse, next: () => void) => {
|
return (req: Req, res: ServerResponse, next: () => void) => {
|
||||||
|
if (req[IGNORE]) return next();
|
||||||
|
|
||||||
if (filter(req)) {
|
if (filter(req)) {
|
||||||
const type = lookup(req.path);
|
const type = lookup(req.path);
|
||||||
|
|
||||||
@@ -245,6 +263,8 @@ function get_server_route_handler(routes: ServerRoute[]) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return function find_route(req: Req, res: ServerResponse, next: () => void) {
|
return function find_route(req: Req, res: ServerResponse, next: () => void) {
|
||||||
|
if (req[IGNORE]) return next();
|
||||||
|
|
||||||
for (const route of routes) {
|
for (const route of routes) {
|
||||||
if (route.pattern.test(req.path)) {
|
if (route.pattern.test(req.path)) {
|
||||||
handle_route(route, req, res, next);
|
handle_route(route, req, res, next);
|
||||||
@@ -256,7 +276,10 @@ function get_server_route_handler(routes: ServerRoute[]) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store) {
|
function get_page_handler(
|
||||||
|
manifest: Manifest,
|
||||||
|
store_getter: (req: Req, res: ServerResponse) => Store
|
||||||
|
) {
|
||||||
const output = locations.dest();
|
const output = locations.dest();
|
||||||
|
|
||||||
const get_chunks = dev()
|
const get_chunks = dev()
|
||||||
@@ -306,7 +329,7 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
|
|||||||
|
|
||||||
res.setHeader('Link', link);
|
res.setHeader('Link', link);
|
||||||
|
|
||||||
const store = store_getter ? store_getter(req) : null;
|
const store = store_getter ? store_getter(req, res) : null;
|
||||||
|
|
||||||
let redirect: { statusCode: number, location: string };
|
let redirect: { statusCode: number, location: string };
|
||||||
let preload_error: { statusCode: number, message: Error | string };
|
let preload_error: { statusCode: number, message: Error | string };
|
||||||
@@ -316,6 +339,7 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
|
|||||||
if (redirect && (redirect.statusCode !== statusCode || redirect.location !== location)) {
|
if (redirect && (redirect.statusCode !== statusCode || redirect.location !== location)) {
|
||||||
throw new Error(`Conflicting redirects`);
|
throw new Error(`Conflicting redirects`);
|
||||||
}
|
}
|
||||||
|
location = location.replace(/^\//g, ''); // leading slash (only)
|
||||||
redirect = { statusCode, location };
|
redirect = { statusCode, location };
|
||||||
},
|
},
|
||||||
error: (statusCode: number, message: Error | string) => {
|
error: (statusCode: number, message: Error | string) => {
|
||||||
@@ -382,10 +406,24 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
|
|||||||
return []; // appease TypeScript
|
return []; // appease TypeScript
|
||||||
}).then(preloaded => {
|
}).then(preloaded => {
|
||||||
if (redirect) {
|
if (redirect) {
|
||||||
|
const location = `${req.baseUrl}/${redirect.location}`;
|
||||||
|
|
||||||
res.statusCode = redirect.statusCode;
|
res.statusCode = redirect.statusCode;
|
||||||
res.setHeader('Location', `${req.baseUrl}/${redirect.location}`);
|
res.setHeader('Location', location);
|
||||||
res.end();
|
res.end();
|
||||||
|
|
||||||
|
if (process.send) {
|
||||||
|
process.send({
|
||||||
|
__sapper__: true,
|
||||||
|
event: 'file',
|
||||||
|
url: req.url,
|
||||||
|
method: req.method,
|
||||||
|
status: redirect.statusCode,
|
||||||
|
type: 'text/html',
|
||||||
|
body: `<script>window.location.href = "${location}"</script>`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -452,9 +490,9 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
|
|||||||
|
|
||||||
let inline_script = `__SAPPER__={${[
|
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}`,
|
||||||
serialized.store && `store: ${serialized.store}`
|
serialized.store && `store:${serialized.store}`
|
||||||
].filter(Boolean).join(',')}};`;
|
].filter(Boolean).join(',')}};`;
|
||||||
|
|
||||||
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'));
|
||||||
@@ -478,7 +516,7 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
|
|||||||
event: 'file',
|
event: 'file',
|
||||||
url: req.url,
|
url: req.url,
|
||||||
method: req.method,
|
method: req.method,
|
||||||
status: 200,
|
status,
|
||||||
type: 'text/html',
|
type: 'text/html',
|
||||||
body
|
body
|
||||||
});
|
});
|
||||||
@@ -494,7 +532,9 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return function find_route(req: Req, res: ServerResponse) {
|
return function find_route(req: Req, res: ServerResponse, next: () => void) {
|
||||||
|
if (req[IGNORE]) return next();
|
||||||
|
|
||||||
if (!server_routes.some(route => route.pattern.test(req.path))) {
|
if (!server_routes.some(route => route.pattern.test(req.path))) {
|
||||||
for (const page of pages) {
|
for (const page of pages) {
|
||||||
if (page.pattern.test(req.path)) {
|
if (page.pattern.test(req.path)) {
|
||||||
@@ -546,4 +586,4 @@ function escape_html(html: string) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return html.replace(/["'&<>]/g, c => `&${chars[c]};`);
|
return html.replace(/["'&<>]/g, c => `&${chars[c]};`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -233,7 +233,7 @@ function prepare_page(target: Target): Promise<{
|
|||||||
path,
|
path,
|
||||||
preloading: false,
|
preloading: false,
|
||||||
child: Object.assign({}, root_props.child, {
|
child: Object.assign({}, root_props.child, {
|
||||||
segment: new_segments[0]
|
segment: segments[0]
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
if (changed(query, root_props.query)) data.query = query;
|
if (changed(query, root_props.query)) data.query = query;
|
||||||
@@ -260,12 +260,11 @@ function prepare_page(target: Target): Promise<{
|
|||||||
params: get_params(target.match),
|
params: get_params(target.match),
|
||||||
}, results[i].preloaded);
|
}, results[i].preloaded);
|
||||||
|
|
||||||
level.props.child = {
|
level.props.child = {};
|
||||||
segment: new_segments[i + 1]
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
level = level.props.child;
|
level = level.props.child;
|
||||||
|
level.segment = segments[i + 1];
|
||||||
}
|
}
|
||||||
|
|
||||||
return { data, nullable_depth };
|
return { data, nullable_depth };
|
||||||
@@ -299,7 +298,7 @@ async function navigate(target: Target, id: number): Promise<any> {
|
|||||||
await goto(redirect.location, { replaceState: true });
|
await goto(redirect.location, { replaceState: true });
|
||||||
} else {
|
} else {
|
||||||
render(data, nullable_depth, scroll_history[id], token);
|
render(data, nullable_depth, scroll_history[id], token);
|
||||||
document.activeElement.blur();
|
if (document.activeElement) document.activeElement.blur();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -85,14 +85,27 @@ const middlewares = [
|
|||||||
next();
|
next();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// set up some values for the store
|
||||||
|
(req, res, next) => {
|
||||||
|
req.hello = 'hello';
|
||||||
|
res.locals = { name: 'world' };
|
||||||
|
next();
|
||||||
|
},
|
||||||
|
|
||||||
sapper({
|
sapper({
|
||||||
manifest,
|
manifest,
|
||||||
store: () => {
|
store: (req, res) => {
|
||||||
return new Store({
|
return new Store({
|
||||||
title: 'Stored title'
|
title: `${req.hello} ${res.locals.name}`
|
||||||
});
|
});
|
||||||
}
|
},
|
||||||
})
|
ignore: [
|
||||||
|
/foobar/i,
|
||||||
|
'/buzz',
|
||||||
|
'fizz',
|
||||||
|
x => x === '/hello'
|
||||||
|
]
|
||||||
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
if (BASEPATH) {
|
if (BASEPATH) {
|
||||||
@@ -101,4 +114,8 @@ if (BASEPATH) {
|
|||||||
app.use(...middlewares);
|
app.use(...middlewares);
|
||||||
}
|
}
|
||||||
|
|
||||||
app.listen(PORT);
|
['foobar', 'buzz', 'fizzer', 'hello'].forEach(uri => {
|
||||||
|
app.get('/'+uri, (req, res) => res.end(uri));
|
||||||
|
});
|
||||||
|
|
||||||
|
app.listen(PORT);
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
<span>y: {segment} {count}</span>
|
<span>y: {segment} {count}</span>
|
||||||
<svelte:component this={child.component} {...child.props}/>
|
<svelte:component this={child.component} {...child.props}/>
|
||||||
|
|
||||||
|
<span>child segment: {child.segment}</span>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import counts from '../_counts.js';
|
import counts from '../_counts.js';
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
<a href='about'>about</a>
|
<a href='about'>about</a>
|
||||||
<a href='slow-preload'>slow preload</a>
|
<a href='slow-preload'>slow preload</a>
|
||||||
<a href='redirect-from'>redirect</a>
|
<a href='redirect-from'>redirect</a>
|
||||||
|
<a href='redirect-root'>redirect (root)</a>
|
||||||
<a href='blog/nope'>broken link</a>
|
<a href='blog/nope'>broken link</a>
|
||||||
<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>
|
||||||
|
|||||||
7
test/app/routes/redirect-root.html
Normal file
7
test/app/routes/redirect-root.html
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
preload() {
|
||||||
|
this.redirect(301, '/');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
@@ -59,9 +59,19 @@ describe('sapper', function() {
|
|||||||
basepath: '/custom-basepath'
|
basepath: '/custom-basepath'
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('export', () => {
|
testExport({});
|
||||||
|
|
||||||
|
testExport({ basepath: '/custom-basepath' });
|
||||||
|
});
|
||||||
|
|
||||||
|
function testExport({ basepath = '' }) {
|
||||||
|
describe(basepath ? `export --basepath ${basepath}` : 'export', () => {
|
||||||
before(() => {
|
before(() => {
|
||||||
return exec(`node ${cli} export`);
|
if (basepath) {
|
||||||
|
process.env.BASEPATH = basepath;
|
||||||
|
}
|
||||||
|
|
||||||
|
return exec(`node ${cli} export ${basepath ? `--basepath ${basepath}` : ''}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('export all pages', () => {
|
it('export all pages', () => {
|
||||||
@@ -96,7 +106,10 @@ describe('sapper', function() {
|
|||||||
'service-worker.js',
|
'service-worker.js',
|
||||||
'svelte-logo-192.png',
|
'svelte-logo-192.png',
|
||||||
'svelte-logo-512.png',
|
'svelte-logo-512.png',
|
||||||
];
|
].map(file => {
|
||||||
|
return basepath ? `${basepath.replace(/^[\/\\]/, '')}/${file}` : file;
|
||||||
|
});
|
||||||
|
|
||||||
// Client scripts that should show up in the extraction directory.
|
// Client scripts that should show up in the extraction directory.
|
||||||
const expectedClientRegexes = [
|
const expectedClientRegexes = [
|
||||||
/client\/[^/]+\/main(\.\d+)?\.js/,
|
/client\/[^/]+\/main(\.\d+)?\.js/,
|
||||||
@@ -126,7 +139,7 @@ describe('sapper', function() {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
}
|
||||||
|
|
||||||
function run({ mode, basepath = '' }) {
|
function run({ mode, basepath = '' }) {
|
||||||
describe(`mode=${mode}`, function () {
|
describe(`mode=${mode}`, function () {
|
||||||
@@ -423,6 +436,33 @@ function run({ mode, basepath = '' }) {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('redirects on server (root)', () => {
|
||||||
|
return nightmare.goto(`${base}/redirect-root`)
|
||||||
|
.path()
|
||||||
|
.then(path => {
|
||||||
|
assert.equal(path, `${basepath}/`);
|
||||||
|
})
|
||||||
|
.then(() => nightmare.page.title())
|
||||||
|
.then(title => {
|
||||||
|
assert.equal(title, 'Great success!');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('redirects in client (root)', () => {
|
||||||
|
return nightmare.goto(base)
|
||||||
|
.wait('[href="redirect-root"]')
|
||||||
|
.click('[href="redirect-root"]')
|
||||||
|
.wait(200)
|
||||||
|
.path()
|
||||||
|
.then(path => {
|
||||||
|
assert.equal(path, `${basepath}/`);
|
||||||
|
})
|
||||||
|
.then(() => nightmare.page.title())
|
||||||
|
.then(title => {
|
||||||
|
assert.equal(title, 'Great success!');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('handles 4xx error on server', () => {
|
it('handles 4xx error on server', () => {
|
||||||
return nightmare.goto(`${base}/blog/nope`)
|
return nightmare.goto(`${base}/blog/nope`)
|
||||||
.path()
|
.path()
|
||||||
@@ -477,6 +517,42 @@ function run({ mode, basepath = '' }) {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Ignores are meant for top-level escape.
|
||||||
|
// ~> Sapper **should** own the entire {basepath} when designated.
|
||||||
|
if (!basepath) {
|
||||||
|
it('respects `options.ignore` values (RegExp)', () => {
|
||||||
|
return nightmare.goto(`${base}/foobar`)
|
||||||
|
.evaluate(() => document.documentElement.textContent)
|
||||||
|
.then(text => {
|
||||||
|
assert.equal(text, 'foobar');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('respects `options.ignore` values (String #1)', () => {
|
||||||
|
return nightmare.goto(`${base}/buzz`)
|
||||||
|
.evaluate(() => document.documentElement.textContent)
|
||||||
|
.then(text => {
|
||||||
|
assert.equal(text, 'buzz');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('respects `options.ignore` values (String #2)', () => {
|
||||||
|
return nightmare.goto(`${base}/fizzer`)
|
||||||
|
.evaluate(() => document.documentElement.textContent)
|
||||||
|
.then(text => {
|
||||||
|
assert.equal(text, 'fizzer');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('respects `options.ignore` values (Function)', () => {
|
||||||
|
return nightmare.goto(`${base}/hello`)
|
||||||
|
.evaluate(() => document.documentElement.textContent)
|
||||||
|
.then(text => {
|
||||||
|
assert.equal(text, 'hello');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
it('does not attempt client-side navigation to server routes', () => {
|
it('does not attempt client-side navigation to server routes', () => {
|
||||||
return nightmare.goto(`${base}/blog/how-is-sapper-different-from-next`)
|
return nightmare.goto(`${base}/blog/how-is-sapper-different-from-next`)
|
||||||
.init()
|
.init()
|
||||||
@@ -532,11 +608,11 @@ function run({ mode, basepath = '' }) {
|
|||||||
return nightmare.goto(`${base}/store`)
|
return nightmare.goto(`${base}/store`)
|
||||||
.page.title()
|
.page.title()
|
||||||
.then(title => {
|
.then(title => {
|
||||||
assert.equal(title, 'Stored title');
|
assert.equal(title, 'hello world');
|
||||||
return nightmare.init().page.title();
|
return nightmare.init().page.title();
|
||||||
})
|
})
|
||||||
.then(title => {
|
.then(title => {
|
||||||
assert.equal(title, 'Stored title');
|
assert.equal(title, 'hello world');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -630,7 +706,8 @@ function run({ mode, basepath = '' }) {
|
|||||||
.then(text => {
|
.then(text => {
|
||||||
assert.deepEqual(text.split('\n').filter(Boolean), [
|
assert.deepEqual(text.split('\n').filter(Boolean), [
|
||||||
'y: bar 1',
|
'y: bar 1',
|
||||||
'z: baz 1'
|
'z: baz 1',
|
||||||
|
'child segment: baz'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return nightmare.click(`a`)
|
return nightmare.click(`a`)
|
||||||
@@ -642,7 +719,8 @@ function run({ mode, basepath = '' }) {
|
|||||||
.then(text => {
|
.then(text => {
|
||||||
assert.deepEqual(text.split('\n').filter(Boolean), [
|
assert.deepEqual(text.split('\n').filter(Boolean), [
|
||||||
'y: bar 1',
|
'y: bar 1',
|
||||||
'z: qux 2'
|
'z: qux 2',
|
||||||
|
'child segment: qux'
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user