Просмотр исходного кода

Merge pull request #4291 from hestiacp/simplify-dep-pinning

Simplify dependency pinning
Jaap Marcus 2 лет назад
Родитель
Сommit
e12c20dd79
6 измененных файлов с 375 добавлено и 305 удалено
  1. 2 2
      .github/workflows/crowdin.yml
  2. 10 10
      .github/workflows/lint.yml
  3. 330 259
      package-lock.json
  4. 29 29
      package.json
  5. 0 1
      renovate.json
  6. 4 4
      src/deb/web-terminal/package.json

+ 2 - 2
.github/workflows/crowdin.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@v4
         if: github.repository == 'hestiacp/hestiacp'
       - name: crowdin action
-        uses: crowdin/github-action@c953b17499daa6be3e5afbf7a63616fb02d8b18d # v1
+        uses: crowdin/github-action@v1
         if: github.repository == 'hestiacp/hestiacp'
         with:
           upload_sources: true

+ 10 - 10
.github/workflows/lint.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@v4
 
       - name: Run markdownlint
-        uses: DavidAnson/markdownlint-cli2-action@510b996878fc0d1a46c8a04ec86b06dbfba09de7 # v15
+        uses: DavidAnson/markdownlint-cli2-action@v15
         with:
           globs: |
             *.md
@@ -26,10 +26,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@v4
 
       - name: Run ShellCheck
-        uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # 2.0.0
+        uses: ludeeus/action-shellcheck@master
         with:
           severity: error
 
@@ -38,13 +38,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.event.pull_request.head.ref }}
 
       - name: Setup Node
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4
+        uses: actions/setup-node@v4
         with:
           node-version: "lts/*"
 
@@ -59,10 +59,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4
+        uses: actions/setup-node@v4
         with:
           node-version: "lts/*"
 
@@ -77,10 +77,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4
+        uses: actions/setup-node@v4
         with:
           node-version: "lts/*"
 

Разница между файлами не показана из-за своего большого размера
+ 330 - 259
package-lock.json


+ 29 - 29
package.json

@@ -18,37 +18,37 @@
 		"prepare": "husky"
 	},
 	"dependencies": {
-		"@fortawesome/fontawesome-free": "6.5.1",
-		"alpinejs": "3.13.5",
-		"chart.js": "4.4.1",
-		"check-password-strength": "2.0.7",
-		"floating-vue": "5.2.2",
-		"nanoid": "5.0.5",
-		"normalize.css": "8.0.1",
-		"xterm": "5.3.0",
-		"xterm-addon-canvas": "0.5.0",
-		"xterm-addon-webgl": "0.16.0"
+		"@fortawesome/fontawesome-free": "^6.5.1",
+		"alpinejs": "^3.13.5",
+		"chart.js": "^4.4.1",
+		"check-password-strength": "^2.0.7",
+		"floating-vue": "^5.2.2",
+		"nanoid": "^5.0.5",
+		"normalize.css": "^8.0.1",
+		"xterm": "^5.3.0",
+		"xterm-addon-canvas": "^0.5.0",
+		"xterm-addon-webgl": "^0.16.0"
 	},
 	"devDependencies": {
-		"@prettier/plugin-php": "0.22.2",
-		"browserslist": "4.22.3",
-		"esbuild": "0.20.0",
-		"eslint": "8.56.0",
-		"eslint-config-prettier": "9.1.0",
-		"eslint-plugin-editorconfig": "4.0.3",
-		"eslint-plugin-import": "2.29.1",
-		"husky": "9.0.10",
-		"lightningcss": "1.23.0",
-		"lint-staged": "15.2.2",
-		"markdownlint-cli2": "0.12.1",
-		"prettier": "3.2.5",
-		"prettier-plugin-nginx": "1.0.3",
-		"prettier-plugin-sh": "0.14.0",
-		"prettier-plugin-sql": "0.18.0",
-		"stylelint": "16.2.1",
-		"stylelint-config-standard": "36.0.0",
-		"vitepress": "1.0.0-rc.42",
-		"vue": "3.4.19"
+		"@prettier/plugin-php": "^0.22.2",
+		"browserslist": "^4.22.3",
+		"esbuild": "^0.20.0",
+		"eslint": "^8.56.0",
+		"eslint-config-prettier": "^9.1.0",
+		"eslint-plugin-editorconfig": "^4.0.3",
+		"eslint-plugin-import": "^2.29.1",
+		"husky": "^9.0.10",
+		"lightningcss": "^1.23.0",
+		"lint-staged": "^15.2.2",
+		"markdownlint-cli2": "^0.12.1",
+		"prettier": "^3.2.5",
+		"prettier-plugin-nginx": "^1.0.3",
+		"prettier-plugin-sh": "^0.14.0",
+		"prettier-plugin-sql": "^0.18.0",
+		"stylelint": "^16.2.1",
+		"stylelint-config-standard": "^36.0.0",
+		"vitepress": "^1.0.0-rc.42",
+		"vue": "^3.4.19"
 	},
 	"browserslist": [
 		"defaults"

+ 0 - 1
renovate.json

@@ -1,7 +1,6 @@
 {
 	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
 	"branchPrefix": "dependencies/",
-	"enabledManagers": ["npm", "composer", "github-actions"],
 	"extends": [
 		"config:recommended",
 		"schedule:weekly",

+ 4 - 4
src/deb/web-terminal/package.json

@@ -7,11 +7,11 @@
 		"start": "node server.js"
 	},
 	"dependencies": {
-		"node-pty": "1.0.0",
-		"ws": "8.16.0"
+		"node-pty": "^1.0.0",
+		"ws": "^8.16.0"
 	},
 	"devDependencies": {
-		"@types/ws": "8.5.10",
-		"@types/node": "20.11.17"
+		"@types/ws": "^8.5.10",
+		"@types/node": "^20.11.17"
 	}
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов