Switch to mjs

BNationsDEV · Mar 13, 2019 · 306358a · 306358a
1 parent 5cddbdd
commit 306358a
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 22 deletions.
diff --git a/docs/examples/01-simple-example/index.html b/docs/examples/01-simple-example/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 
 <script type="module">
-  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.js";
-  import * as Comlink from "../../../dist/esm/comlink.js";
+  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.mjs";
+  import * as Comlink from "../../../dist/esm/comlink.mjs";
 
   async function init() {
     const worker = new Worker("worker.js");

diff --git a/docs/examples/02-callback-example/index.html b/docs/examples/02-callback-example/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 
 <script type="module">
-  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.js";
-  import * as Comlink from "../../../dist/esm/comlink.js";
+  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.mjs";
+  import * as Comlink from "../../../dist/esm/comlink.mjs";
 
   function callback(value) {
     alert(`Result: ${value}`);

diff --git a/docs/examples/03-classes-example/index.html b/docs/examples/03-classes-example/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 
 <script type="module">
-  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.js";
-  import * as Comlink from "../../../dist/esm/comlink.js";
+  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.mjs";
+  import * as Comlink from "../../../dist/esm/comlink.mjs";
 
   let instance1, instance2;
   async function showState() {

diff --git a/docs/examples/05-serviceworker-example/index.html b/docs/examples/05-serviceworker-example/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 
 <script type="module">
-  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.js";
-  import * as Comlink from "../../../dist/esm/comlink.js";
+  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.mjs";
+  import * as Comlink from "../../../dist/esm/comlink.mjs";
 
   async function initComlink() {
     const { port1, port2 } = new MessageChannel();

diff --git a/docs/examples/99-nonworker-examples/iframes/iframe.html b/docs/examples/99-nonworker-examples/iframes/iframe.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 
 <script type="module">
-  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.js";
-  import * as Comlink from "../../../../dist/esm/comlink.js";
+  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.mjs";
+  import * as Comlink from "../../../../dist/esm/comlink.mjs";
   function add(a, b) {
     return a + b;
   }

diff --git a/docs/examples/99-nonworker-examples/iframes/index.html b/docs/examples/99-nonworker-examples/iframes/index.html
@@ -2,8 +2,8 @@
 
 <iframe src="iframe.html"></iframe>
 <script type="module">
-  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.js";
-  import * as Comlink from "../../../../dist/esm/comlink.js";
+  // import * as Comlink from "https://unpkg.com/comlink@alpha/dist/esm/comlink.mjs";
+  import * as Comlink from "../../../../dist/esm/comlink.mjs";
   async function main() {
     const ifr = document.querySelector("iframe");
     await new Promise(resolve => (ifr.onload = resolve));

diff --git a/karma.conf.js b/karma.conf.js
@@ -21,7 +21,7 @@ module.exports = function(config) {
         included: false
       },
       {
-        pattern: "dist/**/*.js",
+        pattern: "dist/**/*.@(mjs|js)",
         included: false
       },
       {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "4.0.0-alpha.6",
   "description": "Comlink makes WebWorkers enjoyable",
   "main": "dist/umd/comlink.js",
-  "module": "dist/esm/comlink.js",
+  "module": "dist/esm/comlink.mjs",
   "types": "dist/umd/comlink.d.ts",
   "scripts": {
     "build": "rollup -c",
@@ -43,6 +43,7 @@
     "karma-safaritechpreview-launcher": "2.0.2",
     "mocha": "5.2.0",
     "prettier": "1.16.1",
+    "rimraf": "^2.6.3",
     "rollup": "^1.6.0",
     "rollup-plugin-terser": "^4.0.4",
     "rollup-plugin-typescript2": "^0.19.3",

diff --git a/rollup.config.js b/rollup.config.js
@@ -3,11 +3,13 @@ import { terser } from "rollup-plugin-terser";
 
 function config({ format, minify }) {
   const dir = `dist/${format}/`;
+  const minifierSuffix = minify ? ".min" : "";
+  const ext = format === "esm" ? "mjs" : "js";
   return {
     input: "./src/comlink.ts",
     output: {
       name: "Comlink",
-      file: `${dir}/comlink${minify ? ".min" : ""}.js`,
+      file: `${dir}/comlink${minifierSuffix}.${ext}`,
       format,
       sourcemap: true
     },
@@ -35,6 +37,8 @@ function config({ format, minify }) {
   };
 }
 
+require("rimraf").sync("dist");
+
 export default [
   { format: "esm", minify: false },
   { format: "esm", minify: true },

diff --git a/tests/fixtures/iframe.html b/tests/fixtures/iframe.html
@@ -1,5 +1,5 @@
 <script type="module">
-  import * as Comlink from "/base/dist/esm/comlink.js";
+  import * as Comlink from "/base/dist/esm/comlink.mjs";
 
   Comlink.expose((a, b) => a + b, Comlink.windowEndpoint(self.parent));
 </script>
diff --git a/tests/iframe.comlink.test.js b/tests/iframe.comlink.test.js
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-import * as Comlink from "/base/dist/esm/comlink.js";
+import * as Comlink from "/base/dist/esm/comlink.mjs";
 
 describe("Comlink across iframes", function() {
   beforeEach(function() {

diff --git a/tests/same_window.comlink.test.js b/tests/same_window.comlink.test.js
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-import * as Comlink from "/base/dist/esm/comlink.js";
+import * as Comlink from "/base/dist/esm/comlink.mjs";
 
 class SampleClass {
   constructor(counterInit = 1) {

diff --git a/tests/worker.comlink.test.js b/tests/worker.comlink.test.js
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-import * as Comlink from "/base/dist/esm/comlink.js";
+import * as Comlink from "/base/dist/esm/comlink.mjs";
 
 describe("Comlink across workers", function() {
   beforeEach(function() {