Преглед на файлове

Revert "Merge pull request #609 from benphelps/fix-576"

This reverts commit a7f290dfdd583c8c9696c71d93a9c39a2348bf2d, reversing
changes made to cf3839510045cc51cf4d653dabb83477e9743d80.
shamoon преди 2 години
родител
ревизия
7b474d4cef
променени са 2 файла, в които са добавени 4 реда и са изтрити 17 реда
  1. 2 2
      src/pages/index.jsx
  2. 2 15
      src/utils/config/config.js

+ 2 - 2
src/pages/index.jsx

@@ -100,7 +100,7 @@ function Index({ initialSettings, fallback }) {
           localStorage.setItem("hash", hashData.hash);
         }
 
-        if (!initialSettings.isValid || (previousHash && previousHash !== hashData.hash)) {
+        if (previousHash && previousHash !== hashData.hash) {
           setStale(true);
           localStorage.setItem("hash", hashData.hash);
 
@@ -112,7 +112,7 @@ function Index({ initialSettings, fallback }) {
         }
       }
     }
-  }, [hashData, initialSettings]);
+  }, [hashData]);
 
   if (stale) {
     return (

+ 2 - 15
src/utils/config/config.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 import { join } from "path";
-import { existsSync, copyFile, readFileSync, statSync } from "fs";
+import { existsSync, copyFile, readFileSync } from "fs";
 
 import yaml from "js-yaml";
 
@@ -32,18 +32,5 @@ export function getSettings() {
 
   const settingsYaml = join(process.cwd(), "config", "settings.yaml");
   const fileContents = readFileSync(settingsYaml, "utf8");
-
-  let stats;
-  try {
-    stats = statSync(settingsYaml);
-  } catch (e) {
-    stats = {};
-  }
-
-  const yamlLoaded = yaml.load(fileContents) ?? {};
-
-  return { 
-    ...yamlLoaded,
-    isValid: fileContents !== "-\n" && stats.size !== 2 // see https://github.com/benphelps/homepage/pull/609
-  };
+  return yaml.load(fileContents) ?? {};
 }