Merge pull request #1479 from glimmerjs/more-cjs-re-adding

CJS needs to be enabled entirely, because ember-source requires it for now
glimmerjs · Oct 31, 2023 · 17764c0 · 17764c0
2 parents de418ee + 26c4cf3
commit 17764c0
Show file tree

Hide file tree

Showing 45 changed files with 277 additions and 379 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ tmp/
 instrumentation.*.json
 .cache
 **/.yalc
+**/*.tgz
diff --git a/packages/@glimmer-workspace/build/lib/config.js b/packages/@glimmer-workspace/build/lib/config.js
@@ -245,7 +245,7 @@ export class Package {
   /**
    * @typedef {object} Formats
    * @property {boolean} [ esm ] enabled by default
-   * @property {boolean} [ cjs ] disabled by default
+   * @property {boolean} [ cjs ] enabled by default until eslint-plugin-ember and ember-source no longer need it
    *
    * @returns {import("rollup").RollupOptions[] | import("rollup").RollupOptions}
    */
@@ -257,7 +257,7 @@ export class Package {
       builds.push(...this.rollupESM({ env: 'prod' }));
     }
 
-    if (formats.cjs) {
+    if (formats.cjs ?? true) {
       builds.push(...this.rollupCJS({ env: 'dev' }));
     }
 

diff --git a/packages/@glimmer/compiler/.npmignore b/packages/@glimmer/compiler/.npmignore
@@ -1 +1,2 @@
 test/
+index.ts
diff --git a/packages/@glimmer/compiler/package.json b/packages/@glimmer/compiler/package.json
@@ -16,19 +16,20 @@
   ],
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
         "development": {
           "require": "./dist/dev/index.cjs",
-          "default": "./dist/dev/index.js"
+          "import": "./dist/dev/index.js"
         },
         "require": "./dist/dev/index.cjs",
-        "default": "./dist/prod/index.js"
+        "import": "./dist/dev/index.js"
       }
-    }
+    },
+    "main": null,
+    "module": null
   },
   "dependencies": {
     "@glimmer/interfaces": "workspace:^",

diff --git a/packages/@glimmer/compiler/rollup.config.mjs b/packages/@glimmer/compiler/rollup.config.mjs
@@ -1,3 +1,3 @@
 import { Package } from '@glimmer-workspace/build-support';
 
-export default Package.config(import.meta, { esm: true, cjs: true });
+export default Package.config(import.meta);
diff --git a/packages/@glimmer/debug/.npmignore b/packages/@glimmer/debug/.npmignore
@@ -1 +1,2 @@
 test/
+index.ts
diff --git a/packages/@glimmer/debug/package.json b/packages/@glimmer/debug/package.json
@@ -14,17 +14,15 @@
   ],
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
-        "development": {
-          "default": "./dist/dev/index.js"
-        },
-        "default": "./dist/prod/index.js"
+        "development": {}
       }
-    }
+    },
+    "main": null,
+    "module": null
   },
   "dependencies": {
     "@glimmer/interfaces": "workspace:^",

diff --git a/packages/@glimmer/destroyable/.npmignore b/packages/@glimmer/destroyable/.npmignore
@@ -0,0 +1 @@
+index.ts
diff --git a/packages/@glimmer/destroyable/package.json b/packages/@glimmer/destroyable/package.json
@@ -12,17 +12,15 @@
   ],
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
-        "development": {
-          "default": "./dist/dev/index.js"
-        },
-        "default": "./dist/prod/index.js"
+        "development": {}
       }
-    }
+    },
+    "main": null,
+    "module": null
   },
   "dependencies": {
     "@glimmer/env": "0.1.7",

diff --git a/packages/@glimmer/dom-change-list/.npmignore b/packages/@glimmer/dom-change-list/.npmignore
@@ -1 +1,2 @@
 test/
+index.ts
diff --git a/packages/@glimmer/dom-change-list/package.json b/packages/@glimmer/dom-change-list/package.json
@@ -7,17 +7,20 @@
   "types": "index.ts",
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
         "development": {
-          "default": "./dist/dev/index.js"
+          "require": "./dist/dev/index.cjs",
+          "import": "./dist/dev/index.js"
         },
-        "default": "./dist/prod/index.js"
+        "require": "./dist/dev/index.cjs",
+        "import": "./dist/prod/index.js"
       }
