Merge pull request #857 from WatWowMap/develop

Sync Dev to Main

.eslintrc

@@ -16,7 +16,7 @@
   "globals": {
     "document": true,
     "window": true,
-    "inject": true
+    "CONFIG": true
   },
   "rules": {
     "global-require": 0,
@@ -42,6 +42,7 @@
     "react/function-component-definition": 0,
     "no-underscore-dangle": 0,
     "no-return-assign": 0,
+    "no-nested-ternary": "off",
     "import/prefer-default-export": 0,
     "max-len": [
       "error",

.github/workflows/config.yml

@@ -21,10 +21,10 @@ jobs:
           fetch-depth: 2
       - name: Run script
         run: |
-          yarn config-check
+          yarn config:check
       - name: Generate latest env vars
         run: |
-          yarn gen-env-config
+          yarn config:env
       - name: Configure git
         run: |
           git config --global user.name "turtlesocks-bot"

.github/workflows/lint.yml

@@ -20,6 +20,9 @@ jobs:
       - name: Install Dependencies
         run: yarn
 
+      - name: Masterfile
+        run: yarn masterfile
+
       - name: Lint
         run: yarn eslint:check
 

.github/workflows/locales.yml

@@ -23,7 +23,7 @@ jobs:
           yarn
       - name: Run generating script
         run: |
-          yarn generate-locales
+          yarn locales:generate
         env:
           OPENAI_API_KEY: ${{secrets.OPENAI_API_KEY}}
       - name: Configure git

.gitignore

@@ -1,5 +1,5 @@
-/node_modules/
-/dist/
+node_modules
+dist
 
 # Config files
 server/src/configs/*
@@ -14,6 +14,7 @@ server/src/configs/koji_backups/*
 
 # Masterfile
 server/src/data/masterfile.json
+packages/masterfile/lib/data/masterfile.json
 
 # Docker file
 /docker-compose.yml
@@ -24,6 +25,9 @@ server/src/data/masterfile.json
 public/favicon/*
 !public/favicon/fallback.ico
 
+# Asset Links JSON
+/public/.well-known/assetlinks.json
+
 # Strategies
 server/src/strategies/*
 !server/src/strategies/discord.js
@@ -53,6 +57,8 @@ public/images/custom/*
 public/locales/*
 public/missing-locales/*
 locales/missing-locales/*
+packages/locales/lib/data/**/*.json
+packages/locales/lib/missing/**/*.json
 
 # OS X
 .DS_Store*

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
   "i18n-ally.localesPaths": [
-    "locales"
+    "packages/locales/lib/human",
+    "packages/locales/lib/generated"
   ],
   "i18n-ally.keystyle": "flat",
   "[javascript]": {

ReactMap.js

@@ -1,12 +1,11 @@
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable import/extensions */
-process.env.FORCE_COLOR = 3
-process.env.NODE_CONFIG_DIR = `${__dirname}/server/src/configs`
-process.env.ALLOW_CONFIG_MUTATIONS = 'true'
 
 const { build } = require('vite')
-const { log, HELPERS } = require('./server/src/services/logger')
-const { generate } = require('./server/scripts/generateMasterfile')
+
+const { log, HELPERS } = require('@rm/logger')
+const { generate } = require('@rm/masterfile')
+
 const viteConfig = require('./vite.config')
 
 generate(true).then(() =>

jsconfig.json

@@ -2,23 +2,23 @@
   "compilerOptions": {
     "target": "ESNext",
     "module": "CommonJS",
-    "allowSyntheticDefaultImports": false,
     "resolveJsonModule": true,
-    "baseUrl": "./src",
+    "esModuleInterop": true,
+    "baseUrl": ".",
     "jsx": "react",
     "paths": {
       "@assets/*": [
-        "./assets/*"
+        "./src/assets/*"
       ],
       "@components/*": [
-        "./components/*"
+        "./src/components/*"
       ],
       "@services/*": [
-        "./services/*"
+        "./src/services/*"
       ],
       "@hooks/*": [
-        "./hooks/*"
-      ]
+        "./src/hooks/*"
+      ],
     }
   },
   "exclude": [