Skip to content

Commit 6989cb7

Browse files
authored
fix: missing dependabot updates aws#4259
Problem: Dependabot fails since 60ffe61. This is because _transitive_ deps can set "engines" to something more restrictive than our own `package.json`. There's basically no way around this. dependabot/dependabot-core#4072 `engine-strict=true` was intended to help developers avoid using outdated tooling, but because transitive deps can (and do) specify more restrictive "engines" in their `package.json`, it's unrealistic for us (unless we restrict ourselves to older versions of those deps--but that's difficult because often our _direct_ dependencies aren't aware of the transitive deps they are pulling in). Solution: - Remove `engine-strict`. - TODO: write a "prepare" script that checks local developer's `npm` and `node` versions.
1 parent 4f3a4c1 commit 6989cb7

File tree

8 files changed

+7
-19
lines changed

8 files changed

+7
-19
lines changed

.github/dependabot.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Documentation for configuration options:
22
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
3+
#
4+
# Troubleshooting: Insights tab > Dependency Graph > Dependabot
5+
# https://github.com/aws/aws-toolkit-vscode/network/updates
36

47
version: 2
58
updates:

.github/workflows/node.js.yml

-6
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323
NODE_OPTIONS: '--max-old-space-size=8192'
2424
steps:
2525
- uses: actions/checkout@v4
26-
- name: Disable engine-strict check
27-
run: sed -i -e 's/engine.strict.true/engine-strict=false/' .npmrc
2826
- name: Use Node.js ${{ matrix.node-version }}
2927
uses: actions/setup-node@v4
3028
with:
@@ -67,8 +65,6 @@ jobs:
6765
NODE_OPTIONS: '--max-old-space-size=8192'
6866
steps:
6967
- uses: actions/checkout@v4
70-
- name: Disable engine-strict check
71-
run: sed -i -e 's/engine.strict.true/engine-strict=false/' .npmrc
7268
- name: Use Node.js ${{ matrix.node-version }}
7369
uses: actions/setup-node@v4
7470
with:
@@ -98,8 +94,6 @@ jobs:
9894
NODE_OPTIONS: '--max-old-space-size=8192'
9995
steps:
10096
- uses: actions/checkout@v4
101-
- name: Disable engine-strict check
102-
run: sed -i -e 's/engine.strict.true/engine-strict=false/' .npmrc
10397
- name: Use Node.js ${{ matrix.node-version }}
10498
uses: actions/setup-node@v4
10599
with:

.github/workflows/release.yml

-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ jobs:
3030
- uses: actions/checkout@v4
3131
with:
3232
fetch-depth: 0
33-
- name: Disable engine-strict check
34-
run: sed -i -e 's/engine.strict.true/engine-strict=false/' .npmrc
3533
- name: Use Node.js ${{ matrix.node-version }}
3634
uses: actions/setup-node@v4
3735
with:
@@ -93,8 +91,6 @@ jobs:
9391
# Must perform checkout first, it deletes the target directory
9492
# before running, thus would delete the downloaded artifacts.
9593
- uses: actions/checkout@v4
96-
- name: Disable engine-strict check
97-
run: sed -i -e 's/engine.strict.true/engine-strict=false/' .npmrc
9894
- uses: actions/download-artifact@v4
9995
- name: Delete existing prerelease
10096
# "prerelease" (main branch) or "pre-<feature>"

.npmrc

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# ensure that the project uses the public npm registry see: https://docs.npmjs.com/cli/v8/configuring-npm/npmrc
22
registry = "https://registry.npmjs.org/"
3-
engine-strict=true
3+
# `engine-strict=true` prevents dependabot from working, because _transitive_ deps can set "engines"
4+
# more restrictive than our own package.json. https://github.com/dependabot/dependabot-core/issues/4072
5+
engine-strict=false

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# AWS Toolkit for Visual Studio Code
22

3-
[![GitHub CI status](https://github.com/aws/aws-toolkit-vscode/workflows/CI/badge.svg?event=push&branch=master)](https://github.com/aws/aws-toolkit-vscode/actions?query=branch%3Amaster) [![Coverage](https://img.shields.io/codecov/c/github/aws/aws-toolkit-vscode/master.svg)](https://codecov.io/gh/aws/aws-toolkit-vscode/branch/master) [![Marketplace Version](https://img.shields.io/vscode-marketplace/v/AmazonWebServices.aws-toolkit-vscode.svg) ![Marketplace Downloads](https://img.shields.io/vscode-marketplace/d/AmazonWebServices.aws-toolkit-vscode.svg)](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.aws-toolkit-vscode)
3+
[![Coverage](https://img.shields.io/codecov/c/github/aws/aws-toolkit-vscode/master.svg)](https://codecov.io/gh/aws/aws-toolkit-vscode/branch/master) [![Marketplace Version](https://img.shields.io/vscode-marketplace/v/AmazonWebServices.aws-toolkit-vscode.svg) ![Marketplace Downloads](https://img.shields.io/vscode-marketplace/d/AmazonWebServices.aws-toolkit-vscode.svg)](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.aws-toolkit-vscode)
44

55
The AWS Toolkit for Visual Studio Code is an [extension](https://marketplace.visualstudio.com/itemdetails?itemName=AmazonWebServices.aws-toolkit-vscode) for connecting your IDE to your AWS resources:
66

buildspec/release/10changeversion.yml

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ phases:
1111

1212
build:
1313
commands:
14-
# Disable engine-strict in CI.
15-
- sed -i -e 's/engine.strict.true/engine-strict=false/' .npmrc
1614
- |
1715
echo "Removing SNAPSHOT from version string"
1816
git config --global user.name "aws-toolkit-automation"

buildspec/release/20buildrelease.yml

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ phases:
1919
- apt-get install -y libasound2-plugins
2020
build:
2121
commands:
22-
# Disable engine-strict in CI.
23-
- sed -i -e 's/engine.strict.true/engine-strict=false/' .npmrc
2422
# --unsafe-perm is needed because we run as root
2523
- npm ci --unsafe-perm
2624
- cp ./README.quickstart.vscode.md ./README.md

buildspec/shared/linux-install.sh

-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ test -n "$VSCODE_TEST_VERSION" || {
1111
}
1212
set -x
1313

14-
# Disable engine-strict in CI.
15-
sed -i -e 's/engine.strict.true/engine-strict=false/' .npmrc
16-
1714
# Without this, "Unable to locate package libatk1.0-0".
1815
apt-get > /dev/null -yqq update
1916
# Dependencies for running vscode.

0 commit comments

Comments
 (0)