From 1a9d7477f357fe7ee043e6cdd47a72034b816d56 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 13 May 2020 16:01:46 -0700 Subject: [PATCH 1/3] Revert "Revert changes to pre-3.9 behavior, update version to 1.13.0" --- README.md | 2 +- bower.json | 2 +- package.json | 2 +- tslib.d.ts | 2 +- tslib.es6.js | 19 ++++++++++++++----- tslib.js | 26 +++++++++++++++++--------- 6 files changed, 35 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 2038cf9..c14f87c 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ For JSPM users: "importHelpers": true, "baseUrl": "./", "paths": { - "tslib" : ["jspm_packages/npm/tslib@1.13.0/tslib.d.ts"] + "tslib" : ["jspm_packages/npm/tslib@1.12.0/tslib.d.ts"] } } } diff --git a/bower.json b/bower.json index dd46530..b0363e0 100644 --- a/bower.json +++ b/bower.json @@ -4,7 +4,7 @@ "Microsoft Corp." ], "homepage": "http://typescriptlang.org/", - "version": "1.13.0", + "version": "1.12.0", "license": "0BSD", "description": "Runtime library for TypeScript helper functions", "keywords": [ diff --git a/package.json b/package.json index 72a6455..d2edd79 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tslib", "author": "Microsoft Corp.", "homepage": "https://www.typescriptlang.org/", - "version": "1.13.0", + "version": "1.12.0", "license": "0BSD", "description": "Runtime library for TypeScript helper functions", "keywords": [ diff --git a/tslib.d.ts b/tslib.d.ts index 0756b28..57ad995 100644 --- a/tslib.d.ts +++ b/tslib.d.ts @@ -34,4 +34,4 @@ export declare function __importStar(mod: T): T; export declare function __importDefault(mod: T): T | { default: T }; export declare function __classPrivateFieldGet(receiver: T, privateMap: { has(o: T): boolean, get(o: T): V | undefined }): V; export declare function __classPrivateFieldSet(receiver: T, privateMap: { has(o: T): boolean, set(o: T, value: V): any }, value: V): V; -export declare function __createBinding(object: object, target: object, key: PropertyKey, objectKey?: PropertyKey): void; \ No newline at end of file +export declare function __createBinding(object: object, target: object, key: PropertyKey, objectKey?: PropertyKey): void; diff --git a/tslib.es6.js b/tslib.es6.js index 0e0d8d0..ce26163 100644 --- a/tslib.es6.js +++ b/tslib.es6.js @@ -103,13 +103,16 @@ export function __generator(thisArg, body) { } } -export function __createBinding(o, m, k, k2) { +export const __createBinding = Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; -} +}); export function __exportStar(m, exports) { - for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) exports[p] = m[p]; + for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p); } export function __values(o) { @@ -190,11 +193,17 @@ export function __makeTemplateObject(cooked, raw) { return cooked; }; +const __setModuleDefault = Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}; + export function __importStar(mod) { if (mod && mod.__esModule) return mod; var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result.default = mod; + if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); return result; } diff --git a/tslib.js b/tslib.js index e5b7c9b..50dc71c 100644 --- a/tslib.js +++ b/tslib.js @@ -12,7 +12,6 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ***************************************************************************** */ - /* global global, define, System, Reflect, Promise */ var __extends; var __assign; @@ -144,14 +143,17 @@ var __createBinding; } }; - __createBinding = function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; + __exportStar = function(m, exports) { + for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p); }; - __exportStar = function (m, exports) { - for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) exports[p] = m[p]; - }; + __createBinding = Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + }) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; + }); __values = function (o) { var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0; @@ -231,11 +233,17 @@ var __createBinding; return cooked; }; + var __setModuleDefault = Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); + }) : function(o, v) { + o["default"] = v; + }; + __importStar = function (mod) { if (mod && mod.__esModule) return mod; var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; + if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); return result; }; From fa5c8a0b7641914313bf1f12bc37b13f68a5f395 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 13 May 2020 16:04:21 -0700 Subject: [PATCH 2/3] Switch from const to var --- tslib.es6.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tslib.es6.js b/tslib.es6.js index ce26163..2c2ddf5 100644 --- a/tslib.es6.js +++ b/tslib.es6.js @@ -103,7 +103,7 @@ export function __generator(thisArg, body) { } } -export const __createBinding = Object.create ? (function(o, m, k, k2) { +export var __createBinding = Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); }) : (function(o, m, k, k2) { @@ -193,7 +193,7 @@ export function __makeTemplateObject(cooked, raw) { return cooked; }; -const __setModuleDefault = Object.create ? (function(o, v) { +var __setModuleDefault = Object.create ? (function(o, v) { Object.defineProperty(o, "default", { enumerable: true, value: v }); }) : function(o, v) { o["default"] = v; From 19e3f350152194d462c29579f4cf60eb6d3ff164 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 13 May 2020 16:04:32 -0700 Subject: [PATCH 3/3] Switch to 2.0.0 --- README.md | 2 +- bower.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c14f87c..4f24d79 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ For JSPM users: "importHelpers": true, "baseUrl": "./", "paths": { - "tslib" : ["jspm_packages/npm/tslib@1.12.0/tslib.d.ts"] + "tslib" : ["jspm_packages/npm/tslib@2.0.0/tslib.d.ts"] } } } diff --git a/bower.json b/bower.json index b0363e0..0486279 100644 --- a/bower.json +++ b/bower.json @@ -4,7 +4,7 @@ "Microsoft Corp." ], "homepage": "http://typescriptlang.org/", - "version": "1.12.0", + "version": "2.0.0", "license": "0BSD", "description": "Runtime library for TypeScript helper functions", "keywords": [ diff --git a/package.json b/package.json index d2edd79..76d8726 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tslib", "author": "Microsoft Corp.", "homepage": "https://www.typescriptlang.org/", - "version": "1.12.0", + "version": "2.0.0", "license": "0BSD", "description": "Runtime library for TypeScript helper functions", "keywords": [