sable 0.5.10 → 0.5.14

package/{readme.md → README.md}

@@ -1,8 +1,6 @@
 # Sable
 
-[![CircleCI](https://circleci.com/gh/kei-ito/sable.svg?style=svg)](https://circleci.com/gh/kei-ito/sable)
-[![Build Status](https://travis-ci.com/kei-ito/sable.svg?branch=master)](https://travis-ci.com/kei-ito/sable)
-[![Build status](https://ci.appveyor.com/api/projects/status/github/kei-ito/sable?branch=master&svg=true)](https://ci.appveyor.com/project/kei-ito/sable/branch/master)
+[![test](https://github.com/kei-ito/sable/actions/workflows/test.yml/badge.svg)](https://github.com/kei-ito/sable/actions/workflows/test.yml)
 [![codecov](https://codecov.io/gh/kei-ito/sable/branch/master/graph/badge.svg)](https://codecov.io/gh/kei-ito/sable)
 
 Starts a server for development.

package/bin/sable

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 const console = require('console');
-const program = require('commander');
+const {Command} = require('commander');
 const {startServer} = require('..');
 const packageJSON = require('../package.json');
 
-program
+const program = new Command()
 .version(packageJSON.version)
 .description('Starts a HTTP server for development')
 .usage('[options] <documentRoot ...>')
@@ -18,7 +18,10 @@ if (program.noWatch) {
     program.watch = false;
 }
 
-startServer(program)
+startServer({
+    ...program.opts(),
+    documentRoot: 0 < program.args.length ? program.args : [process.cwd()],
+})
 .catch((error) => {
     console.error(error);
     process.exit(1);

package/lib/index.d.ts

@@ -2,7 +2,7 @@ import * as http from 'http';
 import * as connect from 'connect';
 import * as staticLivereload from 'middleware-static-livereload';
 export { LogLevel } from 'middleware-static-livereload';
-export interface SableOptions extends staticLivereload.IOptions {
+export interface SableOptions extends staticLivereload.Options {
     port?: number;
     host?: string;
     middlewares?: Array<connect.HandleFunction>;

package/lib/index.js

@@ -13,7 +13,7 @@ const startServer = async (options = {}) => {
     }
     app.use(staticLivereload.middleware(options));
     const server = http.createServer(app);
-    await new Promise((resolve, reject) => {
+    return await new Promise((resolve, reject) => {
         server.once('listening', () => {
             const addressInfo = server.address();
             if (addressInfo && typeof addressInfo === 'object') {
@@ -25,19 +25,17 @@ const startServer = async (options = {}) => {
             resolve(server);
         });
         const listen = (port, host) => {
-            server
-                .once('error', (error) => {
+            server.once('error', (error) => {
                 if (error.code === 'EADDRINUSE') {
                     listen(port + 1, host);
                 }
                 else {
                     reject(error);
                 }
-            })
-                .listen(port, host);
+            });
+            server.listen(port, host);
         };
         listen(options.port || 4000, options.host);
     });
-    return server;
 };
 exports.startServer = startServer;

package/package.json

@@ -1,25 +1,35 @@
 {
     "name": "sable",
-    "version": "0.5.10",
+    "version": "0.5.14",
     "description": "Starts a server and a file watcher",
     "author": {
         "name": "Kei Ito",
         "email": "kei.itof@gmail.com",
-        "url": "https://github.com/kei-ito"
+        "url": "https://github.com/gjbkz"
     },
     "license": "Apache-2.0",
     "engines": {
-        "node": ">=8"
+        "node": ">=12"
     },
-    "repository": "kei-ito/sable",
+    "repository": "https://github.com/gjbkz/sable",
     "main": "./lib/index.js",
     "bin": {
         "sable": "./bin/sable"
     },
+    "files": [
+        "lib"
+    ],
+    "scripts": {
+        "lint": "eslint --ext .ts src",
+        "build": "tsc --project tsconfig.build.json",
+        "test": "ava",
+        "version": "run-s version:changelog version:add",
+        "version:changelog": "npx @nlib/changelog --output CHANGELOG.md",
+        "version:add": "git add ."
+    },
     "dependencies": {
-        "@types/connect": "3.4.34",
-        "commander": "6.2.1",
+        "commander": "8.3.0",
         "connect": "3.7.0",
-        "middleware-static-livereload": "1.2.17"
+        "middleware-static-livereload": "1.2.21"
     }
 }

package/CHANGELOG.md

@@ -1,202 +0,0 @@
-# Changelog
-
-## v0.5.10 (2020-12-20)
-
-### Dependency Upgrades
-
-- upgrade dependencies (#229) (be5fbaf)
-
-
-## v0.5.9 (2020-06-26)
-
-
-## v0.5.8 (2020-06-22)
-
-
-## v0.5.7 (2019-12-09)
-
-
-## v0.5.6 (2019-12-09)
-
-
-## v0.5.5 (2019-12-08)
-
-
-## v0.5.4 (2019-11-15)
-
-
-## v0.5.3 (2019-08-23)
-
-### Code Refactoring
-
-- fix an eslint error (b5dd2ec)
-
-
-## v0.5.2 (2019-06-27)
-
-### Features
-
-- add middlewares (30874fb)
-
-
-## v0.5.1 (2019-06-27)
-
-### Features
-
-- support all options (8a6abf7)
-
-### Documentation
-
-- update README (bab63ee)
-
-
-## v0.5.0 (2019-06-11)
-
-### Features
-
-- use connect (#42) (95c2e9a)
-
-### Documentation
-
-- update README (7eda663)
-- change some badges (e21ef1e)
-
-
-## v0.4.6 (2018-11-28)
-
-
-## v0.4.5 (2018-10-19)
-
-
-## v0.4.4 (2018-10-18)
-
-
-## v0.4.3 (2018-08-22)
-
-
-## v0.4.2 (2018-08-22)
-
-
-## v0.4.1 (2018-08-16)
-
-
-## v0.4.0 (2018-08-09)
-
-
-## v0.3.1 (2018-07-18)
-
-
-## v0.3.0 (2018-07-18)
-
-
-## v0.2.15 (2018-04-03)
-
-
-## v0.2.14 (2018-03-15)
-
-
-## v0.2.13 (2018-01-22)
-
-
-## v0.2.12 (2018-01-22)
-
-
-## v0.2.11 (2018-01-09)
-
-
-## v0.2.10 (2017-12-27)
-
-
-## v0.2.9 (2017-12-22)
-
-
-## v0.2.8 (2017-12-22)
-
-
-## v0.2.7 (2017-12-22)
-
-
-## v0.2.6 (2017-12-22)
-
-
-## v0.2.5 (2017-12-22)
-
-
-## v0.2.4 (2017-12-21)
-
-
-## v0.2.3 (2017-12-12)
-
-
-## v0.2.2 (2017-12-07)
-
-
-## v0.2.1 (2017-12-07)
-
-
-## v0.2.0 (2017-12-06)
-
-
-## v0.1.7 (2017-07-28)
-
-
-## v0.1.6 (2017-06-30)
-
-
-## v0.1.5 (2017-06-30)
-
-
-## v0.1.4 (2017-06-30)
-
-
-## v0.1.3 (2017-06-15)
-
-
-## v0.1.2 (2017-05-24)
-
-
-## v0.1.1 (2017-05-24)
-
-
-## v0.1.0 (2017-05-06)
-
-
-## v0.0.21 (2017-04-12)
-
-
-## v0.0.20 (2017-03-30)
-
-
-## v0.0.19 (2017-03-27)
-
-
-## v0.0.18 (2017-03-27)
-
-
-## v0.0.17 (2017-03-23)
-
-
-## v0.0.16 (2017-03-23)
-
-
-## v0.0.15 (2017-03-23)
-
-
-## v0.0.14 (2017-03-23)
-
-
-## v0.0.13 (2017-03-23)
-
-
-## v0.0.12 (2017-03-22)
-
-
-## v0.0.11 (2017-03-16)
-
-
-## v0.0.10 (2017-03-15)
-
-
-## v0.0.9 (2017-03-15)
-
-

package/lib/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,mCAAmC;AACnC,iEAAiE;AACjE,6EAAsD;AAA9C,wHAAA,QAAQ,OAAA;AAsBT,MAAM,WAAW,GAAG,KAAK,EAC5B,UAAwB,EAAE,EACN,EAAE;IACtB,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IACtB,KAAK,MAAM,UAAU,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE;QAClD,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KACvB;IACD,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,IAAI,OAAO,CAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC/C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YAC1B,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YACrC,IAAI,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;gBAChD,MAAM,EAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAC,GAAG,WAAW,CAAC;gBAC5C,MAAM,UAAU,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;gBACjD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,IAAI,CAAC,UAAU,IAAI,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC9F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,QAAQ,GAAG,UAAU,IAAI,CAAC,CAAC;aAC7D;YACD,OAAO,CAAC,MAAM,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,IAAa,EAAE,EAAE;YAC3C,MAAM;iBACL,IAAI,CAAC,OAAO,EAAE,CAAC,KAA6B,EAAE,EAAE;gBAC7C,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE;oBAC7B,MAAM,CAAC,IAAI,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;iBAC1B;qBAAM;oBACH,MAAM,CAAC,KAAK,CAAC,CAAC;iBACjB;YACL,CAAC,CAAC;iBACD,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACxB,CAAC,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAlCW,QAAA,WAAW,eAkCtB"}

package/src/index.ts

@@ -1,60 +0,0 @@
-import * as http from 'http';
-import * as connect from 'connect';
-import * as staticLivereload from 'middleware-static-livereload';
-export {LogLevel} from 'middleware-static-livereload';
-
-export interface SableOptions extends staticLivereload.IOptions {
-    /**
-     * The first argument of server.listen()
-     * https://nodejs.org/api/net.html#net_server_listen_port_host_backlog_callback
-     * @default 4000
-     */
-    port?: number,
-    /**
-     * The second argument of server.listen()
-     * https://nodejs.org/api/net.html#net_server_listen_port_host_backlog_callback
-     * @default undefined
-     */
-    host?: string,
-    /**
-     * A list of middlewares.
-     * @default []
-     */
-    middlewares?: Array<connect.HandleFunction>,
-}
-
-export const startServer = async (
-    options: SableOptions = {},
-): Promise<http.Server> => {
-    const app = connect();
-    for (const middleware of (options.middlewares || [])) {
-        app.use(middleware);
-    }
-    app.use(staticLivereload.middleware(options));
-    const server = http.createServer(app);
-    await new Promise<http.Server>((resolve, reject) => {
-        server.once('listening', () => {
-            const addressInfo = server.address();
-            if (addressInfo && typeof addressInfo === 'object') {
-                const {address, family, port} = addressInfo;
-                const portSuffix = port === 80 ? '' : `:${port}`;
-                const hostname = options.host || (portSuffix && family === 'IPv6' ? `[${address}]` : address);
-                process.stdout.write(`http://${hostname}${portSuffix}\n`);
-            }
-            resolve(server);
-        });
-        const listen = (port: number, host?: string) => {
-            server
-            .once('error', (error: Error & {code: string}) => {
-                if (error.code === 'EADDRINUSE') {
-                    listen(port + 1, host);
-                } else {
-                    reject(error);
-                }
-            })
-            .listen(port, host);
-        };
-        listen(options.port || 4000, options.host);
-    });
-    return server;
-};