Change messaging to allow node ESM

Author: hsubox76

packages/messaging-compat/package.json

@@ -11,7 +11,7 @@
   "exports": {
     ".": {
       "types": "./dist/src/index.d.ts",
-      "node": "./dist/index.cjs.js",
+      "require": "./dist/index.cjs.js",
       "esm5": "./dist/esm/index.esm.js",
       "default": "./dist/esm/index.esm2017.js"
     },

packages/messaging/package.json

@@ -6,22 +6,21 @@
   "main": "dist/index.cjs.js",
   "browser": "dist/esm/index.esm2017.js",
   "module": "dist/esm/index.esm2017.js",
-  "sw": "dist/index.sw.esm2017.js",
+  "sw": "dist/esm/index.sw.esm2017.js",
   "sw-main": "dist/index.sw.cjs",
   "esm5": "dist/esm/index.esm.js",
   "exports": {
     ".": {
       "types": "./dist/index-public.d.ts",
-      "node": "./dist/index.cjs.js",
-      "browser": "./dist/esm/index.esm2017.js",
+      "require": "./dist/index.cjs.js",
       "module": "./dist/esm/index.esm2017.js",
       "esm5": "./dist/esm/index.esm.js",
-      "default": "./dist/index.cjs.js"
+      "default": "./dist/esm/index.esm2017.js"
     },
     "./sw": {
       "types": "./dist/sw/index-public.d.ts",
-      "node": "./dist/index.sw.cjs",
-      "default": "./dist/index.sw.esm2017.js"
+      "require": "./dist/index.sw.cjs",
+      "default": "./dist/esm/index.sw.esm2017.js"
     },
     "./package.json": "./package.json"
   },

packages/messaging/sw/package.json

@@ -3,6 +3,6 @@
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "../dist/index.sw.cjs",
-  "module": "../dist/index.sw.esm2017.js",
+  "module": "../dist/esm/index.sw.esm2017.js",
   "typings": "../dist/src/index.sw.d.ts"
 }

scripts/ci-test/add-cjs.ts

@@ -30,6 +30,7 @@ const results: Result[] = [];
 
 const nodeOnlyMessages: string[] = [];
 const singleNodeFieldMessages: string[]  =  [];
+const requireOnlyMessages: string[]  =  [];
 const changedPackages:string[] = [];
 
 /**
@@ -58,18 +59,12 @@ function checkExports(
     if (typeof exports[key] === 'string') {
       const filePath = resolve(pkgRoot, exports[key]);
       if (key === 'node') {
-        singleNodeFieldMessages.push(`${pkgName} has a single node field pointing to ${filePath}`)
+        singleNodeFieldMessages.push(`${pkgName} > ${filePath}`)
+      }
+      if (key === 'require' && !path.includes('node') && !path.includes('browser')) {
+        console.log(path.includes('browser'));
+        requireOnlyMessages.push(`${pkgName} > ${filePath}`)
       }
-      // const result = {
-      //   packageName: pkgName,
-      //   found: false,
-      //   filePath,
-      //   fieldPath: `exports${path}[${key}]`
-      // };
-      // if (existsSync(filePath)) {
-      //   result.found = true;
-      // }
-      // results.push(result);
     } else {
       if (key === 'node') {
         let requirePath = exports[key]['require'];
@@ -82,10 +77,10 @@ function checkExports(
         if (!exports.default) {
           console.log(`Couldnt find default bundle for ${pkgName}`);
         }
-        if (requirePath.includes('node')) {
-          requirePath = 'NODE_ONLY_BUNDLE_FIXME';
-          nodeOnlyMessages.push(`${pkgName} ${path} cjs bundle is Node only`);
-        }
+        // if (requirePath.includes('node')) {
+        //   requirePath = 'NODE_ONLY_BUNDLE_FIXME';
+        //   nodeOnlyMessages.push(`${pkgName} ${path} cjs bundle is Node only`);
+        // }
         if (!exports['browser']) {
           exports['browser'] = {
             require: requirePath,
@@ -135,7 +130,10 @@ async function main() {
     }
   }
 
+  console.log('SINGLE NODE FIELD');
   console.log(singleNodeFieldMessages.join('\n'));
+  console.log('SINGLE REQUIRE FIELD');
+  console.log(requireOnlyMessages.join('\n'));
   console.log(nodeOnlyMessages.join('\n'));
 
   let missingPaths: boolean = false;