5 files changed, 62 insertions, 24 deletions

diff --git a/packages/browser/package.json b/packages/browser/package.json
index eb58ab5..8afb7f1 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -2,8 +2,8 @@
   "name": "@simplewebauthn/browser",
   "version": "2.1.0",
   "description": "SimpleWebAuthn for Browsers",
-  "main": "dist/es2018/index.js",
-  "browser": "dist/es5/index.js",
+  "main": "dist/bundles/index.es2018.js",
+  "browser": "dist/bundles/index.es5.js",
   "types": "dist/types/index.d.ts",
   "author": "Matthew Miller <matthew@millerti.me>",
   "license": "MIT",
@@ -17,10 +17,9 @@
     "access": "public"
   },
   "scripts": {
-    "build": "npm-run-all -l clean -p build:es2018 build:es5 -s build:bundles",
-    "build:es2018": "tsc -p tsconfig.json",
-    "build:es5": "tsc -p tsconfig.es5.json",
-    "build:bundles": "rollup -c",
+    "build": "npm-run-all -l clean -p build:es2018 build:es5",
+    "build:es2018": "rollup -c",
+    "build:es5": "rollup -c rollup.config.es5.js",
     "clean": "rimraf dist",
     "test": "jest",
     "test:watch": "jest --watch",
@@ -33,6 +32,9 @@
     "fido",
     "umd"
   ],
+  "peerDependencies": {
+    "tslib": "^2.2.0"
+  },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
@@ -41,7 +43,8 @@
     "npm-run-all": "^4.1.5",
     "rollup": "^2.44.0",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-version-injector": "^1.3.2"
+    "rollup-plugin-version-injector": "^1.3.2",
+    "tslib": "^2.2.0"
   },
   "gitHead": "33ccf8c6c9add811c87d3089e24156c2342b3498"
 }
diff --git a/packages/browser/rollup.config.es5.js b/packages/browser/rollup.config.es5.js
new file mode 100644
index 0000000..92d10c1
--- /dev/null
+++ b/packages/browser/rollup.config.es5.js
@@ -0,0 +1,41 @@
+import typescript from '@rollup/plugin-typescript';
+import commonjs from '@rollup/plugin-commonjs';
+import nodeResolve from '@rollup/plugin-node-resolve';
+import { terser } from 'rollup-plugin-terser';
+import versionInjector from 'rollup-plugin-version-injector';
+
+export default {
+  input: 'src/index.ts',
+  output: [
+    {
+      dir: 'dist',
+      format: 'cjs',
+      entryFileNames: 'bundles/[name].es5.js',
+      exports: 'auto',
+    },
+    {
+      dir: 'dist',
+      format: 'umd',
+      name: 'SimpleWebAuthnBrowser',
+      entryFileNames: 'bundles/[name].umd.min.js',
+      plugins: [terser()],
+      globals: {
+        tslib: 'tslib',
+      },
+    },
+  ],
+  plugins: [
+    typescript({ tsconfig: './tsconfig.es5.json' }),
+    commonjs({ extensions: ['.ts'] }),
+    nodeResolve(),
+    versionInjector({
+      injectInComments: {
+        fileRegexp: /\.(js)$/,
+        // [@simplewebauthn/browser]  Version: 2.1.0 - Saturday, February 6th, 2021, 4:10:31 PM
+        tag: '[@simplewebauthn/browser]  Version: {version} - {date}',
+        dateFormat: 'dddd, mmmm dS, yyyy, h:MM:ss TT',
+      },
+    }),
+  ],
+  external: ['tslib'],
+};
diff --git a/packages/browser/rollup.config.js b/packages/browser/rollup.config.js
index dc95436..cb701c1 100644
--- a/packages/browser/rollup.config.js
+++ b/packages/browser/rollup.config.js
@@ -1,23 +1,18 @@
 import typescript from '@rollup/plugin-typescript';
-import commonjs from '@rollup/plugin-commonjs';
 import nodeResolve from '@rollup/plugin-node-resolve';
-import { terser } from 'rollup-plugin-terser';
 import versionInjector from 'rollup-plugin-version-injector';
 
 export default {
   input: 'src/index.ts',
-  output: [
-    {
-      file: 'dist/bundles/bundle.umd.min.js',
-      format: 'umd',
-      name: 'SimpleWebAuthnBrowser',
-      plugins: [terser()],
-    },
-  ],
+  output: {
+    dir: 'dist',
+    format: 'esm',
+    entryFileNames: 'bundles/[name].es2018.js',
+    preferConst: true,
+  },
   plugins: [
-    typescript({ tsconfig: './tsconfig.es5.json' }),
-    commonjs({ extensions: ['.js', '.ts'] }),
-    nodeResolve({ mainFields: ['jsnext:main', 'module', 'main'] }),
+    typescript({ tsconfig: './tsconfig.json' }),
+    nodeResolve(),
     versionInjector({
       injectInComments: {
         fileRegexp: /\.(js)$/,
diff --git a/packages/browser/tsconfig.es5.json b/packages/browser/tsconfig.es5.json
index a8569b2..02a125c 100644
--- a/packages/browser/tsconfig.es5.json
+++ b/packages/browser/tsconfig.es5.json
@@ -9,13 +9,13 @@
       "DOM"
     ],
     "baseUrl": "./src",
-    "outDir": "./dist/es5",
     "declaration": false,
     "declarationMap": false,
     "downlevelIteration": true,
     "removeComments": true,
     "sourceMap": false,
-    "experimentalDecorators": true
+    "importHelpers": true,
+    "noEmit": true
   },
   "include": [
     "./src/**/*.ts"
diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json
index c421c15..aec3091 100644
--- a/packages/browser/tsconfig.json
+++ b/packages/browser/tsconfig.json
@@ -9,13 +9,12 @@
       "DOM"
     ],
     "baseUrl": "./src",
-    "outDir": "./dist/es2018",
     "declaration": true,
     "declarationDir": "./dist/types",
     "declarationMap": false,
     "removeComments": true,
     "sourceMap": false,
-    "experimentalDecorators": true
+    "noEmit": true,
   },
   "include": [
     "./src/**/*.ts"