Skip to content

Commit 27069c3

Browse files
author
Corentin Mors
authored
Update to node18 and yarn3.6 (#188)
1 parent 8800a93 commit 27069c3

11 files changed

+1240
-1317
lines changed

.github/workflows/documentation-deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Node.js
1818
uses: actions/setup-node@v2
1919
with:
20-
node-version: 16
20+
node-version: 18
2121

2222
- name: Build
2323
run: |

.github/workflows/manual-test-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ jobs:
1515
- host: ubuntu-latest
1616
target: linux-x64
1717
runs-on: ${{ matrix.settings.host }}
18-
name: dev build - ${{ matrix.settings.target }} - node@16
18+
name: dev build - ${{ matrix.settings.target }} - node@18
1919
steps:
2020
- uses: actions/checkout@v3
2121
- name: Use Node.js
2222
uses: actions/setup-node@v3
2323
with:
24-
node-version: 16.x
24+
node-version: 18.x
2525

2626
- run: yarn
2727
- run: yarn run build
2828
# remove dev dependencies before packaging
2929
- run: yarn workspaces focus --all --production
3030
# package final binaries
3131
- run: |
32-
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"
32+
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"
3333
3434
- name: Archive binary artifact
3535
uses: actions/upload-artifact@v3

.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ jobs:
1818
- host: ubuntu-latest
1919
target: linux-x64
2020
runs-on: ${{ matrix.settings.host }}
21-
name: dev build - ${{ matrix.settings.target }} - node@16
21+
name: dev build - ${{ matrix.settings.target }} - node@18
2222
steps:
2323
- uses: actions/checkout@v3
2424
- name: Use Node.js
2525
uses: actions/setup-node@v3
2626
with:
27-
node-version: 16.x
27+
node-version: 18.x
2828

2929
- run: yarn
3030
- run: yarn run build
3131
# remove dev dependencies before packaging
3232
- run: yarn workspaces focus --all --production
3333
# package final binaries
3434
- run: |
35-
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"
35+
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"
3636
3737
- name: Archive binary artifact
3838
uses: actions/upload-artifact@v3

.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- name: Use Node.js
1111
uses: actions/setup-node@v3
1212
with:
13-
node-version: 16.x
13+
node-version: 18.x
1414
- run: yarn
1515
- run: yarn run lint
1616
- run: yarn run test

.prettierrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"singleQuote": true,
33
"tabWidth": 4,
4-
"printWidth": 120
4+
"printWidth": 120,
5+
"trailingComma": "es5"
56
}

.yarn/releases/yarn-3.4.1.cjs

-873
This file was deleted.

.yarn/releases/yarn-3.6.3.cjs

+874
Large diffs are not rendered by default.

.yarnrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ plugins:
66
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
77
spec: "@yarnpkg/plugin-interactive-tools"
88

9-
yarnPath: .yarn/releases/yarn-3.4.1.cjs
9+
yarnPath: .yarn/releases/yarn-3.6.3.cjs

package.json

