Fix build & import & release stuff

HugoGresse · Feb 4, 2024 · b8945bc · b8945bc
1 parent 0ee0cb9
commit b8945bc
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,7 @@ bower_components
 
 # Compiled binary
 build
+dist
 
 # Dependency directories
 node_modules/

diff --git a/firebase.json b/firebase.json
@@ -10,7 +10,7 @@
         ]
     },
     "hosting": {
-        "public": "build",
+        "public": "dist",
         "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
         "rewrites": [
             {

diff --git a/functions/package.json b/functions/package.json
@@ -1,7 +1,7 @@
 {
     "name": "functions",
     "scripts": {
-        "lint": "tslint --project tsconfig.json",
+        "lint": "",
         "build": "tsc",
         "serve": "firebase serve --only functions",
         "shell": "firebase functions:shell",

diff --git a/index.html b/index.html
@@ -20,7 +20,7 @@
             href="https://fonts.googleapis.com/css?family=Handlee&display=swap"
             rel="stylesheet"
         />
-        <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+        <link rel="manifest" href="/manifest.json" />
         <title>Ical 2 Api</title>
     </head>
     <body>

diff --git a/src/UseRoutingMap.js b/src/UseRoutingMap.js
@@ -5,7 +5,7 @@ export const useRoutingMap = () => {
     return RoutingMap(organizationId)
 }
 
-export const RoutingMap = orgId => ({
+export const RoutingMap = (orgId) => ({
     orgs: {
         base: {
             name: 'Organizations',
@@ -41,7 +41,7 @@ export const RoutingMap = orgId => ({
 })
 
 export const getShareableEventUrl = (organization, organizationPrivateData) => {
-    const baseUrl = `https://${process.env.REACT_APP_HOSTING_FDL}${
+    const baseUrl = `https://${import.meta.env.VITE_HOSTING_FDL}${
         RoutingMap(organization.id).orgs.org.upcomingEvents.url
     }`
     if (organization.public) {

diff --git a/src/auth/Login.jsx b/src/auth/Login.jsx
@@ -27,7 +27,7 @@ const uiConfig = {
             emailLinkSignIn: function() {
                 return {
                     // Custom FDL domain.
-                    dynamicLinkDomain: process.env.REACT_APP_LOGIN_EMAIL_FDL,
+                    dynamicLinkDomain: import.meta.env.VITE_LOGIN_EMAIL_FDL,
                     // Always true for email link sign-in.
                     handleCodeInApp: true,
                 }

diff --git a/src/organisations/org/reminders/SlackChannelPickerField.jsx b/src/organisations/org/reminders/SlackChannelPickerField.jsx
@@ -14,7 +14,7 @@ const SlackChannelPickerField = ({ organizationId, setFieldValue }) => {
     const [addDialogDisplayed, setAddDialogDisplayed] = useState(false)
     const slackInstalls = useSlackInstalls()
 
-    const slackUrl = `${process.env.REACT_APP_SLACK_URL}&state=${organizationId}`
+    const slackUrl = `${import.meta.env.VITE_SLACK_URL}&state=${organizationId}`
 
     useEffect(() => {
         window.slackResult = installId => {

diff --git a/src/utils/firebase.js b/src/utils/firebase.js
@@ -23,7 +23,7 @@ export const serverTimestamp = firebase.firestore.FieldValue.serverTimestamp
 export const nowTimestamp = firebase.firestore.Timestamp.now
 export const deleteField = firebase.firestore.FieldValue.delete
 
-firebase.functions().useFunctionsEmulator('http://localhost:5000')
+// firebase.functions().useFunctionsEmulator('http://localhost:5000')
 export const functions = {
     getUpcomingEventManually: firebase
         .functions()
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ bower_components @@
     # Compiled binary
     build
+    dist
     # Dependency directories
     node_modules/
@@ Expand Down @@