diff --git a/.ci/publish-nightly.yml b/.ci/publish-nightly.yml index 2965cf45..d7646ac2 100644 --- a/.ci/publish-nightly.yml +++ b/.ci/publish-nightly.yml @@ -1,5 +1,14 @@ +trigger: none pr: none +schedules: + - cron: '0 9 * * Mon-Thu' + displayName: Nightly Release Schedule + always: true + branches: + include: + - main + resources: repositories: - repository: templates @@ -8,17 +17,10 @@ resources: ref: main endpoint: Monaco -parameters: - - name: publishExtension - displayName: 🚀 Publish Extension - type: boolean - default: true - extends: template: azure-pipelines/extension/pre-release.yml@templates parameters: workingDirectory: dist - usePreReleaseChannel: false vscePackageArgs: --no-dependencies cgIgnoreDirectories: 'testdata,demos,.vscode-test' buildSteps: @@ -26,4 +28,4 @@ extends: displayName: Install dependencies - script: npm run compile -- package:prepare --nightly - displayName: Package + displayName: Package Stable diff --git a/CHANGELOG.md b/CHANGELOG.md index c3b616d1..8b8fea25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Changelog -This changelog records changes to stable releases since 1.50.2. "TBA" changes here may be available in the [nightly release](https://github.com/microsoft/vscode-js-debug/#nightly-extension) before they're in stable. Note that the minor version (`v1.X.0`) corresponds to the VS Code version js-debug is shipped in, but the patch version (`v1.50.X`) is not meaningful. +This changelog records changes to stable releases since 1.50.2. "TBA" changes here may be available in the pre-release version of the extension before they're in stable. Note that the minor version (`v1.X.0`) corresponds to the VS Code version js-debug is shipped in, but the patch version (`v1.50.X`) is not meaningful. -## Nightly (only) +## Prerelease (only) - feat: make Deno easier to configure - fix: path display issues in breakpoint diagnostic tool ([#1343](https://github.com/microsoft/vscode-js-debug/issues/1343)) diff --git a/README.md b/README.md index 25d2bf67..b393b32e 100644 --- a/README.md +++ b/README.md @@ -11,12 +11,11 @@ This is a [DAP](https://microsoft.github.io/debug-adapter-protocol/)-based JavaS ### Nightly Extension -The shipped version of VS Code includes the js-debug version at the time of its release, however you may want to install our nightly build to get the latest fixes and features. The nightly build runs at 5PM PST on each day that there are changes ([see pipeline](https://dev.azure.com/vscode/VS%20Code%20debug%20adapters/_build?definitionId=28)). To get the build: +The shipped version of VS Code includes the js-debug version at the time of its release, however you may want to install our pre-release build to get the latest fixes and features. The build runs at 5PM PST on each day that there are changes ([see pipeline](https://dev.azure.com/vscode/VS%20Code%20debug%20adapters/_build?definitionId=28)). To get the build: 1. Open the extensions view (ctrl+shift+x) and search for `@builtin @id:ms-vscode.js-debug` -2. Right click on the `JavaScript Debugger` extension and `Disable` it. -3. Search for `@id:ms-vscode.js-debug-nightly` in the extensions view. -4. Install that extension. +2. Right click on the `JavaScript Debugger` extension and select `Switch to Pre-Release Version`. +3. Reload VS Code ## What's new? diff --git a/gulpfile.js b/gulpfile.js index 6a769622..ac6fb20c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -44,9 +44,9 @@ const nodeTargetsDir = `targets/node`; const isNightly = process.argv.includes('--nightly') || process.argv.includes('watch'); /** - * Extension ID to build. Appended with '-nightly' as necessary. + * Extension ID to build. */ -const extensionName = isNightly ? 'js-debug-nightly' : 'js-debug'; +const extensionName = 'js-debug'; function runBuildScript(name) { return new Promise((resolve, reject) => @@ -100,14 +100,6 @@ gulp.task('compile:ts', () => .pipe(gulp.dest(buildSrcDir)), ); -async function fixNightlyReadme() { - const readmePath = `${buildDir}/README.md`; - const readmeText = await readFile(readmePath); - const readmeNightlyText = await readFile(`README.nightly.md`); - - await writeFile(readmePath, readmeNightlyText + '\n' + readmeText); -} - const getVersionNumber = () => { if (process.env.JS_DEBUG_VERSION) { return process.env.JS_DEBUG_VERSION; @@ -136,10 +128,8 @@ gulp.task('compile:dynamic', async () => { let packageJson = await readJson(`${buildDir}/package.json`); packageJson.name = extensionName; if (isNightly) { - packageJson.displayName += ' (Nightly)'; packageJson.version = getVersionNumber(); - packageJson.preview = true; - await fixNightlyReadme(); + packageJson.isNightly = true; } packageJson = deepmerge(packageJson, contributions); diff --git a/package.json b/package.json index 458dfd8c..7b1abe53 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "description": "An extension for debugging Node.js programs and Chrome.", "license": "MIT", "engines": { - "vscode": "^1.67.0-insider", + "vscode": "^1.71.0-insider", "node": ">=10" }, "icon": "resources/logo.png", diff --git a/src/binder.ts b/src/binder.ts index b7351bc7..13dbd6cf 100644 --- a/src/binder.ts +++ b/src/binder.ts @@ -503,7 +503,7 @@ function warnNightly(dap: Dap.Api): void { if (isNightly) { dap.output({ category: 'console', - output: `Note: Using the "preview" debug extension\n`, + output: `Note: Using the pre-release version of js-debug\n`, }); } } diff --git a/src/configuration.ts b/src/configuration.ts index b953373b..ac99838e 100644 --- a/src/configuration.ts +++ b/src/configuration.ts @@ -1134,5 +1134,5 @@ export const breakpointLanguages: ReadonlyArray = [ export const packageName: string = pkg.name; export const packageVersion: string = pkg.version; export const packagePublisher: string = pkg.publisher; -export const isNightly = packageName.includes('nightly'); +export const isNightly = !!pkg.isNightly; export const extensionId = `${packagePublisher}.${packageName}`;