totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-14 12:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

convert to typescript

Browse Source
This commit is contained in:
Rich Harris
2018-01-21 16:28:02 -05:00
parent fd0dd4fe58
commit 8bad37205d
18 changed files with 177 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/index.js → src/cli/index.ts
View File

@@ -1,5 +1,5 @@
import { build, export as exporter } from 'sapper/core.js';
import { dest, dev, entry, src } from '../config.js';
import { dest, dev, entry, src } from '../config';
const cmd = process.argv[2];
const start = Date.now();

0
src/config.js → src/config.ts
View File

22
src/core/build.js → src/core/build.ts
View File

@@ -6,7 +6,17 @@ import create_compilers from './create_compilers.js';
import create_app from './create_app.js';
import create_assets from './create_assets.js';
export default function build({ dest, dev, entry, src }) {
export default function build({
src,
dest,
dev,
entry
}: {
src: string;
dest: string;
dev: boolean;
entry: { client: string, server: string }
}) {
mkdirp.sync(dest);
rimraf.sync(path.join(dest, '**/*'));
@@ -31,12 +41,18 @@ export default function build({ dest, dev, entry, src }) {
client.run((err, client_stats) => {
handleErrors(err, client_stats);
const client_info = client_stats.toJson();
fs.writeFileSync(path.join(dest, 'stats.client.json'), JSON.stringify(client_info, null, ' '));
fs.writeFileSync(
path.join(dest, 'stats.client.json'),
JSON.stringify(client_info, null, ' ')
);
server.run((err, server_stats) => {
handleErrors(err, server_stats);
const server_info = server_stats.toJson();
fs.writeFileSync(path.join(dest, 'stats.server.json'), JSON.stringify(server_info, null, ' '));
fs.writeFileSync(
path.join(dest, 'stats.server.json'),
JSON.stringify(server_info, null, ' ')
);
create_assets({ src, dest, dev, client_info, server_info });
fulfil();

94
src/core/create_app.js
View File

@@ -1,94 +0,0 @@
import * as fs from 'fs';
import * as path from 'path';
import create_routes from './create_routes.js';
function posixify(file) {
return file.replace(/[/\\]/g, '/');
}
function fudge_mtime(file) {
// need to fudge the mtime so that webpack doesn't go doolally
const { atime, mtime } = fs.statSync(file);
fs.utimesSync(file, new Date(atime.getTime() - 999999), new Date(mtime.getTime() - 999999));
}
function create_app({ src, dev, entry }) {
const routes = create_routes({ src });
function create_client_main() {
const code = `[${
routes
.filter(route => route.type === 'page')
.map(route => {
const params = route.dynamic.length === 0 ?
'{}' :
`{ ${route.dynamic.map((part, i) => `${part}: match[${i + 1}]`).join(', ') } }`;
const file = posixify(`${src}/${route.file}`);
return `{ pattern: ${route.pattern}, params: match => (${params}), load: () => import(/* webpackChunkName: "${route.id}" */ '${file}') }`
})
.join(', ')
}]`;
let main = fs.readFileSync('templates/main.js', 'utf-8')
.replace(/__app__/g, posixify(path.resolve(__dirname, '../../runtime/app.js')))
.replace(/__routes__/g, code)
.replace(/__dev__/g, String(dev));
if (dev) {
const hmr_client = posixify(require.resolve(`webpack-hot-middleware/client`));
main += `\n\nimport('${hmr_client}?path=/__webpack_hmr&timeout=20000'); if (module.hot) module.hot.accept();`
}
fs.writeFileSync(entry.client, main);
fudge_mtime(entry.client);
}
function create_server_routes() {
const imports = routes
.map(route => {
const file = posixify(`${src}/${route.file}`);
return route.type === 'page' ?
`import ${route.id} from '${file}';` :
`import * as ${route.id} from '${file}';`;
})
.join('\n');
const exports = `export { ${routes.map(route => route.id)} };`;
fs.writeFileSync(entry.server, `${imports}\n\n${exports}`);
fudge_mtime(entry.server);
}
create_client_main();
create_server_routes();
}
// export function start_watching({ src }) {
// const chokidar = require('chokidar');
// const watch = (glob, callback) => {
// const watcher = chokidar.watch(glob, {
// ignoreInitial: true,
// persistent: false
// });
// watcher.on('add', callback);
// watcher.on('change', callback);
// watcher.on('unlink', callback);
// };
// watch('templates/main.js', create_app);
// watch('routes/**/*.+(html|js|mjs)', () => {
// route_manager.update({ src });
// create_app();
// });
// watch('templates/**.html', () => {
// create_templates();
// // TODO reload current page?
// });
// }
export default create_app;

90
src/core/create_app.ts Normal file
View File

@@ -0,0 +1,90 @@
import * as fs from 'fs';
import * as path from 'path';
import create_routes from './create_routes';
function posixify(file: string) {
return file.replace(/[/\\]/g, '/');
}
function fudge_mtime(file: string) {
// need to fudge the mtime so that webpack doesn't go doolally
const { atime, mtime } = fs.statSync(file);
fs.utimesSync(
file,
new Date(atime.getTime() - 999999),
new Date(mtime.getTime() - 999999)
);
}
function create_app({
src,
dev,
entry
}: {
src: string;
dev: boolean;
entry: { client: string; server: string };
}) {
const routes = create_routes({ src });
function create_client_main() {
const code = `[${routes
.filter(route => route.type === 'page')
.map(route => {
const params =
route.dynamic.length === 0
? '{}'
: `{ ${route.dynamic
.map((part, i) => `${part}: match[${i + 1}]`)
.join(', ')} }`;
const file = posixify(`${src}/${route.file}`);
return `{ pattern: ${
route.pattern
}, params: match => (${params}), load: () => import(/* webpackChunkName: "${
route.id
}" */ '${file}') }`;
})
.join(', ')}]`;
let main = fs
.readFileSync('templates/main.js', 'utf-8')
.replace(
/__app__/g,
posixify(path.resolve(__dirname, '../../runtime/app.js'))
)
.replace(/__routes__/g, code)
.replace(/__dev__/g, String(dev));
if (dev) {
const hmr_client = posixify(
require.resolve(`webpack-hot-middleware/client`)
);
main += `\n\nimport('${hmr_client}?path=/__webpack_hmr&timeout=20000'); if (module.hot) module.hot.accept();`;
}
fs.writeFileSync(entry.client, main);
fudge_mtime(entry.client);
}
function create_server_routes() {
const imports = routes
.map(route => {
const file = posixify(`${src}/${route.file}`);
return route.type === 'page'
? `import ${route.id} from '${file}';`
: `import * as ${route.id} from '${file}';`;
})
.join('\n');
const exports = `export { ${routes.map(route => route.id)} };`;
fs.writeFileSync(entry.server, `${imports}\n\n${exports}`);
fudge_mtime(entry.server);
}
create_client_main();
create_server_routes();
}
export default create_app;

4
src/core/create_assets.js → src/core/create_assets.ts
View File

@@ -1,8 +1,8 @@
import * as fs from 'fs';
import * as path from 'path';
import glob from 'glob';
import { create_templates, render } from './templates.js';
import create_routes from './create_routes.js';
import { create_templates, render } from './templates';
import create_routes from './create_routes';
function ensure_array(thing) {
return Array.isArray(thing) ? thing : [thing]; // omg webpack what the HELL are you doing

0
src/core/create_compilers.js → src/core/create_compilers.ts
View File

0
src/core/create_routes.js → src/core/create_routes.ts
View File

0
src/core/export.js → src/core/export.ts
View File

10
src/core/index.js
View File

@@ -1,10 +0,0 @@
import * as templates from './templates.js'; // TODO templates is an anomaly... fix post-#91
export { default as build } from './build.js';
export { default as export } from './export.js';
export { default as create_assets } from './create_assets.js';
export { default as create_compilers } from './create_compilers.js';
export { default as create_routes } from './create_routes.js';
export { default as create_app } from './create_app.js';
export { templates };

11
src/core/index.ts Normal file
View File

@@ -0,0 +1,11 @@
import { create_templates, render, stream } from './templates'; // TODO templates is an anomaly... fix post-#91
export { default as build } from './build';
export { default as export } from './export.js';
export { default as create_app } from './create_app';
export { default as create_assets } from './create_assets';
export { default as create_compilers } from './create_compilers';
export { default as create_routes } from './create_routes';
export const templates = { create_templates, render, stream };

0
src/core/templates.js → src/core/templates.ts
View File

4
src/middleware/create_watcher.js → src/middleware/create_watcher.ts
View File

@@ -1,7 +1,7 @@
import * as fs from 'fs';
import * as path from 'path';
import chalk from 'chalk';
import { create_app, create_assets, create_routes, create_templates } from 'sapper/core.js';
import { create_app, create_assets, create_routes, templates } from 'sapper/core.js';
import { dest } from '../config.js';
function deferred() {
@@ -84,7 +84,7 @@ export default function create_watcher({ compilers, dev, entry, src, onroutes })
});
watch_files('templates/**.html', () => {
create_templates();
templates.create_templates();
// TODO reload current page?
});

4
src/middleware/index.js → src/middleware/index.ts
View File

@@ -5,8 +5,8 @@ import rimraf from 'rimraf';
import serialize from 'serialize-javascript';
import escape_html from 'escape-html';
import { create_routes, templates, create_compilers, create_assets } from 'sapper/core.js';
import create_watcher from './create_watcher.js';
import { dest, dev, entry, src } from '../config.js';
import create_watcher from './create_watcher';
import { dest, dev, entry, src } from '../config';
function connect_dev() {
mkdirp.sync(dest);

2
src/webpack/index.js → src/webpack/index.ts
View File

@@ -1,4 +1,4 @@
import { dest, dev, entry } from '../config.js';
import { dest, dev, entry } from '../config';
export default {
dev,