Skip to content

Commit

Permalink
Update to node18 and yarn3.6 (#188)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mikescops
Mikescops authored Sep 5, 2023
1 parent 8800a93 commit 27069c3
Show file tree
Hide file tree
Showing 11 changed files with 1,240 additions and 1,317 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/documentation-deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: 16
node-version: 18

- name: Build
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/manual-test-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ jobs:
- host: ubuntu-latest
target: linux-x64
runs-on: ${{ matrix.settings.host }}
name: dev build - ${{ matrix.settings.target }} - node@16
name: dev build - ${{ matrix.settings.target }} - node@18
steps:
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.x

- run: yarn
- run: yarn run build
# remove dev dependencies before packaging
- run: yarn workspaces focus --all --production
# package final binaries
- run: |
yarn dlx pkg . -t node16-${{ matrix.settings.target }} -o bundle/dcli-${{ matrix.settings.target }}${{ matrix.settings.extension }} -C GZip "--public" "--public-packages" "tslib,thirty-two" "--no-bytecode"
yarn dlx pkg . -t node18-${{ matrix.settings.target }} -o bundle/dcli-${{ matrix.settings.target }}${{ matrix.settings.extension }} -C GZip "--public" "--public-packages" "tslib,thirty-two" "--no-bytecode"
- name: Archive binary artifact
uses: actions/upload-artifact@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ jobs:
- host: ubuntu-latest
target: linux-x64
runs-on: ${{ matrix.settings.host }}
name: dev build - ${{ matrix.settings.target }} - node@16
name: dev build - ${{ matrix.settings.target }} - node@18
steps:
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.x

- run: yarn
- run: yarn run build
# remove dev dependencies before packaging
- run: yarn workspaces focus --all --production
# package final binaries
- run: |
yarn dlx pkg . -t node16-${{ matrix.settings.target }} -o bundle/dcli-${{ matrix.settings.target }}${{ matrix.settings.extension }} -C GZip "--public" "--public-packages" "tslib,thirty-two" "--no-bytecode"
yarn dlx pkg . -t node18-${{ matrix.settings.target }} -o bundle/dcli-${{ matrix.settings.target }}${{ matrix.settings.extension }} -C GZip "--public" "--public-packages" "tslib,thirty-two" "--no-bytecode"
- name: Archive binary artifact
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.x
- run: yarn
- run: yarn run lint
- run: yarn run test
Expand Down
3 changes: 2 additions & 1 deletion .prettierrc.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"singleQuote": true,
"tabWidth": 4,
"printWidth": 120
"printWidth": 120,
"trailingComma": "es5"
}
873 changes: 0 additions & 873 deletions .yarn/releases/yarn-3.4.1.cjs
View file

This file was deleted.

874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.3.cjs
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.4.1.cjs
yarnPath: .yarn/releases/yarn-3.6.3.cjs
65 changes: 26 additions & 39 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,75 +22,62 @@
"lint": "eslint src",
"format": "prettier --write src && eslint --fix src",
"start": "node dist",
"pkg:linux": "pkg . -t node16-linux-x64 -o bundle/dcli-linux",
"pkg:macos": "pkg . -t node16-macos-x64 -o bundle/dcli-macos",
"pkg:macos-arm": "pkg . -t node16-macos-arm64 -o bundle/dcli-macos-arm",
"pkg:win": "pkg . -t node16-win-x64 -o bundle/dcli-win.exe",
"pkg:linux": "pkg . -t node18-linux-x64 -o bundle/dcli-linux",
"pkg:macos": "pkg . -t node18-macos-x64 -o bundle/dcli-macos",
"pkg:macos-arm": "pkg . -t node18-macos-arm64 -o bundle/dcli-macos-arm",
"pkg:win": "pkg . -t node18-win-x64 -o bundle/dcli-win.exe",
"pkg": "yarn run build && yarn run pkg:linux && yarn run pkg:macos && yarn run pkg:win",
"prepare": "husky install",
"test": "mocha"
},
"author": {
"name": "Corentin Mors",
"email": "corentin@dashlane.com",
"url": "https://pixelswap.fr/"
"name": "Dashlane",
"email": "engineering@dashlane.com",
"url": "https://www.dashlane.com/"
},
"contributors": [
{
"name": "Jérôme Boillot"
},
{
"name": "Paul-Louis Hery"
},
{
"name": "Léos Julien"
},
{
"name": "Tristan Parisot"
}
],
"contributors": [],
"license": "Apache-2.0",
"devDependencies": {
"@types/async": "^3.2.20",
"@types/better-sqlite3": "^7.6.4",
"@types/chai": "^4.3.5",
"@types/chai": "^4.3.6",
"@types/inquirer": "^8.2.6",
"@types/mocha": "^10.0.1",
"@types/node": "^18.17.4",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"chai": "^4.3.7",
"eslint": "^8.46.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-import": "^2.28.0",
"@types/node": "^18.17.14",
"@typescript-eslint/eslint-plugin": "^6.6.0",
"@typescript-eslint/parser": "^6.6.0",
"chai": "^4.3.8",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"husky": "^8.0.3",
"mocha": "^10.2.0",
"pkg": "^5.8.1",
"prettier": "^2.8.8",
"prettier": "^3.0.3",
"ts-node": "^10.9.1",
"typescript": "^4.9.5"
"typescript": "^5.2.2"
},
"dependencies": {
"@json2csv/plainjs": "^7.0.1",
"@json2csv/transforms": "^7.0.1",
"@json2csv/plainjs": "^7.0.3",
"@json2csv/transforms": "^7.0.3",
"@napi-rs/clipboard": "^1.1.1",
"@napi-rs/keyring": "^1.1.3",
"@node-rs/argon2": "^1.5.2",
"better-sqlite3": "^8.5.0",
"commander": "^10.0.1",
"better-sqlite3": "^8.6.0",
"commander": "^11.0.0",
"got": "^11.8.6",
"inquirer": "^8.2.6",
"inquirer-search-list": "^1.2.6",
"jsonpath-plus": "^7.2.0",
"otplib": "^12.0.1",
"playwright": "^1.37.0",
"playwright-core": "^1.37.1",
"winston": "^3.10.0",
"xml-js": "^1.6.11",
"zlib": "^1.0.5"
},
"engines": {
"node": ">=16",
"yarn": ">=3.4.0"
"node": ">=18",
"yarn": ">=3.6.0"
},
"packageManager": "yarn@3.4.1"
"packageManager": "yarn@3.6.3"
}
2 changes: 1 addition & 1 deletion src/modules/auth/sso/index.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { chromium } from 'playwright';
import { chromium } from 'playwright-core';
import { DASHLANE_APP_REGEX, extractSsoInfoFromUrl } from './utils';
import { performSSOVerification } from '../../../endpoints/performSSOVerification';

Expand Down
Loading

0 comments on commit 27069c3

Please sign in to comment.