Skip to content

Commit 0112e8a

Browse files
committed
Switching to yarn
1 parent c4b57b4 commit 0112e8a

File tree

22 files changed

+8766
-5762
lines changed

22 files changed

+8766
-5762
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ dist
33
build
44
node_modules
55
coverage
6+
/.yarn
67
/doc
78
/components/assistive-playwright-server/src/validation.js
89
test-reports

.github/workflows/ci.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,20 @@ jobs:
6060
- uses: actions/cache@v3
6161
with:
6262
path: |
63-
~/.pnpm-store
63+
.yarn/cache
6464
~/.ms-playwright
65-
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}
65+
key: yarn-${{ hashFiles('yarn.lock') }}
6666
restore-keys: |
67-
pnpm-
67+
yarn-
6868
- run: |
69-
npm i -g pnpm
69+
corepack enable
7070
echo "PLAYWRIGHT_BROWSERS_PATH=$HOME/.ms-playwright" >> $GITHUB_ENV
71-
pnpm config set store-dir ~/.pnpm-store
72-
- run: pnpm install --frozen-lockfile
73-
- run: pnpm lint
74-
- run: pnpm format:check
75-
- run: pnpm apidoc
76-
- run: pnpm test -r
71+
- run: yarn install --immutable
72+
- run: yarn workspaces foreach -tv run build
73+
- run: yarn lint
74+
- run: yarn format:check
75+
- run: yarn apidoc
76+
- run: yarn workspaces foreach -tv run test
7777
- name: "Download software"
7878
run: cd ./vagrant/win10-chromium-nvda && ./download.sh
7979
- uses: nick-fields/retry@3e91a01664abd3c5cd539100d10d33b9c5b68482 # v2.8.2
@@ -91,7 +91,7 @@ jobs:
9191
command: |
9292
export VM_SETTINGS="$(node -e 'console.log(JSON.stringify(require("./vagrant/win10-chromium-nvda/vm-config.json").nvda.vmSettings))')" &&
9393
. ./vagrant/win10-chromium-nvda/vm-skip-keys.sh &&
94-
pnpm nyc-apw-tester -l debug -k $NVDA_SKIP_KEYS --vm-settings '$VM_SETTINGS'
94+
yarn nyc-apw-tester -l debug -k $NVDA_SKIP_KEYS --vm-settings "$VM_SETTINGS"
9595
- uses: nick-fields/retry@3e91a01664abd3c5cd539100d10d33b9c5b68482 # v2.8.2
9696
name: "test assistive-playwright (jaws, chromium)"
9797
with:
@@ -100,11 +100,11 @@ jobs:
100100
command: |
101101
export VM_SETTINGS="$(node -e 'console.log(JSON.stringify(require("./vagrant/win10-chromium-nvda/vm-config.json").jaws.vmSettings))')" &&
102102
. ./vagrant/win10-chromium-nvda/vm-skip-keys.sh &&
103-
pnpm nyc-apw-tester -l debug -k $JAWS_SKIP_KEYS --vm-settings '$VM_SETTINGS'
104-
- run: pnpm nyc-apw-test
103+
yarn nyc-apw-tester -l debug -k $JAWS_SKIP_KEYS --vm-settings "$VM_SETTINGS"
104+
- run: yarn nyc-apw-test
105105
name: "test assistive-playwright-test"
106106
- run: |
107-
pnpm nyc-awd-server -l debug -c ./vagrant/win10-chromium-nvda/vm-config.json --pid-file assistive-webdriver.pid &> assistive-webdriver.log &
107+
yarn nyc-awd-server -l debug -c ./vagrant/win10-chromium-nvda/vm-config.json --pid-file assistive-webdriver.pid &> assistive-webdriver.log &
108108
while ! nc -z 127.0.0.1 3000; do sleep 1; done
109109
name: "Start assistive-webdriver server"
110110
- uses: nick-fields/retry@3e91a01664abd3c5cd539100d10d33b9c5b68482 # v2.8.2
@@ -114,15 +114,15 @@ jobs:
114114
max_attempts: 5
115115
command: |
116116
. ./vagrant/win10-chromium-nvda/vm-skip-keys.sh &&
117-
pnpm nyc-awd-tester -m nvda -k $NVDA_SKIP_KEYS -l debug
117+
yarn nyc-awd-tester -m nvda -k $NVDA_SKIP_KEYS -l debug
118118
- uses: nick-fields/retry@3e91a01664abd3c5cd539100d10d33b9c5b68482 # v2.8.2
119119
name: "test assistive-webdriver (jaws, chromium)"
120120
with:
121121
timeout_minutes: 30
122122
max_attempts: 5
123123
command: |
124124
. ./vagrant/win10-chromium-nvda/vm-skip-keys.sh &&
125-
pnpm nyc-awd-tester -m jaws -k $JAWS_SKIP_KEYS -l debug
125+
yarn nyc-awd-tester -m jaws -k $JAWS_SKIP_KEYS -l debug
126126
- run: |
127127
ASSISTIVE_WEBDRIVER_PID=$(cat ./assistive-webdriver.pid)
128128
echo "Sending SIGINT to $ASSISTIVE_WEBDRIVER_PID"
@@ -135,17 +135,17 @@ jobs:
135135
if: ${{ always() }}
136136
- run: cat vboxwebsrv.log
137137
if: ${{ always() }}
138-
- run: pnpm nyc-report
138+
- run: yarn nyc-report
139139
if: matrix.ENABLE_COVERAGE == '1'
140140
- uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 #v3.1.1
141141
with:
142142
file: ./coverage/lcov.info
143143
if: matrix.ENABLE_COVERAGE == '1'
144144
- if: matrix.ENABLE_COVERAGE == '0' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/release/')
145-
name: pnpm publish
145+
name: yarn publish
146146
run: |
147147
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
148-
pnpm publish -r --no-git-checks
148+
yarn workspaces foreach -tv npm publish --tolerate-republish
149149
- if: matrix.ENABLE_COVERAGE == '0' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/release/')
150150
uses: actions/checkout@v3
151151
with:

