From c04123a2d1b70641d2ba69aebe6c3608bfa1756b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 3 May 2018 16:55:43 +0530 Subject: [PATCH] Remove frappejs dep --- client/electron.js | 2 +- package.json | 6 ++++-- server/index.js | 1 - yarn.lock | 49 ---------------------------------------------- 4 files changed, 5 insertions(+), 53 deletions(-) diff --git a/client/electron.js b/client/electron.js index 76c74462..92b9226e 100644 --- a/client/electron.js +++ b/client/electron.js @@ -28,7 +28,7 @@ module.exports = { await frappe.getSingle('SystemSettings'); frappe.desk = new Desk(columns); - await frappe.login(); + await frappe.login('Administrator'); } }; diff --git a/package.json b/package.json index b2927543..b713d67b 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ "express": "^4.16.2", "flatpickr": "^4.3.2", "frappe-datatable": "frappe/datatable", - "frappejs": "../frappejs", "jquery": "^3.3.1", "jwt-simple": "^0.5.1", "luxon": "^1.0.0", @@ -69,5 +68,8 @@ "url": "https://github.com/frappe/frappejs/issues" }, "homepage": "https://github.com/frappe/frappejs#readme", - "devDependencies": {} + "devDependencies": {}, + "engines": { + "node": "8.11.1" + } } diff --git a/server/index.js b/server/index.js index e4cbccb6..10ac5775 100644 --- a/server/index.js +++ b/server/index.js @@ -27,7 +27,6 @@ module.exports = { if (models) { frappe.registerModels(models, 'server'); - frappe.models.User.documentClass = require('frappejs/models/doctype/User/UserServer.js'); } // database diff --git a/yarn.lock b/yarn.lock index f26156f6..89dd8f13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1425,55 +1425,6 @@ frappe-datatable@frappe/datatable: lodash "^4.17.5" sortablejs "^1.7.0" -frappejs@../frappejs: - version "0.0.5" - dependencies: - autoprefixer "^7.2.4" - awesomplete "^1.1.2" - body-parser "^1.18.2" - bootstrap "^4.0.0" - clusterize.js "^0.18.0" - codemirror "^5.35.0" - commander "^2.13.0" - cors "^2.8.4" - deepmerge "^2.1.0" - eslint "^4.19.1" - express "^4.16.2" - flatpickr "^4.3.2" - frappe-datatable frappe/datatable - frappejs "../frappejs" - jquery "^3.3.1" - jwt-simple "^0.5.1" - luxon "^1.0.0" - mkdirp "^0.5.1" - mocha "^4.1.0" - moment "^2.20.1" - morgan "^1.9.0" - mysql "^2.15.0" - node-fetch "^1.7.3" - node-sass "^4.7.2" - nodemon "^1.14.7" - nunjucks "^3.1.0" - octicons "^7.2.0" - passport "^0.4.0" - passport-jwt "^4.0.0" - popper.js "^1.12.9" - precss "^2.0.0" - puppeteer "^1.2.0" - rollup "^0.55.1" - rollup-plugin-commonjs "^8.3.0" - rollup-plugin-html "^0.2.1" - rollup-plugin-json "^2.3.0" - rollup-plugin-node-resolve "^3.0.2" - rollup-plugin-postcss "^1.2.7" - rollup-plugin-replace "^2.0.0" - rollup-plugin-sass "^0.5.3" - showdown "^1.8.6" - socket.io "^2.0.4" - sortablejs "^1.7.0" - sqlite3 "^3.1.13" - walk "^2.3.9" - fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"