Skip to content

Commit

Permalink
Merge pull request #23 from paritytech/yuri/upgrades
Browse files Browse the repository at this point in the history
Yarn & Node.js upgrade
  • Loading branch information
mutantcornholio committed Jun 14, 2024
2 parents 3d87fbc + 42c1409 commit ee5229e
Show file tree
Hide file tree
Showing 10 changed files with 6,052 additions and 3,350 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 22

- name: Install
run: yarn install --frozen-lockfile
run: yarn install --immutable

- name: Lint
run: yarn lint
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/npm-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 22.x

- name: Install
run: yarn install --frozen-lockfile
run: yarn install --immutable

- name: Build
run: yarn build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 22.x

- name: Install
run: yarn install --immutable --network-concurrency 1
run: yarn install --immutable

- name: Build
run: yarn build
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
dist
.idea
.yarn/install-state.gz
894 changes: 894 additions & 0 deletions .yarn/releases/yarn-4.3.0.cjs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.3.0.cjs
26 changes: 12 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"description": "Parity EngAutomation test helpers and fixtures",
"author": "Parity <admin@parity.io> (https://parity.io)",
"license": "Apache-2.0",
"private": false,
"type": "commonjs",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand All @@ -14,33 +13,32 @@
"types": "./dist/index.d.ts"
}
},
"imports": {
"#src/*": "./dist/*.js"
},
"files": [
"dist"
],
"dependencies": {
"@eng-automation/js": "^0.0.21",
"@eng-automation/js": "^2.1.0",
"@octokit/rest": "^19.0.7",
"mockttp": "^3.9.4",
"node-fetch": "^2.6.7",
"selfsigned": "^2.1.0"
},
"devDependencies": {
"@eng-automation/js-style": "^2.0.0",
"@eng-automation/js-style": "^3.1.0",
"@octokit/webhooks-types": "^5.8.0",
"@types/node": "^16",
"@types/node-fetch": "^2.6.2",
"ts-patch": "^2.0.2",
"typescript": "^4.6.2",
"typescript-transform-paths": "^3.4.4"
"@types/node": "^20",
"typescript": "^5.4.5"
},
"scripts": {
"build": "tsc",
"build:watch": "tsc -w",
"lint": "eslint '{*,**/*}.{cjs,ts}' && prettier --check '{*,**/*}.json'",
"lint": "npx eslint '{*,**/*}.{cjs,ts}' && npx prettier --check '{*,**/*}.json'",
"fix": "yarn fix:eslint '{*,**/*}.{cjs,js,ts}' && yarn fix:prettier '{*,**/*}.json'",
"fix:eslint": "eslint --fix",
"fix:prettier": "prettier --write",
"prepare": "ts-patch install -s",
"fix:eslint": "npx eslint --fix",
"fix:prettier": "npx prettier --write",
"typecheck": "tsc --noEmit"
}
},
"packageManager": "yarn@4.3.0"
}
1 change: 0 additions & 1 deletion src/githubWebhooks.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { WebhookEvent } from "@octokit/webhooks-types";
import { createHmac } from "crypto";
import fetch from "node-fetch";

export type TriggerWebhookParams = {
payload: WebhookEvent;
Expand Down
20 changes: 4 additions & 16 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
"allowJs": true,
"moduleResolution": "node",
"module": "commonjs",
"target": "ES2021",
// Node.js LTS 16
"lib": ["ES2021"],
// Node.js LTS 16
"target": "ES2022",
"lib": ["ES2022"],
"strict": true,
"noImplicitAny": true,
"skipLibCheck": true,
Expand All @@ -21,19 +19,9 @@
"types": ["node"],
"typeRoots": ["./node_modules/@types", "./src", "@eng-automation/js"],
"paths": {
"src/*": ["./src/*"]
"#src/*": ["./src/*"]
},
"plugins": [
// Transform paths in output .js files
{
"transform": "typescript-transform-paths"
},
// Transform paths in output .d.ts files (Include this line if you output declarations files)
{
"transform": "typescript-transform-paths",
"afterDeclarations": true
}
]
"plugins": []
},
"include": ["src/**/*"]
}
Loading

0 comments on commit ee5229e

Please sign in to comment.