+26-39
Original file line numberDiff line numberDiff line change
@@ -22,75 +22,62 @@
2222
"lint": "eslint src",
2323
"format": "prettier --write src && eslint --fix src",
2424
"start": "node dist",
25-
"pkg:linux": "pkg . -t node16-linux-x64 -o bundle/dcli-linux",
26-
"pkg:macos": "pkg . -t node16-macos-x64 -o bundle/dcli-macos",
27-
"pkg:macos-arm": "pkg . -t node16-macos-arm64 -o bundle/dcli-macos-arm",
28-
"pkg:win": "pkg . -t node16-win-x64 -o bundle/dcli-win.exe",
25+
"pkg:linux": "pkg . -t node18-linux-x64 -o bundle/dcli-linux",
26+
"pkg:macos": "pkg . -t node18-macos-x64 -o bundle/dcli-macos",
27+
"pkg:macos-arm": "pkg . -t node18-macos-arm64 -o bundle/dcli-macos-arm",
28+
"pkg:win": "pkg . -t node18-win-x64 -o bundle/dcli-win.exe",
2929
"pkg": "yarn run build && yarn run pkg:linux && yarn run pkg:macos && yarn run pkg:win",
3030
"prepare": "husky install",
3131
"test": "mocha"
3232
},
3333
"author": {
34-
"name": "Corentin Mors",
35-
"email": "corentin@dashlane.com",
36-
"url": "https://pixelswap.fr/"
34+
"name": "Dashlane",
35+
"email": "engineering@dashlane.com",
36+
"url": "https://www.dashlane.com/"
3737
},
38-
"contributors": [
39-
{
40-
"name": "Jérôme Boillot"
41-
},
42-
{
43-
"name": "Paul-Louis Hery"
44-
},
45-
{
46-
"name": "Léos Julien"
47-
},
48-
{
49-
"name": "Tristan Parisot"
50-
}
51-
],
38+
"contributors": [],
5239
"license": "Apache-2.0",
5340
"devDependencies": {
5441
"@types/async": "^3.2.20",
5542
"@types/better-sqlite3": "^7.6.4",
56-
"@types/chai": "^4.3.5",
43+
"@types/chai": "^4.3.6",
5744
"@types/inquirer": "^8.2.6",
5845
"@types/mocha": "^10.0.1",
59-
"@types/node": "^18.17.4",
60-
"@typescript-eslint/eslint-plugin": "^5.62.0",
61-
"@typescript-eslint/parser": "^5.62.0",
62-
"chai": "^4.3.7",
63-
"eslint": "^8.46.0",
64-
"eslint-config-prettier": "^8.10.0",
65-
"eslint-plugin-import": "^2.28.0",
46+
"@types/node": "^18.17.14",
47+
"@typescript-eslint/eslint-plugin": "^6.6.0",
48+
"@typescript-eslint/parser": "^6.6.0",
49+
"chai": "^4.3.8",
50+
"eslint": "^8.48.0",
51+
"eslint-config-prettier": "^9.0.0",
52+
"eslint-plugin-import": "^2.28.1",
6653
"husky": "^8.0.3",
6754
"mocha": "^10.2.0",
6855
"pkg": "^5.8.1",
69-
"prettier": "^2.8.8",
56+
"prettier": "^3.0.3",
7057
"ts-node": "^10.9.1",
71-
"typescript": "^4.9.5"
58+
"typescript": "^5.2.2"
7259
},
7360
"dependencies": {
74-
"@json2csv/plainjs": "^7.0.1",
75-
"@json2csv/transforms": "^7.0.1",
61+
"@json2csv/plainjs": "^7.0.3",
62+
"@json2csv/transforms": "^7.0.3",
7663
"@napi-rs/clipboard": "^1.1.1",
7764
"@napi-rs/keyring": "^1.1.3",
7865
"@node-rs/argon2": "^1.5.2",
79-
"better-sqlite3": "^8.5.0",
80-
"commander": "^10.0.1",
66+
"better-sqlite3": "^8.6.0",
67+
"commander": "^11.0.0",
8168
"got": "^11.8.6",
8269
"inquirer": "^8.2.6",
8370
"inquirer-search-list": "^1.2.6",
8471
"jsonpath-plus": "^7.2.0",
8572
"otplib": "^12.0.1",
86-
"playwright": "^1.37.0",
73+
"playwright-core": "^1.37.1",
8774
"winston": "^3.10.0",
8875
"xml-js": "^1.6.11",
8976
"zlib": "^1.0.5"
9077
},
9178
"engines": {
92-
"node": ">=16",
93-
"yarn": ">=3.4.0"
79+
"node": ">=18",
80+
"yarn": ">=3.6.0"
9481
},
95-
"packageManager": "yarn@3.4.1"
82+
"packageManager": "yarn@3.6.3"
9683
}

src/modules/auth/sso/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { chromium } from 'playwright';
1+
import { chromium } from 'playwright-core';
22
import { DASHLANE_APP_REGEX, extractSsoInfoFromUrl } from './utils';
33
import { performSSOVerification } from '../../../endpoints/performSSOVerification';
44

0 commit comments

Comments
 (0)