Don't bundle node and web targets, only for third "bundle" target

babel.config.json

@@ -14,5 +14,6 @@
         ]
       ]
     }
-  }
+  },
+  "ignore": ["src/**/*.test.ts"]
 }

package.json

@@ -4,7 +4,7 @@
   "description": "Sia Skynet Javascript Client",
   "browser": "dist/web/index.web.js",
   "main": "dist/node/index.node.js",
-  "module": "src/index.web.js",
+  "module": "dist/web/index.web.js",
   "files": [
     "dist/*"
   ],
@@ -14,7 +14,10 @@
     "not OperaMini all"
   ],
   "scripts": {
-    "build": "rimraf dist && yarn run webpack",
+    "build": "rimraf dist && yarn build-bundle && yarn build-node && yarn build-web",
+    "build-bundle": "yarn run webpack",
+    "build-node": "babel src --out-dir dist/node --extensions .ts && tsc --project tsconfig.build.json --outDir dist/node && rimraf dist/node/**/web* && rimraf dist/node/**/*web*",
+    "build-web": "babel src --out-dir dist/web --extensions .ts && tsc --project tsconfig.build.json --outDir dist/web && rimraf dist/web/**/node* && rimraf dist/web/**/*node*",
     "lint:eslint": "eslint --ext .ts src utils --max-warnings 0",
     "lint:tsc": "tsc",
     "prepublishOnly": "yarn build",

tsconfig.build.json

@@ -9,6 +9,6 @@
     "types": ["node", "jest"],
     "typeRoots": ["./types", "./node_modules/@types"]
   },
-  "include": ["types/**/*.d.ts"],
+  "include": ["src", "types/**/*.d.ts"],
   "exclude": ["src/**/*.test.ts"]
 }

webpack.config.js

@@ -1,7 +1,9 @@
 const path = require("path");
 const { merge } = require("webpack-merge");
 
-var baseConfig = {
+module.exports = {
+  entry: "./src/index.web.ts",
+  target: "web",
   mode: "production",
 
   module: {
@@ -10,46 +12,17 @@ var baseConfig = {
         test: /\.tsx?$/,
         exclude: /(node_modules|bower_components)/,
         loader: "babel-loader",
-        options: {
-          ignore: ["src/**/*.test.ts"],
-        },
       },
     ],
   },
   resolve: {
     extensions: [".tsx", ".ts", ".js"],
   },
   output: {
+    path: path.resolve(__dirname, "./dist/bundle"),
+    // The filename needs to match the index.web.d.ts declarations file.
+    filename: "index.js",
     library: "skynet",
     libraryTarget: "umd",
   },
 };
-
-let targets = ["web", "node"].map((target) => {
-  let base = merge(baseConfig, {
-    entry: "./src/index." + target + ".ts",
-    target: target,
-    module: {
-      rules: [
-        {
-          test: /\.tsx?$/,
-          loader: "ts-loader",
-          exclude: /node_modules/,
-          options: {
-            configFile: "tsconfig.build.json",
-            compilerOptions: {
-              outDir: path.resolve(__dirname, "./dist/" + target),
-            },
-          },
-        },
-      ],
-    },
-    output: {
-      path: path.resolve(__dirname, "./dist/" + target),
-      filename: "index." + target + ".js",
-    },
-  });
-  return base;
-});
-
-module.exports = targets;