Skip to content

Commit

Permalink
Fixed merge conflicts..?
Browse files Browse the repository at this point in the history
  • Loading branch information
SteakFisher committed Jun 11, 2024
2 parents 98354d3 + c35f9ae commit 6d9a1f7
Show file tree
Hide file tree
Showing 21 changed files with 2,451 additions and 112 deletions.
18 changes: 18 additions & 0 deletions environment.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
declare global {
namespace NodeJS {
interface ProcessEnv {
API_KEY: string;
AUTH_DOMAIN: string;
PROJECT_ID: string;
STORAGE_BUCKET: string;
MESSAGING_SENDER_ID: string;
APP_ID: string;

FIREBASE_SERVICE_ACCOUNT_KEY: string;
}
}
}

// If this file has no import/export statements (i.e. is a script)
// convert it into a module by adding an empty export statement.
export {}
10 changes: 10 additions & 0 deletions next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
experimental: {
turbo: {
rules: {
'*.svg': {
loaders: ['@svgr/webpack'],
as: '*.js',
},
},
},
},
webpack(config) {
// Grab the existing rule that handles SVG imports
const fileLoaderRule = config.module.rules.find((rule) =>
Expand Down
Loading

0 comments on commit 6d9a1f7

Please sign in to comment.