Update scripts/setup.js, dotenv.config({ silent })

koistya · koistya · commit 6f139653b726 · 2016-12-16T21:19:28.000+03:00
diff --git a/package.json b/package.json
@@ -41,7 +41,6 @@
     "babel-register": "^6.18.0",
     "chai": "^3.5.0",
     "chai-http": "^3.0.0",
-    "cp-file": "^4.1.1",
     "eslint": "^3.12.0",
     "eslint-config-airbnb-base": "^11.0.0",
     "eslint-plugin-flowtype": "^2.29.1",
@@ -52,6 +51,7 @@
     "rimraf": "^2.5.4"
   },
   "scripts": {
+    "postinstall": "node scripts/setup.js",
     "lint": "eslint src test scripts --ignore-pattern scripts/start.js",
     "check": "flow check",
     "test": "mocha test/unit --compilers js:babel-register --require dotenv/config",
diff --git a/scripts/build.js b/scripts/build.js
@@ -9,15 +9,12 @@
 
 const fs = require('fs');
 const cp = require('child_process');
-const copyFile = require('cp-file');
 const pkg = require('../package.json');
 const clean = require('./clean');
-const setup = require('./setup');
 const task = require('../src/utils/task');
 
 module.exports = task('build', () => Promise.resolve()
   .then(clean)
-  .then(setup)
   .then(() => new Promise((resolve) => {
     cp.spawn('node', [
       'node_modules/babel-cli/bin/babel.js',
@@ -37,13 +34,15 @@ module.exports = task('build', () => Promise.resolve()
         process.stdout.write(data);
       });
   }))
-  .then(() => copyFile.bind('yarn.lock', 'build/yarn.lock'))
-  .then(() => new Promise((resolve) => {
+  .then(() => {
+    fs.writeFileSync('build/yarn.lock', fs.readFileSync('yarn.lock', 'utf8'), 'utf8');
+    console.log('yarn.lock -> build/yarn.lock');
+  })
+  .then(() => {
     fs.writeFileSync('build/package.json', JSON.stringify({
       engines: pkg.engines,
       dependencies: pkg.dependencies,
       scripts: { start: 'node server.js' },
     }, null, '  '), 'utf8');
     console.log('package.json -> build/package.json');
-    resolve();
-  })));
+  }));
diff --git a/scripts/setup.js b/scripts/setup.js
@@ -12,29 +12,13 @@ const task = require('../src/utils/task');
 
 // Creates .env file from the template (.env.example)
 // with application settings for the development environment
-module.exports = task('setup', () => new Promise((resolve, reject) => {
-  fs.open('.env', 'wx', (err, fd) => {
-    if (err) {
-      if (err.code === 'EEXIST') {
-        resolve();
-      } else {
-        reject(err);
-      }
-    } else {
-      fs.readFile('.env.example', 'utf8', (err2, data) => {
-        if (err2) {
-          reject(err2);
-        } else {
-          fs.write(fd, data, 'utf8', (err3) => {
-            if (err3) {
-              reject(err3);
-            } else {
-              console.log('.env.example -> .env');
-              resolve();
-            }
-          });
-        }
-      });
-    }
-  });
-}));
+module.exports = task('setup', () => {
+  if (!fs.existsSync('.env.example')) {
+    return;
+  }
+
+  if (!fs.existsSync('.env')) {
+    fs.writeFileSync('.env', fs.readFileSync('.env.example', 'utf8'), 'utf8');
+    console.log('.env.example -> .env');
+  }
+});
diff --git a/scripts/start.js b/scripts/start.js
@@ -9,10 +9,9 @@
 
 const path = require('path');
 const nodemon = require('nodemon');
-const setup = require('./setup');
 const task = require('../src/utils/task');
 
-module.exports = task('start', () => setup().then(() => new Promise((resolve) => {
+module.exports = task('start', () => new Promise((resolve) => {
   let start;
 
   const nm = nodemon({
@@ -37,4 +36,4 @@ module.exports = task('start', () => setup().then(() => new Promise((resolve) =>
 
   process.on('exit', () => nm.emit.bind(nm, 'exit'));
   process.once('SIGINT', process.exit.bind(process, 0));
-})));
+}));
diff --git a/src/server.js b/src/server.js
@@ -9,9 +9,11 @@
 
 /* @flow */
 
-import 'dotenv/config';
+import dotenv from 'dotenv';
 import app from './app';
 
+dotenv.config({ silent: true });
+
 const server = app.listen(process.env.PORT, () => {
   process.stdout.write(`Node.js app is listening on http://localhost:${String(process.env.PORT)}/\n`);
 });
diff --git a/src/utils/task.js b/src/utils/task.js
@@ -17,7 +17,9 @@
  *     Finished 'db:create' in 25ms
  */
 
-require('dotenv/config');
+const dotenv = require('dotenv');
+
+dotenv.config({ silent: true });
 
 function run(task, action) {
   const command = process.argv[2];
