totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-15 20:34:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #197 from sveltejs/fix-clorox

Browse Source 
workaround clorox bug
This commit is contained in:
Rich Harris
2018-03-11 21:29:12 -04:00
committed by GitHub
parent 9a5d273590 37d3d57694
commit dad48e4abd
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cli/build.ts
View File

@@ -21,12 +21,12 @@ export async function build() {
const { client, server, serviceworker } = create_compilers(); const { client, server, serviceworker } = create_compilers();
const client_stats = await compile(client); const client_stats = await compile(client);
console.log(clorox.inverse(`\nbuilt client`).toString()); console.log(`${clorox.inverse(`\nbuilt client`)}`);
console.log(client_stats.toString({ colors: true })); console.log(client_stats.toString({ colors: true }));
fs.writeFileSync(path.join(output, 'client_info.json'), JSON.stringify(client_stats.toJson())); fs.writeFileSync(path.join(output, 'client_info.json'), JSON.stringify(client_stats.toJson()));
const server_stats = await compile(server); const server_stats = await compile(server);
console.log(clorox.inverse(`\nbuilt server`).toString()); console.log(`${clorox.inverse(`\nbuilt server`)}`);
console.log(server_stats.toString({ colors: true })); console.log(server_stats.toString({ colors: true }));
let serviceworker_stats; let serviceworker_stats;
@@ -38,7 +38,7 @@ export async function build() {
}); });
serviceworker_stats = await compile(serviceworker); serviceworker_stats = await compile(serviceworker);
console.log(clorox.inverse(`\nbuilt service worker`).toString()); console.log(`${clorox.inverse(`\nbuilt service worker`)}`);
console.log(serviceworker_stats.toString({ colors: true })); console.log(serviceworker_stats.toString({ colors: true }));
} }

10
src/cli/dev.ts
View File

@@ -77,7 +77,7 @@ export async function dev(opts: { port: number, open: boolean }) {
if (port) { if (port) {
if (!await ports.check(port)) { if (!await ports.check(port)) {
console.log(clorox.bold.red(`> Port ${port} is unavailable`)); console.log(`${clorox.bold.red(`> Port ${port} is unavailable`)}`);
return; return;
} }
} else { } else {
@@ -155,15 +155,15 @@ export async function dev(opts: { port: number, open: boolean }) {
compiler.watch({}, (err: Error, stats: any) => { compiler.watch({}, (err: Error, stats: any) => {
if (err) { if (err) {
console.error(clorox.red(`✗ ${name}`)); console.log(`${clorox.red(`✗ ${name}`)}`);
console.error(clorox.red(err.message)); console.log(`${clorox.red(err.message)}`);
error(err); error(err);
} else { } else {
const messages = format_messages(stats); const messages = format_messages(stats);
const info = stats.toJson(); const info = stats.toJson();
if (messages.errors.length > 0) { if (messages.errors.length > 0) {
console.log(clorox.bold.red(`✗ ${name}`)); console.log(`${clorox.bold.red(`✗ ${name}`)}`);
const filtered = messages.errors.filter((message: string) => { const filtered = messages.errors.filter((message: string) => {
return !build.unique_errors.has(message); return !build.unique_errors.has(message);
@@ -180,7 +180,7 @@ export async function dev(opts: { port: number, open: boolean }) {
} }
} else { } else {
if (messages.warnings.length > 0) { if (messages.warnings.length > 0) {
console.log(clorox.bold.yellow(`• ${name}`)); console.log(`${clorox.bold.yellow(`• ${name}`)}`);
const filtered = messages.warnings.filter((message: string) => { const filtered = messages.warnings.filter((message: string) => {
return !build.unique_warnings.has(message); return !build.unique_warnings.has(message);

2
src/cli/export.ts
View File

@@ -85,7 +85,7 @@ export async function exporter(export_dir: string) {
} }
}) })
.catch((err: Error) => { .catch((err: Error) => {
console.log(clorox.red(`> Error rendering ${url.pathname}: ${err.message}`)); console.log(`${clorox.red(`> Error rendering ${url.pathname}: ${err.message}`)}`);
}); });
} }

4
src/cli/upgrade.ts
View File

@@ -27,10 +27,10 @@ async function upgrade_sapper_main() {
if (/\%sapper\.main\%/.test(template)) { if (/\%sapper\.main\%/.test(template)) {
if (!pattern.test(template)) { if (!pattern.test(template)) {
console.log(clorox.red(`Could not replace %sapper.main% in ${file}`)); console.log(`${clorox.red(`Could not replace %sapper.main% in ${file}`)}`);
} else { } else {
write(file, template.replace(pattern, `%sapper.scripts%`)); write(file, template.replace(pattern, `%sapper.scripts%`));
console.log(clorox.green(`Replaced %sapper.main% in ${file}`)); console.log(`${clorox.green(`Replaced %sapper.main% in ${file}`)}`);
replaced = true; replaced = true;
} }
} }