Fix commonjs not working

Azure · Sep 22, 2023 · d798b40 · d798b40
1 parent 30c703f
commit d798b40
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 14 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/sdk/web-pubsub/web-pubsub-client-protobuf/package.json b/sdk/web-pubsub/web-pubsub-client-protobuf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure/web-pubsub-client-protobuf",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "Azure Web PubSub Client Protobuf",
   "sdk-type": "client",
   "main": "dist/index.js",
@@ -11,11 +11,11 @@
   "types": "types/web-pubsub-client-protobuf.d.ts",
   "scripts": {
     "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
-    "build:browser": "npm run build-protobuf && tsc -p . && npm run copy-files && dev-tool run bundle",
-    "build:node": "npm run build-protobuf && tsc -p . && npm run copy-files && dev-tool run bundle",
+    "build:browser": "npm run build-protobuf && tsc -p . && npm run copy-files && rollup -c",
+    "build:node": "npm run build-protobuf && tsc -p . && npm run copy-files && rollup -c",
     "build:samples": "dev-tool samples publish -f",
-    "build:test": "npm run build-protobuf && tsc -p . && npm run copy-files && dev-tool run bundle",
-    "build": "npm run clean && npm run build-protobuf && tsc -p . && npm run copy-files && dev-tool run bundle && api-extractor run --local",
+    "build:test": "npm run build-protobuf && tsc -p . && npm run copy-files && rollup -c",
+    "build": "npm run clean && npm run build-protobuf && tsc -p . && npm run copy-files && rollup -c && api-extractor run --local",
     "copy-files": "copyfiles ./src/generated/clientProto.js ./dist-esm/",
     "build-protobuf": "pbjs -t static-module -w es6 -o ./src/generated/clientProto.js ./src/protos/client.proto && pbts -o ./src/generated/clientProto.d.ts ./src/generated/clientProto.js",
     "check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
@@ -70,6 +70,10 @@
     "@azure/dev-tool": "^1.0.0",
     "@azure/eslint-plugin-azure-sdk": "^3.0.0",
     "@microsoft/api-extractor": "^7.31.1",
+    "@rollup/plugin-commonjs": "^24.0.0",
+    "@rollup/plugin-node-resolve": "^13.1.3",
+    "rollup": "^2.78.0",
+    "rollup-plugin-sourcemaps": "^0.6.2",
     "@types/chai": "^4.1.6",
     "@types/chai-as-promised": "^7.1.5",
     "@types/express": "^4.16.0",

diff --git a/sdk/web-pubsub/web-pubsub-client-protobuf/rollup.config.js b/sdk/web-pubsub/web-pubsub-client-protobuf/rollup.config.js
@@ -0,0 +1,33 @@
+import nodeBuiltins from "builtin-modules";
+import nodeResolve from "@rollup/plugin-node-resolve";
+import cjs from "@rollup/plugin-commonjs";
+import sourcemaps from "rollup-plugin-sourcemaps";
+
+export function makeConfig(pkg) {
+  if (!pkg.module) {
+    log.error(pkg.name, "does not specify a `module` field.");
+    return false;
+  }
+
+  const baseConfig = {
+    // Use the package's module field if it has one
+    input: pkg.module,
+    external: [
+      ...nodeBuiltins,
+      ...Object.keys(pkg.dependencies),
+      ...Object.keys(pkg.devDependencies),
+    ],
+    output: {
+      file: "dist/index.js",
+      format: "cjs",
+      sourcemap: true,
+      exports: "named",
+    },
+    preserveSymlinks: false,
+    plugins: [sourcemaps(), cjs(), nodeResolve()],
+  };
+
+  return baseConfig;
+}
+
+export default makeConfig(require("./package.json"));