Merge pull request #173 from brizental/1700578-only-browser

Bug 1700578 - Drop Node.js support from webext build

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 [Full changelog](https://github.com/mozilla/glean.js/compare/v0.7.0...main)
 
+* [#173](https://github.com/mozilla/glean.js/pull/173): Drop Node.js support from webext entry points
 * [#155](https://github.com/mozilla/glean.js/pull/155): Allow to define custom uploaders in the configuration.
 
 # v0.7.0 (2021-03-26)

glean/package.json

@@ -5,26 +5,10 @@
   "type": "module",
   "exports": {
     "./package.json": "./package.json",
-    "./webext": {
-      "browser": "./dist/webext/browser/index/webext.js",
-      "import": "./dist/webext/esm/index/webext.js",
-      "require": "./dist/webext/cjs/index/webext.js"
-    },
-    "./webext/private/metrics/*": {
-      "browser": "./dist/webext/browser/core/metrics/types/*.js",
-      "import": "./dist/webext/esm/core/metrics/types/*.js",
-      "require": "./dist/webext/cjs/core/metrics/types/*.js"
-    },
-    "./webext/private/ping": {
-      "browser": "./dist/webext/browser/core/pings/index.js",
-      "import": "./dist/webext/esm/core/pings/index.js",
-      "require": "./dist/webext/cjs/core/pings/index.js"
-    },
-    "./webext/plugins/*": {
-      "browser": "./dist/webext/browser/plugins/*.js",
-      "import": "./dist/webext/esm/plugins/*.js",
-      "require": "./dist/webext/cjs/plugins/*.js"
-    }
+    "./webext": "./dist/webext/index/webext.js",
+    "./webext/private/metrics/*": "./dist/webext/core/metrics/types/*.js",
+    "./webext/private/ping": "./dist/webext/core/pings/index.js",
+    "./webext/plugins/*": "./dist/webext/plugins/*.js"
   },
   "typesVersions": {
     "*": {
@@ -61,11 +45,9 @@
     "lint:circular-deps": "madge --circular src/ --extensions ts",
     "fix": "eslint . --ext .ts,.js,.json --fix",
     "build:cli": "tsc -p ./tsconfig/cli.json",
-    "build:webext:lib:esm": "tsc -p ./tsconfig/webext/esm.json",
-    "build:webext:lib:cjs": "tsc -p ./tsconfig/webext/cjs.json && echo '{\"type\": \"commonjs\"}'> dist/webext/cjs/package.json",
-    "build:webext:lib:browser": "tsc -p ./tsconfig/webext/browser.json",
+    "build:webext:lib": "tsc -p ./tsconfig/webext/index.json",
     "build:webext:types": "tsc -p ./tsconfig/webext/types.json",
-    "build:webext": "rm -rf dist/webext && npm run build:webext:lib:esm && npm run build:webext:lib:cjs && npm run build:webext:lib:browser && npm run build:webext:types",
+    "build:webext": "rm -rf dist/webext && npm run build:webext:lib && npm run build:webext:types",
     "build:qt": "webpack --config webpack.config.qt.js --mode production",
     "prepublishOnly": "cp ../README.md ./README.md && npm run build:cli && npm run build:webext",
     "postpublish": "rm ./README.md"

glean/tsconfig/webext/browser.json → glean/tsconfig/webext/index.json

@@ -8,6 +8,6 @@
   "compilerOptions": {
     "target": "ES2018",
     "module": "ES6",
-    "outDir": "../../dist/webext/browser"
+    "outDir": "../../dist/webext"
   }
 }