Merge pull request #276 from fluture-js/avaq/mjs

Migrate to mjs
fluture-js · Aug 29, 2018 · 7130b91 · 7130b91
2 parents 489afd2 + 0aa28b3
commit 7130b91
Show file tree

Hide file tree

Showing 96 changed files with 222 additions and 107 deletions.
diff --git a/index.cjs.js → index.cjs.mjs b/index.cjs.js → index.cjs.mjs
@@ -1,2 +1,2 @@
-import * as Fluture from './index.mjs.js';
+import * as Fluture from './index.mjs';
 export default Object.assign(Fluture.Future, Fluture);
diff --git a/index.mjs.js → index.mjs b/index.mjs.js → index.mjs
diff --git a/package.json b/package.json
@@ -2,30 +2,27 @@
   "name": "fluture",
   "version": "9.0.2",
   "description": "FantasyLand compliant (monadic) alternative to Promises",
-  "main": "index.js",
+  "main": "index",
   "types": "index.d.ts",
-  "module": "index.mjs.js",
-  "esm": {
-    "mode": "all",
-    "cjs": true
-  },
+  "module": "index.mjs",
   "files": [
     "src",
-    "index.es.js",
+    "index.js",
+    "index.mjs",
     "index.d.ts"
   ],
   "repository": "https://github.com/fluture-js/Fluture.git",
   "scripts": {
     "bench": "npm run build && sanctuary-benchmark",
     "build": "rollup -c",
-    "clean": "rimraf npm-debug.log coverage index.js index.test.js .esm-cache .nyc_output node_modules/.cache",
-    "lint": "eslint src test index.*.js README.md",
+    "clean": "rimraf npm-debug.log coverage index.js .esm-cache .nyc_output node_modules/.cache",
+    "lint": "eslint --ext mjs src test index.mjs index.cjs.mjs README.md",
     "lint:readme": "remark --no-stdout --frail -u remark-validate-links README.md",
     "release": "npm outdated --long; xyz --edit --repo git@github.com:fluture-js/Fluture.git --tag 'X.Y.Z' --script scripts/distribute --increment",
     "test": "npm run lint && npm run lint:readme && npm run test:unit && npm run test:types && npm run test:build",
-    "test:unit": "npm run clean && mocha --require esm --ui bdd --reporter list --full-trace --check-leaks --bail test/**.test.js",
-    "test:build": "npm run clean && npm run build && es-check es5 index.js && mocha --require esm --ui bdd --reporter dot --bail test/**.buildtest.js",
-    "test:coverage": "npm run clean && nyc --include src mocha --require esm --ui bdd --reporter dot test/**.test.js || true",
+    "test:unit": "npm run clean && mocha --require esm --ui bdd --reporter list --full-trace --check-leaks --bail test.js",
+    "test:build": "npm run clean && npm run build && es-check es5 index.js && mocha --require esm --ui bdd --reporter dot --bail test-build.js",
+    "test:coverage": "npm run clean && nyc --extension .mjs --include src mocha --require esm --ui bdd --reporter dot test.js || true",
     "coverage:upload": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "coverage:report": "nyc report --reporter=html",
     "test:types": "tsc --lib es6 index.d.ts"

diff --git a/rollup.config.dist.js b/rollup.config.dist.js
@@ -11,7 +11,7 @@ var banner = `/**
 `;
 
 export default {
-  input: 'index.cjs.js',
+  input: 'index.cjs.mjs',
   plugins: [node(), commonjs({include: 'node_modules/**'})],
   output: {
     banner: banner,

diff --git a/rollup.config.js b/rollup.config.js
@@ -9,11 +9,11 @@ var dependencies = {
 };
 
 export default {
-  input: 'index.cjs.js',
+  input: 'index.cjs.mjs',
   external: Object.keys(dependencies),
   output: {
     format: 'umd',
-    file: pkg.main,
+    file: pkg.main + '.js',
     name: 'Fluture',
     globals: dependencies
   }

diff --git a/src/after.js → src/after.mjs b/src/after.js → src/after.mjs
diff --git a/src/attempt.js → src/attempt.mjs b/src/attempt.js → src/attempt.mjs
diff --git a/src/cache.js → src/cache.mjs b/src/cache.js → src/cache.mjs
diff --git a/src/chain-rec.js → src/chain-rec.mjs b/src/chain-rec.js → src/chain-rec.mjs
diff --git a/src/dispatchers/alt.js → src/dispatchers/alt.mjs b/src/dispatchers/alt.js → src/dispatchers/alt.mjs
diff --git a/src/dispatchers/and.js → src/dispatchers/and.mjs b/src/dispatchers/and.js → src/dispatchers/and.mjs
diff --git a/src/dispatchers/ap.js → src/dispatchers/ap.mjs b/src/dispatchers/ap.js → src/dispatchers/ap.mjs
diff --git a/src/dispatchers/bimap.js → src/dispatchers/bimap.mjs b/src/dispatchers/bimap.js → src/dispatchers/bimap.mjs
diff --git a/src/dispatchers/both.js → src/dispatchers/both.mjs b/src/dispatchers/both.js → src/dispatchers/both.mjs
diff --git a/src/dispatchers/chain-rej.js → src/dispatchers/chain-rej.mjs b/src/dispatchers/chain-rej.js → src/dispatchers/chain-rej.mjs
diff --git a/src/dispatchers/chain.js → src/dispatchers/chain.mjs b/src/dispatchers/chain.js → src/dispatchers/chain.mjs
diff --git a/src/dispatchers/done.js → src/dispatchers/done.mjs b/src/dispatchers/done.js → src/dispatchers/done.mjs
diff --git a/src/dispatchers/extract-left.js → src/dispatchers/extract-left.mjs b/src/dispatchers/extract-left.js → src/dispatchers/extract-left.mjs
diff --git a/src/dispatchers/extract-right.js → src/dispatchers/extract-right.mjs b/src/dispatchers/extract-right.js → src/dispatchers/extract-right.mjs
diff --git a/src/dispatchers/fold.js → src/dispatchers/fold.mjs b/src/dispatchers/fold.js → src/dispatchers/fold.mjs
diff --git a/src/dispatchers/fork-catch.js → src/dispatchers/fork-catch.mjs b/src/dispatchers/fork-catch.js → src/dispatchers/fork-catch.mjs
diff --git a/src/dispatchers/fork.js → src/dispatchers/fork.mjs b/src/dispatchers/fork.js → src/dispatchers/fork.mjs
diff --git a/src/dispatchers/index.js → src/dispatchers/index.mjs b/src/dispatchers/index.js → src/dispatchers/index.mjs
diff --git a/src/dispatchers/lastly.js → src/dispatchers/lastly.mjs b/src/dispatchers/lastly.js → src/dispatchers/lastly.mjs
diff --git a/src/dispatchers/map-rej.js → src/dispatchers/map-rej.mjs b/src/dispatchers/map-rej.js → src/dispatchers/map-rej.mjs
diff --git a/src/dispatchers/map.js → src/dispatchers/map.mjs b/src/dispatchers/map.js → src/dispatchers/map.mjs
diff --git a/src/dispatchers/or.js → src/dispatchers/or.mjs b/src/dispatchers/or.js → src/dispatchers/or.mjs
diff --git a/src/dispatchers/promise.js → src/dispatchers/promise.mjs b/src/dispatchers/promise.js → src/dispatchers/promise.mjs
diff --git a/src/dispatchers/race.js → src/dispatchers/race.mjs b/src/dispatchers/race.js → src/dispatchers/race.mjs
diff --git a/src/dispatchers/swap.js → src/dispatchers/swap.mjs b/src/dispatchers/swap.js → src/dispatchers/swap.mjs
diff --git a/src/dispatchers/value.js → src/dispatchers/value.mjs b/src/dispatchers/value.js → src/dispatchers/value.mjs
diff --git a/src/encase-n.js → src/encase-n.mjs b/src/encase-n.js → src/encase-n.mjs
diff --git a/src/encase-n2.js → src/encase-n2.mjs b/src/encase-n2.js → src/encase-n2.mjs
diff --git a/src/encase-n3.js → src/encase-n3.mjs b/src/encase-n3.js → src/encase-n3.mjs
diff --git a/src/encase-p.js → src/encase-p.mjs b/src/encase-p.js → src/encase-p.mjs
diff --git a/src/encase-p2.js → src/encase-p2.mjs b/src/encase-p2.js → src/encase-p2.mjs
diff --git a/src/encase-p3.js → src/encase-p3.mjs b/src/encase-p3.js → src/encase-p3.mjs
diff --git a/src/encase.js → src/encase.mjs b/src/encase.js → src/encase.mjs
diff --git a/src/encase2.js → src/encase2.mjs b/src/encase2.js → src/encase2.mjs
diff --git a/src/encase3.js → src/encase3.mjs b/src/encase3.js → src/encase3.mjs
diff --git a/src/future.js → src/future.mjs b/src/future.js → src/future.mjs
diff --git a/src/go.js → src/go.mjs b/src/go.js → src/go.mjs
diff --git a/src/hook.js → src/hook.mjs b/src/hook.js → src/hook.mjs
diff --git a/src/internal/const.js → src/internal/const.mjs b/src/internal/const.js → src/internal/const.mjs
diff --git a/src/internal/error.js → src/internal/error.mjs b/src/internal/error.js → src/internal/error.mjs
diff --git a/src/internal/iteration.js → src/internal/iteration.mjs b/src/internal/iteration.js → src/internal/iteration.mjs
diff --git a/src/internal/list.js → src/internal/list.mjs b/src/internal/list.js → src/internal/list.mjs
diff --git a/src/internal/predicates.js → src/internal/predicates.mjs b/src/internal/predicates.js → src/internal/predicates.mjs
diff --git a/src/internal/throw.js → src/internal/throw.mjs b/src/internal/throw.js → src/internal/throw.mjs
diff --git a/src/internal/timing.js → src/internal/timing.mjs b/src/internal/timing.js → src/internal/timing.mjs
diff --git a/src/internal/utils.js → src/internal/utils.mjs b/src/internal/utils.js → src/internal/utils.mjs
diff --git a/src/node.js → src/node.mjs b/src/node.js → src/node.mjs
diff --git a/src/parallel.js → src/parallel.mjs b/src/parallel.js → src/parallel.mjs
diff --git a/src/try-p.js → src/try-p.mjs b/src/try-p.js → src/try-p.mjs
diff --git a/test-build.js b/test-build.js
@@ -0,0 +1 @@
+import './test/index.buildtest.mjs';
diff --git a/test.js b/test.js
@@ -0,0 +1,37 @@
+import './test/0.error.test.mjs';
+import './test/0.iteration.test.mjs';
+import './test/0.predicates.test.mjs';
+import './test/0.utils.test.mjs';
+import './test/1.future.test.mjs';
+import './test/2.computation.test.mjs';
+import './test/2.crashed.test.mjs';
+import './test/2.transformation.test.mjs';
+import './test/3.after.test.mjs';
+import './test/3.of.test.mjs';
+import './test/3.reject-after.test.mjs';
+import './test/3.reject.test.mjs';
+import './test/4.chain-rec.test.mjs';
+import './test/5.and.test.mjs';
+import './test/5.ap.test.mjs';
+import './test/5.bimap.test.mjs';
+import './test/5.both.test.mjs';
+import './test/5.cache.test.mjs';
+import './test/5.chain-rej.test.mjs';
+import './test/5.chain.test.mjs';
+import './test/5.encase-n.test.mjs';
+import './test/5.encase-p.test.mjs';
+import './test/5.encase.test.mjs';
+import './test/5.finally.test.mjs';
+import './test/5.fold.test.mjs';
+import './test/5.hook.test.mjs';
+import './test/5.map-rej.test.mjs';
+import './test/5.map.test.mjs';
+import './test/5.never.test.mjs';
+import './test/5.or.test.mjs';
+import './test/5.parallel-ap.test.mjs';
+import './test/5.parallel.test.mjs';
+import './test/5.race.test.mjs';
+import './test/5.swap.test.mjs';
+import './test/6.go.test.mjs';
+import './test/6.par.test.mjs';
+import './test/7.compliance.test.mjs';
diff --git a/test/0.error.test.js → test/0.error.test.mjs b/test/0.error.test.js → test/0.error.test.mjs
diff --git a/test/0.iteration.test.js → test/0.iteration.test.mjs b/test/0.iteration.test.js → test/0.iteration.test.mjs
@@ -1,6 +1,8 @@
-import {expect} from 'chai';
+import chai from 'chai';
 import {Next, Done, isIteration} from '../src/internal/iteration';
 
+var expect = chai.expect;
+
 describe('Iteration', function (){
 
   describe('.Next()', function (){

diff --git a/test/0.predicates.test.js → test/0.predicates.test.mjs b/test/0.predicates.test.js → test/0.predicates.test.mjs
@@ -1,8 +1,10 @@
-import {expect} from 'chai';
+import chai from 'chai';
 import * as U from './util';
-import Future from '../index.mjs.js';
+import Future from '../index.mjs';
 import * as util from '../src/internal/predicates';
 
+var expect = chai.expect;
+
 describe('is', function (){
 
   describe('.isThenable()', function (){

diff --git a/test/0.utils.test.js → test/0.utils.test.mjs b/test/0.utils.test.js → test/0.utils.test.mjs
@@ -1,6 +1,8 @@
-import {expect} from 'chai';
+import chai from 'chai';
 import * as fn from '../src/internal/utils';
 
+var expect = chai.expect;
+
 describe('fn', function (){
 
   describe('.padf()', function (){

diff --git a/test/1.future.test.js → test/1.future.test.mjs b/test/1.future.test.js → test/1.future.test.mjs
@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import chai from 'chai';
 import * as U from './util';
 import * as F from './futures';
 import type from 'sanctuary-type-identifiers';
@@ -16,7 +16,9 @@ import {
   extractRight,
   never,
   isNever,
-} from '../index.mjs.js';
+} from '../index.mjs';
+
+var expect = chai.expect;
 
 describe('Future', function (){
 

diff --git a/test/2.computation.test.js → test/2.computation.test.mjs b/test/2.computation.test.js → test/2.computation.test.mjs
@@ -1,8 +1,10 @@
-import {expect} from 'chai';
-import Future from '../index.mjs.js';
+import chai from 'chai';
+import Future from '../index.mjs';
 import * as U from './util';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 describe('Future()', function (){
 
   it('is a unary function', function (){

diff --git a/test/2.crashed.test.js → test/2.crashed.test.mjs b/test/2.crashed.test.js → test/2.crashed.test.mjs
@@ -1,8 +1,10 @@
-import {expect} from 'chai';
-import {Future, isFuture} from '../index.mjs.js';
-import {Crashed} from '../src/future.js';
+import chai from 'chai';
+import {Future, isFuture} from '../index.mjs';
+import {Crashed} from '../src/future';
 import show from 'sanctuary-show';
 
+var expect = chai.expect;
+
 describe('Crashed', function (){
 
   it('Creates members of Future', function (){

diff --git a/test/2.transformation.test.js → test/2.transformation.test.mjs b/test/2.transformation.test.js → test/2.transformation.test.mjs
@@ -1,10 +1,13 @@
-import {Future, of, after} from '../index.mjs.js';
-import {expect} from 'chai';
+import {Future, of, after} from '../index.mjs';
+import chai from 'chai';
 import {add, bang, noop, error, assertResolved, assertRejected, assertCrashed} from './util';
 import {resolved, rejected, resolvedSlow} from './futures';
 import {Transformation} from '../src/future';
 import {nil} from '../src/internal/list';
-import {StateT} from 'fantasy-states';
+import State from 'fantasy-states';
+
+var expect = chai.expect;
+var StateT = State.StateT;
 
 describe('Transformation', function (){
 

diff --git a/test/3.after.test.js → test/3.after.test.mjs b/test/3.after.test.js → test/3.after.test.mjs
@@ -1,8 +1,10 @@
-import {expect} from 'chai';
-import {Future, after, never} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, after, never} from '../index.mjs';
 import * as U from './util';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 describe('after()', function (){
 
   it('is a curried binary function', function (){

diff --git a/test/3.of.test.js → test/3.of.test.mjs b/test/3.of.test.js → test/3.of.test.mjs
@@ -1,9 +1,11 @@
-import {expect} from 'chai';
+import chai from 'chai';
 import FL from 'fantasy-land';
-import {Future, of} from '../index.mjs.js';
+import {Future, of} from '../index.mjs';
 import * as U from './util';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 describe('of()', function (){
 
   it('is also available as fantasy-land function', function (){

diff --git a/test/3.reject-after.test.js → test/3.reject-after.test.mjs b/test/3.reject-after.test.js → test/3.reject-after.test.mjs
@@ -1,8 +1,10 @@
-import {expect} from 'chai';
-import {Future, rejectAfter, never} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, rejectAfter, never} from '../index.mjs';
 import * as U from './util';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 describe('rejectAfter()', function (){
 
   it('is a curried binary function', function (){

diff --git a/test/3.reject.test.js → test/3.reject.test.mjs b/test/3.reject.test.js → test/3.reject.test.mjs
@@ -1,8 +1,10 @@
-import {expect} from 'chai';
-import {Future, reject} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, reject} from '../index.mjs';
 import * as U from './util';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 describe('reject()', function (){
 
   it('returns an instance of Future', function (){

diff --git a/test/4.chain-rec.test.js → test/4.chain-rec.test.mjs b/test/4.chain-rec.test.js → test/4.chain-rec.test.mjs
@@ -1,9 +1,11 @@
-import {expect} from 'chai';
-import {Future, of, after, reject} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, of, after, reject} from '../index.mjs';
 import {isIteration} from '../src/internal/iteration';
 import * as U from './util';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 function mockStep (next, done, x){
   return of(done(x));
 }

diff --git a/test/5.and.test.js → test/5.and.test.mjs b/test/5.and.test.js → test/5.and.test.mjs
@@ -1,9 +1,11 @@
-import {expect} from 'chai';
-import {Future, and, of} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, and, of} from '../index.mjs';
 import * as U from './util';
 import * as F from './futures';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 var testInstance = function (and){
 
   it('is considered a member of fluture/Fluture', function (){

diff --git a/test/5.ap.test.js → test/5.ap.test.mjs b/test/5.ap.test.js → test/5.ap.test.mjs
@@ -1,10 +1,12 @@
-import {expect} from 'chai';
-import {Future, ap, of, reject, after} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, ap, of, reject, after} from '../index.mjs';
 import * as U from './util';
 import * as F from './futures';
 import type from 'sanctuary-type-identifiers';
 import R from 'ramda';
 
+var expect = chai.expect;
+
 var testInstance = function (ap){
 
   it('is considered a member of fluture/Fluture', function (){

diff --git a/test/5.bimap.test.js → test/5.bimap.test.mjs b/test/5.bimap.test.js → test/5.bimap.test.mjs
@@ -1,8 +1,10 @@
-import {expect} from 'chai';
-import {Future, bimap, of, reject} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, bimap, of, reject} from '../index.mjs';
 import * as U from './util';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 var testInstance = function (bimap){
 
   it('is considered a member of fluture/Fluture', function (){

diff --git a/test/5.both.test.js → test/5.both.test.mjs b/test/5.both.test.js → test/5.both.test.mjs
@@ -1,9 +1,11 @@
-import {expect} from 'chai';
-import {Future, both, of, node} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, both, of, node} from '../index.mjs';
 import * as U from './util';
 import * as F from './futures';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 var testInstance = function (both){
 
   it('is considered a member of fluture/Fluture', function (){

diff --git a/test/5.cache.test.js → test/5.cache.test.mjs b/test/5.cache.test.js → test/5.cache.test.mjs
@@ -1,10 +1,12 @@
-import {expect} from 'chai';
-import {Future, cache, of, reject, after} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, cache, of, reject, after} from '../index.mjs';
 import {Cached} from '../src/cache';
 import * as U from './util';
 import * as F from './futures';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 describe('cache()', function (){
 
   it('throws when not given a Future', function (){

diff --git a/test/5.chain-rej.test.js → test/5.chain-rej.test.mjs b/test/5.chain-rej.test.js → test/5.chain-rej.test.mjs
@@ -1,9 +1,11 @@
-import {expect} from 'chai';
-import {Future, chainRej, of} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, chainRej, of} from '../index.mjs';
 import * as U from './util';
 import * as F from './futures';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 var testInstance = function (chainRej){
 
   it('is considered a member of fluture/Fluture', function (){

diff --git a/test/5.chain.test.js → test/5.chain.test.mjs b/test/5.chain.test.js → test/5.chain.test.mjs
@@ -1,9 +1,11 @@
-import {expect} from 'chai';
-import {Future, chain, of} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, chain, of} from '../index.mjs';
 import * as U from './util';
 import * as F from './futures';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
+
 var testInstance = function (chain){
 
   it('is considered a member of fluture/Fluture', function (){

diff --git a/test/5.encase-n.test.js → test/5.encase-n.test.mjs b/test/5.encase-n.test.js → test/5.encase-n.test.mjs
@@ -1,8 +1,9 @@
-import {expect} from 'chai';
-import {Future, encaseN, encaseN2, encaseN3, node} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, encaseN, encaseN2, encaseN3, node} from '../index.mjs';
 import * as U from './util';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
 var unaryNoop = function (a, f){ return void f };
 var binaryNoop = function (a, b, f){ return void f };
 var ternaryNoop = function (a, b, c, f){ return void f };

diff --git a/test/5.encase-p.test.js → test/5.encase-p.test.mjs b/test/5.encase-p.test.js → test/5.encase-p.test.mjs
@@ -1,10 +1,11 @@
 /* eslint prefer-promise-reject-errors: 0 */
 
-import {expect} from 'chai';
-import {Future, encaseP, encaseP2, encaseP3, tryP} from '../index.mjs.js';
+import chai from 'chai';
+import {Future, encaseP, encaseP2, encaseP3, tryP} from '../index.mjs';
 import * as U from './util';
 import type from 'sanctuary-type-identifiers';
 
+var expect = chai.expect;
 var unaryNoop = function (a){ return Promise.resolve(a) };
 var binaryNoop = function (a, b){ return Promise.resolve(b) };
 var ternaryNoop = function (a, b, c){ return Promise.resolve(c) };