-    }
+    },
+    "main": null,
+    "module": null
   },
   "files": [
     "dist"

diff --git a/packages/@glimmer/encoder/.npmignore b/packages/@glimmer/encoder/.npmignore
@@ -0,0 +1 @@
+index.ts
diff --git a/packages/@glimmer/encoder/package.json b/packages/@glimmer/encoder/package.json
@@ -7,17 +7,20 @@
   "types": "index.ts",
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
         "development": {
-          "default": "./dist/dev/index.js"
+          "require": "./dist/dev/index.cjs",
+          "import": "./dist/dev/index.js"
         },
-        "default": "./dist/prod/index.js"
+        "require": "./dist/dev/index.cjs",
+        "import": "./dist/prod/index.js"
       }
-    }
+    },
+    "main": null,
+    "module": null
   },
   "files": [
     "dist"

diff --git a/packages/@glimmer/global-context/.npmignore b/packages/@glimmer/global-context/.npmignore
@@ -0,0 +1 @@
+index.ts
diff --git a/packages/@glimmer/global-context/package.json b/packages/@glimmer/global-context/package.json
@@ -10,17 +10,20 @@
   ],
   "publishConfig": {
     "access": "public",
-    "main": "./dist/prod/index.js",
     "types": "./dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
         "development": {
-          "default": "./dist/dev/index.js"
+          "require": "./dist/dev/index.cjs",
+          "import": "./dist/dev/index.js"
         },
-        "default": "./dist/prod/index.js"
+        "require": "./dist/dev/index.cjs",
+        "import": "./dist/prod/index.js"
       }
-    }
+    },
+    "main": null,
+    "module": null
   },
   "scripts": {
     "test:lint": "eslint .",

diff --git a/packages/@glimmer/interfaces/package.json b/packages/@glimmer/interfaces/package.json
@@ -17,7 +17,9 @@
     "test:publint": "publint"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "main": null,
+    "module": null
   },
   "dependencies": {
     "@simple-dom/interface": "^1.4.0"

diff --git a/packages/@glimmer/manager/.npmignore b/packages/@glimmer/manager/.npmignore
@@ -0,0 +1 @@
+index.ts
diff --git a/packages/@glimmer/manager/package.json b/packages/@glimmer/manager/package.json
@@ -28,17 +28,20 @@
   "types": "index.ts",
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
         "development": {
-          "default": "./dist/dev/index.js"
+          "require": "./dist/dev/index.cjs",
+          "import": "./dist/dev/index.js"
         },
-        "default": "./dist/prod/index.js"
+        "require": "./dist/dev/index.cjs",
+        "import": "./dist/prod/index.js"
       }
-    }
+    },
+    "main": null,
+    "module": null
   },
   "scripts": {
     "test:lint": "eslint .",

diff --git a/packages/@glimmer/node/.npmignore b/packages/@glimmer/node/.npmignore
@@ -0,0 +1 @@
+index.ts
diff --git a/packages/@glimmer/node/package.json b/packages/@glimmer/node/package.json
@@ -30,16 +30,19 @@
   "types": "index.ts",
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
         "development": {
-          "default": "./dist/dev/index.js"
+          "require": "./dist/dev/index.cjs",
+          "import": "./dist/dev/index.js"
         },
-        "default": "./dist/prod/index.js"
+        "require": "./dist/dev/index.cjs",
+        "import": "./dist/prod/index.js"
       }
-    }
+    },
+    "main": null,
+    "module": null
   }
 }
diff --git a/packages/@glimmer/opcode-compiler/.npmignore b/packages/@glimmer/opcode-compiler/.npmignore
@@ -1 +1,2 @@
 test/
