From ef352dff14b3e096b80b60bfe1aa293a1f03b160 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sun, 30 Dec 2018 15:37:26 +0700 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20la?= =?UTF-8?q?zy.js=20=D0=BD=D0=B0=20lodash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 14 +++++++------- package.json | 3 ++- server/controllers/MiscController.js | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac30acb4..08d22a66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -949,6 +949,12 @@ "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", "dev": true }, + "babel-plugin-syntax-dynamic-import": { + "version": "6.18.0", + "resolved": "http://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", + "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=", + "dev": true + }, "babel-plugin-syntax-exponentiation-operator": { "version": "6.13.0", "resolved": "http://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", @@ -4728,11 +4734,6 @@ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true }, - "lazy.js": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.5.1.tgz", - "integrity": "sha512-p9v24vaKrzS2mEx3yuzva/3M6I3+HwvXd0pB1Xf/IvsFIMdhQgmym7JBO0e7c0OZmKTo07sCuiCIm6jazSWFNw==" - }, "lcid": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", @@ -4799,8 +4800,7 @@ "lodash": { "version": "4.17.11", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", - "dev": true + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" }, "lodash.debounce": { "version": "4.0.8", diff --git a/package.json b/package.json index 1e654752..418f4f3a 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "babel-core": "^6.22.1", "babel-eslint": "^10.0.1", "babel-loader": "^7.1.1", + "babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-preset-env": "^1.3.2", "css-loader": "^1.0.0", "eslint": "^5.11.1", @@ -43,7 +44,7 @@ "axios": "^0.18.0", "bluebird": "^3.5.3", "express": "^4.16.4", - "lazy.js": "^0.5.1", + "lodash": "^4.17.11", "sql-template-strings": "^2.2.2", "sqlite": "^3.0.0", "vue": "^2.5.21", diff --git a/server/controllers/MiscController.js b/server/controllers/MiscController.js index 7245d246..54fd1d5b 100644 --- a/server/controllers/MiscController.js +++ b/server/controllers/MiscController.js @@ -1,11 +1,11 @@ const log = require('../core/getLogger').getLog(); const BaseController = require('./BaseController'); -const Lazy = require('lazy.js'); +const _ = require('lodash'); class MiscController extends BaseController { async getConfig(req, res) { if (Array.isArray(req.body.params)) - return Lazy(this.config).pick(req.body.params).toObject(); + return _.pick(this.config, req.body.params); //bad request res.status(400).send({error: 'params is not an array'}); return false;