ghorsington 4 年之前
父节点
当前提交
4def17ba1a
共有 4 个文件被更改,包括 14 次插入7 次删除
  1. 0 4
      .env.template
  2. 10 2
      web/rollup.config.js
  3. 0 1
      web/src/server.ts
  4. 4 0
      web/tailwind.config.js

+ 0 - 4
.env.template

@@ -2,8 +2,6 @@ BOT_TOKEN=
 FORUM_PASS=
 FORUM_PASS=
 FORUM_API_KEY=
 FORUM_API_KEY=
 IGNORE_CHANGED_NEWS=
 IGNORE_CHANGED_NEWS=
-GOOGLE_APPLICATION_CREDENTIALS=gcloud_key.json
-GOOGLE_APP_ID=
 
 
 DB_USERNAME=
 DB_USERNAME=
 DB_PASSWORD=
 DB_PASSWORD=
@@ -12,8 +10,6 @@ DB_NAME=
 BOT_CLIENT_ID=
 BOT_CLIENT_ID=
 BOT_CLIENT_SECRET=
 BOT_CLIENT_SECRET=
 
 
-ADMIN_URL=
-
 GMAIL_NAME=
 GMAIL_NAME=
 GMAIL_PASSWORD=
 GMAIL_PASSWORD=
 ERRORS_ADDR=
 ERRORS_ADDR=

+ 10 - 2
web/rollup.config.js

@@ -22,9 +22,17 @@ const dev = mode === "development";
 const sourcemap = dev ? "inline" : false;
 const sourcemap = dev ? "inline" : false;
 const legacy = !!process.env.SAPPER_LEGACY_BUILD;
 const legacy = !!process.env.SAPPER_LEGACY_BUILD;
 
 
-const warningIsIgnored = (warning) => warning.message.includes(
+const IGNORED_MESSAGES = [
     "Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification",
     "Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification",
-) || warning.message.includes("Circular dependency: node_modules");
+    "Circular dependency: node_modules",
+];
+
+const IGNORED_CODES = [
+    "THIS_IS_UNDEFINED",
+];
+
+const warningIsIgnored = (warning) => IGNORED_MESSAGES.some((m) => warning.message.includes(m))
+                                    || IGNORED_CODES.indexOf(warning.code) >= 0;
 
 
 // Workaround for https://github.com/sveltejs/sapper/issues/1221
 // Workaround for https://github.com/sveltejs/sapper/issues/1221
 const onwarn = (warning, _onwarn) => (warning.code === "CIRCULAR_DEPENDENCY" && /[/\\]@sapper[/\\]/.test(warning.message)) || warningIsIgnored(warning) || console.warn(warning.toString());
 const onwarn = (warning, _onwarn) => (warning.code === "CIRCULAR_DEPENDENCY" && /[/\\]@sapper[/\\]/.test(warning.message)) || warningIsIgnored(warning) || console.warn(warning.toString());

+ 0 - 1
web/src/server.ts

@@ -8,7 +8,6 @@ import session from "cookie-session";
 import sirv from "sirv";
 import sirv from "sirv";
 import { createConnection, getConnectionOptions } from "typeorm";
 import { createConnection, getConnectionOptions } from "typeorm";
 import { DB_ENTITIES } from "@shared/db/entities";
 import { DB_ENTITIES } from "@shared/db/entities";
-import { ENV } from "src/utils/environment";
 import { logger } from "./utils/logging";
 import { logger } from "./utils/logging";
 import { AppSession } from "./utils/session";
 import { AppSession } from "./utils/session";
 
 

+ 4 - 0
web/tailwind.config.js

@@ -1,4 +1,8 @@
 module.exports = {
 module.exports = {
+    future: {
+        removeDeprecatedGapUtilities: true,
+        purgeLayersByDefault: true,
+    },
     purge: {
     purge: {
         content: [
         content: [
             "./src/**/*.svelte",
             "./src/**/*.svelte",