omit sprintf

bin/search.js

@@ -1,6 +1,5 @@
 
 var program = require('commander')
-  , sprintf = require('sprintf')
   , debug = require('debug')('crowi:console:search-util')
   , colors = require('colors')
   , crowi = new (require('../lib/crowi'))(__dirname + '/../', process.env)

bin/util.js

@@ -1,5 +1,4 @@
 var program = require('commander')
-  , sprintf = require('sprintf')
   , debug = require('debug')('crowi:console:util')
   , colors = require('colors')
   , crowi = new (require('../lib/crowi'))(__dirname + '/../', process.env)

lib/events/page.js

@@ -1,7 +1,6 @@
 var debug = require('debug')('crowi:events:page');
 var util = require('util');
 var events = require('events');
-var sprintf = require('sprintf');
 
 function PageEvent(crowi) {
   this.crowi = crowi;

lib/events/user.js

@@ -1,7 +1,6 @@
 var debug = require('debug')('crowi:events:user');
 var util = require('util');
 var events = require('events');
-var sprintf = require('sprintf');
 
 function UserEvent(crowi) {
   this.crowi = crowi;
@@ -19,7 +18,7 @@ UserEvent.prototype.onActivated = function(user) {
   .then(function(page) {
     // do nothing because user page is already exists.
   }).catch(function(err) {
-    var body = sprintf('# %s\nThis is %s\'s page', user.username, user.username)
+    var body = `# ${user.username}\nThis is ${user.username}\'s page`;
     // create user page
     Page.create(userPagePath, body, user, {})
     .then(function(page) {

lib/routes/page.js

@@ -9,8 +9,6 @@ module.exports = function(crowi, app) {
     , ApiResponse = require('../util/apiResponse')
     , interceptorManager = crowi.getInterceptorManager()
 
-    , sprintf = require('sprintf')
-
     , actions = {};
 
   // register page events
@@ -823,13 +821,13 @@ module.exports = function(crowi, app) {
     var page = {};
 
     if (!Page.isCreatableName(newPagePath)) {
-      return res.json(ApiResponse.error(sprintf('このページ名は作成できません (%s)', newPagePath)));
+      return res.json(ApiResponse.error(`このページ名は作成できません (${newPagePath})`));
     }
 
     Page.findPageByPath(newPagePath)
     .then(function(page) {
       // if page found, cannot cannot rename to that path
-      return res.json(ApiResponse.error(sprintf('このページ名は作成できません (%s)。ページが存在します。', newPagePath)));
+      return res.json(ApiResponse.error(`このページ名は作成できません (${newPagePath})。ページが存在します。`));
     }).catch(function(err) {
 
       Page.findPageById(pageId)

lib/routes/search.js

@@ -6,8 +6,6 @@ module.exports = function(crowi, app) {
     , User = crowi.model('User')
     , ApiResponse = require('../util/apiResponse')
 
-    , sprintf = require('sprintf')
-
     , actions = {};
   var api = actions.api = {};
 

lib/util/slack.js

@@ -8,7 +8,6 @@ module.exports = function(crowi) {
   var debug = require('debug')('crowi:util:slack'),
     Config = crowi.model('Config'),
     Botkit = require('botkit'),
-    sprintf = require('sprintf'),
     bot = null,
     slack = {};
   slack.controller = undefined;
@@ -126,12 +125,12 @@ module.exports = function(crowi) {
       debug('diff line', line)
       var value = line.value.replace(/\r\n|\r/g, '\n');
       if (line.added) {
-        diffText += sprintf(':pencil2: ...\n%s', line.value);
+        diffText += `:pencil2: ...\n${line.value}`;
       } else if (line.removed) {
         // diffText += '-' + line.value.replace(/(.+)?\n/g, '- $1\n');
         // 1以下は無視
         if (line.count > 1) {
-          diffText += sprintf(':wastebasket: ... %s lines\n', line.count);
+          diffText += `:wastebasket: ... ${line.count} lines\n`;
         }
       } else {
         //diffText += '...\n';
@@ -182,9 +181,9 @@ module.exports = function(crowi) {
     var text;
 
     if (updateType == 'create') {
-      text = sprintf(':white_check_mark: %s created a new page! %s', user.username, path);
+      text = `:white_check_mark: ${user.username} created a new page! ${path}`;
     } else {
-      text = sprintf(':up: %s updated %s', user.username, path);
+      text = `:up: ${user.username} updated ${path}`;
     }
 
     return text;

package.json

@@ -110,7 +110,6 @@
     "sass-loader": "^6.0.3",
     "socket.io": "~1.7.0",
     "socket.io-client": "~1.7.0",
-    "sprintf": "~0.1.5",
     "style-loader": "^0.16.1",
     "swig": "~1.4.0",
     "uglifycss": "^0.0.25",

yarn.lock

@@ -4176,6 +4176,10 @@ path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -4909,7 +4913,13 @@ resolve-from@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
 
-resolve@^1.0.0, resolve@~1.1.0, resolve@~1.1.7:
+resolve@^1.0.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
+  dependencies:
+    path-parse "^1.0.5"
+
+resolve@~1.1.0, resolve@~1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
@@ -5244,10 +5254,6 @@ sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
-sprintf@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/sprintf/-/sprintf-0.1.5.tgz#8f83e39a9317c1a502cb7db8050e51c679f6edcf"
-
 sshpk@^1.7.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
@@ -5786,14 +5792,10 @@ window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
 
-wordwrap@0.0.2:
+wordwrap@0.0.2, wordwrap@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-
 wordwrapjs@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-1.2.1.tgz#754a5ea0664cfbff50540dc32d67bda3289fc34b"