From ef638d58233e760a241b2791462eef0c201568e9 Mon Sep 17 00:00:00 2001 From: "andrii.ponamarov" Date: Mon, 16 Mar 2020 12:51:32 +0100 Subject: [PATCH 1/3] Use TextEncoder from build instead of externals --- build/rollup.config.js | 5 ++--- environment/config.js | 4 +--- src/core/digest.js | 4 +++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build/rollup.config.js b/build/rollup.config.js index d46296b..5da5361 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -66,11 +66,10 @@ export default inputs.map(input => { 'lib/uuid', 'lodash', 'module', - 'moment', - 'fastestsmallesttextencoderdecoder' + 'moment' ], plugins: [ - resolve(), + resolve({ mainFields: ['main'] }), commonJS(), alias({ resolve: ['.js', '.json'], diff --git a/environment/config.js b/environment/config.js index 11a2c73..a94ef30 100644 --- a/environment/config.js +++ b/environment/config.js @@ -36,9 +36,7 @@ define(['/node_modules/@oat-sa/tao-core-libs/dist/pathdefinition.js'], function( 'jquery.mockjax': '/node_modules/jquery-mockjax/dist/jquery.mockjax', 'webcrypto-shim': '/node_modules/webcrypto-shim/webcrypto-shim', - 'idb-wrapper': '/node_modules/idb-wrapper/idbstore', - fastestsmallesttextencoderdecoder: - '/node_modules/fastestsmallesttextencoderdecoder/NodeJS/EncoderAndDecoderNodeJS.min' + 'idb-wrapper': '/node_modules/idb-wrapper/idbstore' }, libPathDefinition ), diff --git a/src/core/digest.js b/src/core/digest.js index 36a8560..85dec90 100644 --- a/src/core/digest.js +++ b/src/core/digest.js @@ -26,7 +26,9 @@ */ import _ from 'lodash'; import 'webcrypto-shim'; -import { TextEncoder } from 'fastestsmallesttextencoderdecoder'; +import TextEncoderPolyfill from 'fastestsmallesttextencoderdecoder'; + +const { TextEncoder } = TextEncoderPolyfill; //get the native implementation of the CryptoSubtle var subtle = window.crypto.subtle || window.crypto.webkitSubtle; From eede61aa7b32036fde80e1ff96e26c0dfdf295ca Mon Sep 17 00:00:00 2001 From: "andrii.ponamarov" Date: Mon, 16 Mar 2020 12:52:50 +0100 Subject: [PATCH 2/3] Bump version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1d6aed4..b45eeec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@oat-sa/tao-core-sdk", - "version": "1.2.0", + "version": "1.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 66706c6..9b1fdcb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@oat-sa/tao-core-sdk", - "version": "1.2.0", + "version": "1.3.0", "displayName": "TAO Core SDK", "description": "Core libraries of TAO", "homepage": "https://github.com/oat-sa/tao-core-sdk-fe#readme", From f19eea1dca31ee3514a6c955ca9603023a9e6d22 Mon Sep 17 00:00:00 2001 From: "andrii.ponamarov" Date: Wed, 18 Mar 2020 09:51:28 +0100 Subject: [PATCH 3/3] Add TextEncoder to commonjs exports --- build/rollup.config.js | 6 +++++- src/core/digest.js | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/rollup.config.js b/build/rollup.config.js index 5da5361..84630a2 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -70,7 +70,11 @@ export default inputs.map(input => { ], plugins: [ resolve({ mainFields: ['main'] }), - commonJS(), + commonJS({ + namedExports: { + fastestsmallesttextencoderdecoder: ['TextEncoder'] + } + }), alias({ resolve: ['.js', '.json'], core: path.resolve(srcDir, 'core'), diff --git a/src/core/digest.js b/src/core/digest.js index 85dec90..36a8560 100644 --- a/src/core/digest.js +++ b/src/core/digest.js @@ -26,9 +26,7 @@ */ import _ from 'lodash'; import 'webcrypto-shim'; -import TextEncoderPolyfill from 'fastestsmallesttextencoderdecoder'; - -const { TextEncoder } = TextEncoderPolyfill; +import { TextEncoder } from 'fastestsmallesttextencoderdecoder'; //get the native implementation of the CryptoSubtle var subtle = window.crypto.subtle || window.crypto.webkitSubtle;