Skip to content

Commit

Permalink
yarn upgrade (#1962)
Browse files Browse the repository at this point in the history
* adopt tsx

* upgrade node in ci

* test node 20

* yarn upgrade

* yarn upgrade

* adopt latest tsx

* upgrade node in ci
  • Loading branch information
mbostock authored Dec 27, 2023
1 parent 9ddddbc commit 3a9581b
Show file tree
Hide file tree
Showing 7 changed files with 1,391 additions and 933 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'
node-version: 20
cache: yarn
- run: yarn --frozen-lockfile
- run: yarn prepublishOnly
- run: yarn docs:build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'
node-version: 20
cache: yarn
- run: yarn --frozen-lockfile
- run: yarn test:mocha
- run: yarn test:tsc
Expand Down
5 changes: 0 additions & 5 deletions .mocharc.json

This file was deleted.

35 changes: 0 additions & 35 deletions loader.js

This file was deleted.

19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"scripts": {
"test": "yarn test:mocha && yarn test:tsc && yarn test:lint && yarn test:prettier",
"test:coverage": "c8 yarn test:mocha",
"test:mocha": "mkdir -p test/output && TZ=America/Los_Angeles mocha 'test/**/*-test.*' 'test/plot.js'",
"test:mocha": "mkdir -p test/output && TZ=America/Los_Angeles tsx node_modules/.bin/mocha 'test/**/*-test.*' 'test/plot.*'",
"test:lint": "eslint src test",
"test:prettier": "prettier --check src test",
"test:tsc": "tsc",
Expand All @@ -47,7 +47,6 @@
"./src/plot.js"
],
"devDependencies": {
"@esbuild-kit/core-utils": "^3.1.0",
"@observablehq/runtime": "^5.7.3",
"@rollup/plugin-commonjs": "^25.0.2",
"@rollup/plugin-json": "^6.0.0",
Expand All @@ -62,20 +61,20 @@
"canvas": "^2.0.0",
"d3-geo-projection": "^4.0.0",
"eslint": "^8.16.0",
"eslint-config-prettier": "^8.5.0",
"get-tsconfig": "^4.1.0",
"eslint-config-prettier": "^9.1.0",
"htl": "^0.3.0",
"js-beautify": "1",
"jsdom": "^22.1.0",
"markdown-it-container": "^3.0.0",
"jsdom": "^23.0.1",
"markdown-it-container": "^4.0.0",
"mocha": "^10.0.0",
"module-alias": "^2.0.0",
"prettier": "^3.0.0",
"rollup": "^3.7.0",
"prettier": "~3.0.0",
"rollup": "^4.9.1",
"topojson-client": "^3.1.0",
"ts-morph": "^19.0.0",
"ts-morph": "^21.0.1",
"tsx": "^4.7.0",
"typescript": "^5.0.2",
"vite": "^4.4.9",
"vite": "^5.0.10",
"vitepress": "^1.0.0-rc.12"
},
"c8": {
Expand Down
2 changes: 1 addition & 1 deletion test/plot.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as path from "path";
import beautify from "js-beautify";
import assert from "./assert.js";
import it from "./jsdom.js";
import * as plots from "./plots/index.js";
import * as plots from "./plots/index.ts"; // TODO index.js

for (const [name, plot] of Object.entries(plots)) {
it(`plot ${name}`, async () => {
Expand Down
Loading

0 comments on commit 3a9581b

Please sign in to comment.