PeL/force-orange-2022
PeL/force-orange-2022
1
1
Fork 0
mirror of https://github.com/Paris-est-Ludique/intranet.git synced 2025-06-09 00:54:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix various prod bugs

Browse Source
This commit is contained in:
pikiou 2021-11-22 05:58:18 +01:00
parent 581393f78e
commit 003ea65979
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -50,7 +50,7 @@
"lint": "run-s lint:*", "lint": "run-s lint:*",
"lint:code": "eslint --fix . --ext .js,.jsx,.ts,.tsx", "lint:code": "eslint --fix . --ext .js,.jsx,.ts,.tsx",
"lint:type": "tsc", "lint:type": "tsc",
"lint:style": "stylelint --fix \"**/*.{css,ts,tsx}\"", "lint:style": "stylelint --fix \"**/*.{css,scss,sass,ts,tsx}\"",
"lint:format": "prettier -w . -u --loglevel silent", "lint:format": "prettier -w . -u --loglevel silent",
"test": "cross-env NODE_ENV=test jest --config ./jest/config.js", "test": "cross-env NODE_ENV=test jest --config ./jest/config.js",
"test:watch": "yarn test --watch", "test:watch": "yarn test --watch",
@ -93,7 +93,6 @@
"lodash": "^4.17.21", "lodash": "^4.17.21",
"morgan": "^1.10.0", "morgan": "^1.10.0",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
"os": "^0.1.2",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-helmet": "^6.1.0", "react-helmet": "^6.1.0",

2
src/app/index.tsx
View File

@ -7,8 +7,8 @@ import logo from "../static/logo.svg"
import config from "../config" import config from "../config"
// Import your global styles here // Import your global styles here
import "normalize.css/normalize.css" import "normalize.css/normalize.css"
import styles from "./styles.module.scss"
import "react-toastify/dist/ReactToastify.css" import "react-toastify/dist/ReactToastify.css"
import styles from "./styles.module.scss"
interface Route { interface Route {
route: { routes: RouteConfig[] } route: { routes: RouteConfig[] }

14
src/config/prod.ts
View File

@ -1,9 +1,11 @@
import os from "os" const PORT = 4000
const HOST_LOCALLY = true
const hostname = os.hostname()
export default { export default {
PORT: 4000, PORT,
HOST: hostname === "ns3075300" ? "fo.parisestludique.fr" : "localhost", HOST: HOST_LOCALLY ? "localhost" : "fo.parisestludique.fr",
API_URL: hostname === "ns3075300" ? "http://fo.parisestludique.fr" : "http://localhost:4000", API_URL:
__SERVER__ || HOST_LOCALLY
? `http://localhost:${PORT}`
: `http://fo.parisestludique.fr:${PORT}`,
} }

2
webpack/base.config.ts
View File

@ -16,7 +16,7 @@ const getStyleLoaders = (isWeb: boolean, isSass?: boolean) => {
importLoaders: isSass ? 2 : 1, importLoaders: isSass ? 2 : 1,
modules: { modules: {
auto: true, auto: true,
localIdentName: isDev ? "[path][name]__[local]" : "[hash:base64]", localIdentName: "[path][name]__[local]", // Don't use hash:base64, a bug makes it generate different hashes in the .js and the .css files
exportOnlyLocals: !isWeb, exportOnlyLocals: !isWeb,
}, },
}, },

5
yarn.lock
View File

@ -7857,11 +7857,6 @@ os-filter-obj@^2.0.0:
dependencies: dependencies:
arch "^2.1.0" arch "^2.1.0"
os@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/os/-/os-0.1.2.tgz#f29a50c62908516ba42652de42f7038600cadbc2"
integrity sha512-ZoXJkvAnljwvc56MbvhtKVWmSkzV712k42Is2mA0+0KTSRakq5XXuXpjZjgAt9ctzl51ojhQWakQQpmOvXWfjQ==
p-cancelable@^0.3.0: p-cancelable@^0.3.0:
version "0.3.0" version "0.3.0"
resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"