Skip to content

Commit ad6ae34

Browse files
committed
Switches to esbuild for tests
Switches to mjs for all scripts
1 parent 312bae6 commit ad6ae34

14 files changed

+274
-431
lines changed

.vscode-test.cjs renamed to .vscode-test.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const { defineConfig } = require('@vscode/test-cli');
1+
import { defineConfig } from '@vscode/test-cli';
22

3-
module.exports = defineConfig([
3+
export default defineConfig([
44
{
55
mocha: {
66
ui: 'bdd',

.vscodeignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ images/originals/**
1313
node_modules/**
1414
out/**
1515
patches/**
16+
resources/**
1617
scripts/**
1718
src/**
1819
test/**
19-
**/*.fig
2020
**/*.map
2121
**/*.pdn
2222
**/*.js.LICENSE.txt
23-
.browserslistrc
2423
.eslintcache
24+
.DS_Store
25+
.browserslistrc
2526
.eslintignore
2627
.fantasticonrc.js
2728
.git-blame-ignore-revs
@@ -30,17 +31,16 @@ test/**
3031
.mailmap
3132
.prettierignore
3233
.prettierrc
34+
.vscode-test.mjs
3335
.yarnrc
3436
BACKERS.md
3537
CODE_OF_CONDUCT.md
3638
CONTRIBUTING.md
37-
esbuild.mjs
3839
eslint.config.mjs
3940
pnpm-lock.yaml
4041
README.pre.md
4142
svgo.config.js
4243
tsconfig*.json
4344
tsconfig*.tsbuildinfo
44-
webpack.config*.js
45+
webpack.config*.mjs
4546
yarn.lock
46-
.DS_Store

package.json

+6-9
Original file line numberDiff line numberDiff line change
@@ -17935,12 +17935,11 @@
1793517935
"build:extension:browser": "webpack --mode development --config-name extension:webworker",
1793617936
"build:webviews": "webpack --mode development --config-name webviews",
1793717937
"build:icons": "pnpm run icons:svgo && pnpm run fantasticon && pnpm run icons:apply",
17938-
"build:tests": "tsc -p tsconfig.test.json && tsc-alias -p tsconfig.test.json",
17939-
"-build:tests": "webpack -c webpack.config.test.js --mode development",
17938+
"build:tests": "node ./scripts/esbuild.tests.mjs --mode development",
1794017939
"bundle": "webpack --mode production",
1794117940
"bundle:extension": "webpack --mode production --config-name extension:node",
1794217941
"clean": "npx rimraf dist out .vscode-test .vscode-test-web .eslintcache* tsconfig*.tsbuildinfo",
17943-
"copy:images": "webpack --config webpack.config.images.js",
17942+
"copy:images": "webpack --config webpack.config.images.mjs",
1794417943
"graph:link": "pnpm link @gitkraken/gitkraken-components",
1794517944
"graph:link:main": "pushd \"../GitKrakenComponents\" && pnpm link && popd && pnpm graph:link",
1794617945
"graph:unlink": "pnpm unlink @gitkraken/gitkraken-components && pnpm install --force",
@@ -17953,8 +17952,8 @@
1795317952
"lint:clear-cache": "npx rimraf .eslintcache",
1795417953
"package": "vsce package --no-dependencies",
1795517954
"package-pre": "pnpm run patch-pre && pnpm run package --pre-release",
17956-
"patch-pre": "node ./scripts/applyPreReleasePatch.js",
17957-
"prep-release": "node ./scripts/prep-release.js",
17955+
"patch-pre": "node ./scripts/applyPreReleasePatch.mjs",
17956+
"prep-release": "node ./scripts/prep-release.mjs",
1795817957
"pretty": "prettier --config .prettierrc --write .",
1795917958
"pretty:check": "prettier --config .prettierrc --check .",
1796017959
"pub": "vsce publish --no-dependencies",
@@ -17966,8 +17965,7 @@
1796617965
"watch": "webpack --watch --mode development",
1796717966
"watch:extension": "webpack --watch --mode development --config-name extension",
1796817967
"watch:webviews": "webpack --watch --mode development --config-name webviews",
17969-
"watch:tests": "concurrently \"tsc-alias -p tsconfig.test.json -w\" \"tsc -p tsconfig.test.json -w\"",
17970-
"-watch:tests": "webpack --watch -c webpack.config.test.js --mode development",
17968+
"watch:tests": "node ./scripts/esbuild.tests.mjs --watch --mode development",
1797117969
"web": "vscode-test-web --extensionDevelopmentPath=. --folder-uri=vscode-vfs://github/gitkraken/vscode-gitlens",
1797217970
"web:serve": "node -e \"const p = require('path'); const h = require('os').homedir(); require('child_process').execSync('npx serve --cors -l 5000 --ssl-cert '+p.resolve(h, 'certs/localhost.pem')+' --ssl-key '+p.resolve(h, 'certs/localhost-key.pem'), { stdio: 'inherit' })\"",
1797317971
"update-dts": "pushd \"src/@types\" && npx @vscode/dts dev && popd",
@@ -18034,14 +18032,14 @@
1803418032
"@vscode/vsce": "3.1.0",
1803518033
"circular-dependency-plugin": "5.2.2",
1803618034
"clean-webpack-plugin": "4.0.0",
18037-
"concurrently": "9.0.1",
1803818035
"copy-webpack-plugin": "12.0.2",
1803918036
"csp-html-webpack-plugin": "5.1.0",
1804018037
"css-loader": "7.1.2",
1804118038
"css-minimizer-webpack-plugin": "7.0.0",
1804218039
"cssnano-preset-advanced": "7.0.6",
1804318040
"esbuild": "0.23.1",
1804418041
"esbuild-loader": "4.2.2",
18042+
"esbuild-node-externals": "1.14.0",
1804518043
"esbuild-sass-plugin": "3.3.1",
1804618044
"eslint": "9.10.0",
1804718045
"eslint-import-resolver-typescript": "3.6.3",
@@ -18068,7 +18066,6 @@
1806818066
"svgo": "3.3.2",
1806918067
"terser-webpack-plugin": "5.3.10",
1807018068
"ts-loader": "9.5.1",
18071-
"tsc-alias": "1.8.10",
1807218069
"typescript": "5.6.2",
1807318070
"typescript-eslint": "8.5.0",
1807418071
"webpack": "5.94.0",

pnpm-lock.yaml

+15-90
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

0 commit comments

Comments
 (0)