.github/workflows/update.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,12 @@ node_modules
1010
/components/vm-providers/src/config.ts
1111
/doc/apidoc-output
1212
test-reports
13+
14+
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored (not using Zero-Installs):
15+
.pnp.*
16+
.yarn/*
17+
!.yarn/patches
18+
!.yarn/plugins
19+
!.yarn/releases
20+
!.yarn/sdks
21+
!.yarn/versions

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dist
33
build
44
node_modules
55
coverage
6-
/pnpm-lock.yaml
6+
/.yarn
77
/components/assistive-webdriver/config-schema.json
88
/components/assistive-playwright-server/src/validation.js
99
/doc/apidoc-input

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Lines changed: 28 additions & 0 deletions
Large diffs are not rendered by default.

.yarn/releases/yarn-3.3.0.cjs

Lines changed: 807 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
nodeLinker: node-modules
2+
3+
plugins:
4+
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
5+
spec: "@yarnpkg/plugin-workspace-tools"
6+
7+
yarnPath: .yarn/releases/yarn-3.3.0.cjs

components/assistive-playwright-client/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"assistive-playwright-server": "workspace:*",
3737
"jest": "29.3.1",
3838
"node-fetch": "3.3.0",
39+
"nyc": "15.1.0",
3940
"rollup": "3.5.1",
4041
"tslib": "2.4.1",
4142
"typescript": "4.9.3",
@@ -48,8 +49,8 @@
4849
"ws": "8.11.0"
4950
},
5051
"scripts": {
51-
"prepare": "pnpm build",
52-
"build": "node ../../tools/clean && pnpm build:rollup && pnpm build:dts && pnpm build:api",
52+
"prepack": "yarn build",
53+
"build": "node ../../tools/clean && yarn build:rollup && yarn build:dts && yarn build:api",
5354
"build:rollup": "rollup --failAfterWarnings -c",
5455
"build:dts": "tsc -p tsconfig.d.json",
5556
"build:api": "api-extractor run --config ./api-extractor.json --verbose",

components/assistive-playwright-server/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,18 @@
3535
"@types/yargs": "17.0.15",
3636
"jest": "29.3.1",
3737
"node-fetch": "3.3.0",
38+
"nyc": "15.1.0",
3839
"rollup": "3.5.1",
3940
"tslib": "2.4.1",
4041
"typescript": "4.9.3",
4142
"typescript-json-schema": "0.55.0",
4243
"wait-port": "1.0.4"
4344
},
4445
"scripts": {
45-
"prepare": "pnpm build",
46+
"prepack": "yarn build",
4647
"build:validation": "node ./generateValidation",
4748
"build:rollup": "rollup --failAfterWarnings -c",
48-
"build": "node ../../tools/clean && pnpm build:validation && pnpm build:rollup",
49+
"build": "node ../../tools/clean && yarn build:validation && yarn build:rollup",
4950
"test": "nyc --cwd ../.. jest"
5051
},
5152
"license": "MIT"

0 commit comments

Comments
 (0)