Skip to content

Commit 594538e

Browse files
kddnewtonkddnewton
authored
Merge pull request #36 from xeger/esbuild
Switch to esbuild. Closes #14.
2 parents e5c611f + 1e66dc8 commit 594538e

File tree

6 files changed

+226
-53
lines changed

6 files changed

+226
-53
lines changed

‎.github/workflows/main.yml‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,25 @@ on:
33
- push
44
- pull_request_target
55
jobs:
6-
ci:
7-
name: CI
6+
# Ensure that the distributables compile with esbuild (since tests use tsc)
7+
build:
8+
name: Build Distributables
9+
runs-on: ubuntu-latest
10+
env:
11+
CI: true
12+
steps:
13+
- uses: actions/checkout@master
14+
- uses: actions/setup-node@v3
15+
with:
16+
node-version: 14.x
17+
cache: yarn
18+
- name: Compile extension
19+
run: |
20+
yarn install --frozen-lockfile
21+
yarn compile
22+
# Run tests (including a special build of extension w/ tsc, not esbuild)
23+
test:
24+
name: Run Tests
825
strategy:
926
matrix:
1027
os:
@@ -28,12 +45,12 @@ jobs:
2845
with:
2946
bundler-cache: true
3047
ruby-version: ${{ matrix.ruby }}
31-
- name: Install gem
48+
- name: Install Gem
3249
run: gem install syntax_tree
33-
- name: Compile extension
50+
- name: Compile Tests
3451
run: |
3552
yarn install --frozen-lockfile
36-
yarn compile
53+
yarn test-compile
3754
- name: Setup GUI Environment
3855
run: |
3956
sudo apt-get install -yq dbus-x11 ffmpeg > /dev/null
@@ -100,9 +117,12 @@ jobs:
100117
start-stop-daemon --stop --pidfile ~/var/run/Xvfb.pid
101118
kill $DBUS_SESSION_BUS_PID
102119
if: always() && runner.os == 'Linux'
120+
# Merge green PRs automatically if they come from repository owner or Dependabot
103121
automerge:
104122
name: AutoMerge
105-
needs: ci
123+
needs:
124+
- build
125+
- test
106126
runs-on: ubuntu-latest
107127
if: github.event_name == 'pull_request_target' && (github.actor == github.repository_owner || github.actor == 'dependabot[bot]')
108128
steps:

‎.vscode/extensions.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"recommendations": [
3+
"connor4312.esbuild-problem-matchers"
4+
],
5+
"unwantedRecommendations": []
6+
}

‎.vscode/launch.json‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,33 @@
33
// Hover to view descriptions of existing attributes.
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
{
6-
"version": "0.2.0",
7-
"configurations": [
8-
9-
{
10-
"name": "Run Extension",
11-
"type": "extensionHost",
12-
"request": "launch",
13-
"args": [
14-
"--extensionDevelopmentPath=${workspaceFolder}"
15-
],
16-
"outFiles": [
17-
"${workspaceFolder}/out/**/*.js"
18-
],
19-
"preLaunchTask": "${defaultBuildTask}"
20-
},
21-
{
22-
"name": "Run Extension Tests",
23-
"type": "extensionHost",
24-
"request": "launch",
25-
"runtimeExecutable": "${execPath}",
26-
"args": [
27-
"--extensionDevelopmentPath=${workspaceFolder}",
28-
"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
29-
],
30-
"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
31-
"preLaunchTask": "${defaultBuildTask}"
32-
}
33-
]
6+
"version": "0.2.0",
7+
"configurations": [
8+
{
9+
"name": "Run Extension",
10+
"type": "extensionHost",
11+
"request": "launch",
12+
"args": [
13+
"--extensionDevelopmentPath=${workspaceFolder}"
14+
],
15+
"outFiles": [
16+
"${workspaceFolder}/out/extension.js"
17+
],
18+
"preLaunchTask": "${defaultBuildTask}"
19+
},
20+
{
21+
"name": "Run Extension Tests",
22+
"type": "extensionHost",
23+
"request": "launch",
24+
"runtimeExecutable": "${execPath}",
25+
"args": [
26+
"--extensionDevelopmentPath=${workspaceFolder}",
27+
"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
28+
],
29+
"outFiles": [
30+
"${workspaceFolder}/out/**/*.js"
31+
],
32+
"preLaunchTask": "test-watch"
33+
}
34+
]
3435
}

