Merge branch 'main' into crx-file-icon

.github/workflows/build.yml

@@ -14,17 +14,21 @@ jobs:
 
     steps:
       - name: Checkout 🛎
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
       - name: Setup Node.js ${{ matrix.node-version }} ⚙
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
+
       - name: Run display server 🖥
         run: /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & echo "Started xvfb"
         shell: bash
         if: ${{ success() && matrix.os == 'ubuntu-latest' }}
+
       - name: Install node_modules 📦
         run: npm ci
+
       - name: Cache node_modules 💾
         uses: actions/cache@v3
         env:
@@ -37,6 +41,7 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
+
       - name: Test + Build 🚀
         run: |
           npm test

.github/workflows/color-check.yml

@@ -13,9 +13,10 @@ jobs:
       TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
       - name: Check colors 🎨
         run: |
           svgFiles=$(git diff origin/${{ env.TARGET_BRANCH }} --diff-filter=ACMRTUX  --name-only | grep '.svg$')

.github/workflows/icon-review.yml

@@ -12,21 +12,24 @@ jobs:
     env:
       TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
     steps:
-      - name: Checkout 🛎️
+      - name: Checkout Fork 🛎️
         uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           fetch-depth: 0
+          path: fork
 
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
+      - name: Checkout Original 🛎️
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          path: main
 
       - name: Review SVG files 🔍
         run: |
-          svgFiles=$(git diff origin/${{ env.TARGET_BRANCH }} --diff-filter=ACMRTUX  --name-only | grep '.svg$')
+          cd main
+          svgFiles=$(git diff --no-index ../main ../fork --diff-filter=ACMRTUX --name-only | grep '.svg$')
           echo "SVG files changed: ${svgFiles}"
           npx svg-icon-review ${svgFiles}
 
@@ -38,7 +41,7 @@ jobs:
           IMAGE_UPLOAD: ${{ secrets.IMAGE_UPLOAD }}
         id: upload
         run: |
-          IMAGE_URL=$(curl --location 'https://freeimage.host/json' --form 'source=@"./preview.png"' --form 'type="file"' --form 'action="upload"' --form 'auth_token="${{env.IMAGE_UPLOAD}}"' | jq -r '.image.url')
+          IMAGE_URL=$(curl --location 'https://freeimage.host/json' --form 'source=@"./main/preview.png"' --form 'type="file"' --form 'action="upload"' --form 'auth_token="${{env.IMAGE_UPLOAD}}"' | jq -r '.image.url')
           echo image_url=$IMAGE_URL >> $GITHUB_ENV
         shell: bash
 

.github/workflows/pr-closed.yml

@@ -0,0 +1,26 @@
+name: PR closed
+
+on:
+  pull_request_target:
+    types:
+      - closed
+
+jobs:
+  thank_you:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true
+    steps:
+      - name: Post Thank You Comment 🙏
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `## Merge Successful 
+              
+              Thanks for your contribution! 🎉 
+              
+              The changes will be part of the upcoming update on the marketplace.`
+            })

.github/workflows/release.yml

@@ -19,24 +19,28 @@ jobs:
       VERSION_CHANGE: ${{ github.event.inputs.versionChange }}
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
       - name: Setup Node.js ⚙️
         uses: actions/setup-node@v3
         with:
           node-version: 'lts/*'
           registry-url: 'https://registry.npmjs.org'
+
       - name: Install node_modules 📦
         run: |
           npm ci
           npm install --global @vscode/vsce
+          
       - name: Update version ↗
         run: |
           git config --global user.name 'Philipp Kief'
           git config --global user.email 'PKief@users.noreply.github.com'
           git config --global push.followTags true
           npm version ${{ env.VERSION_CHANGE }} -m "Release %s"
+          
       - name: Get meta data 🔍
         run: |
           NODE_VERSION=$(node -p -e "require('./package.json').version")
@@ -45,28 +49,34 @@ jobs:
           echo NAME=$NODE_NAME >> $GITHUB_ENV
           NODE_DISPLAY_NAME=$(node -p -e "require('./package.json').displayName")
           echo DISPLAY_NAME=$NODE_DISPLAY_NAME >> $GITHUB_ENV
+          
       - name: Build ⚒️
         run: vsce package
+
       - name: Push tags 📌
         run: git push
+
       - name: Release ${{ env.VERSION }} 🔆
         uses: softprops/action-gh-release@v1
         with:
           files: ${{ env.NAME }}-${{ env.VERSION }}.vsix
           tag_name: v${{ env.VERSION }}
           name: ${{ env.DISPLAY_NAME }} v${{ env.VERSION }}
           generate_release_notes: true
+
       - name: Publish to Open VSX Registry 🌐
         uses: HaaLeo/publish-vscode-extension@v1
         with:
           pat: ${{ secrets.OPEN_VSX_TOKEN }}
           extensionFile: ${{ env.NAME }}-${{ env.VERSION }}.vsix
+
       - name: Publish to Visual Studio Marketplace 🌐
         uses: HaaLeo/publish-vscode-extension@v1
         with:
           pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
           registryUrl: https://marketplace.visualstudio.com
           extensionFile: ${{ env.NAME }}-${{ env.VERSION }}.vsix
+
       - name: Publish to NPM Registry 🌐
         run: npm publish
         env:

