From f60a5f12dd6278af3e97e1215b8457dd4fb6c6dd Mon Sep 17 00:00:00 2001 From: shanyun Date: Sun, 21 Aug 2022 15:59:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=97=A0=E5=AE=9E=E8=B4=A8=E6=80=A7?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=BA=AF=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/db.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/db.js b/lib/db.js index a1fe32c..be94ecc 100644 --- a/lib/db.js +++ b/lib/db.js @@ -2,7 +2,7 @@ const Tapable = require('tapable') class DB extends Tapable { constructor() { - // TODO + // TODO } request() { From 25a1c4dffab184434655716bf87ab40f27a362f6 Mon Sep 17 00:00:00 2001 From: tangmingxiang <55589577+tangmingxiang@users.noreply.github.com> Date: Mon, 22 Aug 2022 21:53:01 +0800 Subject: [PATCH 2/7] Update Readme.md --- Readme.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 48612c6..bc89432 100644 --- a/Readme.md +++ b/Readme.md @@ -8,4 +8,13 @@ ### 注意 -大家可以选择 tapable@0.2，也可以选择 tapable@1.x，这个看大家个人喜好哈，虽然我用的是0.2 \ No newline at end of file +大家可以选择 tapable@0.2，也可以选择 tapable@1.x，这个看大家个人喜好哈，虽然我用的是0.2 + +### 项目克隆至本地之后， npm install 、 npm run test 之后报如下错误 + Cannot start ChromeHeadless + Can not find the binary C:\Users\唐明响\Desktop\前端进阶培训_极客时间\homework\homework2\node_modules\puppeteer\.local-chromium\win64-1022525\chrome-win\chrome.exe + Please set env variable CHROME_BIN + 此时只需要将 karma.conf.js 配置文件中的 + process.env.CHROME_BIN = require('puppeteer').executablePath() 改为 + process.env.CHROME_BIN = 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' （即本地 Chrome 浏览器启动的路径即可） + 参考 https://www.npmjs.com/package/karma-chrome-launcher From 6dde18d16ab75186a92391ba9c62f9ed9757f63a Mon Sep 17 00:00:00 2001 From: tangmingxiang <55589577+tangmingxiang@users.noreply.github.com> Date: Mon, 22 Aug 2022 21:54:21 +0800 Subject: [PATCH 3/7] Update Readme.md --- Readme.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Readme.md b/Readme.md index bc89432..5140de5 100644 --- a/Readme.md +++ b/Readme.md @@ -11,10 +11,10 @@ 大家可以选择 tapable@0.2，也可以选择 tapable@1.x，这个看大家个人喜好哈，虽然我用的是0.2 ### 项目克隆至本地之后， npm install 、 npm run test 之后报如下错误 - Cannot start ChromeHeadless - Can not find the binary C:\Users\唐明响\Desktop\前端进阶培训_极客时间\homework\homework2\node_modules\puppeteer\.local-chromium\win64-1022525\chrome-win\chrome.exe - Please set env variable CHROME_BIN - 此时只需要将 karma.conf.js 配置文件中的 - process.env.CHROME_BIN = require('puppeteer').executablePath() 改为 - process.env.CHROME_BIN = 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' （即本地 Chrome 浏览器启动的路径即可） - 参考 https://www.npmjs.com/package/karma-chrome-launcher +> Cannot start ChromeHeadless +> Can not find the binary C:\Users\唐明响\Desktop\前端进阶培训_极客时间\homework\homework2\node_modules\puppeteer\.local-chromium\win64-1022525\chrome-win\chrome.exe +> Please set env variable CHROME_BIN +> 此时只需要将 karma.conf.js 配置文件中的 +> process.env.CHROME_BIN = require('puppeteer').executablePath() 改为 +> process.env.CHROME_BIN = 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' （即本地 Chrome 浏览器启动的路径即可） +> 参考 https://www.npmjs.com/package/karma-chrome-launcher From e18f2c7619329a4c9e89b4b1df66264b5b596e15 Mon Sep 17 00:00:00 2001 From: shanyun Date: Fri, 26 Aug 2022 08:11:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E5=91=A8=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=5F1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- karma.conf.js | 4 +++- lib/db.js | 42 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 9f54051..b28c843 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,6 +1,8 @@ // Karma configuration // Generated on Fri Aug 11 2017 22:02:05 GMT+0800 (CST) -process.env.CHROME_BIN = require('puppeteer').executablePath() +// process.env.CHROME_BIN = require('puppeteer').executablePath() +process.env.CHROME_BIN = 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' +console.log(process.env.CHROME_BIN); module.exports = function(config) { config.set({ diff --git a/lib/db.js b/lib/db.js index be94ecc..404db26 100644 --- a/lib/db.js +++ b/lib/db.js @@ -1,12 +1,48 @@ const Tapable = require('tapable') class DB extends Tapable { - constructor() { + constructor(options) { // TODO + super() + this.options = options } - request() { - // TODO + // request(options) { + // // TODO + // // return this.applyPluginsWaterfall('endpoint') // 1 + // // return this.applyPluginsWaterfall0('endpoint') // 1 + // // return this.applyPluginsBailResult('endpoint') // 1 + // // if (this.options) { + // // this.options = this.applyPluginsWaterfall0('options',this.options) // + // // } + // return this.applyPluginsBailResult('endpoint',options) // 1 2 + // } + + // request(options) { + // if (!this.options) { + // this.options = {} + // } + // Object.assign(this.options, options); + // this.options = this.applyPluginsWaterfall0('options',this.options) // + // return this.applyPluginsBailResult('endpoint', this.options) // 1 2 3 + // } + + request(params = {}) { + if (!this.options) { + this.options = {} + } + let newParams = Object.assign(params, this.options) + this.applyPluginsWaterfall0('options',newParams) + newParams = Object.assign(newParams, this.options) + return new Promise((resolve,reject) => { + this.applyPluginsBailResult('endpoint', newParams).then(res => { + // 超时 + // return this.applyPluginsWaterfall('judge',res) ? reject(res) : resolve(res) + return this.applyPluginsBailResult('judge',res) ? reject(res) : resolve(res) + }, res => { + return reject() + }) + }) } } From 749afc93ca77927ec0c8f9bf36a73e3f5746f94a Mon Sep 17 00:00:00 2001 From: tangmingxiang <55589577+tangmingxiang@users.noreply.github.com> Date: Mon, 29 Aug 2022 22:56:58 +0800 Subject: [PATCH 5/7] Update karma.conf.js --- karma.conf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index b28c843..5fd0126 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,7 +1,7 @@ // Karma configuration // Generated on Fri Aug 11 2017 22:02:05 GMT+0800 (CST) -// process.env.CHROME_BIN = require('puppeteer').executablePath() -process.env.CHROME_BIN = 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' +process.env.CHROME_BIN = require('puppeteer').executablePath() +// process.env.CHROME_BIN = 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' console.log(process.env.CHROME_BIN); module.exports = function(config) { config.set({ From 9ca52b219faa4a523c99011847e3f41ed8ddbfa2 Mon Sep 17 00:00:00 2001 From: tangmingxiang <55589577+tangmingxiang@users.noreply.github.com> Date: Mon, 29 Aug 2022 23:00:03 +0800 Subject: [PATCH 6/7] Update karma.conf.js --- karma.conf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 5fd0126..b28c843 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,7 +1,7 @@ // Karma configuration // Generated on Fri Aug 11 2017 22:02:05 GMT+0800 (CST) -process.env.CHROME_BIN = require('puppeteer').executablePath() -// process.env.CHROME_BIN = 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' +// process.env.CHROME_BIN = require('puppeteer').executablePath() +process.env.CHROME_BIN = 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' console.log(process.env.CHROME_BIN); module.exports = function(config) { config.set({ From 647c229c461a8ada53e1121485727556bb54c8f8 Mon Sep 17 00:00:00 2001 From: tangmingxiang <55589577+tangmingxiang@users.noreply.github.com> Date: Thu, 1 Dec 2022 22:43:12 +0800 Subject: [PATCH 7/7] Update node.js.yml --- .github/workflows/node.js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 789fe49..1957fad 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest - strategy: + strategy: # strategy 定义 job 的运行参数 matrix: node-version: [16.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ @@ -27,4 +27,4 @@ jobs: node-version: ${{ matrix.node-version }} - run: npm i # Just run tests once - - run: npm test \ No newline at end of file + - run: npm test