From d30ee8e285a0f63901e40e146bdba2769ea0dabd Mon Sep 17 00:00:00 2001 From: Marc Harter Date: Mon, 22 Jan 2024 10:20:22 -0700 Subject: [PATCH] Fix broken windows (#105) Includes: - Remove Node 14 support - Update depedencies - Update build scripts --- .github/workflows/build.yml | 8 ++++---- index.ts | 4 ++-- package.json | 29 +++++++++++++++-------------- tsconfig.json | 4 ++-- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed3cfa2..9538674 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,15 +8,15 @@ jobs: build: runs-on: ubuntu-latest container: - image: osgeo/gdal:ubuntu-small-latest + image: ghcr.io/osgeo/gdal:ubuntu-small-latest options: --user 1001 strategy: matrix: - node: ["14", "16", "18"] + node: ["16", "18", "20"] name: Node v${{ matrix.node }} steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} - run: npm install diff --git a/index.ts b/index.ts index bd1e143..f5db4f5 100644 --- a/index.ts +++ b/index.ts @@ -79,7 +79,7 @@ class Ogr2ogr implements PromiseLike { then( onfulfilled?: (value: Result) => TResult1 | PromiseLike, - onrejected?: (reason: string) => TResult2 | PromiseLike + onrejected?: (reason: string) => TResult2 | PromiseLike, ): PromiseLike { return this.run().then(onfulfilled, onrejected) } @@ -164,7 +164,7 @@ class Ogr2ogr implements PromiseLike { (err, stdout, stderr) => { if (err) rej(err) res({stdout, stderr}) - } + }, ) if (this.inputStream && proc.stdin) this.inputStream.pipe(proc.stdin) }) diff --git a/package.json b/package.json index c36485b..a002851 100644 --- a/package.json +++ b/package.json @@ -32,25 +32,26 @@ "fmt-check": "prettier --check ." }, "dependencies": { - "archiver": "^5.3.1" + "archiver": "^6.0.1" }, "devDependencies": { - "@types/archiver": "^5.3.1", - "@types/blue-tape": "^0.1.33", - "@types/geojson": "^7946.0.10", - "@types/node": "^18.14.6", - "@typescript-eslint/eslint-plugin": "^5.54.0", - "@typescript-eslint/parser": "^5.54.0", + "@types/archiver": "^6.0.2", + "@types/blue-tape": "^0.1.36", + "@types/geojson": "^7946.0.13", + "@types/node": "^20.11.5", + "@typescript-eslint/eslint-plugin": "^6.19.0", + "@typescript-eslint/parser": "^6.19.0", "blue-tape": "^1.0.0", - "eslint": "^8.35.0", - "eslint-config-prettier": "^8.6.0", + "eslint": "^8.56.0", + "eslint-config-prettier": "^9.1.0", + "eslint-prettier-config": "^1.0.1", "nyc": "^15.1.0", - "prettier": "^2.8.4", - "prettier-plugin-organize-imports": "^3.2.2", - "ts-node": "^10.9.1", - "typescript": "^4.9.5" + "prettier": "^3.2.4", + "prettier-plugin-organize-imports": "^3.2.4", + "ts-node": "^10.9.2", + "typescript": "^5.3.3" }, "engines": { - "node": ">=12" + "node": ">=16" } } diff --git a/tsconfig.json b/tsconfig.json index da1c546..525d29b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,7 @@ "declaration": true, "outDir": "./dist/cjs", "esModuleInterop": true, - "resolveJsonModule": true + "resolveJsonModule": true, }, - "exclude": ["node_modules", "dist"] + "exclude": ["node_modules", "dist"], }