diff --git a/.eslintrc.json b/.eslintrc.json index b587f2d3..72ce2be8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -11,24 +11,10 @@ "document": false, "navigator": false, "window": false, - "app": true, "appconfig": true, "appdata": true, - "db": true, - "entries": true, - "git": true, - "lang": true, - "lcdata": true, - "mark": true, - "rights": true, - "search": true, - "upl": true, - "winston": true, - "ws": true, - "Mongoose": true, "ROOTPATH": true, "SERVERPATH": true, - "IS_DEBUG": true, - "PROCNAME": true + "IS_DEBUG": true } } diff --git a/package.json b/package.json index 1db21387..9cf6d7cb 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,6 @@ "through2": "^2.0.3", "validator": "^7.0.0", "validator-as-promised": "^1.0.2", - "vue-template-es2015-compiler": "^1.5.2", "winston": "^2.3.1", "yargs": "^8.0.1" }, @@ -135,7 +134,7 @@ "eslint-plugin-node": "latest", "eslint-plugin-promise": "latest", "eslint-plugin-standard": "latest", - "fuse-box": "beta", + "fuse-box": "^2.0.0", "jest": "latest", "jquery": "^3.2.1", "jquery-contextmenu": "^2.4.5", @@ -147,38 +146,13 @@ "nodemon": "latest", "pug-lint": "latest", "snyk": "latest", - "standard": "latest", "twemoji-awesome": "^1.0.6", "typescript": "^2.3.2", "uglify-js": "latest", "vee-validate": "^2.0.0-rc.3", "vue": "^2.3.3", - "vue-template-compiler": "^2.3.3" - }, - "standard": { - "globals": [ - "app", - "appconfig", - "appdata", - "db", - "entries", - "git", - "mark", - "lang", - "lcdata", - "rights", - "search", - "upl", - "winston", - "ws", - "Mongoose", - "ROOTPATH", - "IS_DEBUG", - "PROCNAME", - "describe", - "it", - "expect" - ] + "vue-template-compiler": "^2.3.3", + "vue-template-es2015-compiler": "^1.5.2" }, "jest": { "collectCoverage": false, diff --git a/server/agent.js b/server/agent.js index f583db8a..2639e59b 100644 --- a/server/agent.js +++ b/server/agent.js @@ -26,7 +26,7 @@ global.winston = require('./libs/logger')(IS_DEBUG, 'AGENT') // Load global modules // ---------------------------------------- -winston.info('Background Agent is initializing...') +global.winston.info('Background Agent is initializing...') global.db = require('./libs/db').init() global.upl = require('./libs/uploads-agent').init() @@ -53,7 +53,7 @@ const entryHelper = require('./helpers/entry') // Localization Engine // ---------------------------------------- -lang +global.lang .use(i18nextBackend) .use(i18nextMw.LanguageDetector) .init({ @@ -77,8 +77,8 @@ let job let jobIsBusy = false let jobUplWatchStarted = false -db.onReady.then(() => { - return db.Entry.remove({}) +global.db.onReady.then(() => { + return global.db.Entry.remove({}) }).then(() => { job = new Cron({ cronTime: '0 */5 * * * *', @@ -86,10 +86,10 @@ db.onReady.then(() => { // Make sure we don't start two concurrent jobs if (jobIsBusy) { - winston.warn('Previous job has not completed gracefully or is still running! Skipping for now. (This is not normal, you should investigate)') + global.winston.warn('Previous job has not completed gracefully or is still running! Skipping for now. (This is not normal, you should investigate)') return } - winston.info('Running all jobs...') + global.winston.info('Running all jobs...') jobIsBusy = true // Prepare async job collector @@ -107,7 +107,7 @@ db.onReady.then(() => { // -> Sync with Git remote //* **************************************** - jobs.push(git.resync().then(() => { + jobs.push(global.git.resync().then(() => { // -> Stream all documents let cacheJobs = [] @@ -140,7 +140,7 @@ db.onReady.then(() => { // -> Update cache and search index if (fileStatus !== 'active') { - return entries.updateCache(entryPath).then(entry => { + return global.entries.updateCache(entryPath).then(entry => { process.send({ action: 'searchAdd', content: entry @@ -187,18 +187,18 @@ db.onReady.then(() => { // ---------------------------------------- Promise.all(jobs).then(() => { - winston.info('All jobs completed successfully! Going to sleep for now.') + global.winston.info('All jobs completed successfully! Going to sleep for now.') if (!jobUplWatchStarted) { jobUplWatchStarted = true - upl.initialScan().then(() => { + global.upl.initialScan().then(() => { job.start() }) } return true }).catch((err) => { - winston.error('One or more jobs have failed: ', err) + global.winston.error('One or more jobs have failed: ', err) }).finally(() => { jobIsBusy = false }) @@ -214,7 +214,7 @@ db.onReady.then(() => { // ---------------------------------------- process.on('disconnect', () => { - winston.warn('Lost connection to main server. Exiting...') + global.winston.warn('Lost connection to main server. Exiting...') job.stop() process.exit() }) diff --git a/server/controllers/admin.js b/server/controllers/admin.js index dd8975b6..4514257d 100644 --- a/server/controllers/admin.js +++ b/server/controllers/admin.js @@ -1,5 +1,7 @@ 'use strict' +/* global db, lang, rights, winston */ + var express = require('express') var router = express.Router() const Promise = require('bluebird') diff --git a/server/controllers/auth.js b/server/controllers/auth.js index b1a07dcb..b513470e 100644 --- a/server/controllers/auth.js +++ b/server/controllers/auth.js @@ -1,5 +1,7 @@ 'use strict' +/* global db, lang */ + const Promise = require('bluebird') const express = require('express') const router = express.Router() diff --git a/server/controllers/pages.js b/server/controllers/pages.js index a633af57..44fcb82e 100644 --- a/server/controllers/pages.js +++ b/server/controllers/pages.js @@ -1,5 +1,7 @@ 'use strict' +/* global entries, lang, winston */ + const express = require('express') const router = express.Router() const _ = require('lodash') diff --git a/server/controllers/uploads.js b/server/controllers/uploads.js index 437f8ec3..ddcc92d2 100644 --- a/server/controllers/uploads.js +++ b/server/controllers/uploads.js @@ -1,5 +1,7 @@ 'use strict' +/* global git, lang, lcdata, upl */ + const express = require('express') const router = express.Router() diff --git a/server/controllers/ws.js b/server/controllers/ws.js index 1abcd7b4..95065ee0 100644 --- a/server/controllers/ws.js +++ b/server/controllers/ws.js @@ -1,6 +1,6 @@ 'use strict' -/* global appconfig, rights */ +/* global appconfig, entries, rights, search, upl */ /* eslint-disable standard/no-callback-literal */ const _ = require('lodash') diff --git a/server/index.js b/server/index.js index d9950c20..1fc92a99 100644 --- a/server/index.js +++ b/server/index.js @@ -25,7 +25,7 @@ global.appdata = appconf.data // ---------------------------------------- global.winston = require('./libs/logger')(IS_DEBUG, 'SERVER') -winston.info('Wiki.js is initializing...') +global.winston.info('Wiki.js is initializing...') // ---------------------------------------- // Load global modules @@ -53,8 +53,7 @@ const favicon = require('serve-favicon') const flash = require('connect-flash') const fork = require('child_process').fork const http = require('http') -const i18nextBackend = require('i18next-node-fs-backend') -const i18nextMw = require('i18next-express-middleware') +const i18nBackend = require('i18next-node-fs-backend') const passport = require('passport') const passportSocketIo = require('passport.socketio') const session = require('express-session') @@ -68,7 +67,8 @@ var ctrl = autoload(path.join(SERVERPATH, '/controllers')) // Define Express App // ---------------------------------------- -global.app = express() +const app = express() +global.app = app app.use(compression()) // ---------------------------------------- @@ -90,10 +90,10 @@ app.use(express.static(path.join(ROOTPATH, 'assets'))) require('./libs/auth')(passport) global.rights = require('./libs/rights') -rights.init() +global.rights.init() let sessionStore = new SessionMongoStore({ - mongooseConnection: db.connection, + mongooseConnection: global.db.connection, touchAfter: 15 }) @@ -119,16 +119,15 @@ app.use(mw.seo) // Localization Engine // ---------------------------------------- -lang - .use(i18nextBackend) - .use(i18nextMw.LanguageDetector) +global.lang + .use(i18nBackend) .init({ load: 'languageOnly', ns: ['common', 'admin', 'auth', 'errors', 'git'], defaultNS: 'common', saveMissing: false, - supportedLngs: ['en', 'fr'], - preload: ['en', 'fr'], + preload: [appconfig.lang], + lng: appconfig.lang, fallbackLng: 'en', backend: { loadPath: path.join(SERVERPATH, 'locales/{{lng}}/{{ns}}.json') @@ -139,7 +138,6 @@ lang // View Engine Setup // ---------------------------------------- -app.use(i18nextMw.handle(lang)) app.set('views', path.join(SERVERPATH, 'views')) app.set('view engine', 'pug') @@ -151,7 +149,9 @@ app.use(bodyParser.urlencoded({ extended: false, limit: '1mb' })) // ---------------------------------------- app.locals._ = require('lodash') +app.locals.t = global.lang.t.bind(global.lang) app.locals.moment = require('moment') +app.locals.moment.locale(appconfig.lang) app.locals.appconfig = appconfig app.use(mw.flash) @@ -187,7 +187,7 @@ app.use(function (err, req, res, next) { // Start HTTP server // ---------------------------------------- -winston.info('Starting HTTP/WS server on port ' + appconfig.port + '...') +global.winston.info('Starting HTTP/WS server on port ' + appconfig.port + '...') app.set('port', appconfig.port) var server = http.createServer(app) @@ -202,10 +202,10 @@ server.on('error', (error) => { // handle specific listen errors with friendly messages switch (error.code) { case 'EACCES': - winston.error('Listening on port ' + appconfig.port + ' requires elevated privileges!') + global.winston.error('Listening on port ' + appconfig.port + ' requires elevated privileges!') return process.exit(1) case 'EADDRINUSE': - winston.error('Port ' + appconfig.port + ' is already in use!') + global.winston.error('Port ' + appconfig.port + ' is already in use!') return process.exit(1) default: throw error @@ -213,7 +213,7 @@ server.on('error', (error) => { }) server.on('listening', () => { - winston.info('HTTP/WS server started successfully! [RUNNING]') + global.winston.info('HTTP/WS server started successfully! [RUNNING]') }) // ---------------------------------------- @@ -248,7 +248,7 @@ bgAgent.on('message', m => { switch (m.action) { case 'searchAdd': - search.add(m.content) + global.search.add(m.content) break } }) diff --git a/server/libs/auth.js b/server/libs/auth.js index 24a17ecc..3629a8f5 100644 --- a/server/libs/auth.js +++ b/server/libs/auth.js @@ -1,6 +1,6 @@ 'use strict' -/* global appconfig, appdata, db, winston */ +/* global appconfig, appdata, db, lang, winston */ const fs = require('fs') diff --git a/server/libs/db.js b/server/libs/db.js index 7aef4c20..3afc617d 100644 --- a/server/libs/db.js +++ b/server/libs/db.js @@ -21,7 +21,6 @@ module.exports = { */ init () { let self = this - global.Mongoose = modb let dbModelsPath = path.join(SERVERPATH, 'models') diff --git a/server/libs/entries.js b/server/libs/entries.js index 2a5b9e37..020390ab 100644 --- a/server/libs/entries.js +++ b/server/libs/entries.js @@ -1,5 +1,7 @@ 'use strict' +/* global db, git, lang, mark, rights, search, winston */ + const Promise = require('bluebird') const path = require('path') const fs = Promise.promisifyAll(require('fs-extra')) diff --git a/server/libs/git.js b/server/libs/git.js index 422f99fc..22946cdb 100644 --- a/server/libs/git.js +++ b/server/libs/git.js @@ -1,5 +1,7 @@ 'use strict' +/* global lang, winston */ + const Git = require('git-wrapper2-promise') const Promise = require('bluebird') const path = require('path') diff --git a/server/libs/local.js b/server/libs/local.js index 9507419c..381041ae 100644 --- a/server/libs/local.js +++ b/server/libs/local.js @@ -1,5 +1,7 @@ 'use strict' +/* global lang, winston */ + const path = require('path') const Promise = require('bluebird') const fs = Promise.promisifyAll(require('fs-extra')) diff --git a/server/libs/search.js b/server/libs/search.js index 0738e574..724886c1 100644 --- a/server/libs/search.js +++ b/server/libs/search.js @@ -1,5 +1,7 @@ 'use strict' +/* global winston */ + const Promise = require('bluebird') const _ = require('lodash') const searchIndex = require('./search-index') diff --git a/server/libs/system.js b/server/libs/system.js index c905161d..7542b2a6 100644 --- a/server/libs/system.js +++ b/server/libs/system.js @@ -1,5 +1,7 @@ 'use strict' +/* global winston */ + const Promise = require('bluebird') const crypto = require('crypto') const fs = Promise.promisifyAll(require('fs-extra')) diff --git a/server/libs/uploads-agent.js b/server/libs/uploads-agent.js index 426ca964..d8e9fe3e 100644 --- a/server/libs/uploads-agent.js +++ b/server/libs/uploads-agent.js @@ -1,5 +1,7 @@ 'use strict' +/* global db, git, lang, upl */ + const path = require('path') const Promise = require('bluebird') const fs = Promise.promisifyAll(require('fs-extra')) diff --git a/server/libs/uploads.js b/server/libs/uploads.js index 931d774b..2bee6322 100644 --- a/server/libs/uploads.js +++ b/server/libs/uploads.js @@ -1,5 +1,7 @@ 'use strict' +/* global db, lang, lcdata, upl, winston */ + const path = require('path') const Promise = require('bluebird') const fs = Promise.promisifyAll(require('fs-extra')) diff --git a/server/middlewares/auth.js b/server/middlewares/auth.js index 9518bfd6..cd20b7a0 100644 --- a/server/middlewares/auth.js +++ b/server/middlewares/auth.js @@ -2,8 +2,6 @@ /* global appdata, rights */ -const moment = require('moment-timezone') - /** * Authentication middleware * @@ -34,12 +32,6 @@ module.exports = (req, res, next) => { return res.render('error-forbidden') } - // Set i18n locale - - req.i18n.changeLanguage(req.user.lang) - res.locals.userMoment = moment - res.locals.userMoment.locale(req.user.lang) - // Expose user data res.locals.user = req.user diff --git a/server/models/bruteforce.js b/server/models/bruteforce.js index 998cac7a..76981fd7 100644 --- a/server/models/bruteforce.js +++ b/server/models/bruteforce.js @@ -1,5 +1,7 @@ 'use strict' +const Mongoose = require('mongoose') + /** * BruteForce schema * diff --git a/server/models/entry.js b/server/models/entry.js index 6740f722..746d6d28 100644 --- a/server/models/entry.js +++ b/server/models/entry.js @@ -1,5 +1,7 @@ 'use strict' +const Mongoose = require('mongoose') + /** * Entry schema * diff --git a/server/models/upl-file.js b/server/models/upl-file.js index be0866ca..a48602bb 100644 --- a/server/models/upl-file.js +++ b/server/models/upl-file.js @@ -1,5 +1,7 @@ 'use strict' +const Mongoose = require('mongoose') + /** * Upload File schema * diff --git a/server/models/upl-folder.js b/server/models/upl-folder.js index 3b103bc8..80028b6f 100644 --- a/server/models/upl-folder.js +++ b/server/models/upl-folder.js @@ -1,5 +1,7 @@ 'use strict' +const Mongoose = require('mongoose') + /** * Upload Folder schema * diff --git a/server/models/user.js b/server/models/user.js index 16fdba2b..1c32f694 100644 --- a/server/models/user.js +++ b/server/models/user.js @@ -1,5 +1,8 @@ 'use strict' +/* global db, lang */ + +const Mongoose = require('mongoose') const Promise = require('bluebird') const bcrypt = require('bcryptjs-then') const _ = require('lodash') diff --git a/yarn.lock b/yarn.lock index b06d71b7..7fd13ce2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -219,13 +219,6 @@ array-unique@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" -array.prototype.find@^2.0.1: - version "2.0.4" - resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" - arraybuffer.slice@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca" @@ -1494,10 +1487,6 @@ de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" -debug-log@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f" - debug@*, debug@^2.1.1, debug@^2.2.0, debug@^2.6, debug@^2.6.3, debug@~2.6.4, debug@~2.6.6: version "2.6.6" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.6.tgz#a9fa6fbe9ca43cf1e79f73b75c0189cbb7d6db5a" @@ -1558,24 +1547,6 @@ deferred-leveldown@~1.2.1: dependencies: abstract-leveldown "~2.4.0" -define-properties@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94" - dependencies: - foreach "^2.0.5" - object-keys "^1.0.8" - -deglob@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/deglob/-/deglob-2.1.0.tgz#4d44abe16ef32c779b4972bd141a80325029a14a" - dependencies: - find-root "^1.0.0" - glob "^7.0.5" - ignore "^3.0.9" - pkg-config "^1.1.0" - run-parallel "^1.1.2" - uniq "^1.0.1" - del@^2.0.2: version "2.2.2" resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" @@ -1637,7 +1608,7 @@ docproc@^0.0.8: term-frequency "^0.0.15" term-vector "^0.1.2" -doctrine@1.5.0, doctrine@^1.2.2: +doctrine@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" dependencies: @@ -1819,23 +1790,6 @@ error-ex@^1.2.0: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c" - dependencies: - es-to-primitive "^1.1.1" - function-bind "^1.1.0" - is-callable "^1.1.3" - is-regex "^1.0.3" - -es-to-primitive@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" - dependencies: - is-callable "^1.1.1" - is-date-object "^1.0.1" - is-symbol "^1.0.1" - es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14: version "0.10.16" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.16.tgz#1ef1b04f3d09db6a5d630226d62202f2e425e45a" @@ -1924,11 +1878,7 @@ escope@^3.6.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-config-standard-jsx@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-4.0.1.tgz#cd4e463d0268e2d9e707f61f42f73f5b3333c642" - -eslint-config-standard@10.2.1, eslint-config-standard@latest: +eslint-config-standard@latest: version "10.2.1" resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591" @@ -1947,7 +1897,7 @@ eslint-module-utils@^2.0.0: debug "2.2.0" pkg-dir "^1.0.0" -eslint-plugin-import@latest, eslint-plugin-import@~2.2.0: +eslint-plugin-import@latest: version "2.2.0" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.2.0.tgz#72ba306fad305d67c4816348a4699a4229ac8b4e" dependencies: @@ -1962,7 +1912,7 @@ eslint-plugin-import@latest, eslint-plugin-import@~2.2.0: minimatch "^3.0.3" pkg-up "^1.0.0" -eslint-plugin-node@latest, eslint-plugin-node@~4.2.2: +eslint-plugin-node@latest: version "4.2.2" resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-4.2.2.tgz#82959ca9aed79fcbd28bb1b188d05cac04fb3363" dependencies: @@ -1972,25 +1922,15 @@ eslint-plugin-node@latest, eslint-plugin-node@~4.2.2: resolve "^1.1.7" semver "5.3.0" -eslint-plugin-promise@latest, eslint-plugin-promise@~3.5.0: +eslint-plugin-promise@latest: version "3.5.0" resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca" -eslint-plugin-react@~6.10.0: - version "6.10.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz#c5435beb06774e12c7db2f6abaddcbf900cd3f78" - dependencies: - array.prototype.find "^2.0.1" - doctrine "^1.2.2" - has "^1.0.1" - jsx-ast-utils "^1.3.4" - object.assign "^4.0.4" - -eslint-plugin-standard@latest, eslint-plugin-standard@~3.0.1: +eslint-plugin-standard@latest: version "3.0.1" resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2" -eslint@latest, eslint@~3.19.0: +eslint@latest: version "3.19.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc" dependencies: @@ -2373,10 +2313,6 @@ find-line-column@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/find-line-column/-/find-line-column-0.5.2.tgz#db00238ff868551a182e74a103416d295a98c8ca" -find-root@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.0.0.tgz#962ff211aab25c6520feeeb8d6287f8f6e95807a" - find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -2421,10 +2357,6 @@ for-own@^0.1.4: dependencies: for-in "^1.0.1" -foreach@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -2496,7 +2428,7 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: mkdirp ">=0.5 0" rimraf "2" -function-bind@^1.0.2, function-bind@^1.1.0: +function-bind@^1.0.2: version "1.1.0" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771" @@ -2504,9 +2436,9 @@ functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" -fuse-box@beta: - version "2.0.0-beta.23" - resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-2.0.0-beta.23.tgz#3537199096d0e0374975e965954fba918205a23d" +fuse-box@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-2.0.0.tgz#b5a712c91e2266af41b3045e6ed341d64aafb992" dependencies: acorn "^4.0.3" acorn-es7 "^0.1.0" @@ -2575,10 +2507,6 @@ get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" -get-stdin@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398" - get-stream@^2.2.0: version "2.3.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" @@ -2888,7 +2816,7 @@ ignore-by-default@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" -ignore@^3.0.11, ignore@^3.0.9, ignore@^3.2.0: +ignore@^3.0.11, ignore@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.0.tgz#3812d22cbe9125f2c2b4915755a1b8abd745a001" @@ -3037,20 +2965,12 @@ is-builtin-module@^1.0.0: dependencies: builtin-modules "^1.0.0" -is-callable@^1.1.1, is-callable@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2" - is-ci@^1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e" dependencies: ci-info "^1.0.0" -is-date-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - is-dotfile@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d" @@ -3188,10 +3108,6 @@ is-stream@^1.0.0, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" -is-symbol@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572" - is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -3699,10 +3615,6 @@ jstransformer@1.0.0: is-promise "^2.0.0" promise "^7.0.1" -jsx-ast-utils@^1.3.4: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1" - jwa@^1.1.4: version "1.1.5" resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.5.tgz#a0552ce0220742cd52e153774a32905c30e756e5" @@ -4670,18 +4582,6 @@ object-component@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" -object-keys@^1.0.10, object-keys@^1.0.8: - version "1.0.11" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" - -object.assign@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc" - dependencies: - define-properties "^1.1.2" - function-bind "^1.1.0" - object-keys "^1.0.10" - object.omit@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" @@ -5091,21 +4991,6 @@ pixelmatch@^4.0.0: dependencies: pngjs "^3.0.0" -pkg-conf@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.0.0.tgz#071c87650403bccfb9c627f58751bfe47c067279" - dependencies: - find-up "^2.0.0" - load-json-file "^2.0.0" - -pkg-config@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pkg-config/-/pkg-config-1.1.1.tgz#557ef22d73da3c8837107766c52eadabde298fe4" - dependencies: - debug-log "^1.0.0" - find-root "^1.0.0" - xtend "^4.0.1" - pkg-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" @@ -5799,10 +5684,6 @@ run-async@^2.2.0: dependencies: is-promise "^2.1.0" -run-parallel@^1.1.2: - version "1.1.6" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.6.tgz#29003c9a2163e01e2d2dfc90575f2c6c1d61a039" - rx-lite@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" @@ -6235,29 +6116,6 @@ stack-trace@0.0.x: version "0.0.9" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.9.tgz#a8f6eaeca90674c333e7c43953f275b451510695" -standard-engine@~7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-7.0.0.tgz#ebb77b9c8fc2c8165ffa353bd91ba0dff41af690" - dependencies: - deglob "^2.1.0" - get-stdin "^5.0.1" - minimist "^1.1.0" - pkg-conf "^2.0.0" - -standard@latest: - version "10.0.2" - resolved "https://registry.yarnpkg.com/standard/-/standard-10.0.2.tgz#974c1c53cc865b075a4b576e78441e1695daaf7b" - dependencies: - eslint "~3.19.0" - eslint-config-standard "10.2.1" - eslint-config-standard-jsx "4.0.1" - eslint-plugin-import "~2.2.0" - eslint-plugin-node "~4.2.2" - eslint-plugin-promise "~3.5.0" - eslint-plugin-react "~6.10.0" - eslint-plugin-standard "~3.0.1" - standard-engine "~7.0.0" - "statuses@>= 1.3.1 < 2", statuses@~1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" @@ -6683,10 +6541,6 @@ underscore@~1.8.3: version "1.8.3" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" -uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - universalify@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778"