Merge branch 'main' into main

material-extensions · Dec 24, 2023 · 1a3a41f · 1a3a41f
2 parents 91de9f5 + 3aeb90c
commit 1a3a41f
Show file tree

Hide file tree

Showing 58 changed files with 407 additions and 48 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/build.yml b/.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

diff --git a/.github/workflows/color-check.yml b/.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$')

diff --git a/.github/workflows/icon-review.yml b/.github/workflows/icon-review.yml
@@ -0,0 +1,63 @@
+name: Icon Review
+
+on:
+  pull_request_target:
+    paths:
+      - 'icons/*.svg'
+
+jobs:
+  icon-review:
+    name: Icon Review
+    runs-on: ubuntu-latest
+    env:
+      TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
+    steps:
+      - 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: Checkout Original 🛎️
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          path: main
+
+      - name: Review SVG files 🔍
+        run: |
+          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}
+
+      - name: Install jq ⚙️
+        run: sudo apt-get install jq
+
+      - name: Upload PNG ⬆️
+        env:
+          IMAGE_UPLOAD: ${{ secrets.IMAGE_UPLOAD }}
+        id: upload
+        run: |
+          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
+
+      - name: Post review in PR ✍️
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const image_url = "${{ env.image_url }}";
+            console.log('URL: '+image_url);
+            const commentBody = '## Preview \n\nThank you for creating a pull request. This preview shows you how your changes will look on the different themes: \n\n ![Generated Preview](' + image_url + ') \n\n You can find more information how to contribute in the [contribution guidelines](https://github.com/PKief/vscode-material-icon-theme/blob/main/CONTRIBUTING.md).';
+
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: commentBody
+            })
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pr-closed.yml b/.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.`
+            })
diff --git a/.github/workflows/release.yml b/.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 '[email protected]'
           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:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,42 @@
  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 
+
+- added templ file icon [`#2102`](https://github.com/PKief/vscode-material-icon-theme/pull/2102)
+- Add .o and .zst extensions [`#2063`](https://github.com/PKief/vscode-material-icon-theme/pull/2063)
+- Add Biome icon [`#2075`](https://github.com/PKief/vscode-material-icon-theme/pull/2075)
+- Added .stan file icon [`#2050`](https://github.com/PKief/vscode-material-icon-theme/pull/2050)
+- [Icon Request] ESBuild [`#2104`](https://github.com/PKief/vscode-material-icon-theme/pull/2104)
+- add plural versions for manager, moderator, and admin folders [`#2098`](https://github.com/PKief/vscode-material-icon-theme/pull/2098)
+- Add SPWN file icon [`#2090`](https://github.com/PKief/vscode-material-icon-theme/pull/2090)
+- Support OWNERS files [`#2088`](https://github.com/PKief/vscode-material-icon-theme/pull/2088)
+- Remove sponsors badge from readme [`#2082`](https://github.com/PKief/vscode-material-icon-theme/pull/2082)
+- Add more panda file names (Closes #2065) [`afac99a`](https://github.com/PKief/vscode-material-icon-theme/commit/afac99a)
+- Add csharp file extension (Closes #2080) [`411e1c9`](https://github.com/PKief/vscode-material-icon-theme/commit/411e1c9)
+- feat: icons for desktop os [`#1635`](https://github.com/PKief/vscode-material-icon-theme/pull/1635)
+- Added disc file extensions (vmdk, qcow2, etc.) [`#2069`](https://github.com/PKief/vscode-material-icon-theme/pull/2069)
+
 #### [v4.30.1](https://github.com/PKief/vscode-material-icon-theme/compare/v4.30.0...v4.30.1) 
 
 > August 28, 2023 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -109,10 +109,7 @@ Icons are assigned to file names, folder names or registered languages of VS Cod
 - [folderIcons.ts](src/icons/folderIcons.ts)
 - [languageIcons.ts](src/icons/languageIcons.ts)
 
-> **Note**
-> It is very important that icons are only assigned to the file and folder names that really apply to them. This means that you should be careful which files and folders you assign icons to. There are many people with different projects all over the world and not everyone expects that e.g. a file name will have a special framework based icon even though the framework is not used at all by this one user.
->
-> A solution for this can be [icon packs](#icon-packs).
+Be careful when assigning icons to files and folders, as not everyone expects a file name to have a special icon based on a framework that is not used by them. A solution for this can be the usage of [Language icon definitions](#language-icons) or [icon packs](#icon-packs).
 
 #### File icons
 

diff --git a/README.md b/README.md
@@ -16,11 +16,6 @@
     <a href="https://marketplace.visualstudio.com/items?itemName=PKief.material-icon-theme"><img src="https://img.shields.io/visual-studio-marketplace/d/PKief.material-icon-theme?style=for-the-badge&colorA=252526&colorB=43A047&label=Downloads" alt="Downloads"></a>
 </p>
 
-<p align="center"><br>
-<b>Sponsored by</b><br><br>
-<a title="Try CodeStream" href="https://sponsorlink.codestream.com/?utm_source=vscmarket&amp;utm_campaign=pkief_material&amp;utm_medium=banner"><img width="198px" src="https://alt-images.codestream.com/codestream_logo_pkief_material.png"></a>
-</p>
-
 ### File icons
 
 <img src="https://raw.githubusercontent.com/PKief/vscode-material-icon-theme/main/images/fileIcons.png" alt="file icons">
@@ -103,7 +98,7 @@ For example a custom SVG file called `sample.svg` can be placed in an `icons` fo
      ┗ sample.svg
 ```
 
-In the settings.json the icon can be associated to a file name or file extension like this:
+In the settings.json (User Settings only!) the icon can be associated to a file name or file extension like this:
 
 ```json
 "material-icon-theme.files.associations": {
@@ -138,7 +133,7 @@ In our example we place them into an `icons` folder inside of the `.vscode/exten
      ┗ folder-sample-open.svg
 ```
 
-In the settings.json the folder icons can be associated to a folder name (e.g. "src") like this:
+In the settings.json (User Settings only!) the folder icons can be associated to a folder name (e.g. "src") like this:
 
 ```json
 "material-icon-theme.folders.associations": {

diff --git a/icons/abap.svg b/icons/abap.svg
diff --git a/icons/angular-component.svg b/icons/angular-component.svg
diff --git a/icons/angular-directive.svg b/icons/angular-directive.svg
diff --git a/icons/angular-guard.svg b/icons/angular-guard.svg
diff --git a/icons/angular-pipe.svg b/icons/angular-pipe.svg
diff --git a/icons/angular-resolver.svg b/icons/angular-resolver.svg
diff --git a/icons/angular-service.svg b/icons/angular-service.svg
diff --git a/icons/angular.svg b/icons/angular.svg
diff --git a/icons/apps-script.svg b/icons/apps-script.svg
diff --git a/icons/biome.svg b/icons/biome.svg
diff --git a/icons/chrome.svg b/icons/chrome.svg
diff --git a/icons/esbuild.svg b/icons/esbuild.svg