‎.vscode/tasks.json‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
// See https://go.microsoft.com/fwlink/?LinkId=733558
22
// for the documentation about the tasks.json format
33
{
4-
"version": "2.0.0",
5-
"tasks": [
6-
{
7-
"type": "npm",
8-
"script": "watch",
9-
"problemMatcher": "$tsc-watch",
10-
"isBackground": true,
11-
"presentation": {
12-
"reveal": "never"
13-
},
14-
"group": {
15-
"kind": "build",
16-
"isDefault": true
17-
}
18-
}
19-
]
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"type": "npm",
8+
"script": "watch",
9+
"problemMatcher": "$esbuild-watch",
10+
"isBackground": true,
11+
"presentation": {
12+
"reveal": "never"
13+
},
14+
"group": {
15+
"kind": "build",
16+
"isDefault": true
17+
}
18+
},
19+
{
20+
"label": "test-watch",
21+
"type": "npm",
22+
"script": "test-watch",
23+
"problemMatcher": "$tsc-watch",
24+
"isBackground": true,
25+
"presentation": {
26+
"reveal": "never"
27+
},
28+
"group": {
29+
"kind": "build",
30+
"isDefault": false
31+
}
32+
}
33+
]
2034
}

‎package.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"bugs": {
1414
"url": "https://github.com/ruby-syntax-tree/vscode-syntax-tree/issues"
1515
},
16+
"packageManager": "yarn@1.22.19",
1617
"engines": {
1718
"vscode": "^1.68.0"
1819
},
@@ -94,12 +95,16 @@
9495
"colors": []
9596
},
9697
"scripts": {
97-
"compile": "tsc -p ./",
98+
"clean": "rm -rf ./out",
99+
"compile": "yarn run esbuild-base --sourcemap",
100+
"esbuild-base": "esbuild --bundle --external:vscode --external:vscode-languageclient --format=cjs --outfile=out/extension.js --platform=node src/extension.ts",
98101
"package": "vsce package --no-yarn --githubBranch main",
99102
"publish": "vsce publish --no-yarn --githubBranch main",
100103
"test": "node ./out/test/runTest.js",
101-
"vscode:prepublish": "yarn compile",
102-
"watch": "tsc --watch -p ./"
104+
"test-compile": "tsc -p ./",
105+
"test-watch": "tsc --watch -p ./",
106+
"vscode:prepublish": "yarn run esbuild-base -- --minify",
107+
"watch": "yarn run esbuild-base --sourcemap --watch"
103108
},
104109
"dependencies": {
105110
"vscode-languageclient": "8.0.2"
@@ -110,6 +115,7 @@
110115
"@types/node": "^18.0.0",
111116
"@types/vscode": "^1.68.0",
112117
"@vscode/test-electron": "^1.6.2",
118+
"esbuild": "^0.14.49",
113119
"glob": "^8.0.3",
114120
"mocha": "^10.0.0",
115121
"typescript": "^4.7.4",

‎yarn.lock‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,132 @@ entities@~2.1.0:
438438
resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
439439
integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
440440

441+
esbuild-android-64@0.14.49:
442+
version "0.14.49"
443+
resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.49.tgz#9e4682c36dcf6e7b71b73d2a3723a96e0fdc5054"
444+
integrity sha512-vYsdOTD+yi+kquhBiFWl3tyxnj2qZJsl4tAqwhT90ktUdnyTizgle7TjNx6Ar1bN7wcwWqZ9QInfdk2WVagSww==
445+
446+
esbuild-android-arm64@0.14.49:
447+
version "0.14.49"
448+
resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.49.tgz#9861b1f7e57d1dd1f23eeef6198561c5f34b51f6"
449+
integrity sha512-g2HGr/hjOXCgSsvQZ1nK4nW/ei8JUx04Li74qub9qWrStlysaVmadRyTVuW32FGIpLQyc5sUjjZopj49eGGM2g==
450+
451+
esbuild-darwin-64@0.14.49:
452+
version "0.14.49"
453+
resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.49.tgz#fd30a5ebe28704a3a117126c60f98096c067c8d1"
454+
integrity sha512-3rvqnBCtX9ywso5fCHixt2GBCUsogNp9DjGmvbBohh31Ces34BVzFltMSxJpacNki96+WIcX5s/vum+ckXiLYg==
455+
456+
esbuild-darwin-arm64@0.14.49:
457+
version "0.14.49"
458+
resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.49.tgz#c04a3a57dad94a972c66a697a68a25aa25947f41"
459+
integrity sha512-XMaqDxO846srnGlUSJnwbijV29MTKUATmOLyQSfswbK/2X5Uv28M9tTLUJcKKxzoo9lnkYPsx2o8EJcTYwCs/A==
460+
461+
esbuild-freebsd-64@0.14.49:
462+
version "0.14.49"
463+
resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.49.tgz#c404dbd66c98451395b1eef0fa38b73030a7be82"
464+
integrity sha512-NJ5Q6AjV879mOHFri+5lZLTp5XsO2hQ+KSJYLbfY9DgCu8s6/Zl2prWXVANYTeCDLlrIlNNYw8y34xqyLDKOmQ==
465+
466+
esbuild-freebsd-arm64@0.14.49:
467+
version "0.14.49"
468+
resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.49.tgz#b62cec96138ebc5937240ce3e1b97902963ea74a"
469+
integrity sha512-lFLtgXnAc3eXYqj5koPlBZvEbBSOSUbWO3gyY/0+4lBdRqELyz4bAuamHvmvHW5swJYL7kngzIZw6kdu25KGOA==
470+
471+
esbuild-linux-32@0.14.49:
472+
version "0.14.49"
473+
resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.49.tgz#495b1cc011b8c64d8bbaf65509c1e7135eb9ddbf"
474+
integrity sha512-zTTH4gr2Kb8u4QcOpTDVn7Z8q7QEIvFl/+vHrI3cF6XOJS7iEI1FWslTo3uofB2+mn6sIJEQD9PrNZKoAAMDiA==
475+
476+
esbuild-linux-64@0.14.49:
477+
version "0.14.49"
478+
resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.49.tgz#3f28dd8f986e6ff42f38888ee435a9b1fb916a56"
479+
integrity sha512-hYmzRIDzFfLrB5c1SknkxzM8LdEUOusp6M2TnuQZJLRtxTgyPnZZVtyMeCLki0wKgYPXkFsAVhi8vzo2mBNeTg==
480+
481+
esbuild-linux-arm64@0.14.49:
482+
version "0.14.49"
483+
resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.49.tgz#a52e99ae30246566dc5f33e835aa6ca98ef70e33"
484+
integrity sha512-KLQ+WpeuY+7bxukxLz5VgkAAVQxUv67Ft4DmHIPIW+2w3ObBPQhqNoeQUHxopoW/aiOn3m99NSmSV+bs4BSsdA==
485+
486+
esbuild-linux-arm@0.14.49:
487+
version "0.14.49"
488+
resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.49.tgz#7c33d05a64ec540cf7474834adaa57b3167bbe97"
489+
integrity sha512-iE3e+ZVv1Qz1Sy0gifIsarJMQ89Rpm9mtLSRtG3AH0FPgAzQ5Z5oU6vYzhc/3gSPi2UxdCOfRhw2onXuFw/0lg==
490+
491+
esbuild-linux-mips64le@0.14.49:
492+
version "0.14.49"
493+
resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.49.tgz#ed062bd844b587be649443831eb84ba304685f25"
494+
integrity sha512-n+rGODfm8RSum5pFIqFQVQpYBw+AztL8s6o9kfx7tjfK0yIGF6tm5HlG6aRjodiiKkH2xAiIM+U4xtQVZYU4rA==
495+
496+
esbuild-linux-ppc64le@0.14.49:
497+
version "0.14.49"
498+
resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.49.tgz#c0786fb5bddffd90c10a2078181513cbaf077958"
499+
integrity sha512-WP9zR4HX6iCBmMFH+XHHng2LmdoIeUmBpL4aL2TR8ruzXyT4dWrJ5BSbT8iNo6THN8lod6GOmYDLq/dgZLalGw==
500+
501+
esbuild-linux-riscv64@0.14.49:
502+
version "0.14.49"
503+
resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.49.tgz#579b0e7cc6fce4bfc698e991a52503bb616bec49"
504+
integrity sha512-h66ORBz+Dg+1KgLvzTVQEA1LX4XBd1SK0Fgbhhw4akpG/YkN8pS6OzYI/7SGENiN6ao5hETRDSkVcvU9NRtkMQ==
505+
506+
esbuild-linux-s390x@0.14.49:
507+
version "0.14.49"
508+
resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.49.tgz#09eb15c753e249a500b4e28d07c5eef7524a9740"
509+
integrity sha512-DhrUoFVWD+XmKO1y7e4kNCqQHPs6twz6VV6Uezl/XHYGzM60rBewBF5jlZjG0nCk5W/Xy6y1xWeopkrhFFM0sQ==
510+
511+
esbuild-netbsd-64@0.14.49:
512+
version "0.14.49"
513+
resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.49.tgz#f7337cd2bddb7cc9d100d19156f36c9ca117b58d"
514+
integrity sha512-BXaUwFOfCy2T+hABtiPUIpWjAeWK9P8O41gR4Pg73hpzoygVGnj0nI3YK4SJhe52ELgtdgWP/ckIkbn2XaTxjQ==
515+
516+
esbuild-openbsd-64@0.14.49:
517+
version "0.14.49"
518+
resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.49.tgz#1f8bdc49f8a44396e73950a3fb6b39828563631d"
519+
integrity sha512-lP06UQeLDGmVPw9Rg437Btu6J9/BmyhdoefnQ4gDEJTtJvKtQaUcOQrhjTq455ouZN4EHFH1h28WOJVANK41kA==
520+
521+
esbuild-sunos-64@0.14.49:
522+
version "0.14.49"
523+
resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.49.tgz#47d042739365b61aa8ca642adb69534a8eef9f7a"
524+
integrity sha512-4c8Zowp+V3zIWje329BeLbGh6XI9c/rqARNaj5yPHdC61pHI9UNdDxT3rePPJeWcEZVKjkiAS6AP6kiITp7FSw==
525+
526+
esbuild-windows-32@0.14.49:
527+
version "0.14.49"
528+
resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.49.tgz#79198c88ec9bde163c18a6b430c34eab098ec21a"
529+
integrity sha512-q7Rb+J9yHTeKr9QTPDYkqfkEj8/kcKz9lOabDuvEXpXuIcosWCJgo5Z7h/L4r7rbtTH4a8U2FGKb6s1eeOHmJA==
530+
531+
esbuild-windows-64@0.14.49:
532+
version "0.14.49"
533+
resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.49.tgz#b36b230d18d1ee54008e08814c4799c7806e8c79"
534+
integrity sha512-+Cme7Ongv0UIUTniPqfTX6mJ8Deo7VXw9xN0yJEN1lQMHDppTNmKwAM3oGbD/Vqff+07K2gN0WfNkMohmG+dVw==
535+
536+
esbuild-windows-arm64@0.14.49:
537+
version "0.14.49"
538+
resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.49.tgz#d83c03ff6436caf3262347cfa7e16b0a8049fae7"
539+
integrity sha512-v+HYNAXzuANrCbbLFJ5nmO3m5y2PGZWLe3uloAkLt87aXiO2mZr3BTmacZdjwNkNEHuH3bNtN8cak+mzVjVPfA==
540+
541+
esbuild@^0.14.49:
542+
version "0.14.49"
543+
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.49.tgz#b82834760eba2ddc17b44f05cfcc0aaca2bae492"
544+
integrity sha512-/TlVHhOaq7Yz8N1OJrjqM3Auzo5wjvHFLk+T8pIue+fhnhIMpfAzsG6PLVMbFveVxqD2WOp3QHei+52IMUNmCw==
545+
optionalDependencies:
546+
esbuild-android-64 "0.14.49"
547+
esbuild-android-arm64 "0.14.49"
548+
esbuild-darwin-64 "0.14.49"
549+
esbuild-darwin-arm64 "0.14.49"
550+
esbuild-freebsd-64 "0.14.49"
551+
esbuild-freebsd-arm64 "0.14.49"
552+
esbuild-linux-32 "0.14.49"
553+
esbuild-linux-64 "0.14.49"
554+
esbuild-linux-arm "0.14.49"
555+
esbuild-linux-arm64 "0.14.49"
556+
esbuild-linux-mips64le "0.14.49"
557+
esbuild-linux-ppc64le "0.14.49"
558+
esbuild-linux-riscv64 "0.14.49"
559+
esbuild-linux-s390x "0.14.49"
560+
esbuild-netbsd-64 "0.14.49"
561+
esbuild-openbsd-64 "0.14.49"
562+
esbuild-sunos-64 "0.14.49"
563+
esbuild-windows-32 "0.14.49"
564+
esbuild-windows-64 "0.14.49"
565+
esbuild-windows-arm64 "0.14.49"
566+
441567
escalade@^3.1.1:
442568
version "3.1.1"
443569
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"

0 commit comments

Comments
 (0)