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

Bump Node dependencies (#3469)

* Bump Node dependencies

* Remove custom node module caching

Which was causing: https://github.com/hestiacp/hestiacp/actions/runs/4706877109/jobs/8348398177?pr=3469

* Upgrade Yarn
Alec Rust 2 лет назад
Родитель
Сommit
af35e0dcbc
4 измененных файлов с 342 добавлено и 402 удалено
  1. 0 53
      .github/actions/yarn-nm-install/action.yml
  2. 6 6
      .github/workflows/lint.yml
  3. 9 9
      package.json
  4. 327 334
      yarn.lock

+ 0 - 53
.github/actions/yarn-nm-install/action.yml

@@ -1,53 +0,0 @@
-########################################################################################
-# "yarn install" composite action for yarn 2/3/4+ and "nodeLinker: node-modules"       #
-#--------------------------------------------------------------------------------------#
-# Cache:                                                                               #
-#   - Downloaded zip archive (multi-arch, preserved across yarn.lock changes)          #
-#   - Yarn install state (discarded on yarn.lock changes)                              #
-# References:                                                                          #
-#   - bench: https://gist.github.com/belgattitude/0ecd26155b47e7be1be6163ecfbb0f0b     #
-#   - vs @setup/node: https://github.com/actions/setup-node/issues/325                 #
-########################################################################################
-
-name: "Yarn install"
-description: "Run yarn install with node_modules linker and cache enabled"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Expose yarn config as "$GITHUB_OUTPUT"
-      id: yarn-config
-      shell: bash
-      run: |
-        echo "CACHE_FOLDER=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
-
-    # Yarn rotates the downloaded cache archives, @see https://github.com/actions/setup-node/issues/325
-    # Yarn cache is also reusable between arch and os.
-    - name: Restore yarn cache
-      uses: actions/cache@v3
-      id: yarn-download-cache
-      with:
-        path: ${{ steps.yarn-config.outputs.CACHE_FOLDER }}
-        key: yarn-download-cache-${{ hashFiles('yarn.lock') }}
-        restore-keys: |
-          yarn-download-cache-
-
-    # Invalidated on yarn.lock changes
-    - name: Restore yarn install state
-      id: yarn-install-state-cache
-      uses: actions/cache@v3
-      with:
-        path: .yarn/ci-cache/
-        key: ${{ runner.os }}-yarn-install-state-cache-${{ hashFiles('yarn.lock', '.yarnrc.yml') }}
-
-    - name: Install dependencies
-      shell: bash
-      run: |
-        yarn install --immutable --inline-builds
-      env:
-        # CI optimizations. Overrides yarnrc.yml options (or their defaults) in the CI action.
-        YARN_ENABLE_GLOBAL_CACHE: "false" # Use local cache folder to keep downloaded archives
-        YARN_NM_MODE: "hardlinks-local" # Hardlinks-(local|global) reduces io / node_modules size
-        YARN_INSTALL_STATE_PATH: .yarn/ci-cache/install-state.gz # Very small speedup when lock does not change
-        # Other environment variables
-        HUSKY: "0" # By default do not run HUSKY install

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

@@ -45,11 +45,11 @@ jobs:
         with:
           node-version: 16
 
-      - name: Install yarn v3
+      - name: Install Yarn v3
         run: corepack enable && corepack prepare yarn@stable --activate
 
       - name: Install Node packages
-        uses: ./.github/actions/yarn-nm-install
+        run: yarn install --immutable
 
       - name: Run Prettier
         run: yarn prettier --check .
@@ -66,11 +66,11 @@ jobs:
         with:
           node-version: 16
 
-      - name: Install yarn v3
+      - name: Install Yarn v3
         run: corepack enable && corepack prepare yarn@stable --activate
 
       - name: Install Node packages
-        uses: ./.github/actions/yarn-nm-install
+        run: yarn install --immutable
 
       - name: Run ESLint
         run: yarn eslint .
@@ -87,11 +87,11 @@ jobs:
         with:
           node-version: 16
 
-      - name: Install yarn v3
+      - name: Install Yarn v3
         run: corepack enable && corepack prepare yarn@stable --activate
 
       - name: Install Node packages
-        uses: ./.github/actions/yarn-nm-install
+        run: yarn install --immutable
 
       - name: Run Stylelint
         run: yarn stylelint web/css/src/**/*.css

+ 9 - 9
package.json

@@ -16,36 +16,36 @@
 		"preinstall": "npx only-allow yarn",
 		"postinstall": "husky install"
 	},
-	"packageManager": "yarn@3.4.1",
+	"packageManager": "yarn@3.5.0",
 	"dependencies": {
 		"@fortawesome/fontawesome-free": "^6.4.0",
 		"normalize.css": "^8.0.1"
 	},
 	"devDependencies": {
 		"@prettier/plugin-php": "^0.19.4",
-		"@typescript-eslint/eslint-plugin": "^5.57.0",
-		"@typescript-eslint/parser": "^5.57.0",
+		"@typescript-eslint/eslint-plugin": "^5.58.0",
+		"@typescript-eslint/parser": "^5.58.0",
 		"cssnano": "^6.0.0",
-		"eslint": "^8.37.0",
+		"eslint": "^8.38.0",
 		"eslint-config-prettier": "^8.8.0",
 		"eslint-plugin-editorconfig": "^4.0.2",
 		"husky": "^8.0.3",
-		"lint-staged": "^13.2.0",
+		"lint-staged": "^13.2.1",
 		"markdownlint-cli2": "^0.6.0",
 		"postcss": "^8.4.21",
 		"postcss-cli": "^10.1.0",
 		"postcss-import": "^15.1.0",
 		"postcss-path-replace": "^1.0.4",
-		"postcss-preset-env": "^8.3.0",
+		"postcss-preset-env": "^8.3.1",
 		"postcss-size": "^4.0.1",
 		"prettier": "^2.8.7",
 		"prettier-plugin-nginx": "^1.0.3",
 		"prettier-plugin-sh": "^0.12.8",
-		"prettier-plugin-sql": "^0.13.0",
+		"prettier-plugin-sql": "^0.14.0",
 		"stylelint": "^15.4.0",
 		"stylelint-config-standard": "^32.0.0",
-		"typescript": "^5.0.3",
-		"vitepress": "1.0.0-alpha.64",
+		"typescript": "^5.0.4",
+		"vitepress": "1.0.0-alpha.65",
 		"vue": "^3.2.47"
 	}
 }

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


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