Skip to content

Commit c5c00dc

Browse files
AvaqAvaq
authored
Merge pull request #601 from fluture-js/avaq/maintenance
Maintenance
2 parents 47b62eb + 670fb9b commit c5c00dc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+139
-137
lines changed

Diff for: ‎.eslintrc.json

+13-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,19 @@
2828
"no-console": 2,
2929
"eqeqeq": [2, "smart"],
3030
"no-eq-null": ["off"],
31-
"no-param-reassign": ["off"]
31+
"no-param-reassign": ["off"],
32+
"no-shadow": ["off"],
33+
"keyword-spacing": ["off"],
34+
"no-plusplus": ["off"],
35+
"operator-assignment": ["off"],
36+
"one-var": ["off"],
37+
"generator-star-spacing": ["error", {"before": false, "after": false}],
38+
"no-mixed-operators": ["off"],
39+
"capitalized-comments": ["off"],
40+
"init-declarations": ["off"],
41+
"function-call-argument-newline": ["off"],
42+
"no-multi-assign": ["off"],
43+
"no-invalid-this": ["off"]
3244
},
3345
"overrides": [
3446
{

Diff for: ‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Install NodeJS
1717
uses: actions/setup-node@v1
1818
with:
19-
node-version: 14.x
19+
node-version: 18.x
2020
- name: Install Dependencies
2121
run: npm install
2222
- name: Execute Tests

Diff for: ‎index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export {
55
isNever,
66
never,
77
reject,
8-
resolve
8+
resolve,
99
} from './src/future.js';
1010

1111
export {after} from './src/after.js';

Diff for: ‎package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
],
7272
"dependencies": {
7373
"sanctuary-show": "^2.0.0",
74-
"sanctuary-type-identifiers": "^3.0.0"
74+
"sanctuary-type-identifiers": "^4.0.0"
7575
},
7676
"devDependencies": {
7777
"@rollup/plugin-commonjs": "^25.0.0",
@@ -80,20 +80,20 @@
8080
"chai": "^4.1.2",
8181
"codecov": "^3.6.1",
8282
"es-check": "^7.0.0",
83-
"eslint": "^7.0.0",
84-
"eslint-config-warp": "^4.0.0",
85-
"fantasy-laws": "^1.0.1",
83+
"eslint": "^8.54.0",
84+
"eslint-config-warp": "^7.1.0",
85+
"fantasy-laws": "^2.0.1",
8686
"jsverify": "^0.8.3",
8787
"oletus": "^4.0.0",
88-
"ramda": "^0.27.0",
89-
"remark-cli": "^11.0.0",
90-
"remark-validate-links": "^12.1.0",
88+
"ramda": "^0.29.1",
89+
"remark-cli": "^12.0.0",
90+
"remark-validate-links": "^13.0.0",
9191
"rimraf": "^5.0.0",
92-
"rollup": "^3.2.5",
92+
"rollup": "^4.5.2",
9393
"sanctuary-benchmark": "^1.0.0",
9494
"sanctuary-either": "^2.0.0",
9595
"sanctuary-type-classes": "^13.0.0",
96-
"tsd": "^0.28.1",
96+
"tsd": "^0.29.0",
9797
"typescript": "^5.0.4",
9898
"xyz": "^4.0.0"
9999
},

Diff for: ‎rollup.config.dist.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
/* global process require Set */
1+
/* global process Set */
22

33
import {readFileSync} from 'fs';
44
import node from '@rollup/plugin-node-resolve';
55
import commonjs from '@rollup/plugin-commonjs';
66

7-
var pkg = require('./package.json');
7+
var pkg = JSON.parse(readFileSync('package.json', 'utf8'));
88

99
var dependencies = pkg => {
1010
var deps = Object.keys(pkg.dependencies || {}).concat(Object.keys(pkg.peerDependencies || {}));
1111
return Array.from(new Set(deps.concat(deps.flatMap(dependency => (
12-
dependencies(require(`${dependency}/package.json`))
12+
dependencies(JSON.parse(readFileSync(`node_modules/${dependency}/package.json`, 'utf8')))
1313
)))));
1414
};
1515

@@ -24,8 +24,7 @@ ${readFileSync('./LICENSE')}*/
2424
2525
${dependencies(pkg).map(dependency => `/** ${dependency} license
2626
27-
${readFileSync(`./node_modules/${dependency}/LICENSE`)}*/`
28-
).join('\n\n')}`;
27+
${readFileSync(`./node_modules/${dependency}/LICENSE`)}*/`).join('\n\n')}`;
2928

3029
var typeref = `/// <reference types="https://cdn.jsdelivr.net/gh/fluture-js/Fluture@${
3130
process.env.VERSION || pkg.version
@@ -39,15 +38,15 @@ export default [{
3938
footer: footer,
4039
format: 'iife',
4140
name: 'Fluture',
42-
file: 'dist/bundle.js'
43-
}
41+
file: 'dist/bundle.js',
42+
},
4443
}, {
4544
input: 'index.js',
4645
plugins: [node(), commonjs({include: 'node_modules/**'})],
4746
output: {
4847
banner: `${banner}\n${typeref}\n`,
4948
footer: footer,
5049
format: 'es',
51-
file: 'dist/module.js'
52-
}
50+
file: 'dist/module.js',
51+
},
5352
}];

