Skip to content

Commit 6765404

Browse files
authored
Relax Aff upper bound (#33)
* Relax Aff upper bound Currently avar isn't in the package set because Aff had a major version bump. * Update CI * Update tooling versions * Typo in npmrc
1 parent d00f578 commit 6765404

File tree

8 files changed

+69
-43
lines changed

8 files changed

+69
-43
lines changed

.eslintrc.json

-29
This file was deleted.

.github/workflows/ci.yml

+7-10
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515

1616
- name: Set up PureScript toolchain
1717
uses: purescript-contrib/setup-purescript@main
1818
with:
19-
purescript: "unstable"
19+
purescript: "latest"
2020
purs-tidy: "latest"
21+
spago: "latest"
2122

2223
- name: Cache PureScript dependencies
23-
uses: actions/cache@v2
24+
uses: actions/cache@v4
2425
with:
2526
key: ${{ runner.os }}-spago-${{ hashFiles('**/*.dhall') }}
2627
path: |
@@ -30,10 +31,10 @@ jobs:
3031
- name: Set up Node toolchain
3132
uses: actions/setup-node@v2
3233
with:
33-
node-version: "14.x"
34+
node-version: "20.x"
3435

3536
- name: Cache NPM dependencies
36-
uses: actions/cache@v2
37+
uses: actions/cache@v4
3738
env:
3839
cache-name: cache-node-modules
3940
with:
@@ -58,9 +59,5 @@ jobs:
5859

5960
- name: Verify Bower & Pulp
6061
run: |
61-
npm install bower [email protected]
62+
npm install bower
6263
npx bower install
63-
npx pulp build -- --censor-lib --strict
64-
if [ -d "test" ]; then
65-
npx pulp test
66-
fi

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.*
2+
!.npmrc
23
!.gitignore
34
!.github
45
!.editorconfig

.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package-lock=false

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"tests"
2424
],
2525
"dependencies": {
26-
"purescript-aff": "^7.0.0",
26+
"purescript-aff": ">=7.0.0 <9.0.0",
2727
"purescript-effect": "^4.0.0",
2828
"purescript-either": "^6.0.0",
2929
"purescript-exceptions": "^6.0.0",

eslint.config.mjs

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
import globals from "globals";
2+
import path from "node:path";
3+
import { fileURLToPath } from "node:url";
4+
import js from "@eslint/js";
5+
import { FlatCompat } from "@eslint/eslintrc";
6+
7+
const __filename = fileURLToPath(import.meta.url);
8+
const __dirname = path.dirname(__filename);
9+
const compat = new FlatCompat({
10+
baseDirectory: __dirname,
11+
recommendedConfig: js.configs.recommended,
12+
allConfig: js.configs.all
13+
});
14+
15+
export default [...compat.extends("eslint:recommended"), {
16+
languageOptions: {
17+
globals: {
18+
...globals.browser,
19+
},
20+
21+
ecmaVersion: 6,
22+
sourceType: "module",
23+
},
24+
25+
rules: {
26+
"block-scoped-var": "error",
27+
"consistent-return": "error",
28+
eqeqeq: "error",
29+
"guard-for-in": "error",
30+
"no-bitwise": "error",
31+
"no-caller": "error",
32+
"no-extra-parens": "off",
33+
"no-extend-native": "error",
34+
"no-loop-func": "error",
35+
"no-new": "error",
36+
"no-param-reassign": "error",
37+
"no-return-assign": "error",
38+
"no-sequences": "error",
39+
"no-unused-expressions": "error",
40+
"no-use-before-define": "error",
41+
"no-undef": "error",
42+
"no-eq-null": "error",
43+
radix: ["error", "always"],
44+
45+
indent: ["error", 2, {
46+
SwitchCase: 1,
47+
}],
48+
49+
quotes: ["error", "double"],
50+
semi: ["error", "always"],
51+
strict: ["error", "global"],
52+
},
53+
}];

package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"test": "spago test --no-install"
66
},
77
"devDependencies": {
8-
"eslint": "^7.6.0",
9-
"purescript-psa": "^0.8.2"
8+
"eslint": "^9.20.0",
9+
"purescript": "^0.15.15",
10+
"purescript-psa": "^0.9.0",
11+
"spago": "^0.21.0"
1012
}
1113
}

packages.dhall

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
let upstream =
2-
https://raw.githubusercontent.com/purescript/package-sets/prepare-0.15/src/packages.dhall
2+
https://github.com/purescript/package-sets/releases/download/psc-0.15.15-20250205/packages.dhall
3+
sha256:442220ce62d4f9a353819b28db9a7295cca7acaae7d2fbe814e52c1b25a7a296
34

45
in upstream

0 commit comments

Comments
 (0)