+index.ts
diff --git a/packages/@glimmer/opcode-compiler/package.json b/packages/@glimmer/opcode-compiler/package.json
@@ -35,16 +35,19 @@
   "types": "index.ts",
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
         "development": {
-          "default": "./dist/dev/index.js"
+          "require": "./dist/dev/index.cjs",
+          "import": "./dist/dev/index.js"
         },
-        "default": "./dist/prod/index.js"
+        "require": "./dist/dev/index.cjs",
+        "import": "./dist/prod/index.js"
       }
-    }
+    },
+    "main": null,
+    "module": null
   }
 }
diff --git a/packages/@glimmer/owner/.npmignore b/packages/@glimmer/owner/.npmignore
@@ -0,0 +1,2 @@
+test/
+index.ts
diff --git a/packages/@glimmer/owner/package.json b/packages/@glimmer/owner/package.json
@@ -28,16 +28,19 @@
   "types": "index.ts",
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
         "development": {
-          "default": "./dist/dev/index.js"
+          "require": "./dist/dev/index.cjs",
+          "import": "./dist/dev/index.js"
         },
-        "default": "./dist/prod/index.js"
+        "require": "./dist/dev/index.cjs",
+        "import": "./dist/prod/index.js"
       }
-    }
+    },
+    "main": null,
+    "module": null
   }
 }
diff --git a/packages/@glimmer/program/.npmignore b/packages/@glimmer/program/.npmignore
@@ -1 +1,2 @@
 test/
+index.ts
diff --git a/packages/@glimmer/program/package.json b/packages/@glimmer/program/package.json
@@ -27,17 +27,20 @@
   "types": "index.ts",
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
         "development": {
-          "default": "./dist/dev/index.js"
+          "require": "./dist/dev/index.cjs",
+          "import": "./dist/dev/index.js"
         },
-        "default": "./dist/prod/index.js"
+        "require": "./dist/dev/index.cjs",
+        "import": "./dist/prod/index.js"
       }
-    }
+    },
+    "main": null,
+    "module": null
   },
   "scripts": {
     "test:lint": "eslint .",

diff --git a/packages/@glimmer/reference/.npmignore b/packages/@glimmer/reference/.npmignore
@@ -1 +1,2 @@
 test/
+index.ts
diff --git a/packages/@glimmer/reference/package.json b/packages/@glimmer/reference/package.json
@@ -36,16 +36,19 @@
   "types": "index.ts",
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
         "development": {
-          "default": "./dist/dev/index.js"
+          "require": "./dist/dev/index.cjs",
+          "import": "./dist/dev/index.js"
         },
-        "default": "./dist/prod/index.js"
+        "require": "./dist/dev/index.cjs",
+        "import": "./dist/prod/index.js"
       }
-    }
+    },
+    "main": null,
+    "module": null
   }
 }
diff --git a/packages/@glimmer/runtime/.npmignore b/packages/@glimmer/runtime/.npmignore
@@ -1 +1,2 @@
 test/
+index.ts
diff --git a/packages/@glimmer/runtime/package.json b/packages/@glimmer/runtime/package.json
@@ -11,17 +11,18 @@
   ],
   "publishConfig": {
     "access": "public",
-    "main": "dist/prod/index.js",
     "types": "dist/dev/index.d.ts",
     "exports": {
       ".": {
         "types": "./dist/dev/index.d.ts",
         "development": {
-          "default": "./dist/dev/index.js"
+          "import": "./dist/dev/index.js"
         },
-        "default": "./dist/prod/index.js"
+        "import": "./dist/prod/index.js"
       }
-    }
+    },
+    "main": null,
+    "module": null
   },
   "dependencies": {
     "@glimmer/destroyable": "workspace:^",

diff --git a/packages/@glimmer/syntax/.npmignore b/packages/@glimmer/syntax/.npmignore
@@ -1 +1,2 @@
 test/
+index.ts