Skip to content

Commit 9275a6b

Browse files
committed
Switch to NPM and update dependencies
Signed-off-by: paulober <[email protected]>
1 parent 9c5d910 commit 9275a6b

File tree

20 files changed

+4167
-4452
lines changed

20 files changed

+4167
-4452
lines changed

.gitattributes

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/.yarn/** linguist-vendored
2-
/.yarn/releases/* binary
3-
/.yarn/plugins/**/* binary
4-
/.pnp.* binary linguist-generated
51
*.html linguist-vendored
62
/web/docs/**/* linguist-vendored
73
/web/tailwindcss-3_3_5.js linguist-vendored

.github/workflows/release.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,17 @@ jobs:
1313
steps:
1414
- name: Checkout
1515
uses: actions/checkout@v4
16-
- name: Enable corepack
17-
run: corepack enable
1816
- name: Setup node v20
1917
uses: actions/setup-node@v4
20-
with:
21-
# the current node version included in VS Code
18+
with:
2219
node-version: '20'
23-
cache: 'yarn'
20+
cache: 'npm'
2421
- name: Install Dependencies
2522
run: |
2623
npm i -g @vscode/vsce ovsx
27-
yarn
24+
npm ci
2825
- name: Lint Extension
29-
run: yarn lint
26+
run: npm run lint
3027
- name: Package Extension Debug Version
3128
run: |
3229
vsce package

.github/workflows/static.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,24 @@ jobs:
3131
steps:
3232
- name: Checkout
3333
uses: actions/checkout@v4
34-
- name: Enable corepack
35-
run: corepack enable
3634
- name: Setup node v20
3735
uses: actions/setup-node@v4
38-
with:
39-
# the current node version used in vscode
36+
with:
4037
node-version: '20'
41-
cache: 'yarn'
38+
cache: 'npm'
4239
- name: Set up Python
4340
uses: actions/setup-python@v5
4441
with:
4542
python-version: '3.11'
4643
- name: Install Dependencies
4744
run: |
48-
yarn
45+
npm ci
4946
pip install requests js2py
5047
- name: Generate Cache JSON
5148
env:
5249
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
5350
run: |
54-
yarn run compile
51+
npm run compile
5552
python3 scripts/genCache.py
5653
- name: Setup Pages
5754
uses: actions/configure-pages@v4

.gitignore

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Created by https://www.toptal.com/developers/gitignore/api/node,macos,python,webstorm,visualstudiocode,yarn
2-
# Edit at https://www.toptal.com/developers/gitignore?templates=node,macos,python,webstorm,visualstudiocode,yarn
1+
# Created by https://www.toptal.com/developers/gitignore/api/node,macos,python,webstorm,visualstudiocode
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=node,macos,python,webstorm,visualstudiocode
33

44
### macOS ###
55
# General
@@ -475,24 +475,7 @@ fabric.properties
475475
# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
476476
.idea/**/azureSettings.xml
477477

478-
### yarn ###
479-
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
480-
481-
.yarn/*
482-
!.yarn/releases
483-
!.yarn/patches
484-
!.yarn/plugins
485-
!.yarn/sdks
486-
!.yarn/versions
487-
488-
# if you are NOT using Zero-installs, then:
489-
# comment the following lines
490-
!.yarn/cache
491-
492-
# and uncomment the following lines
493-
# .pnp.*
494-
495-
# End of https://www.toptal.com/developers/gitignore/api/node,macos,python,webstorm,visualstudiocode,yarn
478+
# End of https://www.toptal.com/developers/gitignore/api/node,macos,python,webstorm,visualstudiocode
496479

497480
*.zip
498481

.vscode/settings.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@
33
// set them to true to hide them in vscode
44
"out": false,
55
"dist": true,
6-
"**/*.vsix": true,
7-
".yarn": true,
8-
".pnp.*": true
6+
"**/*.vsix": true
97
},
108
"search.exclude": {
119
"out": true,
12-
"dist": true,
13-
"**/.yarn": true,
14-
"**/.pnp.*": true
10+
"dist": true
1511
},
1612
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
1713
"typescript.tsc.autoDetect": "off",
@@ -22,11 +18,9 @@
2218
"editor.defaultFormatter": "esbenp.prettier-vscode",
2319
"editor.tabSize": 2,
2420
"editor.formatOnSave": true,
25-
// yarn pnp vscode config
26-
"eslint.nodePath": ".yarn/sdks",
27-
"typescript.tsdk": ".yarn/sdks/typescript/lib",
21+
"typescript.tsdk": "node_modules/typescript/lib",
2822
"typescript.enablePromptUseWorkspaceTsdk": true,
2923
"[python]": {
3024
"editor.defaultFormatter": "ms-python.black-formatter"
3125
}
32-
}
26+
}

.vscodeignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.vscode/**
22
.vscode-test/**
3-
.yarn/**
43
.github/**
54
src/**
65
out/**
@@ -14,7 +13,6 @@ out/**
1413
**/.eslintrc.json
1514
**/eslint.config.mjs
1615
**/*.ts
17-
.pnp*
1816
*.vsix
1917
*.zip
2018
*.tgz
@@ -25,6 +23,7 @@ out/**
2523
*.7z
2624
*.exe
2725
tmp.py
26+
node_modules/**
2827

2928
# make sure scripts and data are always included
3029
!scripts/blink.pio

.yarn/plugins/list-plugin.js

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

0 commit comments

Comments
 (0)