From ffaacb4c9942f554ec4a1a7c2a0d4a04782e2d90 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 5 Mar 2018 15:11:44 -0500 Subject: [PATCH] use fs.existsSync --- src/cli/index.ts | 4 ++-- src/middleware/index.ts | 5 ++--- src/utils.ts | 10 ---------- 3 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 src/utils.ts diff --git a/src/cli/index.ts b/src/cli/index.ts index e96df3a..bad8a81 100755 --- a/src/cli/index.ts +++ b/src/cli/index.ts @@ -1,3 +1,4 @@ +import * as fs from 'fs'; import * as path from 'path'; import * as child_process from 'child_process'; import sade from 'sade'; @@ -10,7 +11,6 @@ import exporter from './export'; import dev from './dev'; import upgrade from './upgrade'; import * as ports from 'port-authority'; -import { exists } from '../utils'; import * as pkg from '../../package.json'; const prog = sade('sapper'); @@ -60,7 +60,7 @@ prog.command('start [dir]') const resolved = path.resolve(dir); const server = path.resolve(dir, 'server.js'); - if (!exists(server)) { + if (!fs.existsSync(server)) { console.log(chalk.bold.red(`> ${dir}/server.js does not exist — type ${chalk.bold.cyan(dir === 'build' ? `npx sapper build` : `npx sapper build ${dir}`)} to create it`)); return; } diff --git a/src/middleware/index.ts b/src/middleware/index.ts index bef1cb5..6313f22 100644 --- a/src/middleware/index.ts +++ b/src/middleware/index.ts @@ -7,7 +7,6 @@ import serialize from 'serialize-javascript'; import escape_html from 'escape-html'; import { lookup } from './mime'; import { create_routes, templates, create_compilers } from 'sapper/core.js'; -import { exists } from '../utils'; import { dest, dev } from '../config'; import { Route, Template } from '../interfaces'; import sourceMapSupport from 'source-map-support'; @@ -52,12 +51,12 @@ export default function middleware({ routes }: { next(); }, - exists(path.join(output, 'index.html')) && serve({ + fs.existsSync(path.join(output, 'index.html')) && serve({ pathname: '/index.html', cache_control: 'max-age=600' }), - exists(path.join(output, 'service-worker.js')) && serve({ + fs.existsSync(path.join(output, 'service-worker.js')) && serve({ pathname: '/service-worker.js', cache_control: 'max-age=600' }), diff --git a/src/utils.ts b/src/utils.ts deleted file mode 100644 index be0f7a4..0000000 --- a/src/utils.ts +++ /dev/null @@ -1,10 +0,0 @@ -import * as fs from 'fs'; - -export function exists(file: string) { - try { - fs.statSync(file); - return true; - } catch (err) { - return false; - } -} \ No newline at end of file