Fix

Author: snanovskyi

karma.conf.js

@@ -1,11 +1,5 @@
-const commonjs = require('rollup-plugin-commonjs');
-const inject = require('rollup-plugin-inject');
-const json = require('rollup-plugin-json');
-const nodeGlobals = require('rollup-plugin-node-globals');
-const nodeResolve = require('rollup-plugin-node-resolve');
-const replace = require('rollup-plugin-replace');
-const typescript = require('rollup-plugin-typescript2');
-const wasm = require('rollup-plugin-wasm');
+const path = require('path');
+const webpack = require('webpack');
 
 const packageJson = require('./package.json');
 
@@ -17,52 +11,49 @@ module.exports = function(config) {
 		autoWatch: false,
 		browsers: ['ChromeHeadless'],
 		files: [
-			{ pattern: 'scripts/register-assert-browser.js' },
-			{ pattern: 'src/__tests__/index.ts' },
-			{ pattern: 'node_modules/virgil-crypto/dist/libfoundation.browser.wasm', included: false }
+			'scripts/register-assert-browser.js',
+			'src/__tests__/index.ts',
 		],
-		proxies: {
-			'/base/src/__tests__/libfoundation.browser.wasm': '/base/node_modules/virgil-crypto/dist/libfoundation.browser.wasm'
-		},
 		colors: true,
 		reporters: ['progress'],
 		logLevel: config.LOG_INFO,
 		browserNoActivityTimeout: 60 * 1000,
 		singleRun: true,
+		mime: {
+			'text/x-typescript': ['ts'],
+			'application/wasm': ['wasm'],
+        },
 		preprocessors: {
-			'src/**/*.ts': ['rollup']
+			'src/__tests__/index.ts': ['webpack']
 		},
-		rollupPreprocessor: {
-			output: {
-				format: 'iife',
-				name: 'virgil',
-				sourcemap: false
-			},
-			plugins: [
-				nodeResolve({
-					browser: true,
-					extensions: ['.js', '.ts'],
-				}),
-				commonjs(),
-				replace({
-					'process.browser': JSON.stringify(true),
-					'process.env.VERSION': JSON.stringify(packageJson.version),
-					'process.env.API_KEY_PRIVATE_KEY': JSON.stringify(process.env.API_KEY_PRIVATE_KEY),
-					'process.env.API_KEY_ID': JSON.stringify(process.env.API_KEY_ID),
-					'process.env.APP_ID': JSON.stringify(process.env.APP_ID),
-					'process.env.API_URL': JSON.stringify(process.env.API_URL),
-				}),
-				typescript(),
-				nodeGlobals(),
-				inject({
-					modules: {
-						Buffer: ['buffer-es6', 'Buffer'],
-					},
-				}),
-				json(),
-				// workaround. maybe there is a better way to handle it
-				wasm()
-			]
-		}
+		webpack: {
+            mode: 'production',
+            resolve: {
+                extensions: ['.js', '.ts'],
+            },
+            module: {
+                rules: [
+                    {
+                        test: /\.ts$/,
+                        loader: 'ts-loader',
+                    },
+                    {
+                        test: /\.wasm$/,
+                        type: 'javascript/auto',
+                        loader: 'file-loader',
+                    },
+                ],
+            },
+            plugins: [
+                new webpack.EnvironmentPlugin({
+					browser: JSON.stringify(true),
+					VERSION: JSON.stringify(packageJson.version),
+					API_KEY_PRIVATE_KEY: JSON.stringify(process.env.API_KEY_PRIVATE_KEY),
+					API_KEY_ID: JSON.stringify(process.env.API_KEY_ID),
+					APP_ID: JSON.stringify(process.env.APP_ID),
+					API_URL: JSON.stringify(process.env.API_URL),
+                }),
+            ],
+        },
 	});
 };

package.json

@@ -40,36 +40,35 @@
   "devDependencies": {
     "@types/chai": "^4.1.7",
     "@types/chai-as-promised": "^7.1.0",
-    "@types/mkdirp": "^0.5.2",
-    "@types/mocha": "^5.2.5",
-    "@types/node": "^10.12.9",
-    "@types/rimraf": "^2.0.2",
+    "@types/mkdirp": "^1.0.0",
+    "@types/mocha": "^7.0.2",
+    "@types/node": "^13.13.2",
+    "@types/rimraf": "^3.0.0",
     "@types/sinon": "^5.0.6",
     "@types/sinon-chai": "^3.2.1",
     "buffer-es6": "^4.9.3",
     "builtin-modules": "^3.0.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "dotenv": "^6.1.0",
-    "eslint": "^5.9.0",
-    "karma": "^4.3.0",
+    "dotenv": "^8.2.0",
+    "file-loader": "^6.0.0",
+    "karma": "^5.0.2",
     "karma-chai-plugins": "^0.9.0",
     "karma-chrome-launcher": "^3.1.0",
-    "karma-mocha": "^1.3.0",
+    "karma-mocha": "^2.0.0",
     "karma-rollup-preprocessor": "^7.0.2",
+    "karma-webpack": "^4.0.2",
     "mocha": "^7.1.1",
-    "rollup": "^1.14.6",
+    "rollup": "^2.7.2",
     "rollup-plugin-commonjs": "^10.0.2",
-    "rollup-plugin-inject": "^3.0.1",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-node-globals": "^1.4.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-terser": "^5.1.1",
-    "rollup-plugin-typescript2": "^0.21.1",
+    "rollup-plugin-typescript2": "^0.27.0",
     "rollup-plugin-wasm": "^3.0.0",
-    "sinon": "^7.1.1",
+    "sinon": "^9.0.2",
     "sinon-chai": "^3.0.0",
+    "ts-loader": "^7.0.1",
     "ts-node": "^8.1.0",
     "typedoc": "^0.17.3",
     "typescript": "^3.1.6",
@@ -82,8 +81,9 @@
     "base-64": "^0.1.0",
     "fetch-ponyfill": "^6.0.2",
     "mkdirp": "^1.0.3",
-    "rimraf": "^2.6.2",
-    "utf8": "^3.0.0"
+    "rimraf": "^3.0.2",
+    "utf8": "^3.0.0",
+    "webpack": "^4.43.0"
   },
   "scripts": {
     "clean": "rimraf .rpt2_cache dist",