require node 10, modernize

silverwind · silverwind · commit 40f81495b2bf · 2020-03-15T16:41:24.000+01:00
diff --git a/.eslintrc b/.eslintrc
@@ -1,3 +1,5 @@
 root: true
+extends: silverwind
 
-extends: eslint-config-silverwind
+ignorePatterns:
+ - /updates
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,20 @@
+name: ci
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macOS-latest, ubuntu-latest, windows-latest]
+        node: ['10', '12', '13']
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - run: yarn -s
+      - run: yarn -s test
+
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
-node_modules
-npm-debug.log*
-yarn-error.log
-yarn.lock
-package-lock.json
-.vscode/
+/.vscode
+/node_modules
+/npm-debug.log*
+/package-lock.json
+/yarn-error.log
+/yarn.lock
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1,2 @@
+package-lock=false
+save-exact=true
diff --git a/.travis.yml b/.travis.yml
diff --git a/.yarnrc b/.yarnrc
@@ -0,0 +1 @@
+--install.no-lockfile true
diff --git a/Makefile b/Makefile
@@ -1,33 +1,29 @@
-.PHONY: test
 test:
-	npx eslint --color --quiet *.js
-	node --pending-deprecation --trace-deprecation --throw-deprecation --trace-warnings test.js
+	yarn -s run eslint --color .
+	yarn -s run jest --color
 
-.PHONY: publish
 publish:
 	git push -u --tags origin master
 	npm publish
 
-.PHONY: update
-update:
-	npx updates -u
+deps:
 	rm -rf node_modules
-	npm i
+	yarn
+
+update:
+	yarn -s run updates -cu
+	$(MAKE) deps
 
-.PHONY: patch
-patch:
-	$(MAKE) test
-	npx ver patch
+patch: test
+	yarn -s run versions -C patch
 	$(MAKE) publish
 
-.PHONY: minor
-minor:
-	$(MAKE) test
-	npx ver minor
+minor: test
+	yarn -s run versions -C minor
 	$(MAKE) publish
 
-.PHONY: major
-major:
-	$(MAKE) test
-	npx ver major
+major: test
+	yarn -s run versions -C major
 	$(MAKE) publish
+
+.PHONY: test publish deps update patch minor major
diff --git a/fixtures/child.js b/fixtures/child.js
@@ -0,0 +1,9 @@
+"use strict";
+
+const daemonizeProcess = require("."); // eslint-disable-line
+const {join} = require("path");
+const {writeFileSync} = require("fs");
+
+daemonizeProcess();
+const output = [String(process.ppid), "_DAEMONIZE_PROCESS" in process.env].join(",");
+writeFileSync(join(__dirname, "test-output"), output);
diff --git a/package.json b/package.json
@@ -5,11 +5,12 @@
   "author": "silverwind <me@silverwind.io>",
   "repository": "silverwind/daemonize-process",
   "license": "BSD-2-Clause",
+  "main": "index.js",
   "scripts": {
     "test": "make test"
   },
   "engines": {
-    "node": ">=6"
+    "node": ">=10"
   },
   "files": [
     "index.js"
@@ -21,9 +22,16 @@
     "process"
   ],
   "devDependencies": {
-    "eslint": "^5.12.1",
-    "eslint-config-silverwind": "^2.0.14",
-    "updates": "^6.2.1",
-    "ver": "^3.0.1"
+    "del": "5.1.0",
+    "eslint": "6.8.0",
+    "eslint-config-silverwind": "10.0.1",
+    "jest": "25.1.0",
+    "tempy": "0.5.0",
+    "updates": "10.2.3",
+    "versions": "8.2.5"
+  },
+  "jest": {
+    "verbose": false,
+    "testTimeout": 10000
   }
 }
diff --git a/test-child.js b/test-child.js
diff --git a/test.js b/test.js
@@ -1,18 +1,42 @@
 "use strict";
 
-const fs = require("fs");
-const fork = require("child_process").fork;
-const assert = require("assert");
-
-// This tests whether the parent pid of the daemonized process is 0 or 1 which
-// indicates the process was correctly orphaned. Also, it verifies the the
-// internal tracking environment variable is not leaked in the child.
-
-fork("test-child.js").on("exit", () => {
-  setTimeout(() => {
-    const [ppid, envVar] = fs.readFileSync("test-output", "utf8").split(",");
-    fs.unlinkSync("test-output");
-    assert(["0", "1"].includes(ppid));
-    assert(envVar === "false");
-  }, 100);
+const del = require("del");
+const tempy = require("tempy");
+const {fork} = require("child_process");
+const {join} = require("path");
+const {platform} = require("os");
+const {test, expect, beforeAll, afterAll} = global;
+const {readFile, copyFile} = require("fs").promises;
+
+const testDir = tempy.directory();
+const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+beforeAll(async () => {
+  await copyFile(join(__dirname, "index.js"), join(testDir, "index.js"));
+  await copyFile(join(__dirname, "fixtures/child.js"), join(testDir, "child.js"));
+});
+
+afterAll(async () => {
+  await del(testDir, {force: true});
+});
+
+test("simple", done => {
+  const child = fork(join(testDir, "child.js"));
+
+  child.on("exit", async () => {
+    await sleep(100);
+    const [ppid, envVar] = (await readFile(join(testDir, "test-output"), "utf8")).split(",");
+
+    // check if process was correctly orphaned. on unix, this should generally mean that
+    // pid 1 picked up the child, but it'll be different on other platforms.
+    if (platform() === "win32") {
+      expect(ppid).toMatch(/[0-9]+/);
+    } else {
+      expect(["0", "1"].includes(ppid)).toEqual(true);
+    }
+
+    // verify that internal tracking variable is not leaked to the child
+    expect(envVar).toEqual("false");
+    done();
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+package-lock=false`
	`2`	`+save-exact=true`