From 36a7afda9b49b0ca5ac7c5c641441df73f07a7a7 Mon Sep 17 00:00:00 2001 From: Serhii Khoma Date: Thu, 10 Oct 2024 22:12:19 +0700 Subject: [PATCH 1/5] feat: migrate to spago@next --- .github/workflows/ci.yml | 49 ++++++++-------------------------------- bower.json | 13 +---------- package.json | 6 ++--- packages.dhall | 4 ---- spago.dhall | 20 ---------------- spago.yaml | 30 ++++++++++++++++++++++++ 6 files changed, 44 insertions(+), 78 deletions(-) delete mode 100644 packages.dhall delete mode 100644 spago.dhall create mode 100644 spago.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc54710..76cf55a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,58 +9,29 @@ on: jobs: build: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - name: Set up PureScript toolchain + - name: Set up a PureScript toolchain uses: purescript-contrib/setup-purescript@main with: - purescript: "unstable" + purescript: "latest" purs-tidy: "latest" + spago: "unstable" - name: Cache PureScript dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: - key: ${{ runner.os }}-spago-${{ hashFiles('**/*.dhall') }} + key: ${{ runner.os }}-spago-${{ hashFiles('**/spago.lock') }} path: | .spago output - - name: Set up Node toolchain - uses: actions/setup-node@v2 - with: - node-version: "14.x" - - - name: Cache NPM dependencies - uses: actions/cache@v2 - env: - cache-name: cache-node-modules - with: - path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - - name: Install NPM dependencies - run: npm install - - - name: Build the project - run: npm run build + - name: Build source + run: spago build --censor-stats --strict --pedantic-packages - name: Run tests - run: npm run test + run: spago test --offline --censor-stats --strict --pedantic-packages -- --censor-codes=UserDefinedWarning - - name: Check formatting + - name: Verify formatting run: purs-tidy check src test - - - name: Verify Bower & Pulp - run: | - npm install bower pulp@16.0.0-0 - npx bower install - npx pulp build -- --censor-lib --strict - if [ -d "test" ]; then - npx pulp test - fi diff --git a/bower.json b/bower.json index 138196a..2c13a5d 100644 --- a/bower.json +++ b/bower.json @@ -14,16 +14,5 @@ "output", "bower.json", "package.json" - ], - "dependencies": { - "purescript-datetime": "^6.0.0", - "purescript-effect": "^4.0.0", - "purescript-foreign": "^7.0.0", - "purescript-integers": "^6.0.0" - }, - "devDependencies": { - "purescript-assert": "^6.0.0", - "purescript-console": "^6.0.0", - "purescript-numbers": "^9.0.0" - } + ] } diff --git a/package.json b/package.json index ad3ecca..65ef6dc 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "private": true, "scripts": { - "build": "eslint src && spago build --purs-args '--censor-lib --strict'", - "test": "spago test --no-install" + "build": "eslint src && spago build --censor-stats --strict --pedantic-packages", + "test": "spago test --offline" }, "devDependencies": { - "eslint": "^7.6.0" + "eslint": "^9.12.0" } } diff --git a/packages.dhall b/packages.dhall deleted file mode 100644 index 582d6d3..0000000 --- a/packages.dhall +++ /dev/null @@ -1,4 +0,0 @@ -let upstream = - https://raw.githubusercontent.com/purescript/package-sets/prepare-0.15/src/packages.dhall - -in upstream diff --git a/spago.dhall b/spago.dhall deleted file mode 100644 index 6210f3a..0000000 --- a/spago.dhall +++ /dev/null @@ -1,20 +0,0 @@ -{ name = "js-date" -, dependencies = - [ "assert" - , "console" - , "datetime" - , "effect" - , "either" - , "enums" - , "foreign" - , "functions" - , "integers" - , "maybe" - , "numbers" - , "partial" - , "prelude" - , "transformers" - ] -, packages = ./packages.dhall -, sources = [ "src/**/*.purs", "test/**/*.purs" ] -} diff --git a/spago.yaml b/spago.yaml new file mode 100644 index 0000000..1f57f18 --- /dev/null +++ b/spago.yaml @@ -0,0 +1,30 @@ +package: + name: js-date + publish: + license: MIT + version: 8.0.0 + location: + githubOwner: purescript-contrib + githubRepo: purescript-js-date + dependencies: + - datetime + - effect + - enums + - foreign + - functions + - integers + - maybe + - prelude + test: + main: Test.Main + dependencies: + - assert + - console + - either + - numbers + - partial + - transformers +workspace: + extraPackages: {} + packageSet: + registry: 60.5.0 From 50c5a438d6cc6920f4b08461d7b433503ef18819 Mon Sep 17 00:00:00 2001 From: Serhii Khoma Date: Thu, 10 Oct 2024 22:12:19 +0700 Subject: [PATCH 2/5] feat: migrate to spago@next --- .github/workflows/ci.yml | 2 +- bower.json | 10 +--------- package.json | 2 +- spago.yaml | 17 +++++++++-------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76cf55a..832e988 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: output - name: Build source - run: spago build --censor-stats --strict --pedantic-packages + run: spago build --censor-stats --strict --ensure-ranges --pedantic-packages - name: Run tests run: spago test --offline --censor-stats --strict --pedantic-packages -- --censor-codes=UserDefinedWarning diff --git a/bower.json b/bower.json index 2c13a5d..e7f4a87 100644 --- a/bower.json +++ b/bower.json @@ -6,13 +6,5 @@ "repository": { "type": "git", "url": "https://github.com/purescript-contrib/purescript-js-date.git" - }, - "ignore": [ - "**/.*", - "bower_components", - "node_modules", - "output", - "bower.json", - "package.json" - ] + } } diff --git a/package.json b/package.json index 65ef6dc..56ecf1d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "scripts": { - "build": "eslint src && spago build --censor-stats --strict --pedantic-packages", + "build": "eslint src && spago build --censor-stats --strict --ensure-ranges --pedantic-packages", "test": "spago test --offline" }, "devDependencies": { diff --git a/spago.yaml b/spago.yaml index 1f57f18..6566256 100644 --- a/spago.yaml +++ b/spago.yaml @@ -1,5 +1,6 @@ package: name: js-date + description: PureScript library for native JavaScript `Date` values publish: license: MIT version: 8.0.0 @@ -7,14 +8,14 @@ package: githubOwner: purescript-contrib githubRepo: purescript-js-date dependencies: - - datetime - - effect - - enums - - foreign - - functions - - integers - - maybe - - prelude + - datetime: ">=6.1.0 <7.0.0" + - effect: ">=4.0.0 <5.0.0" + - enums: ">=6.0.1 <7.0.0" + - foreign: ">=7.0.0 <8.0.0" + - functions: ">=6.0.0 <7.0.0" + - integers: ">=6.0.0 <7.0.0" + - maybe: ">=6.0.0 <7.0.0" + - prelude: ">=6.0.1 <7.0.0" test: main: Test.Main dependencies: From 04979794f69dd7d6b4a2e11aadf8ee8efcb442a7 Mon Sep 17 00:00:00 2001 From: Serhii Khoma Date: Sat, 12 Oct 2024 18:20:27 +0700 Subject: [PATCH 3/5] feat: remove bower.json and empty package-lock.json --- .github/workflows/ci.yml | 2 +- bower.json | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 bower.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 832e988..13a43ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: run: spago build --censor-stats --strict --ensure-ranges --pedantic-packages - name: Run tests - run: spago test --offline --censor-stats --strict --pedantic-packages -- --censor-codes=UserDefinedWarning + run: spago test --offline --censor-stats --strict --pedantic-packages - name: Verify formatting run: purs-tidy check src test diff --git a/bower.json b/bower.json deleted file mode 100644 index e7f4a87..0000000 --- a/bower.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "purescript-js-date", - "homepage": "https://github.com/purescript-contrib/purescript-js-date", - "description": "PureScript library for native JavaScript `Date` values", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/purescript-contrib/purescript-js-date.git" - } -} From 64f5ea9d479c6388329efdef1e59b08c3176897e Mon Sep 17 00:00:00 2001 From: Serhii Khoma Date: Mon, 14 Oct 2024 11:27:02 +0700 Subject: [PATCH 4/5] feat: bump version to 9.0.0 --- spago.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spago.yaml b/spago.yaml index 6566256..7059f42 100644 --- a/spago.yaml +++ b/spago.yaml @@ -3,7 +3,7 @@ package: description: PureScript library for native JavaScript `Date` values publish: license: MIT - version: 8.0.0 + version: 9.0.0 location: githubOwner: purescript-contrib githubRepo: purescript-js-date From 843d28807bd6d4dfcac01835aefa90ca66f2b686 Mon Sep 17 00:00:00 2001 From: Serhii Khoma Date: Mon, 14 Oct 2024 14:54:31 +0700 Subject: [PATCH 5/5] fix: libraries should not use package sets at all -> use solver --- spago.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spago.yaml b/spago.yaml index 7059f42..15cf60e 100644 --- a/spago.yaml +++ b/spago.yaml @@ -25,7 +25,4 @@ package: - numbers - partial - transformers -workspace: - extraPackages: {} - packageSet: - registry: 60.5.0 +workspace: {}