projectfluent · stasm · Apr 20, 2020 · Apr 20, 2020 · May 4, 2020
diff --git a/fluent-bundle/.gitignore b/fluent-bundle/.gitignore
@@ -1,2 +1,2 @@
 esm/
-/index.js
+/index.cjs
diff --git a/fluent-bundle/makefile b/fluent-bundle/makefile
@@ -24,9 +24,9 @@ test: esm/.compiled
 	    test/**/*_test.js
 
 .PHONY: build
-build: index.js
+build: index.cjs
 
-index.js: esm/.compiled
+index.cjs: esm/.compiled
 	@rollup $(CURDIR)/esm/index.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
@@ -47,7 +47,7 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js
+	@rm -f index.cjs
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
 

diff --git a/fluent-bundle/package.json b/fluent-bundle/package.json
@@ -15,8 +15,12 @@
       "email": "stas@mozilla.com"
     }
   ],
-  "type": "commonjs",
-  "main": "./index.js",
+  "type": "module",
+  "main": "./index.cjs",
+  "exports": {
+    "import": "./esm/index.js",
+    "require": "./index.cjs"
+  },
   "module": "./esm/index.js",
   "types": "./esm/index.d.ts",
   "repository": {

diff --git a/fluent-dedent/.gitignore b/fluent-dedent/.gitignore
@@ -1,2 +1,2 @@
 esm/
-/index.js
+/index.cjs
diff --git a/fluent-dedent/makefile b/fluent-dedent/makefile
@@ -24,9 +24,9 @@ test: esm/.compiled
 	    test/**/*_test.js
 
 .PHONY: build
-build: index.js
+build: index.cjs
 
-index.js: esm/.compiled
+index.cjs: esm/.compiled
 	@rollup $(CURDIR)/esm/index.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
@@ -47,6 +47,6 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js
+	@rm -f index.cjs
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
diff --git a/fluent-dedent/package.json b/fluent-dedent/package.json
@@ -11,8 +11,12 @@
       "email": "stas@mozilla.com"
     }
   ],
-  "type": "commonjs",
-  "main": "./index.js",
+  "type": "module",
+  "main": "./index.cjs",
+  "exports": {
+    "import": "./esm/index.js",
+    "require": "./index.cjs"
+  },
   "module": "./esm/index.js",
   "types": "./esm/index.d.ts",
   "repository": {

diff --git a/fluent-dom/.gitignore b/fluent-dom/.gitignore
@@ -1,2 +1,2 @@
 esm/
-/index.js
+/index.cjs
diff --git a/fluent-dom/makefile b/fluent-dom/makefile
@@ -26,9 +26,9 @@ test: esm/.compiled
 	    test/**/*_test.js
 
 .PHONY: build
-build: index.js
+build: index.cjs
 
-index.js: esm/.compiled
+index.cjs: esm/.compiled
 	@rollup $(CURDIR)/esm/index.js \
 		--banner "/* $(PACKAGE)@$(VERSION) */" \
 		--amd.id $(PACKAGE) \
@@ -50,6 +50,6 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js
+	@rm -f index.cjs
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
diff --git a/fluent-dom/package.json b/fluent-dom/package.json
@@ -18,8 +18,12 @@
       "email": "stas@mozilla.com"
     }
   ],
-  "type": "commonjs",
-  "main": "./index.js",
+  "type": "module",
+  "main": "./index.cjs",
+  "exports": {
+    "import": "./esm/index.js",
+    "require": "./index.cjs"
+  },
   "module": "./esm/index.js",
   "types": "./esm/index.d.ts",
   "keywords": [

diff --git a/fluent-gecko/package.json b/fluent-gecko/package.json
@@ -16,9 +16,6 @@
       "email": "stas@mozilla.com"
     }
   ],
-  "directories": {
-    "lib": "./src"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/projectfluent/fluent.js.git"

diff --git a/fluent-langneg/.gitignore b/fluent-langneg/.gitignore
@@ -1,2 +1,2 @@
 esm/
-/index.js
+/index.cjs
diff --git a/fluent-langneg/makefile b/fluent-langneg/makefile
@@ -24,9 +24,9 @@ test: esm/.compiled
 	    test/**/*_test.js
 
 .PHONY: build
-build: index.js
+build: index.cjs
 
-index.js: $(SOURCES)
+index.cjs: $(SOURCES)
 	@rollup $(CURDIR)/esm/index.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
@@ -47,6 +47,6 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js
+	@rm -f index.cjs
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
diff --git a/fluent-langneg/package.json b/fluent-langneg/package.json
@@ -15,8 +15,12 @@
       "email": "stas@mozilla.com"
     }
   ],
