Merge pull request #1900 from cosmos/build-karma-bundle

webmaster128 · web-flow · commit fd70ac14b7b4 · 2025-11-05T15:11:22.000+01:00
Write Karma bundle to build/karma-bundle
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!**/karma-bundle/",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/amino/karma.conf.cjs b/packages/amino/karma.conf.cjs
@@ -15,7 +15,7 @@ module.exports = function (config) {
     frameworks: ["jasmine"],
 
     // list of files / patterns to load in the browser
-    files: ["dist/web/tests.js"],
+    files: ["build/karma-bundle/tests.js"],
 
     client: {
       jasmine: {
diff --git a/packages/amino/package.json b/packages/amino/package.json
@@ -15,6 +15,7 @@
     "*.md",
     "!*.spec.*",
     "!*testutils.*",
+    "!**/karma-bundle/",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/amino/webpack.web.config.cjs b/packages/amino/webpack.web.config.cjs
@@ -2,7 +2,7 @@ const { globSync } = require("glob");
 const path = require("path");
 
 const target = "web";
-const distdir = path.join(__dirname, "dist", "web");
+const bundleDir = path.join(__dirname, "build", "karma-bundle");
 
 module.exports = [
   {
@@ -11,7 +11,7 @@ module.exports = [
     entry: globSync("./build/**/*.spec.js", { dotRelative: true }).sort(),
     output: {
       asyncChunks: false,
-      path: distdir,
+      path: bundleDir,
       filename: "tests.js",
     },
     resolve: {
diff --git a/packages/cosmwasm-stargate/karma.conf.cjs b/packages/cosmwasm-stargate/karma.conf.cjs
@@ -15,7 +15,7 @@ module.exports = function (config) {
     frameworks: ["jasmine"],
 
     // list of files / patterns to load in the browser
-    files: ["dist/web/tests.js"],
+    files: ["build/karma-bundle/tests.js"],
 
     client: {
       jasmine: {
diff --git a/packages/cosmwasm-stargate/package.json b/packages/cosmwasm-stargate/package.json
@@ -15,6 +15,7 @@
     "*.md",
     "!*.spec.*",
     "!*testutils.*",
+    "!**/karma-bundle/",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/cosmwasm-stargate/webpack.web.config.cjs b/packages/cosmwasm-stargate/webpack.web.config.cjs
@@ -3,7 +3,7 @@ const path = require("path");
 const webpack = require("webpack");
 
 const target = "web";
-const distdir = path.join(__dirname, "dist", "web");
+const bundleDir = path.join(__dirname, "build", "karma-bundle");
 
 module.exports = [
   {
@@ -12,7 +12,7 @@ module.exports = [
     entry: globSync("./build/**/*.spec.js", { dotRelative: true }).sort(),
     output: {
       asyncChunks: false,
-      path: distdir,
+      path: bundleDir,
       filename: "tests.js",
     },
     plugins: [
diff --git a/packages/crypto/karma.conf.cjs b/packages/crypto/karma.conf.cjs
@@ -15,7 +15,7 @@ module.exports = function (config) {
     frameworks: ["jasmine"],
 
     // list of files / patterns to load in the browser
-    files: ["dist/web/tests.js"],
+    files: ["build/karma-bundle/tests.js"],
 
     client: {
       jasmine: {
diff --git a/packages/crypto/package.json b/packages/crypto/package.json
@@ -15,6 +15,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!**/karma-bundle/",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/crypto/webpack.web.config.cjs b/packages/crypto/webpack.web.config.cjs
@@ -2,7 +2,7 @@ const { globSync } = require("glob");
 const path = require("path");
 
 const target = "web";
-const distdir = path.join(__dirname, "dist", "web");
+const bundleDir = path.join(__dirname, "build", "karma-bundle");
 
 module.exports = [
   {
@@ -11,7 +11,7 @@ module.exports = [
     entry: globSync("./build/**/*.spec.js", { dotRelative: true }).sort(),
     output: {
       asyncChunks: false,
-      path: distdir,
+      path: bundleDir,
       filename: "tests.js",
     },
     resolve: {
diff --git a/packages/encoding/karma.conf.cjs b/packages/encoding/karma.conf.cjs
@@ -15,7 +15,7 @@ module.exports = function (config) {
     frameworks: ["jasmine"],
 
     // list of files / patterns to load in the browser
-    files: ["dist/web/tests.js"],
+    files: ["build/karma-bundle/tests.js"],
 
     client: {
       jasmine: {
diff --git a/packages/encoding/package.json b/packages/encoding/package.json
@@ -14,6 +14,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!**/karma-bundle/",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/encoding/webpack.web.config.cjs b/packages/encoding/webpack.web.config.cjs
@@ -2,7 +2,7 @@ const { globSync } = require("glob");
 const path = require("path");
 
 const target = "web";
-const distdir = path.join(__dirname, "dist", "web");
+const bundleDir = path.join(__dirname, "build", "karma-bundle");
 
 module.exports = [
   {
@@ -11,7 +11,7 @@ module.exports = [
     entry: globSync("./build/**/*.spec.js", { dotRelative: true }).sort(),
     output: {
       asyncChunks: false,
-      path: distdir,
+      path: bundleDir,
       filename: "tests.js",
     },
     resolve: {
diff --git a/packages/faucet-client/karma.conf.cjs b/packages/faucet-client/karma.conf.cjs
@@ -15,7 +15,7 @@ module.exports = function (config) {
     frameworks: ["jasmine"],
 
     // list of files / patterns to load in the browser
-    files: ["dist/web/tests.js"],
+    files: ["build/karma-bundle/tests.js"],
 
     client: {
       jasmine: {
diff --git a/packages/faucet-client/package.json b/packages/faucet-client/package.json
@@ -14,6 +14,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!**/karma-bundle/",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/faucet-client/webpack.web.config.cjs b/packages/faucet-client/webpack.web.config.cjs
@@ -3,7 +3,7 @@ const path = require("path");
 const webpack = require("webpack");
 
 const target = "web";
-const distdir = path.join(__dirname, "dist", "web");
+const bundleDir = path.join(__dirname, "build", "karma-bundle");
 
 module.exports = [
   {
@@ -12,7 +12,7 @@ module.exports = [
     entry: globSync("./build/**/*.spec.js", { dotRelative: true }).sort(),
     output: {
       asyncChunks: false,
-      path: distdir,
+      path: bundleDir,
       filename: "tests.js",
     },
     plugins: [new webpack.EnvironmentPlugin({ FAUCET_ENABLED: "" })],
diff --git a/packages/faucet/bin/cosmos-faucet-dist b/packages/faucet/bin/cosmos-faucet-dist
@@ -2,5 +2,5 @@
 const path = require("path");
 
 // attempt to call in main file....
-const faucet = require(path.join(__dirname, "..", "dist", "node", "cli.js"));
+const faucet = require(path.join(__dirname, "..", "build", "cli-bundle", "cli.js"));
 faucet.main(process.argv.slice(2));
diff --git a/packages/faucet/package.json b/packages/faucet/package.json
@@ -16,6 +16,8 @@
     "*.md",
     "!*.spec.*",
     "!*testutils.*",
+    "!**/cli-bundle/",
+    "!**/karma-bundle/",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/faucet/webpack.node.config.cjs b/packages/faucet/webpack.node.config.cjs
@@ -1,15 +1,14 @@
 const path = require("path");
 
-const target = "node";
-const distdir = path.join(__dirname, "dist", target);
+const cliBundleDir = path.join(__dirname, "build", "cli-bundle");
 
 module.exports = [
   {
-    target: target,
+    target: "node",
     entry: "./build/cli.js",
     output: {
       asyncChunks: false,
-      path: distdir,
+      path: cliBundleDir,
       filename: "cli.js",
       library: {
         type: "commonjs",
diff --git a/packages/json-rpc/karma.conf.cjs b/packages/json-rpc/karma.conf.cjs
@@ -16,9 +16,9 @@ module.exports = function (config) {
 
     // list of files / patterns to load in the browser
     files: [
-      "dist/web/tests.js",
+      "build/karma-bundle/tests.js",
       {
-        pattern: "dist/web/dummyservice.worker.js",
+        pattern: "build/karma-bundle/dummyservice.worker.js",
         included: false,
         served: true,
         watched: false,
diff --git a/packages/json-rpc/package.json b/packages/json-rpc/package.json
@@ -16,6 +16,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!**/karma-bundle/",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/json-rpc/src/jsonrpcclient.spec.ts b/packages/json-rpc/src/jsonrpcclient.spec.ts
@@ -29,7 +29,7 @@ function makeSimpleMessagingConnection(
 }
 
 (typeof Worker !== "undefined" ? describe : xdescribe)("JsonRpcClient", () => {
-  const dummyserviceKarmaUrl = "/base/dist/web/dummyservice.worker.js";
+  const dummyserviceKarmaUrl = "/base/build/karma-bundle/dummyservice.worker.js";
 
   it("can be constructed with a Worker", () => {
     const worker = new Worker(dummyserviceKarmaUrl);
diff --git a/packages/json-rpc/webpack.web.config.cjs b/packages/json-rpc/webpack.web.config.cjs
@@ -2,7 +2,7 @@ const { globSync } = require("glob");
 const path = require("path");
 
 const target = "web";
-const distdir = path.join(__dirname, "dist", "web");
+const bundleDir = path.join(__dirname, "build", "karma-bundle");
 
 module.exports = [
   {
@@ -11,7 +11,7 @@ module.exports = [
     entry: "./build/workers/dummyservice.worker.js",
     output: {
       asyncChunks: false,
-      path: distdir,
+      path: bundleDir,
       filename: "dummyservice.worker.js",
     },
   },
@@ -21,7 +21,7 @@ module.exports = [
     entry: globSync("./build/**/*.spec.js", { dotRelative: true }).sort(),
     output: {
       asyncChunks: false,
-      path: distdir,
+      path: bundleDir,
       filename: "tests.js",
     },
   },
diff --git a/packages/ledger-amino/README.md b/packages/ledger-amino/README.md
@@ -35,8 +35,8 @@ yarn demo-node
 Serve the project locally:
 
 ```sh
-# Build the package for web
-yarn pack-web
+# Build and bundle the demo for web
+yarn pack-demo-web
 
 # Host the `ledger-amino` package directory, for example using Python 3
 python3 -m http.server
diff --git a/packages/ledger-amino/demo/index.html b/packages/ledger-amino/demo/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Ledger Demo</title>
     <link rel="stylesheet" href="index.css"></style>
-    <script src="../dist/demo/ledger.js"></script>
+    <script src="../build/demo-bundle/ledger.js"></script>
   </head>
   <body>
     <section>
diff --git a/packages/ledger-amino/package.json b/packages/ledger-amino/package.json
@@ -15,6 +15,9 @@
     "*.md",
     "!*.spec.*",
     "!*testutils.*",
+    "!**/demo/",
+    "!**/demo-bundle/",
+    "!**/karma-bundle/",
     "!**/testdata/"
   ],
   "repository": {
@@ -35,7 +38,7 @@
     "test": "yarn build-or-skip && yarn test-node",
     "demo-node": "yarn build-or-skip && node ./demo/node.cjs",
     "coverage": "nyc --reporter=text --reporter=lcov yarn test --quiet",
-    "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.demo.config.cjs"
+    "pack-demo-web": "yarn build-or-skip && webpack --mode development --config webpack.demo.config.cjs"
   },
   "dependencies": {
     "@cosmjs/amino": "workspace:^",
diff --git a/packages/ledger-amino/webpack.demo.config.cjs b/packages/ledger-amino/webpack.demo.config.cjs
@@ -3,16 +3,16 @@ const path = require("path");
 const webpack = require("webpack");
 
 const target = "web";
-const demodir = path.join(__dirname, "dist", "demo");
+const demoBundleDir = path.join(__dirname, "build", "demo-bundle");
 
 module.exports = [
   {
     // bundle used for Ledger demo
     target: target,
-    entry: globSync("./build/demo/web.js"),
+    entry: globSync("./build/demo/web.js", { dotRelative: true }).sort(),
     output: {
       asyncChunks: false,
-      path: demodir,
+      path: demoBundleDir,
       filename: "ledger.js",
     },
     plugins: [
diff --git a/packages/math/karma.conf.cjs b/packages/math/karma.conf.cjs
@@ -15,7 +15,7 @@ module.exports = function (config) {
     frameworks: ["jasmine"],
 
     // list of files / patterns to load in the browser
-    files: ["dist/web/tests.js"],
+    files: ["build/karma-bundle/tests.js"],
 
     client: {
       jasmine: {
diff --git a/packages/math/package.json b/packages/math/package.json
@@ -14,6 +14,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!**/karma-bundle/",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/math/webpack.web.config.cjs b/packages/math/webpack.web.config.cjs
@@ -2,7 +2,7 @@ const { globSync } = require("glob");
 const path = require("path");
 
 const target = "web";
-const distdir = path.join(__dirname, "dist", "web");
+const bundleDir = path.join(__dirname, "build", "karma-bundle");
 
 module.exports = [
   {
@@ -11,7 +11,7 @@ module.exports = [
     entry: globSync("./build/**/*.spec.js", { dotRelative: true }).sort(),
     output: {
       asyncChunks: false,
-      path: distdir,
+      path: bundleDir,
       filename: "tests.js",
     },
   },
diff --git a/packages/proto-signing/karma.conf.cjs b/packages/proto-signing/karma.conf.cjs
@@ -15,7 +15,7 @@ module.exports = function (config) {
     frameworks: ["jasmine"],
 
     // list of files / patterns to load in the browser
-    files: ["dist/web/tests.js"],
+    files: ["build/karma-bundle/tests.js"],
 
     client: {
       jasmine: {
diff --git a/packages/proto-signing/package.json b/packages/proto-signing/package.json
@@ -16,6 +16,7 @@
     "*.md",
     "!*.spec.*",
     "!*testutils.*",
+    "!**/karma-bundle/",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/proto-signing/webpack.web.config.cjs b/packages/proto-signing/webpack.web.config.cjs
diff --git a/packages/socket/karma.conf.cjs b/packages/socket/karma.conf.cjs
diff --git a/packages/socket/package.json b/packages/socket/package.json
diff --git a/packages/socket/webpack.web.config.cjs b/packages/socket/webpack.web.config.cjs
diff --git a/packages/stargate/karma.conf.cjs b/packages/stargate/karma.conf.cjs
diff --git a/packages/stargate/package.json b/packages/stargate/package.json
diff --git a/packages/stargate/webpack.web.config.cjs b/packages/stargate/webpack.web.config.cjs
diff --git a/packages/stream/karma.conf.cjs b/packages/stream/karma.conf.cjs
diff --git a/packages/stream/package.json b/packages/stream/package.json
diff --git a/packages/stream/webpack.web.config.cjs b/packages/stream/webpack.web.config.cjs
diff --git a/packages/tendermint-rpc/karma.conf.cjs b/packages/tendermint-rpc/karma.conf.cjs
diff --git a/packages/tendermint-rpc/package.json b/packages/tendermint-rpc/package.json
diff --git a/packages/tendermint-rpc/webpack.web.config.cjs b/packages/tendermint-rpc/webpack.web.config.cjs
diff --git a/packages/utils/karma.conf.cjs b/packages/utils/karma.conf.cjs
diff --git a/packages/utils/package.json b/packages/utils/package.json
diff --git a/packages/utils/webpack.web.config.cjs b/packages/utils/webpack.web.config.cjs
