material-icon-theme 4.18.1 → 4.19.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
  All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
  
+#### [v4.19.0](https://github.com/PKief/vscode-material-icon-theme/compare/v4.18.1...v4.19.0) 
+
+> July 2, 2022 
+
+- fix: added __integration-tests__ folder [`#1585`](https://github.com/PKief/vscode-material-icon-theme/pull/1585)
+- fix: update cypress files [`#1582`](https://github.com/PKief/vscode-material-icon-theme/pull/1582)
+- [Add] Cypress file name "cypress.config.js" in fileIcon.ts [`#1579`](https://github.com/PKief/vscode-material-icon-theme/pull/1579)
+- feat: add support for new type declaration files [`#1576`](https://github.com/PKief/vscode-material-icon-theme/pull/1576)
+- feat: add `tsconfig.node.json` [`#1575`](https://github.com/PKief/vscode-material-icon-theme/pull/1575)
+- Adds Cypress 10.x e2e extension [`#1573`](https://github.com/PKief/vscode-material-icon-theme/pull/1573)
+- Fixing non-object workspace settings bug [`#1565`](https://github.com/PKief/vscode-material-icon-theme/pull/1565)
+ 
 #### [v4.18.1](https://github.com/PKief/vscode-material-icon-theme/compare/v4.18.0...v4.18.1) 
 
 > June 9, 2022 

package/package.json

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

package/src/helpers/changeDetection.ts

@@ -89,7 +89,11 @@ const getConfigValue = (themeConfig: {
   defaultValue: unknown;
 }) => {
   let configValue;
-  if (themeConfig.workspaceValue && themeConfig.globalValue) {
+  if (
+    typeof themeConfig.workspaceValue === 'object' &&
+    themeConfig.workspaceValue &&
+    themeConfig.globalValue
+  ) {
     configValue = merge(
       {},
       themeConfig.workspaceValue,

package/src/icons/fileIcons.ts

@@ -246,7 +246,10 @@ export const fileIcons: FileIcons = {
         '.clang-tidy',
       ],
     },
-    { name: 'typescript-def', fileExtensions: ['d.ts'] },
+    {
+      name: 'typescript-def',
+      fileExtensions: ['d.ts', 'd.cts', 'd.mts'],
+    },
     { name: 'markojs', fileExtensions: ['marko'] },
     {
       name: 'astro',
@@ -688,6 +691,7 @@ export const fileIcons: FileIcons = {
         'spec.ts',
         'spec.cts',
         'spec.mts',
+        'cy.ts',
         'e2e-spec.ts',
         'e2e-spec.cts',
         'e2e-spec.mts',
@@ -706,6 +710,8 @@ export const fileIcons: FileIcons = {
         'spec.jsx',
         'test.jsx',
         'jsx.snap',
+        'cy.jsx',
+        'cy.tsx',
       ],
     },
     {
@@ -721,6 +727,7 @@ export const fileIcons: FileIcons = {
         'test.cjs',
         'test.mjs',
         'js.snap',
+        'cy.js',
       ],
     },
     {
@@ -1922,6 +1929,7 @@ export const fileIcons: FileIcons = {
         'tsconfig.build.json',
         'tsconfig.eslint.json',
         'tsconfig.lib.json',
+        'tsconfig.node.json',
       ],
       fileExtensions: ['tsconfig.json'],
     },
@@ -2030,7 +2038,17 @@ export const fileIcons: FileIcons = {
       ],
     },
     { name: 'rome', fileNames: ['rome.json'] },
-    { name: 'cypress', fileNames: ['cypress.json', 'cypress.env.json'] },
+    {
+      name: 'cypress',
+      fileNames: [
+        'cypress.json',
+        'cypress.env.json',
+        'cypress.config.ts',
+        'cypress.config.js',
+        'cypress.config.cjs',
+        'cypress.config.mjs',
+      ],
+    },
     { name: 'siyuan', fileExtensions: ['sy'] },
     { name: 'ndst', fileExtensions: ['ndst.yml', 'ndst.yaml', 'ndst.json'] },
     { name: 'plop', fileNames: ['plopfile.js', 'plopfile.ts'] },

package/src/icons/folderIcons.ts

@@ -343,6 +343,8 @@ export const folderIcons: FolderTheme[] = [
           'it',
           'integration-test',
           'integration-tests',
+          '__integration-test__',
+          '__integration-tests__',
         ],
       },
       {