Skip to content

Commit 5dfff76

Browse files
Merge branch 'devcontainers:main' into main
2 parents efd3b7e + e9096d3 commit 5dfff76

File tree

7 files changed

+1548
-1136
lines changed

7 files changed

+1548
-1136
lines changed

.eslintrc.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ module.exports = {
88
'sourceType': 'module'
99
},
1010
'plugins': [
11-
'@typescript-eslint'
11+
'@typescript-eslint',
12+
'@stylistic'
1213
],
1314
'rules': {
1415
// '@typescript-eslint/class-name-casing': 'warn', https://github.com/typescript-eslint/typescript-eslint/issues/2077
15-
'@typescript-eslint/member-delimiter-style': [
16+
'@stylistic/member-delimiter-style': [
1617
'warn',
1718
{
1819
'multiline': {
@@ -25,7 +26,7 @@ module.exports = {
2526
}
2627
}
2728
],
28-
'@typescript-eslint/semi': [
29+
'semi': [
2930
'warn',
3031
'always'
3132
],

.github/dependabot.yml

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,33 @@
1-
# To get started with Dependabot version updates, you'll need to specify which
2-
# package ecosystems to update and where the package manifests are located.
3-
# Please see the documentation for all configuration options:
4-
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5-
61
version: 2
72
updates:
83
- package-ecosystem: "devcontainers"
94
directory: "/"
105
schedule:
11-
interval: daily
6+
interval: "weekly"
7+
8+
- package-ecosystem: "github-actions"
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"
12+
13+
- package-ecosystem: "npm"
14+
directory: "/"
15+
groups:
16+
all:
17+
patterns:
18+
- "*"
19+
ignore:
20+
- dependency-name: "@stylistic/eslint-plugin"
21+
update-types: ["version-update:semver-major"] # stylistic 4 to avoid esm
22+
- dependency-name: "@types/node"
23+
update-types: ["version-update:semver-major"] # Keep Node 18 compatibility
24+
- dependency-name: "chai"
25+
update-types: ["version-update:semver-major"] # chai 4 to avoid esm
26+
- dependency-name: "eslint"
27+
update-types: ["version-update:semver-major"] # eslint 8 for `--rulesdir`
28+
- dependency-name: "rimraf"
29+
update-types: ["version-update:semver-major"] # rimraf 5 for Node 18 compatibility
30+
- dependency-name: "tar"
31+
update-types: ["version-update:semver-major"] # tar 6 for source compatibility
32+
schedule:
33+
interval: "weekly"

.github/workflows/build-chat.yml

Lines changed: 0 additions & 56 deletions
This file was deleted.

.github/workflows/publish-dev-containers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
echo "TGZ=devcontainers-cli-${VERSION}.tgz" | tee -a $GITHUB_ENV
3434
echo "TGZ_UPLOAD=devcontainers-cli-${VERSION}-${GITHUB_SHA:0:8}.tgz" | tee -a $GITHUB_ENV
3535
- name: Download TGZ
36-
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
36+
uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295 # v9
3737
with:
3838
workflow: dev-containers.yml
3939
workflow_conclusion: success

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
Notable changes.
44

5+
## March 2025
6+
7+
### [0.75.0]
8+
- Fix: add check for missing FROM instructions in Dockerfile parsing (https://github.com/devcontainers/cli/pull/950)
9+
- Update dependencies (https://github.com/devcontainers/cli/pull/954)
10+
511
## February 2025
612

713
### [0.74.0]

package.json

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@devcontainers/cli",
33
"description": "Dev Containers CLI",
4-
"version": "0.74.0",
4+
"version": "0.75.0",
55
"bin": {
66
"devcontainer": "devcontainer.js"
77
},
@@ -54,56 +54,57 @@
5454
"scripts/updateUID.Dockerfile"
5555
],
5656
"devDependencies": {
57-
"@types/chai": "^4.3.10",
58-
"@types/chalk": "^2.2.0",
57+
"@stylistic/eslint-plugin": "^3.0.1",
58+
"@types/chai": "^5.2.0",
59+
"@types/chalk": "^2.2.4",
5960
"@types/follow-redirects": "^1.14.4",
6061
"@types/js-yaml": "^4.0.9",
61-
"@types/mocha": "^10.0.4",
62+
"@types/mocha": "^10.0.10",
6263
"@types/ncp": "^2.0.8",
63-
"@types/node": "^18.15.3",
64-
"@types/pull-stream": "^3.6.5",
64+
"@types/node": "^18.19.75",
65+
"@types/pull-stream": "^3.6.7",
6566
"@types/recursive-readdir": "^2.2.4",
66-
"@types/semver": "^7.5.5",
67-
"@types/shell-quote": "^1.7.4",
68-
"@types/tar": "^6.1.9",
67+
"@types/semver": "^7.5.8",
68+
"@types/shell-quote": "^1.7.5",
69+
"@types/tar": "^6.1.13",
6970
"@types/text-table": "^0.2.5",
70-
"@types/yargs": "^17.0.31",
71-
"@typescript-eslint/eslint-plugin": "^6.11.0",
71+
"@types/yargs": "^17.0.33",
72+
"@typescript-eslint/eslint-plugin": "^8.26.0",
7273
"@typescript-eslint/experimental-utils": "^5.62.0",
73-
"@typescript-eslint/parser": "^6.11.0",
74-
"chai": "^4.3.10",
74+
"@typescript-eslint/parser": "^8.26.0",
75+
"chai": "^4.5.0",
7576
"copyfiles": "^2.4.1",
76-
"esbuild": "^0.19.5",
77-
"eslint": "^8.53.0",
77+
"esbuild": "^0.25.0",
78+
"eslint": "^8.57.0",
7879
"event-stream": "^4.0.1",
7980
"gulp-eslint": "^6.0.0",
8081
"gulp-filter": "^9.0.1",
81-
"mocha": "^10.2.0",
82+
"mocha": "^11.1.0",
8283
"npm-run-all": "^4.1.5",
8384
"p-all": "^5.0.0",
84-
"rimraf": "^5.0.5",
85-
"ts-node": "^10.9.1",
86-
"typescript": "^5.2.2",
85+
"rimraf": "^5.0.10",
86+
"ts-node": "^10.9.2",
87+
"typescript": "^5.8.2",
8788
"typescript-formatter": "^7.2.2",
8889
"vinyl": "^3.0.0",
8990
"vinyl-fs": "^4.0.0"
9091
},
9192
"dependencies": {
92-
"chalk": "^5.3.0",
93-
"follow-redirects": "^1.15.3",
93+
"chalk": "^5.4.1",
94+
"follow-redirects": "^1.15.9",
9495
"js-yaml": "^4.1.0",
95-
"jsonc-parser": "^3.2.0",
96+
"jsonc-parser": "^3.3.1",
9697
"ncp": "^2.0.0",
9798
"node-pty": "^1.0.0",
98-
"proxy-agent": "^6.3.1",
99+
"proxy-agent": "^6.5.0",
99100
"pull-stream": "^3.7.0",
100101
"recursive-readdir": "^2.2.3",
101-
"semver": "^7.5.4",
102-
"shell-quote": "^1.8.1",
102+
"semver": "^7.7.1",
103+
"shell-quote": "^1.8.2",
103104
"stream-to-pull-stream": "^1.7.3",
104-
"tar": "^6.2.0",
105+
"tar": "^6.2.1",
105106
"text-table": "^0.2.0",
106-
"vscode-uri": "^3.0.8",
107+
"vscode-uri": "^3.1.0",
107108
"yargs": "~17.7.2"
108109
}
109110
}

0 commit comments

Comments
 (0)