Diff for: ‎rollup.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var dependencies = {
22
'sanctuary-show': 'sanctuaryShow',
3-
'sanctuary-type-identifiers': 'sanctuaryTypeIdentifiers'
3+
'sanctuary-type-identifiers': 'sanctuaryTypeIdentifiers',
44
};
55

66
export default {
@@ -10,6 +10,6 @@ export default {
1010
format: 'umd',
1111
file: 'index.cjs',
1212
name: 'Fluture',
13-
globals: dependencies
14-
}
13+
globals: dependencies,
14+
},
1515
};

Diff for: ‎src/after.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
application1,
55
createInterpreter,
66
never,
7-
positiveInteger
7+
positiveInteger,
88
} from './future.js';
99

1010
export var After = createInterpreter(2, 'after', function After$interpret(rec, rej, res){

Diff for: ‎src/alt.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
application,
77
application1,
88
future,
9-
isFuture
9+
isFuture,
1010
} from './future.js';
1111

1212
export var alternative = {pred: isAlt, error: invalidArgumentOf('have Alt implemented')};

Diff for: ‎src/and.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {createTransformation, application1, application, future} from './future.js';
22

33
export var AndTransformation = createTransformation(1, 'and', {
4-
resolved: function AndTransformation$resolved(){ return this.$1 }
4+
resolved: function AndTransformation$resolved(){ return this.$1 },
55
});
66

77
export function and(left){

Diff for: ‎src/bichain.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {call} from './internal/utils.js';
33

44
export var BichainTransformation = createTransformation(2, 'bichain', {
55
rejected: function BichainTransformation$rejected(x){ return call(this.$1, x) },
6-
resolved: function BichainTransformation$resolved(x){ return call(this.$2, x) }
6+
resolved: function BichainTransformation$resolved(x){ return call(this.$2, x) },
77
});
88

99
export function bichain(f){

Diff for: ‎src/both.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import {createTransformation, Resolve, application1, application, future} from '
55
export var PairTransformation = createTransformation(1, 'pair', {
66
resolved: function PairTransformation$resolved(x){
77
return new Resolve(this.context, [x, this.$1]);
8-
}
8+
},
99
});
1010

1111
export var BothTransformation =
1212
createParallelTransformation('both', earlyCrash, earlyReject, noop, {
1313
resolved: function BothTransformation$resolved(x){
1414
return this.$1._transform(new PairTransformation(this.context, x));
15-
}
15+
},
1616
});
1717

1818
export function both(left){

Diff for: ‎src/chain-rej.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {call} from './internal/utils.js';
22
import {createTransformation, application1, application, future, func} from './future.js';
33

44
export var ChainRejTransformation = createTransformation(1, 'chainRej', {
5-
rejected: function ChainRejTransformation$rejected(x){ return call(this.$1, x) }
5+
rejected: function ChainRejTransformation$rejected(x){ return call(this.$1, x) },
66
});
77

88
export function chainRej(f){

Diff for: ‎src/coalesce.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export var CoalesceTransformation = createTransformation(2, 'coalesce', {
77
},
88
resolved: function CoalesceTransformation$resolved(x){
99
return new Resolve(this.context, call(this.$2, x));
10-
}
10+
},
1111
});
1212

1313
export function coalesce(f){

0 commit comments

Comments
 (0)