-  "type": "commonjs",
-  "main": "./index.js",
+  "type": "module",
+  "main": "./index.cjs",
+  "exports": {
+    "import": "./esm/index.js",
+    "require": "./index.cjs"
+  },
   "module": "./esm/index.js",
   "types": "./esm/index.d.ts",
   "repository": {

diff --git a/fluent-langneg/test/package.json b/fluent-langneg/test/package.json
@@ -0,0 +1,3 @@
+{
+    "type": "commonjs"
+}
diff --git a/fluent-react/.gitignore b/fluent-react/.gitignore
@@ -1,2 +1,2 @@
 esm/
-/index.js
+/index.cjs
diff --git a/fluent-react/makefile b/fluent-react/makefile
@@ -21,9 +21,9 @@ test: esm/.compiled
 	@jest --collect-coverage
 
 .PHONY: build
-build: index.js
+build: index.cjs
 
-index.js: esm/.compiled
+index.cjs: esm/.compiled
 	@rollup $(CURDIR)/esm/index.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
@@ -45,6 +45,6 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js
+	@rm -f index.cjs
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
diff --git a/fluent-react/package.json b/fluent-react/package.json
@@ -15,8 +15,12 @@
       "email": "stas@mozilla.com"
     }
   ],
-  "type": "commonjs",
-  "main": "./index.js",
+  "type": "module",
+  "main": "./index.cjs",
+  "exports": {
+    "import": "./esm/index.js",
+    "require": "./index.cjs"
+  },
   "module": "./esm/index.js",
   "types": "./esm/index.d.ts",
   "repository": {

diff --git a/fluent-sequence/.gitignore b/fluent-sequence/.gitignore
@@ -1,2 +1,2 @@
 esm/
-/index.js
+/index.cjs
diff --git a/fluent-sequence/makefile b/fluent-sequence/makefile
@@ -24,9 +24,9 @@ test: esm/.compiled
 	    test/**/*_test.js
 
 .PHONY: build
-build: index.js
+build: index.cjs
 
-index.js: esm/.compiled
+index.cjs: esm/.compiled
 	@rollup $(CURDIR)/esm/index.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
@@ -47,6 +47,6 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js
+	@rm -f index.cjs
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
diff --git a/fluent-sequence/package.json b/fluent-sequence/package.json
@@ -15,8 +15,12 @@
       "email": "stas@mozilla.com"
     }
   ],
-  "type": "commonjs",
-  "main": "./index.js",
+  "type": "module",
+  "main": "./index.cjs",
+  "exports": {
+    "import": "./esm/index.js",
+    "require": "./index.cjs"
+  },
   "module": "./esm/index.js",
   "types": "./esm/index.d.ts",
   "repository": {

diff --git a/fluent-syntax/.gitignore b/fluent-syntax/.gitignore
@@ -1,2 +1,3 @@
 esm/
-/index.js
+/index.cjs
+/wrapper.mjs
diff --git a/fluent-syntax/makefile b/fluent-syntax/makefile
@@ -24,9 +24,9 @@ test: esm/.compiled
 	    test/**/*_test.js
 
 .PHONY: build
-build: index.js
+build: index.cjs wrapper.mjs
 
-index.js: esm/.compiled
+index.cjs: esm/.compiled
 	@rollup $(CURDIR)/esm/index.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
@@ -35,6 +35,10 @@ index.js: esm/.compiled
 	    --output.file $@
 	@echo -e " $(OK) $@ built"
 
+wrapper.mjs: index.cjs
+	@node ../wrap_as_esm.cjs $< > $@
+	@echo -e " $(OK) $@ built"
+
 html:
 	@typedoc src \
 	    --out ../html/syntax \
@@ -47,7 +51,7 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js
+	@rm -f index.cjs
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
 

diff --git a/fluent-syntax/package.json b/fluent-syntax/package.json
@@ -15,8 +15,12 @@
       "email": "stas@mozilla.com"
     }
   ],
-  "type": "commonjs",
-  "main": "./index.js",
+  "type": "module",
+  "main": "./index.cjs",
+  "exports": {
+    "import": "./wrapper.mjs",
+    "require": "./index.cjs"
+  },
   "module": "./esm/index.js",
   "types": "./esm/index.d.ts",
   "repository": {

diff --git a/wrap_as_esm.cjs b/wrap_as_esm.cjs
@@ -0,0 +1,9 @@
+const path = require("path");
+const index_cjs= process.argv[2];
+const cjs = require(path.join(process.cwd(), index_cjs));
+
+let wrapper = `import cjs from "./index.cjs";`;
+for (let name in cjs) {
+    wrapper += `\nexport const ${name} = cjs.${name};`
+}
+console.log(wrapper);