From aa86b408749b9d694a78aaf2c475ded09e82332d Mon Sep 17 00:00:00 2001 From: zojize Date: Thu, 20 Jun 2024 11:00:38 -0500 Subject: [PATCH] chore: workflow npm only --- .github/workflows/ci.yml | 45 +++++++++------------------------------- package.json | 11 +--------- pnpm-lock.yaml | 9 -------- 3 files changed, 11 insertions(+), 54 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d53d872..51954b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,73 +15,48 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install pnpm - uses: pnpm/action-setup@v3 - - name: Set node uses: actions/setup-node@v4 with: node-version: lts/* - - name: Setup - run: npm i -g @antfu/ni - - name: Install - run: nci + run: npm ci - name: Lint - run: nr lint + run: npm run lint typecheck: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Install pnpm - uses: pnpm/action-setup@v3 - - name: Set node uses: actions/setup-node@v4 with: node-version: lts/* - - name: Setup - run: npm i -g @antfu/ni - - name: Install - run: nci + run: npm ci - name: Typecheck - run: nr typecheck + run: npm run typecheck test: - runs-on: ${{ matrix.os }} - - strategy: - matrix: - node: [lts/*] - os: [ubuntu-latest, windows-latest, macos-latest] - fail-fast: false - + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Install pnpm - uses: pnpm/action-setup@v3 - - - name: Set node ${{ matrix.node }} + - name: Set node uses: actions/setup-node@v4 with: - node-version: ${{ matrix.node }} - - - name: Setup - run: npm i -g @antfu/ni + node-version: lts/* - name: Install - run: nci + run: npm ci - name: Build - run: nr build + run: npm run build - name: Test - run: nr test + run: npm run test diff --git a/package.json b/package.json index 29b0d6f..d386efd 100644 --- a/package.json +++ b/package.json @@ -13,14 +13,6 @@ "bugs": "https://github.com/illinois/autograding-telemetry/issues", "keywords": [], "main": "./dist/index.cjs", - "typesVersions": { - "*": { - "*": [ - "./dist/*", - "./dist/index.d.ts" - ] - } - }, "files": [ "dist" ], @@ -39,7 +31,6 @@ }, "devDependencies": { "@antfu/eslint-config": "^2.18.1", - "@antfu/ni": "^0.21.12", "@types/node": "^20.12.12", "bumpp": "^9.4.1", "eslint": "^9.3.0", @@ -55,7 +46,7 @@ "vitest": "^1.6.0" }, "simple-git-hooks": { - "pre-commit": "pnpm lint-staged && pnpm build && git add dist" + "pre-commit": "npx lint-staged && npm run build && git add dist" }, "lint-staged": { "*": "eslint --fix" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d59362a..ffe50d7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,9 +24,6 @@ importers: '@antfu/eslint-config': specifier: ^2.18.1 version: 2.18.1(@vue/compiler-sfc@3.3.10)(eslint@9.3.0)(typescript@5.4.5)(vitest@1.6.0(@types/node@20.12.12)) - '@antfu/ni': - specifier: ^0.21.12 - version: 0.21.12 '@types/node': specifier: ^20.12.12 version: 20.12.12 @@ -134,10 +131,6 @@ packages: '@antfu/install-pkg@0.3.3': resolution: {integrity: sha512-nHHsk3NXQ6xkCfiRRC8Nfrg8pU5kkr3P3Y9s9dKqiuRmBD0Yap7fymNDjGFKeWhZQHqqbCS5CfeMy9wtExM24w==} - '@antfu/ni@0.21.12': - resolution: {integrity: sha512-2aDL3WUv8hMJb2L3r/PIQWsTLyq7RQr3v9xD16fiz6O8ys1xEyLhhTOv8gxtZvJiTzjTF5pHoArvRdesGL1DMQ==} - hasBin: true - '@antfu/utils@0.7.8': resolution: {integrity: sha512-rWQkqXRESdjXtc+7NRfK9lASQjpXJu1ayp7qi1d23zZorY+wBHVLHHoVcMsEnkqEBWTFqbztO7/QdJFzyEcLTg==} @@ -3165,8 +3158,6 @@ snapshots: dependencies: '@jsdevtools/ez-spawn': 3.0.4 - '@antfu/ni@0.21.12': {} - '@antfu/utils@0.7.8': {} '@babel/code-frame@7.24.2':