Merge branch 'dev'

Author: ChugunovRoman

.vscode/settings.json

@@ -25,6 +25,6 @@
   "eslint.alwaysShowStatus": true,
   "prettier.singleQuote": false,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   }
 }

README.md

@@ -110,6 +110,11 @@ Download the .rpm package from our [Releases](https://github.com/Figma-Linux/fig
 sudo dnf install figma-linux-*.x86_64.rpm
 ```
 
+### Nixos
+On Nixos, you may add `figma-linux` in the `environment.systemPackages` list of your `/etc/nixos/configuration.nix` and run:
+```bash
+sudo nixos-rebuild switch
+```
 
 ## Building from source
 

config/rollup.renderer.config.js

@@ -15,8 +15,8 @@ const postcss = require("rollup-plugin-postcss");
 const dotenv = require("dotenv");
 dotenv.config();
 
-const panelPort = process.env.DEV_PANEL_PORT;
-const settingsPort = process.env.DEV_SETTINGS_PORT;
+const panelPort = process.env.DEV_PANEL_PORT ?? 3330;
+const settingsPort = process.env.DEV_SETTINGS_PORT ?? 3331;
 const production = process.env.NODE_ENV !== "dev";
 const watch = process.env.ROLLUP_WATCH === "true";
 const projectRootDir = path.resolve(__dirname);

package-lock.json

@@ -56,7 +56,7 @@
     "@typescript-eslint/eslint-plugin": "^5.49.0",
     "@typescript-eslint/parser": "^5.49.0",
     "dotenv": "^16.0.3",
-    "electron": "^27.0.4",
+    "electron": "^27.2.2",
     "electron-builder": "^23.6.0",
     "electron-rebuild": "^3.2.9",
     "eslint": "^8.33.0",

package.json

@@ -8,7 +8,7 @@ import { dialogs } from "./Dialogs";
 import { storage } from "Storage";
 import { logger } from "./Logger";
 import { FILE_EXTENSION_WHITE_LIST, FILE_WHITE_LIST, MANIFEST_FILE_NAME } from "Const";
-import { ALLOW_CODE_FILES, ALLOW_EXT_FILES, ALLOW_UI_FILES, sanitizeFileName } from "Utils/Common";
+import { ALLOW_CODE_FILES, ALLOW_EXT_FILES, ALLOW_UI_FILES } from "Utils/Common";
 import { access, mkPath } from "Utils/Main";
 
 type ObserverCallback = (args: any) => void;
@@ -438,8 +438,7 @@ export default class ExtensionManager {
     if (
       !FILE_WHITE_LIST.includes(file.name) &&
       (!FILE_EXTENSION_WHITE_LIST.includes(extname(file.name)) ||
-        !/^\w+(?:\.\w+)*\.\w+/.test(file.name) ||
-        file.name !== sanitizeFileName(file.name))
+        !/^[\w/]+(?:\.\w+)*\.\w+/.test(file.name))
     ) {
       throw new Error(`Filename "${file.name}" not allowed`);
     }

src/main/ExtensionManager.ts

@@ -3,6 +3,7 @@ import * as path from "path";
 import * as fs from "fs";
 
 import { DEFAULT_SETTINGS, accessSync } from "Utils/Main";
+import { logger } from "./Logger";
 
 /**
  * This class has dual initialization: in main process and renderer process
@@ -50,7 +51,16 @@ export class Storage {
   private readSync = (): Types.SettingsInterface => {
     const content = fs.readFileSync(this.filePath).toString();
 
-    return JSON.parse(content);
+    let settings: Types.SettingsInterface;
+    try {
+      settings = JSON.parse(content);
+    } catch (error) {
+      logger.error("Parse settings.json file error: ", error);
+      logger.warn("Apply default settings instead file settings.");
+      settings = DEFAULT_SETTINGS;
+    }
+
+    return settings;
   };
   private writeSync = (settings: Types.SettingsInterface): void => {
     fs.writeFileSync(this.filePath, JSON.stringify(settings, null, 2));

src/main/Storage.ts

@@ -201,10 +201,7 @@ export default class Tab {
   private windowOpenHandler(details: HandlerDetails) {
     const url = details.url;
 
-    if (isFigmaUrl(url)) {
-      shell.openExternal(url);
-      return { action: "deny" };
-    }
+    shell.openExternal(url);
 
     return { action: "deny" };
   }

src/main/Ui/Tab.ts

@@ -258,7 +258,7 @@ export class ThemesApplier {
           cssRule.style["fill"] = `var(--text-active)`;
         }
         if (
-          /search--searchInput__OLD|public-DraftEditorPlaceholder-root|css_builder_color--colorTextSecondary/.test(
+          /search--searchInput__OLD|type_panel--fontPickerTextStyle|public-DraftEditorPlaceholder-root|css_builder_color--colorTextSecondary/.test(
             cssRule.selectorText,
           )
         ) {

src/renderer/DesktopAPI/ThemesApplier.ts

@@ -1,18 +1,3 @@
 export const ALLOW_EXT_FILES = /^(.+\.(html|js|ts)|manifest.json)$/;
 export const ALLOW_CODE_FILES = /^(.+\.(js|ts))$/;
 export const ALLOW_UI_FILES = /^(.+\.html)$/;
-
-export function sanitizeFileName(input: string): string {
-  const illegalRe = /[\/\?<>\\:\*\|":]/g;
-  const controlRe = /[\x00-\x1f\x80-\x9f]/g;
-  const reservedRe = /^\.+$/;
-  const windowsReservedRe = /^(con|prn|aux|nul|com[0-9]|lpt[0-9])(\..*)?$/i;
-  const windowsTrailingRe = /[\. ]+$/;
-
-  return input
-    .replace(illegalRe, "")
-    .replace(controlRe, "")
-    .replace(reservedRe, "")
-    .replace(windowsReservedRe, "")
-    .replace(windowsTrailingRe, "");
-}