refactor: identity.ts & build fixes work in progress

JIRA: UUI-767
schibsted · Feb 19, 2024 · ab50ff3 · ab50ff3
1 parent 6dc3fdb
commit ab50ff3
Show file tree

Hide file tree

Showing 31 changed files with 622 additions and 328 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 .DS_Store
 .cache
 .idea
-/es5
+/dist
 coverage
 docs/
 node_modules/
diff --git a/.npmignore b/.npmignore
@@ -1,9 +1,9 @@
 *
-!index.js
+!index.ts
 !*.d.ts
-!identity.js
-!monetization.js
-!payment.js
+!identity.ts
+!monetization.ts
+!payment.ts
 !es5/*.js
 !es5/*.d.ts
 !es5/*.js.map

diff --git a/__tests__/RESTClient.intest.js b/__tests__/RESTClient.intest.js
@@ -4,8 +4,8 @@
 
 'use strict';
 
-import RESTClient from '../src/clients/RESTClient.js';
-import config from '../src/config/config.js';
+import RESTClient from '../src/clients/RESTClient.ts';
+import config from '../src/config/config.ts';
 
 describe('RESTClient', () => {
 

diff --git a/__tests__/RESTClient.utest.js b/__tests__/RESTClient.utest.js
@@ -4,8 +4,8 @@
 
 'use strict';
 
-import { ENDPOINTS } from '../src/config/config.js';
-import { RESTClient } from '../src/clients/RESTClient.js';
+import { ENDPOINTS } from '../src/config/config.ts';
+import { RESTClient } from '../src/clients/RESTClient.ts';
 
 describe('RESTClient', () => {
     test('has the REST methods for get and go', () => {

diff --git a/__tests__/SDKError.js b/__tests__/SDKError.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-import SDKError from '../src/utils/SDKError.js';
+import SDKError from '../src/utils/SDKError.ts';
 
 describe('SDKError', () => {
     test('Should be able to stringify an error', () => {

diff --git a/__tests__/cache.js b/__tests__/cache.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-import Cache from '../src/utils/cache.js';
+import Cache from '../src/utils/cache.ts';
 
 const webStorageMock = () => {
     const mock = {

diff --git a/__tests__/identity.js b/__tests__/identity.js
@@ -4,9 +4,9 @@
 
 'use strict';
 
-import SDKError from '../src/utils/SDKError.js';
+import SDKError from '../src/utils/SDKError.ts';
 
-import Identity from '../identity.js';
+import Identity from '../identity.ts';
 import { compareUrls, Fixtures } from './utils.js';
 import { URL } from 'url';
 import { URL as u } from 'whatwg-url';

diff --git a/__tests__/monetization.js b/__tests__/monetization.js
@@ -4,9 +4,9 @@
 
 'use strict';
 
-jest.mock('../src/RESTClient.js');
+jest.mock('../src/RESTClient.ts');
 
-import Monetization from '../monetization.js';
+import Monetization from '../monetization.ts';
 
 describe('Monetization', () => {
 

diff --git a/__tests__/object.utest.js b/__tests__/object.utest.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-import { cloneDefined, cloneDeep } from '../src/utils/object.js';
+import { cloneDefined, cloneDeep } from '../src/utils/object.ts';
 
 describe('object', () => {
 

diff --git a/__tests__/payment.js b/__tests__/payment.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-import { Payment } from '../payment.js';
+import { Payment } from '../payment.ts';
 import { compareUrls } from './utils.js';
 
 describe('Payment', () => {

diff --git a/__tests__/popup.js b/__tests__/popup.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import * as popup from '../src/utils/popup.js';
+import * as popup from '../src/utils/popup.ts';
 
 describe('Popup — open', () => {
     const defaultFeatures = 'scrollbars=yes,location=yes,status=no,menubar=no,toolbar=no,resizable=yes';

diff --git a/__tests__/url.utest.js b/__tests__/url.utest.js
@@ -6,7 +6,7 @@
 
 import { URL } from 'whatwg-url';
 import { urlMapper } from '../src/utils/url.ts';
-import RESTClient from '../src/clients/RESTClient.js';
+import RESTClient from '../src/clients/RESTClient.ts';
 
 describe('url', () => {
 

diff --git a/__tests__/validate.utest.js b/__tests__/validate.utest.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-import { isStr, isStrIn, isNonEmptyString, isObject, isNonEmptyObj } from '../src/utils/validate.js';
+import { isStr, isStrIn, isNonEmptyString, isObject, isNonEmptyObj } from '../src/utils/validate.ts';
 
 describe('validate', () => {
 

diff --git a/identity.d.ts b/identity.d.ts
diff --git a/identity.js b/identity.js
diff --git a/index.js → index.ts b/index.js → index.ts
@@ -4,6 +4,6 @@
 
 'use strict';
 
-export * from './identity.js';
-export * from './monetization.js';
-export * from './payment.js';
+export { Identity } from './src/identity';
+export { Monetization } from './src/monetization';
+export { Payment } from './src/payment';
diff --git a/monetization.d.ts b/monetization.d.ts
diff --git a/monetization.js b/monetization.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,10 +2,13 @@
   "name": "@schibsted/account-sdk-browser",
   "version": "4.8.7",
   "description": "Schibsted account SDK for browsers",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "files": [
+    "dist"
+  ],
   "type": "module",
   "scripts": {
-    "build": "webpack --mode production",
+    "build": "tsc --build --verbose",
     "clean": "rimraf .cache coverage dist docs",
     "docs": "rimraf docs && jsdoc -c ./jsdoc.conf.json --verbose",
     "lint": "eslint .",
@@ -19,6 +22,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "eventemitter3": "^5.0.1",
     "tiny-emitter": "^2.1.0"
   },
   "devDependencies": {

diff --git a/payment.d.ts b/payment.d.ts
diff --git a/payment.js b/payment.js
diff --git a/src/__mocks__/RESTClient.js b/src/__mocks__/RESTClient.js
@@ -1,6 +1,6 @@
 import { URL } from 'url';
 import { urlMapper } from '../utils/url.ts';
-import { cloneDefined } from '../utils/object.js';
+import { cloneDefined } from '../utils/object.ts';
 import { Fixtures } from '../../__tests__/utils.js';
 
 const goFn = () => jest.fn().mockImplementation(async ({ pathname }) => {

diff --git a/src/es5/identity.js b/src/es5/identity.js
@@ -5,6 +5,6 @@
 'use strict';
 
 window.regeneratorRuntime = require('regenerator-runtime');
-const { Identity } = require('../identity.js');
+const { Identity } = require('../identity.ts');
 
 module.exports = { Identity };