Skip to content

Commit

Permalink
Migrate from Yarn 1 to PNPM and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jmerle committed Oct 20, 2023
1 parent bb2ac9b commit 0087842
Show file tree
Hide file tree
Showing 16 changed files with 4,336 additions and 4,358 deletions.
19 changes: 14 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,24 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up PNPM
uses: pnpm/action-setup@v2
with:
version: 8

- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: 12
node-version: 18
cache: pnpm

- name: Install dependencies
run: yarn --frozen-lockfile
run: pnpm install --frozen-lockfile

- name: Lint
run: yarn lint
run: pnpm lint

- name: Build
run: pnpm prepack
8 changes: 0 additions & 8 deletions bin/dev

This file was deleted.

3 changes: 0 additions & 3 deletions bin/dev.cmd

This file was deleted.

3 changes: 0 additions & 3 deletions bin/run

This file was deleted.

3 changes: 0 additions & 3 deletions bin/run.cmd

This file was deleted.

3 changes: 3 additions & 0 deletions bin/run.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { run } from '../lib/index.js';

run();
83 changes: 39 additions & 44 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
"bugs": "https://github.com/jmerle/zeal-user-contrib/issues",
"author": "Jasper van Merle",
"license": "MIT",
"main": "lib/index.js",
"type": "module",
"exports": "./lib/index.js",
"types": "lib/index.d.ts",
"bin": {
"zeal-user-contrib": "./bin/run"
},
"bin": "./bin/run.js",
"keywords": [
"zeal",
"dash",
Expand All @@ -25,53 +24,52 @@
],
"scripts": {
"release": "np",
"lint": "yarn lint:eslint && yarn lint:prettier",
"lint:eslint": "eslint --format codeframe 'src/**' 'bin/dev' 'bin/run'",
"lint": "pnpm run \"/^lint:.*/\"",
"lint:eslint": "eslint --format codeframe 'src/**' 'bin/run.js'",
"lint:prettier": "prettier --check --ignore-path .gitignore '**/*.{yml,json}'",
"fix": "yarn fix:eslint && yarn fix:prettier",
"fix:eslint": "yarn lint:eslint --fix",
"fix": "pnpm run --sequential \"/^fix:.*/\"",
"fix:eslint": "pnpm lint:eslint --fix",
"fix:prettier": "prettier --write --ignore-path .gitignore '**/*.{yml,json}'",
"prepack": "rm -rf lib && tsc -b"
},
"dependencies": {
"chalk": "^4.1.2",
"commander": "^8.3.0",
"fs-extra": "^10.0.0",
"got": "^11.8.3",
"ini": "^2.0.0",
"inquirer": "^8.2.0",
"inquirer-autocomplete-prompt": "^1.4.0",
"chalk": "^5.3.0",
"commander": "^11.1.0",
"fs-extra": "^11.1.1",
"got": "^13.0.0",
"ini": "^4.1.1",
"inquirer": "^9.2.11",
"inquirer-autocomplete-prompt": "^3.0.1",
"progress": "^2.0.3",
"table": "^6.8.1",
"tar": "^6.1.11",
"tempy": "^1.0.1",
"tempy": "^3.1.0",
"tslib": "^2.3.1",
"winreg": "^1.2.4"
},
"devDependencies": {
"@types/fs-extra": "^9.0.13",
"@types/fs-extra": "^11.0.3",
"@types/ini": "^1.3.31",
"@types/inquirer": "^8.1.3",
"@types/node": "^17.0.0",
"@types/inquirer": "^9.0.6",
"@types/inquirer-autocomplete-prompt": "^3.0.2",
"@types/node": "^20.8.7",
"@types/progress": "^2.0.5",
"@types/tar": "^6.1.1",
"@types/winreg": "^1.2.31",
"@typescript-eslint/eslint-plugin": "^5.7.0",
"@typescript-eslint/parser": "^5.7.0",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"eslint": "^8.5.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-prettier": "^9.0.0",
"eslint-formatter-codeframe": "^7.32.1",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-prettier": "^4.0.0",
"husky": "4.3.8",
"lint-staged": "^12.1.2",
"np": "^7.6.0",
"prettier": "^2.5.1",
"np": "^8.0.4",
"prettier": "^3.0.3",
"ts-node": "^10.4.0",
"typescript": "^4.5.4"
"typescript": "^5.2.2"
},
"engines": {
"node": ">=8.0.0"
"node": ">=16"
},
"np": {
"tests": false
Expand All @@ -84,15 +82,25 @@
"plugin:import/errors",
"plugin:import/warnings",
"plugin:import/typescript",
"plugin:prettier/recommended"
"prettier"
],
"plugins": [
"@typescript-eslint"
"@typescript-eslint",
"import"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"sourceType": "module"
},
"env": {
"node": true
},
"settings": {
"import/resolver": {
"node": true,
"typescript": true
}
},
"rules": {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/explicit-member-accessibility": "error",
Expand Down Expand Up @@ -146,19 +154,6 @@
]
}
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.ts": [
"eslint --format codeframe --fix"
],
"*.{yml,json}": [
"prettier --write"
]
},
"prettier": {
"printWidth": 120,
"singleQuote": true,
Expand Down
Loading

0 comments on commit 0087842

Please sign in to comment.