From 7a7069b5fa4838e329f1615bd8b73091821fd41a Mon Sep 17 00:00:00 2001 From: laileni Date: Thu, 20 Aug 2026 21:21:56 -0700 Subject: [PATCH] fix: required changes --- .github/CODEOWNERS | 6 +-- .github/workflows/node.js.yml | 37 +++++++++++++-- .github/workflows/notification.yml | 2 +- .github/workflows/release.yml | 4 ++ LICENSE-THIRD-PARTY | 68 ++++++++-------------------- packages/amazonq/.changes/2.5.0.json | 5 ++ packages/amazonq/CHANGELOG.md | 4 ++ packages/amazonq/package.json | 2 +- 8 files changed, 66 insertions(+), 62 deletions(-) create mode 100644 packages/amazonq/.changes/2.5.0.json diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 06f87dae3d..d4fdce58c1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1 @@ -* @aws/aws-ides-team -packages/core/src/codewhisperer/ @aws/codewhisperer-team -packages/core/src/amazonqFeatureDev/ @aws/earlybird -packages/core/src/awsService/accessanalyzer/ @aws/access-analyzer -packages/core/src/awsService/cloudformation/ @aws/cfn-dev-productivity +* @Amazon-Q-Developer/sync-team-dae-production-eng-team diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 9a3e4173a6..edf91fe6a6 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -150,7 +150,7 @@ jobs: env: # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475 NODE_OPTIONS: '' - if: ${{ github.repository == 'aws/amazon-q-vscode' && github.event_name == 'pull_request' && github.base_ref == 'main' }} + if: ${{ github.repository == 'Amazon-Q-Developer/amazon-q-vscode' && github.event_name == 'pull_request' && github.base_ref == 'main' }} uses: codecov/codecov-action@v5 with: flags: linux-${{ matrix.package }}-unittests @@ -188,7 +188,7 @@ jobs: env: # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475 NODE_OPTIONS: '' - if: ${{ github.repository == 'aws/amazon-q-vscode' && github.event_name == 'pull_request' && github.base_ref == 'main' }} + if: ${{ github.repository == 'Amazon-Q-Developer/amazon-q-vscode' && github.event_name == 'pull_request' && github.base_ref == 'main' }} uses: codecov/codecov-action@v5 with: flags: macos-${{ matrix.package }}-unittests @@ -259,7 +259,7 @@ jobs: - name: Code coverage for ${{ matrix.package }} env: NODE_OPTIONS: '' - if: ${{ github.repository == 'aws/amazon-q-vscode' && github.event_name == 'pull_request' && github.base_ref == 'main' }} + if: ${{ github.repository == 'Amazon-Q-Developer/amazon-q-vscode' && github.event_name == 'pull_request' && github.base_ref == 'main' }} uses: codecov/codecov-action@v5 with: flags: linux-${{ matrix.package }}-e2e @@ -298,7 +298,10 @@ jobs: strategy: fail-fast: false matrix: - node-version: [18.x] + # node-gyp >= 12.1.0 is required to detect Visual Studio 2026, but + # node-gyp >= 12 requires Node >= 20.17, so this job runs on Node 20.x + # (the rest of the matrix stays on 18.x). See the node-gyp step below. + node-version: [20.x] vscode-version: [stable, insiders] package: [amazonq] env: @@ -310,6 +313,30 @@ jobs: uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} + # registry-js (a native dependency) builds via `prebuild-install || + # node-gyp rebuild`. npm's bundled node-gyp (v10/11) cannot detect Visual + # Studio 2026 (version major 18 -> toolset v145); support landed in + # node-gyp 12.1.0, and the PowerShell VS-detection maxBuffer crash was + # fixed in 12.3.0 (Add-Type -IgnoreWarnings). npm_config_node_gyp is NOT + # honored for a package's own install script, and `npm install` inside + # npm's own dir fails (npm's internal deps aren't public), so install + # node-gyp@12 in isolation (nested deps = self-contained) and drop it onto + # the path npm resolves for native builds. node-gyp >= 12 needs Node >= + # 20.17 (hence Node 20.x above). Remove once npm bundles node-gyp >= 12.1.0. + - name: Replace npm's bundled node-gyp with v12 (Visual Studio 2026 support) + shell: bash + run: | + set -eo pipefail + WORK=/tmp/ng12 + rm -rf "$WORK"; mkdir -p "$WORK" + ( cd "$WORK" && npm install node-gyp@12 --no-save --no-audit --no-fund --install-strategy=nested ) + NPM_DIR="$(dirname "$(command -v node)")/node_modules/npm" + echo "Bundled npm dir: $NPM_DIR" + test -d "$NPM_DIR/node_modules/node-gyp" + rm -rf "$NPM_DIR/node_modules/node-gyp" + cp -r "$WORK/node_modules/node-gyp" "$NPM_DIR/node_modules/node-gyp" + echo "node-gyp version now in use:" + node "$NPM_DIR/node_modules/node-gyp/bin/node-gyp.js" --version - run: npm ci - name: Tests run: npm run test -w packages/${{ matrix.package }} @@ -317,7 +344,7 @@ jobs: env: # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475 NODE_OPTIONS: '' - if: ${{ github.repository == 'aws/amazon-q-vscode' && github.event_name == 'pull_request' && github.base_ref == 'main' }} + if: ${{ github.repository == 'Amazon-Q-Developer/amazon-q-vscode' && github.event_name == 'pull_request' && github.base_ref == 'main' }} uses: codecov/codecov-action@v5 with: flags: windows-${{ matrix.package }}-unittests diff --git a/.github/workflows/notification.yml b/.github/workflows/notification.yml index 11362b48b3..8072338b5c 100644 --- a/.github/workflows/notification.yml +++ b/.github/workflows/notification.yml @@ -18,7 +18,7 @@ concurrency: jobs: notify: - if: github.repository == 'aws/amazon-q-vscode' + if: github.repository == 'Amazon-Q-Developer/amazon-q-vscode' runs-on: ubuntu-latest permissions: pull-requests: write diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8c850295c1..e374fca773 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,10 @@ on: push: branches: [main, feature/*, release/*] +# Least-privilege default for GITHUB_TOKEN; the `publish` job overrides with `contents: write`. +permissions: + contents: read + jobs: package: runs-on: ubuntu-latest diff --git a/LICENSE-THIRD-PARTY b/LICENSE-THIRD-PARTY index 873fd15869..379cd895c7 100644 --- a/LICENSE-THIRD-PARTY +++ b/LICENSE-THIRD-PARTY @@ -775,7 +775,7 @@ ****************************** @opentelemetry/core -2.0.1 +2.9.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -1810,7 +1810,7 @@ ****************************** @opentelemetry/resources -2.0.1 +2.9.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -2224,7 +2224,7 @@ ****************************** @opentelemetry/sdk-metrics -2.0.1 +2.9.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -2909,7 +2909,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************** @protobufjs/codegen -2.0.4 +2.0.5 Copyright (c) 2016, Daniel Wirtz All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2941,7 +2941,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************** @protobufjs/eventemitter -1.1.0 +1.1.1 Copyright (c) 2016, Daniel Wirtz All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2973,7 +2973,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************** @protobufjs/fetch -1.1.0 +1.1.1 Copyright (c) 2016, Daniel Wirtz All rights reserved. Redistribution and use in source and binary forms, with or without @@ -3034,38 +3034,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -****************************** - -@protobufjs/inquire -1.1.0 -Copyright (c) 2016, Daniel Wirtz All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -* Neither the name of its author, nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - ****************************** @protobufjs/path @@ -3133,7 +3101,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************** @protobufjs/utf8 -1.1.0 +1.1.2 Copyright (c) 2016, Daniel Wirtz All rights reserved. Redistribution and use in source and binary forms, with or without @@ -4431,7 +4399,7 @@ Apache License ****************************** ajv -8.17.1 +8.20.0 The MIT License (MIT) Copyright (c) 2015-2021 Evgeny Poberezkin @@ -4674,7 +4642,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ****************************** brace-expansion -1.1.11 +1.1.16 MIT License Copyright (c) 2013 Julian Gruber @@ -5344,7 +5312,7 @@ THE SOFTWARE. ****************************** escalade -3.1.2 +3.2.0 MIT License Copyright (c) Luke Edwards (lukeed.com) @@ -5447,9 +5415,9 @@ SOFTWARE. ****************************** fast-uri -3.0.6 -Copyright (c) 2021 The Fastify Team +3.1.4 Copyright (c) 2011-2021, Gary Court until https://github.com/garycourt/uri-js/commit/a1acf730b4bba3f1097c9f52e7d9d3aba8cdcaae +Copyright (c) 2021-present The Fastify team All rights reserved. Redistribution and use in source and binary forms, with or without @@ -5976,7 +5944,7 @@ SOFTWARE. ****************************** long -5.3.1 +5.3.2 Apache License Version 2.0, January 2004 @@ -6257,7 +6225,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ****************************** minimatch -3.1.2 +3.1.5 The ISC License Copyright (c) Isaac Z. Schlueter and Contributors @@ -6401,7 +6369,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ****************************** node-forge -1.3.1 +1.4.0 You may use the Forge project under the terms of either the BSD License or the GNU General Public License (GPL) Version 2. @@ -7199,7 +7167,7 @@ SOFTWARE.** ****************************** protobufjs -7.4.0 +7.6.5 This license applies to all parts of protobuf.js except those files either explicitly including or referencing a different license or located in a directory containing a different LICENSE file. @@ -8065,7 +8033,7 @@ THE SOFTWARE. ****************************** tar-fs -2.1.1 +2.1.5 The MIT License (MIT) Copyright (c) 2014 Mathias Buus @@ -8303,7 +8271,7 @@ END OF TERMS AND CONDITIONS ****************************** undici -6.21.2 +6.27.0 MIT License Copyright (c) Matteo Collina and Undici contributors diff --git a/packages/amazonq/.changes/2.5.0.json b/packages/amazonq/.changes/2.5.0.json new file mode 100644 index 0000000000..c8f3c1fbfb --- /dev/null +++ b/packages/amazonq/.changes/2.5.0.json @@ -0,0 +1,5 @@ +{ + "date": "2026-08-20", + "version": "2.5.0", + "entries": [] +} \ No newline at end of file diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md index 327188b9c1..0fff8d26ba 100644 --- a/packages/amazonq/CHANGELOG.md +++ b/packages/amazonq/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.5.0 2026-08-20 + +- Miscellaneous non-user-facing changes + ## 2.4.0 2026-06-24 - Miscellaneous non-user-facing changes diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json index ab0a425ee0..7234915c31 100644 --- a/packages/amazonq/package.json +++ b/packages/amazonq/package.json @@ -2,7 +2,7 @@ "name": "amazon-q-vscode", "displayName": "Amazon Q", "description": "The most capable generative AI–powered assistant for software development.", - "version": "2.5.0-SNAPSHOT", + "version": "2.6.0-SNAPSHOT", "extensionKind": [ "workspace" ],