Skip to content

Commit 2f5181b

Browse files
authored
Merge pull request #302 from htmlhint/dev/coliff/dev-deps-update
Dev Dependency Updates
2 parents 4da91d2 + 4579999 commit 2f5181b

File tree

11 files changed

+70
-20
lines changed

11 files changed

+70
-20
lines changed

.cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"htmlhintrc",
1111
"mylang",
1212
"nvmrc",
13+
"ossf",
1314
"rollup",
1415
"ruleset",
1516
"sarif",

.github/copilot-instructions.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,10 @@
55
- All code is formatted with Prettier.
66
- All code and comments are in US English.
77
- We use TypeScript v5.5.4.
8+
9+
## GitHub Actions
10+
11+
- The GitHub Actions workflows should be placed in the .github/workflows directory.
12+
- The workflows should be named <workflow-name>.yml.
13+
- All GitHub Actions should be pinned versions to avoid breaking changes (SHA-1).
14+
- If using actions/checkout, it should have persist-credentials: false set.

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
persist-credentials: false
3333

3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.30.2
35+
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
3636
with:
3737
languages: ${{ matrix.language }}
3838
queries: +security-and-quality
@@ -41,9 +41,9 @@ jobs:
4141
- test/*
4242
4343
- name: Autobuild
44-
uses: github/codeql-action/autobuild@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.30.2
44+
uses: github/codeql-action/autobuild@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
4545

4646
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.30.2
47+
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
4848
with:
4949
category: "/language:${{matrix.language}}"
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Scorecard supply-chain security
2+
on:
3+
branch_protection_rule:
4+
schedule:
5+
- cron: "27 12 * * 2"
6+
push:
7+
branches: ["main"]
8+
9+
permissions: read-all
10+
11+
jobs:
12+
analysis:
13+
name: Scorecard analysis
14+
runs-on: ubuntu-latest
15+
if: github.event.repository.default_branch == github.ref_name || github.event_name == 'pull_request'
16+
permissions:
17+
security-events: write
18+
id-token: write
19+
20+
steps:
21+
- name: "Checkout code"
22+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
23+
with:
24+
persist-credentials: false
25+
26+
- name: "Run analysis"
27+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
28+
with:
29+
results_file: results.sarif
30+
results_format: sarif
31+
publish_results: true
32+
33+
- name: "Upload artifact"
34+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
35+
with:
36+
name: SARIF file
37+
path: results.sarif
38+
retention-days: 5
39+
40+
- name: "Upload to code-scanning"
41+
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
42+
with:
43+
sarif_file: results.sarif

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828
- run: npm run package
2929

3030
- name: Publish to Open VSX Registry
31-
uses: HaaLeo/publish-vscode-extension@v2
31+
uses: HaaLeo/publish-vscode-extension@ca5561daa085dee804bf9f37fe0165785a9b14db # v2.0.0
3232
with:
3333
pat: ${{ secrets.OPEN_VSX_TOKEN }}
3434

3535
- name: Publish to Visual Studio Marketplace
36-
uses: HaaLeo/publish-vscode-extension@v2
36+
uses: HaaLeo/publish-vscode-extension@ca5561daa085dee804bf9f37fe0165785a9b14db # v2.0.0
3737
with:
3838
pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
3939
registryUrl: https://marketplace.visualstudio.com

.github/workflows/super-linter.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636
SUPPRESS_POSSUM: true
3737
VALIDATE_ALL_CODEBASE: false
3838
VALIDATE_EDITORCONFIG: false
39-
VALIDATE_GITHUB_ACTIONS_ZIZMOR: false
4039
VALIDATE_HTML: false
4140
VALIDATE_HTML_PRETTIER: false
4241
VALIDATE_JSCPD: false

htmlhint-server/package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

htmlhint-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"watch": "tsc --watch -p ./src"
99
},
1010
"dependencies": {
11-
"htmlhint": "^1.6.3",
11+
"htmlhint": "^1.7.0",
1212
"strip-json-comments": "3.1.1",
1313
"vscode-languageserver": "^9.0.1",
1414
"vscode-languageserver-textdocument": "^1.0.12",

htmlhint/package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

htmlhint/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"vscode:prepublish": "npm run compile && npm run bundle-dependencies",
8888
"compile": "tsc -p ./",
8989
"watch": "tsc -watch -p ./",
90-
"bundle-dependencies": "npm install --no-package-lock --no-save --no-fund htmlhint@1.6.3 strip-json-comments@3.1.1 vscode-languageserver@9.0.1 vscode-languageserver-textdocument@1.0.12 vscode-uri@3.1.0 ignore@7.0.5",
90+
"bundle-dependencies": "npm install --no-package-lock --no-save --no-fund htmlhint@1.7.0 strip-json-comments@3.1.1 vscode-languageserver@9.0.1 vscode-languageserver-textdocument@1.0.12 vscode-uri@3.1.0 ignore@7.0.5",
9191
"package": "vsce package"
9292
},
9393
"devDependencies": {
@@ -97,7 +97,7 @@
9797
"vscode-test": "^1.6.1"
9898
},
9999
"dependencies": {
100-
"htmlhint": "1.6.3",
100+
"htmlhint": "1.7.0",
101101
"ignore": "^7.0.5",
102102
"strip-json-comments": "3.1.1",
103103
"vscode-languageclient": "9.0.1",

0 commit comments

Comments
 (0)