Skip to content

Commit 1c4bd5b

Browse files
committed
Merge branch 'master' into fix/AG-47932
2 parents edc8416 + c590f99 commit 1c4bd5b

3 files changed

Lines changed: 661 additions & 33 deletions

File tree

bamboo-specs/build-prerelease.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ Build:
5555
# Run Jest tests
5656
pnpm test
5757
58-
# Create production build
59-
pnpm build:prod
58+
# Create prerelease build
59+
pnpm build:prerelease
6060
6161
# Create build.txt file with version
6262
pnpm build:txt

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,10 @@
8484
"scripts": {
8585
"build:grammar": "tsx tools/grammar-builder.ts",
8686
"build:prod": "pnpm build:clean && pnpm build:grammar && pnpm test:compile && pnpm esbuild:client --minify && pnpm esbuild:server --minify && pnpm build:vsix",
87+
"build:prerelease": "pnpm build:clean && pnpm build:grammar && pnpm test:compile && pnpm esbuild:client --minify && pnpm esbuild:server --minify && pnpm build:vsix-prerelease",
8788
"build:txt": "tsx tools/build-txt.ts",
8889
"build:vsix": "mkdirp out && vsce package --out out/vscode-adblock.vsix",
90+
"build:vsix-prerelease": "mkdirp out && vsce package --out out/vscode-adblock.vsix --pre-release",
8991
"build:clean": "rimraf ./client/out && rimraf ./server/out && rimraf ./syntaxes/out && rimraf ./out",
9092
"clean": "tsx tools/clean.ts",
9193
"esbuild:client": "esbuild ./client/src/extension.ts --bundle --outfile=client/out/extension.js --format=cjs --platform=node --external:vscode",
@@ -112,7 +114,7 @@
112114
"@types/plist": "^3.0.2",
113115
"@typescript-eslint/eslint-plugin": "^6.3.0",
114116
"@typescript-eslint/parser": "^6.3.0",
115-
"@vscode/vsce": "^2.22.0",
117+
"@vscode/vsce": "^3.7.1",
116118
"chokidar-cli": "^3.0.0",
117119
"commander": "^11.1.0",
118120
"concurrently": "^8.0.1",

0 commit comments

Comments
 (0)