Browse Source

organize npm dependencies

Yuki Takei 8 years ago
parent
commit
4ad1b078dd
3 changed files with 76 additions and 72 deletions
  1. 10 10
      lib/crowi/index.js
  2. 61 61
      package.json
  3. 5 1
      yarn.lock

+ 10 - 10
lib/crowi/index.js

@@ -9,16 +9,11 @@ var debug = require('debug')('growi:crowi')
 
   , mongoose    = require('mongoose')
 
-  , eazyLogger = require('eazy-logger')
   , models = require('../models')
   ;
 
 function Crowi(rootdir, env) {
   var self = this;
-  this.logger = eazyLogger.Logger({
-    prefix: '[{green:GROWI}] ',
-    useLevelPrefixes: false,
-  });
 
   this.version = pkg.version;
   this.runtimeVersions = undefined;   // initialized by scanRuntimeVersions()
@@ -368,13 +363,18 @@ Crowi.prototype.start = function() {
       server = http.createServer(app).listen(self.port, function() {
         logger.info(`[${self.node_env}] Express server listening on port ${self.port}`);
 
-        self.logger.info('{bold:Server URLs:}');
-        self.logger.unprefixed('info', '{grey:=======================================}');
-        self.logger.unprefixed('info', `         APP: {magenta:http://localhost:${self.port}}`);
-        self.logger.unprefixed('info', '{grey:=======================================}');
-
         // setup for dev
         if (self.node_env === 'development') {
+          const eazyLogger = require('eazy-logger').Logger({
+            prefix: '[{green:GROWI}] ',
+            useLevelPrefixes: false,
+          });
+
+          eazyLogger.info('{bold:Server URLs:}');
+          eazyLogger.unprefixed('info', '{grey:=======================================}');
+          eazyLogger.unprefixed('info', `         APP: {magenta:http://localhost:${self.port}}`);
+          eazyLogger.unprefixed('info', '{grey:=======================================}');
+
           self.crowiDev.setup(server, app);
         }
       });

+ 61 - 61
package.json

@@ -49,38 +49,20 @@
     "webpack": "webpack"
   },
   "dependencies": {
-    "assets-webpack-plugin": "~3.5.1",
     "async": "^2.3.0",
-    "autoprefixer": "^8.2.0",
     "aws-sdk": "^2.88.0",
     "axios": "^0.18.0",
-    "babel-core": "^6.25.0",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-lodash": "^3.3.2",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.24.1",
     "basic-auth-connect": "~1.0.0",
     "body-parser": "^1.18.2",
-    "bootstrap-sass": "~3.3.6",
-    "bootstrap-select": "^1.12.4",
-    "browser-bunyan": "^1.3.0",
     "bunyan": "^1.8.12",
-    "bunyan-debug": "^2.0.0",
     "bunyan-format": "^0.2.1",
     "check-node-version": "^3.1.1",
-    "codemirror": "^5.37.0",
     "connect-flash": "~0.1.1",
     "connect-mongo": "^2.0.1",
     "connect-redis": "^3.3.0",
     "cookie-parser": "^1.4.3",
     "cross-env": "^5.0.5",
     "csrf": "~3.0.3",
-    "css-loader": "^0.28.0",
-    "csv-to-markdown-table": "^0.4.0",
-    "date-fns": "^1.29.0",
-    "diff": "^3.3.0",
-    "diff2html": "^2.3.3",
-    "eazy-logger": "^3.0.2",
     "elasticsearch": "^14.0.0",
     "entities": "^1.1.1",
     "env-cmd": "^8.0.1",
@@ -91,8 +73,6 @@
     "express-sanitizer": "^1.0.4",
     "express-session": "~1.15.0",
     "express-webpack-assets": "^0.1.0",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "^1.1.0",
     "googleapis": "^29.0.0",
     "graceful-fs": "^4.1.11",
     "growi-pluginkit": "^1.1.0",
@@ -100,6 +80,56 @@
     "i18next-express-middleware": "^1.1.1",
     "i18next-node-fs-backend": "^1.0.0",
     "i18next-sprintf-postprocessor": "^0.2.2",
+    "md5": "^2.2.1",
+    "method-override": "^2.3.10",
+    "mkdirp": "~0.5.1",
+    "module-alias": "^2.0.6",
+    "mongoose": "^5.0.0",
+    "mongoose-paginate": "^5.0.0",
+    "mongoose-unique-validator": "^2.0.0",
+    "multer": "~1.3.0",
+    "nodemailer": "^4.0.1",
+    "nodemailer-ses-transport": "~1.5.0",
+    "npm-run-all": "^4.1.2",
+    "passport": "^0.4.0",
+    "passport-ldapauth": "^2.0.0",
+    "passport-local": "^1.0.0",
+    "rimraf": "^2.6.1",
+    "slack-node": "^0.1.8",
+    "socket.io": "^2.0.3",
+    "swig-templates": "^2.0.2",
+    "uglifycss": "^0.0.29",
+    "xss": "^0.3.5"
+  },
+  "devDependencies": {
+    "assets-webpack-plugin": "~3.5.1",
+    "autoprefixer": "^8.2.0",
+    "babel-core": "^6.25.0",
+    "babel-loader": "^7.1.1",
+    "babel-plugin-lodash": "^3.3.2",
+    "babel-preset-env": "^1.6.0",
+    "babel-preset-react": "^6.24.1",
+    "bootstrap-sass": "~3.3.6",
+    "bootstrap-select": "^1.12.4",
+    "browser-bunyan": "^1.3.0",
+    "browser-sync": "^2.23.6",
+    "bunyan-debug": "^2.0.0",
+    "chai": "^4.1.0",
+    "cli": "~1.0.1",
+    "codemirror": "^5.37.0",
+    "colors": "^1.2.5",
+    "commander": "^2.11.0",
+    "connect-browser-sync": "^2.1.0",
+    "css-loader": "^0.28.0",
+    "csv-to-markdown-table": "^0.4.0",
+    "date-fns": "^1.29.0",
+    "diff": "^3.3.0",
+    "diff2html": "^2.3.3",
+    "eazy-logger": "^3.0.2",
+    "eslint": "^4.19.1",
+    "eslint-plugin-react": "^7.7.0",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "file-loader": "^1.1.0",
     "jquery-slimscroll": "^1.3.8",
     "jquery-ui": "^1.12.1",
     "jquery.cookie": "~1.4.1",
@@ -113,24 +143,14 @@
     "markdown-it-task-lists": "^2.1.0",
     "markdown-it-toc-and-anchor-with-slugid": "^1.1.3",
     "markdown-table": "^1.1.1",
-    "md5": "^2.2.1",
-    "method-override": "^2.3.10",
     "metismenu": "^2.7.4",
-    "mkdirp": "~0.5.1",
-    "module-alias": "^2.0.6",
-    "mongoose": "^5.0.0",
-    "mongoose-paginate": "^5.0.0",
-    "mongoose-unique-validator": "^2.0.0",
-    "multer": "~1.3.0",
+    "mocha": "^5.0.0",
+    "morgan": "^1.9.0",
+    "node-dev": "^3.1.3",
     "node-sass": "^4.5.0",
-    "nodemailer": "^4.0.1",
-    "nodemailer-ses-transport": "~1.5.0",
     "normalize-path": "^3.0.0",
-    "npm-run-all": "^4.1.2",
+    "on-headers": "^1.0.1",
     "optimize-js-plugin": "0.0.4",
-    "passport": "^0.4.0",
-    "passport-ldapauth": "^2.0.0",
-    "passport-local": "^1.0.0",
     "plantuml-encoder": "^1.2.5",
     "postcss-loader": "^2.1.3",
     "react": "^16.2.0",
@@ -141,39 +161,19 @@
     "react-dom": "^16.2.0",
     "react-dropzone": "^4.2.7",
     "reveal.js": "^3.5.0",
-    "rimraf": "^2.6.1",
     "sass-loader": "^7.0.1",
     "simple-load-script": "^1.0.2",
-    "slack-node": "^0.1.8",
-    "socket.io": "^2.0.3",
+    "sinon": "^5.0.2",
+    "sinon-chai": "^3.0.0",
     "socket.io-client": "^2.0.3",
     "style-loader": "^0.21.0",
-    "swig-templates": "^2.0.2",
     "throttle-debounce": "^1.0.1",
     "toastr": "^2.1.2",
-    "uglifycss": "^0.0.29",
     "url-join": "^4.0.0",
     "webpack": "3.11.0",
     "webpack-bundle-analyzer": "^2.9.0",
-    "webpack-merge": "~4.1.0",
-    "xss": "^0.3.5"
-  },
-  "devDependencies": {
-    "browser-sync": "^2.23.6",
-    "chai": "^4.1.0",
-    "cli": "~1.0.1",
-    "colors": "^1.1.2",
-    "commander": "^2.11.0",
-    "connect-browser-sync": "^2.1.0",
-    "eslint": "^4.19.1",
-    "eslint-plugin-react": "^7.7.0",
-    "mocha": "^5.0.0",
-    "morgan": "^1.9.0",
-    "node-dev": "^3.1.3",
-    "on-headers": "^1.0.1",
-    "sinon": "^5.0.2",
-    "sinon-chai": "^3.0.0",
-    "webpack-dll-bundles-plugin": "^1.0.0-beta.5"
+    "webpack-dll-bundles-plugin": "^1.0.0-beta.5",
+    "webpack-merge": "~4.1.0"
   },
   "_moduleAliases": {
     "@root": ".",
@@ -181,9 +181,9 @@
     "debug": "lib/service/logger/alias-for-debug"
   },
   "engines": {
-    "node": ">=6.11 <9",
-    "npm": ">=4",
-    "yarn": "^1.3.1"
+    "node": ">=8.11.1 <9",
+    "npm": ">=5.6.0 <6",
+    "yarn": "^1.5.1"
   },
   "config": {
     "blanket": {

+ 5 - 1
yarn.lock

@@ -1688,7 +1688,11 @@ colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
-colors@^1.1.2, colors@~1.1.2:
+colors@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc"
+
+colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"