Skip to content

Commit 3a9581b

Browse files
authored
yarn upgrade (#1962)
* adopt tsx * upgrade node in ci * test node 20 * yarn upgrade * yarn upgrade * adopt latest tsx * upgrade node in ci
1 parent 9ddddbc commit 3a9581b

File tree

7 files changed

+1391
-933
lines changed

7 files changed

+1391
-933
lines changed

.github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
name: github-pages
1616
url: ${{ steps.deployment.outputs.page_url }}
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: actions/setup-node@v3
2020
with:
21-
node-version: 16
22-
cache: 'yarn'
21+
node-version: 20
22+
cache: yarn
2323
- run: yarn --frozen-lockfile
2424
- run: yarn prepublishOnly
2525
- run: yarn docs:build

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- uses: actions/setup-node@v3
1515
with:
16-
node-version: 16
17-
cache: 'yarn'
16+
node-version: 20
17+
cache: yarn
1818
- run: yarn --frozen-lockfile
1919
- run: yarn test:mocha
2020
- run: yarn test:tsc

.mocharc.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

loader.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

package.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"scripts": {
3030
"test": "yarn test:mocha && yarn test:tsc && yarn test:lint && yarn test:prettier",
3131
"test:coverage": "c8 yarn test:mocha",
32-
"test:mocha": "mkdir -p test/output && TZ=America/Los_Angeles mocha 'test/**/*-test.*' 'test/plot.js'",
32+
"test:mocha": "mkdir -p test/output && TZ=America/Los_Angeles tsx node_modules/.bin/mocha 'test/**/*-test.*' 'test/plot.*'",
3333
"test:lint": "eslint src test",
3434
"test:prettier": "prettier --check src test",
3535
"test:tsc": "tsc",
@@ -47,7 +47,6 @@
4747
"./src/plot.js"
4848
],
4949
"devDependencies": {
50-
"@esbuild-kit/core-utils": "^3.1.0",
5150
"@observablehq/runtime": "^5.7.3",
5251
"@rollup/plugin-commonjs": "^25.0.2",
5352
"@rollup/plugin-json": "^6.0.0",
@@ -62,20 +61,20 @@
6261
"canvas": "^2.0.0",
6362
"d3-geo-projection": "^4.0.0",
6463
"eslint": "^8.16.0",
65-
"eslint-config-prettier": "^8.5.0",
66-
"get-tsconfig": "^4.1.0",
64+
"eslint-config-prettier": "^9.1.0",
6765
"htl": "^0.3.0",
6866
"js-beautify": "1",
69-
"jsdom": "^22.1.0",
70-
"markdown-it-container": "^3.0.0",
67+
"jsdom": "^23.0.1",
68+
"markdown-it-container": "^4.0.0",
7169
"mocha": "^10.0.0",
7270
"module-alias": "^2.0.0",
73-
"prettier": "^3.0.0",
74-
"rollup": "^3.7.0",
71+
"prettier": "~3.0.0",
72+
"rollup": "^4.9.1",
7573
"topojson-client": "^3.1.0",
76-
"ts-morph": "^19.0.0",
74+
"ts-morph": "^21.0.1",
75+
"tsx": "^4.7.0",
7776
"typescript": "^5.0.2",
78-
"vite": "^4.4.9",
77+
"vite": "^5.0.10",
7978
"vitepress": "^1.0.0-rc.12"
8079
},
8180
"c8": {

test/plot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as path from "path";
55
import beautify from "js-beautify";
66
import assert from "./assert.js";
77
import it from "./jsdom.js";
8-
import * as plots from "./plots/index.js";
8+
import * as plots from "./plots/index.ts"; // TODO index.js
99

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

0 commit comments

Comments
 (0)