CHANGELOG.md

@@ -3,6 +3,24 @@
  All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
 
+#### [v4.32.0](https://github.com/PKief/vscode-material-icon-theme/compare/v4.31.0...v4.32.0) 
+
+> November 20, 2023 
+
+- [Icon Request] HJSON file icon [`#2136`](https://github.com/PKief/vscode-material-icon-theme/pull/2136)
+- Update workflow files [`d5912bb`](https://github.com/PKief/vscode-material-icon-theme/commit/d5912bb)
+- Add Google App Script (*.gs) file icon [`#2143`](https://github.com/PKief/vscode-material-icon-theme/pull/2143)
+- build(deps-dev): bump axios from 1.4.0 to 1.6.0 [`#2141`](https://github.com/PKief/vscode-material-icon-theme/pull/2141)
+- Added Lottie Folder Icons aswell as the File Icon. [`#2073`](https://github.com/PKief/vscode-material-icon-theme/pull/2073)
+- [Icon Request] Add more textlintrc file names [`#2137`](https://github.com/PKief/vscode-material-icon-theme/pull/2137)
+- Update Angular icons [`#2134`](https://github.com/PKief/vscode-material-icon-theme/pull/2134)
+- Added mjs extension for stylelint [`#2129`](https://github.com/PKief/vscode-material-icon-theme/pull/2129)
+- Add history icon association [`71173fc`](https://github.com/PKief/vscode-material-icon-theme/commit/71173fc)
+- [Icon Request] Taskfile [`#1739`](https://github.com/PKief/vscode-material-icon-theme/pull/1739)
+- [Icon Request] ABAP [`#2123`](https://github.com/PKief/vscode-material-icon-theme/pull/2123)
+- Associate .whitesource file name with json file [`04e6cce`](https://github.com/PKief/vscode-material-icon-theme/commit/04e6cce)
+- feat: add tailwind config esm [`#2112`](https://github.com/PKief/vscode-material-icon-theme/pull/2112)
+
 #### [v4.31.0](https://github.com/PKief/vscode-material-icon-theme/compare/v4.30.1...v4.31.0) 
 
 > October 6, 2023 

package.json

@@ -2,7 +2,7 @@
   "name": "material-icon-theme",
   "displayName": "Material Icon Theme",
   "description": "Material Design Icons for Visual Studio Code",
-  "version": "4.31.0",
+  "version": "4.32.0",
   "scripts": {
     "build": "npm run compile:dev && npm run generateJson",
     "check": "ts-node ./src/scripts/icons/checks",

src/icons/fileIcons.ts

@@ -41,6 +41,10 @@ export const fileIcons: FileIcons = {
         '.whitesource',
       ],
     },
+    {
+      name: 'hjson',
+      fileExtensions: ['hjson'],
+    },
     {
       name: 'jinja',
       fileExtensions: ['jinja', 'jinja2', 'j2', 'jinja-html'],

src/icons/folderIcons.ts

@@ -55,7 +55,10 @@ export const folderIcons: FolderTheme[] = [
           'pictures',
         ],
       },
-      { name: 'folder-scripts', folderNames: ['script', 'scripts'] },
+      {
+        name: 'folder-scripts',
+        folderNames: ['script', 'scripts', 'scripting'],
+      },
       { name: 'folder-node', folderNames: ['node_modules'] },
       {
         name: 'folder-javascript',
@@ -150,6 +153,8 @@ export const folderIcons: FolderTheme[] = [
           'settings',
           '.settings',
           'META-INF',
+          'option',
+          'options',
         ],
       },
       {
@@ -311,7 +316,7 @@ export const folderIcons: FolderTheme[] = [
         name: 'folder-database',
         folderNames: ['db', 'database', 'databases', 'sql', 'data', '_data'],
       },
-      { name: 'folder-log', folderNames: ['log', 'logs'] },
+      { name: 'folder-log', folderNames: ['log', 'logs', 'logging'] },
       { name: 'folder-target', folderNames: ['target'] },
       {
         name: 'folder-temp',
@@ -451,6 +456,9 @@ export const folderIcons: FolderTheme[] = [
           'plugin',
           'plugins',
           '_plugins',
+          'mod',
+          'mods',
+          'modding',
           'extension',
           'extensions',
           'addon',
@@ -637,7 +645,10 @@ export const folderIcons: FolderTheme[] = [
       { name: 'folder-linux', folderNames: ['linux'] },
       { name: 'folder-windows', folderNames: ['windows'] },
       { name: 'folder-macos', folderNames: ['macos', '.DS_Store'] },
-      { name: 'folder-error', folderNames: ['error', 'errors', 'err'] },
+      {
+        name: 'folder-error',
+        folderNames: ['error', 'errors', 'err', 'errs', 'crash', 'crashes'],
+      },
       { name: 'folder-event', folderNames: ['event', 'events'] },
       {
         name: 'folder-secure',

src/icons/languageIcons.ts

@@ -151,4 +151,5 @@ export const languageIcons: LanguageIcon[] = [
   { icon: { name: 'dart' }, ids: ['dart'] },
   { icon: { name: 'cadence' }, ids: ['cadence'] },
   { icon: { name: 'stylable' }, ids: ['stylable'] },
+  { icon: { name: 'hjson' }, ids: ['hjson'] },
 ];