From b7809bbd5bf86a34fc0b325411ae8043b6902245 Mon Sep 17 00:00:00 2001 From: James Prevett Date: Sun, 3 Nov 2024 13:25:49 -0600 Subject: [PATCH] Updated core and workflows --- .github/workflows/ci.yaml | 28 +++++++++++++++++++++---- .github/workflows/release.yaml | 14 ++++++------- package-lock.json | 38 +++++++++++++++++++++++++--------- package.json | 5 ++--- src/backend.ts | 2 +- 5 files changed, 62 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 94dd28f..429fe33 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,7 +11,27 @@ on: jobs: ci: name: CI - uses: zen-fs/core/.github/workflows/ci.yaml@main - permissions: - contents: read - id-token: write + runs-on: ubuntu-latest + defaults: + run: + shell: bash + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 22 + + - name: Install dependencies + run: npm install + + - name: Formatting + run: npm run format:check + + - name: Linting + run: npm run lint + + - name: Build + run: npm run build diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 613f537..ed454a7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,17 +1,17 @@ name: Release - on: release: types: [created] - jobs: ci: name: CI - uses: zen-fs/core/.github/workflows/ci.yaml@main - permissions: - contents: read - id-token: write + uses: ./.github/workflows/ci.yaml + docs: + name: Docs + uses: zen-fs/core/.github/workflows/deploy-docs.yaml@main + needs: ci release: name: Release - uses: zen-fs/core/.github/workflows/release.yaml@main + uses: zen-fs/core/.github/workflows/release-common.yaml@main + needs: ci secrets: inherit diff --git a/package-lock.json b/package-lock.json index 628e071..7d2f914 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,8 +24,12 @@ "engines": { "node": ">= 18" }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/james-pre" + }, "peerDependencies": { - "@zenfs/core": "^1.0.4" + "@zenfs/core": "^1.1.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -609,10 +613,17 @@ "dev": true, "license": "ISC" }, + "node_modules/@xterm/xterm": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz", + "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==", + "license": "MIT", + "optional": true + }, "node_modules/@zenfs/core": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@zenfs/core/-/core-1.0.4.tgz", - "integrity": "sha512-d0vd7OpJfsZuLyPT3rOrYBIP/Z582vGlR7R0Ij7fQL6+D4i43mzSCWDL3qeSXxqcFqWhmYYmboBVzmfSaWhafw==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@zenfs/core/-/core-1.2.7.tgz", + "integrity": "sha512-sfZy8Baljw+xwW8ZXa3KmH7lLbAL0CJP00iyKJP9aUT1vlG3TIoiQ10Ge0l+OhaUlQSCg6fnbZ113kfcnKqDBA==", "license": "MIT", "peer": true, "dependencies": { @@ -622,14 +633,18 @@ "eventemitter3": "^5.0.1", "minimatch": "^9.0.3", "readable-stream": "^4.5.2", - "utilium": "^0.7.4" + "utilium": "^1.0.0" }, "bin": { - "build": "scripts/build.js", - "make-index": "scripts/make-index.js" + "make-index": "scripts/make-index.js", + "zenfs-test": "scripts/test.js" }, "engines": { "node": ">= 16" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/james-pre" } }, "node_modules/abort-controller": { @@ -2327,12 +2342,15 @@ } }, "node_modules/utilium": { - "version": "0.7.7", - "resolved": "https://registry.npmjs.org/utilium/-/utilium-0.7.7.tgz", - "integrity": "sha512-NIRaFZgHuFDwJ090Iu+Fp605yigQmHxVAUd1aLSWaOZ+aDexvZzGq6tXZWdZBlLpIjSEoErfXjd6O+6JLeJE1A==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/utilium/-/utilium-1.0.4.tgz", + "integrity": "sha512-EGesAFASk3rUTA60heHpw9aspYzRbKe5+3+QO3bS/MoXdEZr0WbMI8SQ6PgI9aEXEUKiKdWnLv4zbArbAW8ohQ==", "license": "MIT", "dependencies": { "eventemitter3": "^5.0.1" + }, + "optionalDependencies": { + "@xterm/xterm": "^5.5.0" } }, "node_modules/vfile": { diff --git a/package.json b/package.json index c5a0457..b2e8d87 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,7 @@ "lint": "eslint src", "build": "tsc -p tsconfig.json", "build:docs": "typedoc --out docs --name 'ZenFS Emscripten' src/index.ts", - "prepublishOnly": "npm run build", - "test": "echo No tests yet" + "prepublishOnly": "npm run build" }, "devDependencies": { "@eslint/js": "^9.12.0", @@ -57,7 +56,7 @@ "typescript-eslint": "^8.8.1" }, "peerDependencies": { - "@zenfs/core": "^1.0.4" + "@zenfs/core": "^1.1.0" }, "dependencies": { "utilium": ">=0.4.0" diff --git a/src/backend.ts b/src/backend.ts index a2788a0..e0e8dca 100644 --- a/src/backend.ts +++ b/src/backend.ts @@ -1,5 +1,5 @@ import { Sync, type Backend } from '@zenfs/core'; -import { basename, dirname } from '@zenfs/core/emulation/path.js'; +import { basename, dirname } from '@zenfs/core/path'; import { Errno, ErrnoError, errorMessages } from '@zenfs/core/error.js'; import { File } from '@zenfs/core/file.js'; import type { FileSystemMetadata } from '@zenfs/core/filesystem.js';