From 200d467b435461fa250cdabb7fc58fc935ee48d6 Mon Sep 17 00:00:00 2001 From: qjfeng Date: Mon, 18 Nov 2019 16:02:47 +0800 Subject: [PATCH 1/2] feat: try docker --- .travis.yml | 10 ++++++++++ Dockerfile | 5 +++++ build/webpack.config.js | 1 - dist/index.js | 2 +- package-lock.json | 41 ++++++++++++++++++++++++++++++----------- 5 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 Dockerfile diff --git a/.travis.yml b/.travis.yml index 4a8fead..6f76e50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,19 @@ node_js: - '9.4.0' - '10.15.3' +services: + - docker + +before_install: + - npm install + script: - npm test - npm run test:cover + - npm run build + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build -t supfn/promise-ployfill:latest . + - docker push supfn/promise-ployfill:latest after_script: - npm run coverage diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..62686b8 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM nginx + +COPY . /usr/share/nginx/html/ + +EXPOSE 80 diff --git a/build/webpack.config.js b/build/webpack.config.js index 6d57cf8..549ee7f 100644 --- a/build/webpack.config.js +++ b/build/webpack.config.js @@ -11,4 +11,3 @@ module.exports = { globalObject: 'this' } }; - diff --git a/dist/index.js b/dist/index.js index 47f939d..90b677d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1 +1 @@ -!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.Promise=t():e.Promise=t()}(this,function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=2)}([function(e,t){var n;n=function(){return this}();try{n=n||new Function("return this")()}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t){var n,r,o=e.exports={};function i(){throw new Error("setTimeout has not been defined")}function s(){throw new Error("clearTimeout has not been defined")}function c(e){if(n===setTimeout)return setTimeout(e,0);if((n===i||!n)&&setTimeout)return n=setTimeout,setTimeout(e,0);try{return n(e,0)}catch(t){try{return n.call(null,e,0)}catch(t){return n.call(this,e,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:i}catch(e){n=i}try{r="function"==typeof clearTimeout?clearTimeout:s}catch(e){r=s}}();var u,a=[],l=!1,f=-1;function h(){l&&u&&(l=!1,u.length?a=u.concat(a):f=-1,a.length&&d())}function d(){if(!l){var e=c(h);l=!0;for(var t=a.length;t;){for(u=a,a=[];++f1)for(var n=1;n{this._onFulfilleds.forEach(t=>t(e))})}}_reject(e){this._status===r.PENDING&&(this._status=r.REJECTED,this._reason=e,o(()=>{this._onRejecteds.forEach(t=>t(e))}))}then(e,t){if(this.constructor!==i&&!i.isPrototypeOf(this.constructor))throw TypeError("incorrect-subclassing");e="function"==typeof e?e:e=>e,t="function"==typeof t?t:e=>{throw e};let n=new i((i,s)=>{let c=t=>{try{let r=e(t);this._resolutionProcedure(n,r,i,s)}catch(e){s(e)}},u=e=>{try{let r=t(e);this._resolutionProcedure(n,r,i,s)}catch(e){s(e)}};this._status===r.PENDING&&(this._onFulfilleds.push(c),this._onRejecteds.push(u)),this._status===r.FULFILLED&&o(()=>c(this._value)),this._status===r.REJECTED&&o(()=>u(this._reason))});return n}_resolutionProcedure(e,t,n,r){if(e===t)throw TypeError("chaining cycle detected for promise");if(t instanceof i)t.then(t=>this._resolutionProcedure(e,t,n,r),r);else if(t&&"object"==typeof t||"function"==typeof t){let o=!1;try{let i=t.then;if("function"!=typeof i)return void n(t);let s=t=>{o||(o=!0,this._resolutionProcedure(e,t,n,r))},c=e=>{o||(o=!0,r(e))};i.call(t,s,c)}catch(e){if(o)return;o=!0,r(e)}}else n(t)}catch(e){return this.then(null,e)}finally(e){return this.then(t=>i.resolve(e()).then(()=>t),t=>i.resolve(e()).then(()=>{throw t}))}static resolve(e){if(this!==i&&!i.isPrototypeOf(this))throw TypeError("incorrect-subclassing");return e instanceof i?e:new i(t=>t(e))}static reject(e){if(this!==i&&!i.isPrototypeOf(this))throw TypeError("incorrect-subclassing");return new i((t,n)=>n(e))}static race(e){if(this!==i&&!i.isPrototypeOf(this))throw TypeError("incorrect-subclassing");return void 0===e.length?i.reject(new TypeError("argument is not iterable")):0===e.length?new i(()=>{}):new i((t,n)=>{e.forEach(e=>{i.resolve(e).then(t,n)})})}static all(e){if(this!==i&&!i.isPrototypeOf(this))throw TypeError("incorrect-subclassing");return void 0===e.length?i.reject(new TypeError("argument is not iterable")):0===e.length?i.resolve([]):new i((t,n)=>{let r=e.length;e.forEach((o,s)=>{try{i.resolve(o).then(n=>{e[s]=n,0==--r&&t(e)},n)}catch(e){n(e)}})})}static deferred(){let e={};return e.promise=new i((t,n)=>{e.resolve=t,e.reject=n}),e}}e.exports?e.exports=i:window.Promise=i},function(e,t){e.exports={PENDING:"pending",FULFILLED:"fulfilled",REJECTED:"rejected"}},function(e,t,n){(function(t,n){e.exports=function(e){if(void 0!==n&&"function"==typeof n.nextTick)return n.nextTick(e);if("undefined"!=typeof MutationObserver){let t=1;const n=new MutationObserver(e),r=document.createTextNode(String(t));return n.observe(r,{characterData:!0}),t^=1,r.data=String(t),n}return function(e){return"function"==typeof t?t(e):setTimeout(e,0)}(e)}}).call(this,n(5).setImmediate,n(1))},function(e,t,n){(function(e){var r=void 0!==e&&e||"undefined"!=typeof self&&self||window,o=Function.prototype.apply;function i(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new i(o.call(setTimeout,r,arguments),clearTimeout)},t.setInterval=function(){return new i(o.call(setInterval,r,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},i.prototype.unref=i.prototype.ref=function(){},i.prototype.close=function(){this._clearFn.call(r,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(6),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(this,n(0))},function(e,t,n){(function(e,t){!function(e,n){"use strict";if(!e.setImmediate){var r,o,i,s,c,u=1,a={},l=!1,f=e.document,h=Object.getPrototypeOf&&Object.getPrototypeOf(e);h=h&&h.setTimeout?h:e,"[object process]"==={}.toString.call(e.process)?r=function(e){t.nextTick(function(){p(e)})}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?e.MessageChannel?((i=new MessageChannel).port1.onmessage=function(e){p(e.data)},r=function(e){i.port2.postMessage(e)}):f&&"onreadystatechange"in f.createElement("script")?(o=f.documentElement,r=function(e){var t=f.createElement("script");t.onreadystatechange=function(){p(e),t.onreadystatechange=null,o.removeChild(t),t=null},o.appendChild(t)}):r=function(e){setTimeout(p,0,e)}:(s="setImmediate$"+Math.random()+"$",c=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(s)&&p(+t.data.slice(s.length))},e.addEventListener?e.addEventListener("message",c,!1):e.attachEvent("onmessage",c),r=function(t){e.postMessage(s+t,"*")}),h.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n1)for(var n=1;n{this._onFulfilleds.forEach(t=>t(e))})}}_reject(e){this._status===r.PENDING&&(this._status=r.REJECTED,this._reason=e,o(()=>{this._onRejecteds.forEach(t=>t(e))}))}then(e,t){if(this.constructor!==i&&!i.isPrototypeOf(this.constructor))throw TypeError("incorrect-subclassing");e="function"==typeof e?e:e=>e,t="function"==typeof t?t:e=>{throw e};let n=new i((i,s)=>{let c=t=>{try{let r=e(t);this._resolutionProcedure(n,r,i,s)}catch(e){s(e)}},u=e=>{try{let r=t(e);this._resolutionProcedure(n,r,i,s)}catch(e){s(e)}};this._status===r.PENDING&&(this._onFulfilleds.push(c),this._onRejecteds.push(u)),this._status===r.FULFILLED&&o(()=>c(this._value)),this._status===r.REJECTED&&o(()=>u(this._reason))});return n}_resolutionProcedure(e,t,n,r){if(e===t)throw TypeError("chaining cycle detected for promise");if(t instanceof i)t.then(t=>this._resolutionProcedure(e,t,n,r),r);else if(!t||"object"!=typeof t&&"function"!=typeof t)n(t);else{let o=!1;try{let i=t.then;if("function"!=typeof i)return void n(t);let s=t=>{o||(o=!0,this._resolutionProcedure(e,t,n,r))},c=e=>{o||(o=!0,r(e))};i.call(t,s,c)}catch(e){if(o)return;o=!0,r(e)}}}catch(e){return this.then(null,e)}finally(e){return this.then(t=>i.resolve(e()).then(()=>t),t=>i.resolve(e()).then(()=>{throw t}))}static resolve(e){if(this!==i&&!i.isPrototypeOf(this))throw TypeError("incorrect-subclassing");return e instanceof i?e:new i(t=>t(e))}static reject(e){if(this!==i&&!i.isPrototypeOf(this))throw TypeError("incorrect-subclassing");return new i((t,n)=>n(e))}static race(e){if(this!==i&&!i.isPrototypeOf(this))throw TypeError("incorrect-subclassing");return void 0===e.length?i.reject(new TypeError("argument is not iterable")):0===e.length?new i(()=>{}):new i((t,n)=>{e.forEach(e=>{i.resolve(e).then(t,n)})})}static all(e){if(this!==i&&!i.isPrototypeOf(this))throw TypeError("incorrect-subclassing");return void 0===e.length?i.reject(new TypeError("argument is not iterable")):0===e.length?i.resolve([]):new i((t,n)=>{let r=e.length;e.forEach((o,s)=>{try{i.resolve(o).then(n=>{e[s]=n,0==--r&&t(e)},n)}catch(e){n(e)}})})}static deferred(){let e={};return e.promise=new i((t,n)=>{e.resolve=t,e.reject=n}),e}}e.exports?e.exports=i:window.Promise=i},function(e,t){e.exports={PENDING:"pending",FULFILLED:"fulfilled",REJECTED:"rejected"}},function(e,t,n){(function(t,n){e.exports=function(e){if(void 0!==n&&"function"==typeof n.nextTick)return n.nextTick(e);if("undefined"!=typeof MutationObserver){let t=1;const n=new MutationObserver(e),r=document.createTextNode(String(t));return n.observe(r,{characterData:!0}),t^=1,r.data=String(t),n}return function(e){return"function"==typeof t?t(e):setTimeout(e,0)}(e)}}).call(this,n(5).setImmediate,n(1))},function(e,t,n){(function(e){var r=void 0!==e&&e||"undefined"!=typeof self&&self||window,o=Function.prototype.apply;function i(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new i(o.call(setTimeout,r,arguments),clearTimeout)},t.setInterval=function(){return new i(o.call(setInterval,r,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},i.prototype.unref=i.prototype.ref=function(){},i.prototype.close=function(){this._clearFn.call(r,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(6),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(this,n(0))},function(e,t,n){(function(e,t){!function(e,n){"use strict";if(!e.setImmediate){var r,o,i,s,c,u=1,a={},l=!1,f=e.document,h=Object.getPrototypeOf&&Object.getPrototypeOf(e);h=h&&h.setTimeout?h:e,"[object process]"==={}.toString.call(e.process)?r=function(e){t.nextTick(function(){p(e)})}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?e.MessageChannel?((i=new MessageChannel).port1.onmessage=function(e){p(e.data)},r=function(e){i.port2.postMessage(e)}):f&&"onreadystatechange"in f.createElement("script")?(o=f.documentElement,r=function(e){var t=f.createElement("script");t.onreadystatechange=function(){p(e),t.onreadystatechange=null,o.removeChild(t),t=null},o.appendChild(t)}):r=function(e){setTimeout(p,0,e)}:(s="setImmediate$"+Math.random()+"$",c=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(s)&&p(+t.data.slice(s.length))},e.addEventListener?e.addEventListener("message",c,!1):e.attachEvent("onmessage",c),r=function(t){e.postMessage(s+t,"*")}),h.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n Date: Mon, 18 Nov 2019 08:03:36 +0000 Subject: [PATCH 2/2] build(deps): bump lodash.template from 4.4.0 to 4.5.0 Bumps [lodash.template](https://github.com/lodash/lodash) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.4.0...4.5.0) Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 00982c4..6fbfc4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4949,12 +4949,12 @@ "dev": true }, "lodash.template": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz", - "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", + "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", "dev": true, "requires": { - "lodash._reinterpolate": "~3.0.0", + "lodash._reinterpolate": "^3.0.0", "lodash.templatesettings": "^4.0.0" } }, @@ -6488,7 +6488,7 @@ "dependencies": { "get-stream": { "version": "3.0.0", - "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", "dev": true } @@ -6849,7 +6849,7 @@ "dependencies": { "get-stream": { "version": "3.0.0", - "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", "dev": true }