Skip to content

Commit 872e710

Browse files
author
Keen Yee Liau
committed
Revert "build: Switch to esbuild instead of rollup for the client and banner"
This reverts commit 27ccba8.
1 parent 6f33965 commit 872e710

File tree

5 files changed

+42
-93
lines changed

5 files changed

+42
-93
lines changed

banner.rollup.config.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module.exports = [
2+
{
3+
input: 'dist/banner/banner.js',
4+
output: {
5+
file: 'dist/banner/banner.rollup.js',
6+
format: 'cjs',
7+
},
8+
external: [
9+
'path',
10+
],
11+
},
12+
13+
];

esbuild.js

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@
136136
],
137137
"main": "./dist/client/extension",
138138
"scripts": {
139-
"compile": "tsc -p server/banner.tsconfig.json && tsc -b && node esbuild.js && rollup -c",
139+
"compile": "yarn compile:banner && tsc -b && rollup -c",
140+
"compile:banner": "tsc -p server/banner.tsconfig.json && rollup -c banner.rollup.config.js",
140141
"compile:test": "tsc -b server/src/tests",
141142
"compile:integration": "tsc -b integration",
142143
"compile:syntaxes-test": "tsc -b syntaxes/test",
@@ -162,7 +163,6 @@
162163
"@types/jasmine": "3.6.3",
163164
"@types/node": "12.19.16",
164165
"clang-format": "1.5.0",
165-
"esbuild": "^0.9.0",
166166
"jasmine": "3.6.4",
167167
"prettier": "2.2.1",
168168
"rollup": "2.38.5",
@@ -178,4 +178,4 @@
178178
"type": "git",
179179
"url": "https://github.com/angular/vscode-ng-language-service"
180180
}
181-
}
181+
}

rollup.config.js

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,28 @@ import * as fs from 'fs';
22
import commonjs from 'rollup-plugin-commonjs';
33

44
module.exports = [
5+
{
6+
input: 'dist/client/extension.js',
7+
output: {
8+
file: 'dist/npm/index.js',
9+
format: 'cjs',
10+
exports: 'named',
11+
},
12+
external: [
13+
'path',
14+
'vscode',
15+
'vscode-languageclient',
16+
],
17+
plugins: [
18+
commonjs(),
19+
],
20+
},
521
{
622
input: 'dist/server/server.js',
723
output: {
824
file: 'dist/npm/server/index.js',
925
format: 'amd',
10-
banner: fs.readFileSync('dist/banner/banner.esbuild.js', 'utf8'),
26+
banner: fs.readFileSync('dist/banner/banner.rollup.js', 'utf8'),
1127
},
1228
external: [
1329
'fs',
@@ -25,4 +41,4 @@ module.exports = [
2541
}),
2642
],
2743
},
28-
];
44+
];

yarn.lock

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
3535

3636
"@types/estree@*":
37-
version "0.0.46"
38-
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe"
39-
integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==
37+
version "0.0.45"
38+
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884"
39+
integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==
4040

4141
4242
version "3.6.3"
@@ -331,11 +331,6 @@ es6-promisify@^5.0.0:
331331
dependencies:
332332
es6-promise "^4.0.3"
333333

334-
esbuild@^0.9.0:
335-
version "0.9.0"
336-
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.9.0.tgz#b8320df85048ed1637c6b59ee52abba248936d3c"
337-
integrity sha512-IqYFO7ZKHf0y4uJpJfGqInmSRn8jMPMbyI1W0Y2PSjSjJcVP538tC8TleJAS4Y8QeqwajqBTwFKayWVzYlMIgg==
338-
339334
[email protected], escape-string-regexp@^1.0.5:
340335
version "1.0.5"
341336
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -369,9 +364,9 @@ fs.realpath@^1.0.0:
369364
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
370365

371366
fsevents@~2.3.1:
372-
version "2.3.2"
373-
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
374-
integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
367+
version "2.3.1"
368+
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
369+
integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
375370

376371
function-bind@^1.1.1:
377372
version "1.1.1"
@@ -482,7 +477,7 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3:
482477
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
483478
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
484479

485-
is-core-module@^2.1.0, is-core-module@^2.2.0:
480+
is-core-module@^2.1.0:
486481
version "2.2.0"
487482
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
488483
integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
@@ -746,22 +741,14 @@ readable-stream@^3.1.1:
746741
string_decoder "^1.1.1"
747742
util-deprecate "^1.0.1"
748743

749-
resolve@^1.1.6, resolve@^1.3.2:
744+
resolve@^1.1.6, resolve@^1.11.0, resolve@^1.3.2:
750745
version "1.19.0"
751746
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
752747
integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
753748
dependencies:
754749
is-core-module "^2.1.0"
755750
path-parse "^1.0.6"
756751

757-
resolve@^1.11.0:
758-
version "1.20.0"
759-
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
760-
integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
761-
dependencies:
762-
is-core-module "^2.2.0"
763-
path-parse "^1.0.6"
764-
765752
766753
version "10.1.0"
767754
resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"

0 commit comments

Comments
 (0)