chore: update build script to deploy backend with Cloud Functions

.github/workflows/deploy.yml

@@ -8,6 +8,7 @@ env:
   FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
   GCLOUD_PROJECT: ${{ secrets.GCLOUD_PROJECT }}
   MONGO_URI: ${{ secrets.MONGO_URI }}
+  GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
   NODE_ENV: production
 
 jobs:

next-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.

package.json

@@ -5,18 +5,21 @@
   "author": "Ijemma Onwuzulike",
   "main": "server.js",
   "scripts": {
-    "build": "rm -rf build/ && npm run build:site && npm run build:src",
-    "build:src": "tsc && cross-env NODE_ENV=build npm run build:dictionaries && npm run build:functions",
-    "build:functions": "rm -rf functions/src && shx cp -r ./build ./functions && shx cp -r ./build/src/dictionaries/ig-en ./functions/dictionaries",
+    "build": "rm -rf build/ rm -rf .next/ && npm run build:site && npm run build:src",
+    "build:src": "tsc && npm run build:site:media && cross-env NODE_ENV=build npm run build:dictionaries && npm run build:functions",
+    "build:functions": "rm -rf functions/src && shx cp -r ./build ./functions && shx cp -r ./.next ./functions && shx cp -r ./build/src/dictionaries/ig-en ./functions/dictionaries",
     "build:dictionaries:ig:en": "[ ! -d \"./build/src/dictionaries\" ] && shx mkdir ./build/src/dictionaries || echo '' && [ ! -d \"./build/src/dictionaries/ig-en\" ] && shx mkdir ./build/src/dictionaries/ig-en || echo 'Igbo to English dictionaries dir already exists'",
     "build:dictionaries:en:ig": "[ ! -d \"./build/src/dictionaries\" ] && shx mkdir ./build/src/dictionaries || echo '' && [ ! -d \"./build/src/dictionaries/en-ig\" ] && shx mkdir ./build/src/dictionaries/en-ig || echo 'English to Igbo dictionaries dir already exists'",
     "build:dictionaries:nsibidi": "[ ! -d \"./build/src/dictionaries\" ] && shx mkdir ./build/src/dictionaries || echo '' && [ ! -d \"./build/src/dictionaries/nsibidi\" ] && shx mkdir ./build/src/dictionaries/nsibidi || echo 'Nsibidi dictionary dir already exists'",
     "prebuild:dictionaries": "npm run build:dictionaries:nsibidi && npm run build:dictionaries:ig:en && npm run build:dictionaries:en:ig && shx cp -r ./src/dictionaries/ig-en ./build/dictionaries && shx cp -r ./src/dictionaries/en-ig ./build/dictionaries",
     "build:dictionaries": "node ./build/src/dictionaries/buildDictionaries.js",
-    "build:site": "next build",
+    "build:site": "cross-env NEXT_PUBLIC_GA_ID=$GA_TRACKING_ID next build",
+    "build:site:media": "npm run build:fonts && npm run build:assets",
+    "build:fonts": "shx cp -r ./src/public/fonts/ ./build/fonts",
+    "build:assets": "shx cp -r ./src/pages/assets/ ./build/assets",
     "start:emulators": "export FIREBASE_AUTH_EMULATOR_HOST=127.0.0.1:9709; node_modules/.bin/firebase emulators:start --only functions,hosting,auth",
     "start:watch": "nodemon --watch './src' --ext ts,js,tsx,jsx --ignore './functions' --verbose --exec \"export FIREBASE_AUTH_EMULATOR_HOST=127.0.0.1:9709; npm run build:src && npm run start\"",
-    "clean": "shx rm -rf node_modules/ build/ .next/ out/ yarn. lock package-lock.json *.log",
+    "clean": "shx rm -rf node_modules/ dist/ out/ yarn. lock package-lock.json *.log",
     "kill:project": "fkill :5005 :8085 :8080 :8081 :8088 -fs",
     "predev:backend": "firebase functions:config:set runtime.env=development && firebase use staging",
     "dev:backend": "npm-run-all -p start:watch start:emulators start:database",

src/pages/components/Demo/Demo.tsx

@@ -8,7 +8,7 @@ import { getWords } from '../../StatsAPI';
 import { APP_URL, DICTIONARY_APP_URL } from '../../siteConstants';
 
 const Demo = ({ defaultWord }: { defaultWord: string }) => {
-  const searchParams = useSearchParams();
+  const searchParams = useSearchParams() || new Map();
   const [isSearchingWord, setIsSearchingWord] = useState(false);
   const [keyword, setKeyword] = useState(defaultWord);
   const [queries, setQueries] = useState<{ [key: string]: string }>({

src/pages/index.page.tsx

@@ -19,7 +19,7 @@ const queryClient = new QueryClient();
 
 const App = () => {
   const router = useRouter();
-  const searchParams = useSearchParams();
+  const searchParams = useSearchParams() || new Map();
   const word = searchParams.get('word') || '';
   const { isPending, error, data } = useQuery({
     queryKey: ['getStats'],

tsconfig.json

@@ -9,7 +9,9 @@
     ],
     "baseUrl": "./",
     "paths": {
-      "src": ["./src"]
+      "src": [
+        "./src"
+      ]
     },
     "skipLibCheck": true,
     "strict": true,
@@ -25,20 +27,26 @@
     "types": [
       "jest",
       "node"
+    ],
+    "plugins": [
+      {
+        "name": "next"
+      }
     ]
   },
   "include": [
     "./**/*.ts",
     "./**/*.tsx",
     "@types",
-    "env.d.ts"
+    "env.d.ts",
+    ".next/types/**/*.ts"
   ],
   "exclude": [
     "node_modules",
     "functions",
     "./**/__tests__/**/*.ts",
     "./**/__tests__/**/*.tsx",
     "./**/__mocks__/**/*.ts",
-    "./**/__mocks__/**/*.tsx",
+    "./**/__mocks__/**/*.tsx"
   ]
 }