Add browser-friendly CommonJS export.

Author: RubenVerborgh

.gitignore

@@ -1,3 +1,4 @@
+browser
 coverage
 dist-lib
 dist-popup

package-lock.json

@@ -3,17 +3,19 @@
   "version": "2.2.10",
   "description": "Opaquely authenticates solid clients",
   "main": "lib/index-default.js",
+  "browser": "browser/index.js",
   "module": "module/index.js",
   "engines": {
     "node": ">=8.0.0"
   },
   "bin": "./bin/solid-auth-client.js",
   "files": [
     "bin",
-    "dist-lib",
-    "dist-popup",
     "lib",
-    "module"
+    "module",
+    "browser",
+    "dist-lib",
+    "dist-popup"
   ],
   "repository": "git@github.com:solid/solid-auth-client.git",
   "author": "Daniel Friedman <dfriedman58@gmail.com>",
@@ -38,10 +40,11 @@
     "test:dev": "npm run jest -- --watch",
     "test:debug": "node --debug-brk ./node_modules/.bin/jest --runInBand src",
     "coverage:report": "cat ./coverage/lcov.info | coveralls",
-    "build": "npm run build:lib && npm run build:module && npm run build:lib:umd && npm run build:popup:template",
+    "build": "npm run build:lib && npm run build:module && npm run build:window && npm run build:browser && npm run build:popup:template",
     "build:lib": "rm -rf lib && babel src --env-name production -d lib",
     "build:module": "rm -rf module && babel src --env-name module -d module",
-    "build:lib:umd": "webpack --config=./webpack/webpack.lib.config.js -p",
+    "build:window": "webpack --config=./webpack/webpack.window.config.js -p",
+    "build:browser": "webpack --config=./webpack/webpack.browser.config.js",
     "build:demo": "webpack --config=./webpack/webpack.demo.config.js -p",
     "build:popup": "webpack --config=./webpack/webpack.popup.config.js -p && rm ./dist-popup/popup.bundle.js && bin/solid-auth-client.js generate-popup '' dist-popup/popup.html",
     "build:popup:template": "cross-env APP_NAME='{{APP_NAME}}' npm run build:popup",
@@ -94,6 +97,7 @@
     "preact-compat": "^3.17.0",
     "prettier": "^1.5.3",
     "prettier-eslint": "^8.8.1",
+    "replace-in-file-webpack-plugin": "^1.0.6",
     "rsa-pem-to-jwk": "^1.1.3",
     "style-loader": "^0.23.0",
     "webpack": "^4.20.2",

package.json

@@ -0,0 +1,43 @@
+/* Browser-friendly CommonJS bundle that exports solid-auth-client */
+
+const path = require('path')
+const CleanWebpackPlugin = require('clean-webpack-plugin')
+const ReplaceInFileWebpackPlugin = require('replace-in-file-webpack-plugin');
+const {
+  context,
+  mode,
+  entry,
+  module: _module,
+  externals,
+  devtool
+} = require('./webpack.common.config')
+
+const outputDir = './browser'
+
+module.exports = {
+  context,
+  mode,
+  entry,
+  output: {
+    filename: 'index.js',
+    path: path.resolve(outputDir),
+    libraryExport: 'default',
+    library: 'exports',
+    libraryTarget: 'window'
+  },
+  module: _module,
+  externals,
+  plugins: [
+    // Replace the assignment to window by a module export
+    new ReplaceInFileWebpackPlugin([{
+        dir: outputDir,
+        files: ['index.js'],
+        rules: [{
+          search: 'window["exports"]',
+          replace: 'module.exports'
+        }]
+    }]),
+    new CleanWebpackPlugin([outputDir]),
+  ],
+  devtool
+}

webpack/webpack.browser.config.js

@@ -1,8 +1,13 @@
+/* Shared webpack configuration */
+
 const path = require('path')
 
 module.exports = {
   context: path.resolve(__dirname, '..'),
   mode: 'none',
+  entry: {
+    'solid-auth-client': './src/index.js'
+  },
   module: {
     rules: [
       {

webpack/webpack.common.config.js

@@ -1,3 +1,5 @@
+/* HTML bundle of the demo application */
+
 const CleanWebpackPlugin = require('clean-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin')

webpack/webpack.demo.config.js

@@ -1,3 +1,5 @@
+/* HTML bundle of the popup application */
+
 const CleanWebpackPlugin = require('clean-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin')

webpack/webpack.popup.config.js

@@ -1,8 +1,11 @@
+/* Browser bundle that exposes solid-auth-client as window.solid.auth */
+
 const path = require('path')
 const CleanWebpackPlugin = require('clean-webpack-plugin')
 const {
   context,
   mode,
+  entry,
   module: _module,
   externals,
   devtool
@@ -13,18 +16,12 @@ const outputDir = './dist-lib'
 module.exports = {
   context,
   mode,
-  entry: {
-    'solid-auth-client': './src/index.js'
-  },
+  entry,
   output: {
     filename: '[name].bundle.js',
     path: path.resolve(outputDir),
     libraryExport: 'default',
-    library: {
-      root: ['solid', 'auth'],
-      amd: 'solid-auth-client',
-      commonjs: 'solid-auth-client'
-    },
+    library: ['solid', 'auth'],
     libraryTarget: 'umd'
   },
   module: _module,