Merge branch 'Hotfix'

# Conflicts: # package.json
bikenik · Jun 1, 2020 · b599c97 · b599c97
2 parents c0894fd + b8335d1
commit b599c97
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -1,5 +1,6 @@
 /* eslint new-cap: ["error", { "capIsNew": false }] */
 /* eslint import/no-unresolved: [2, { commonjs: false, amd: false }] */
+/* eslint-disable node/prefer-promises/fs */
 'use strict'
 const fs = require('fs')
 const alfy = require('alfy')

diff --git a/info.plist b/info.plist
@@ -3080,7 +3080,7 @@ custome translate</string>
 	<key>variablesdontexport</key>
 	<array/>
 	<key>version</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>webaddress</key>
 	<string>https://github.com/bikenik/alfred-lingualeo#readme</string>
 </dict>

diff --git a/package.json b/package.json
@@ -1,6 +1,12 @@
 {
 	"name": "alfred-lingualeo",
+<<<<<<< HEAD
 	"version": "1.4.0",
+||||||| merged common ancestors
+	"version": "1.3.1",
+=======
+	"version": "1.4.1",
+>>>>>>> Hotfix
 	"description": "lingualeo dictionary",
 	"license": "MIT",
 	"repository": "bikenik/alfred-lingualeo",
@@ -10,7 +16,7 @@
 		"url": "http://bikenik.org"
 	},
 	"engines": {
-		"node": ">=7.6"
+		"node": ">=12.6"
 	},
 	"scripts": {
 		"test": "xo",

diff --git a/readme.md b/readme.md
@@ -12,7 +12,7 @@
 $ npm install --global alfred-lingualeo
 ```
 
-*Requires: [Node.js](https://nodejs.org) 7.6+, Alfred [Powerpack](https://www.alfredapp.com/powerpack/)., account [LinguaLeo](https://lingualeo.com)*
+*Requires: [Node.js](https://nodejs.org) 12.6+, Alfred [Powerpack](https://www.alfredapp.com/powerpack/)., account [LinguaLeo](https://lingualeo.com)*
 
 ## Preview / Usage
 

diff --git a/src/api/dictionary.js b/src/api/dictionary.js
@@ -1,5 +1,6 @@
 /* eslint camelcase: ["error", {properties: "never"}] */
 /* eslint new-cap: ["error", { "capIsNew": false }] */
+/* eslint-disable node/prefer-promises/fs */
 'use strict'
 const fs = require('fs')
 const alfy = require('alfy')

diff --git a/src/api/refresh-data/user-info.js b/src/api/refresh-data/user-info.js
@@ -6,8 +6,6 @@ const WorkflowError = require('../../utils/error')
 module.exports = () => {
 	const doLogin = async (user, pw) => {
 		let response1
-		user = '2bikenik@gmail.com'
-		pw = 'ajxCbiB2mPndE'
 		try {
 			response1 = await got.get(`https://lingualeo.com/api/login?email=${user}&password=${pw}`)
 			const userInfo = JSON.parse(response1.body)