Merge branch 'main' of ssh://github.com/ITPNYU/Booking-Tool

ITPNYU · Mar 27, 2024 · aedd639 · aedd639
2 parents e63619c + decf70a
commit aedd639
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/media_commons_booking_app/package.json b/media_commons_booking_app/package.json
@@ -14,9 +14,9 @@
     "open": "clasp open --addon",
     "setup:https": "mkdirp certs && mkcert -key-file ./certs/key.pem -cert-file ./certs/cert.pem localhost 127.0.0.1",
     "build:local": "cross-env NODE_ENV=development CALENDAR_ENV=development webpack",
-    "build:dev": "cross-env NODE_ENV=production CALENDAR_ENV=development webpack",
-    "build:staging": "cross-env NODE_ENV=production CALENDAR_ENV=development webpack",
-    "build": "cross-env NODE_ENV=production CALENDAR_ENV=production webpack",
+    "build:dev": "cross-env NODE_ENV=production CALENDAR_ENV=development webpack --mode=production",
+    "build:staging": "cross-env NODE_ENV=production CALENDAR_ENV=development webpack --mode=production",
+    "build": "cross-env NODE_ENV=production CALENDAR_ENV=production webpack --mode=production",
     "deploy:local": "rimraf dist && npm run build:local && npx clasp push",
     "deploy:dev": "rimraf dist && npm run build:dev && npx clasp push",
     "deploy:staging": "rimraf dist && npm run build:staging && npx clasp push",

diff --git a/media_commons_booking_app/src/client/index.js b/media_commons_booking_app/src/client/index.js
@@ -1,5 +1,3 @@
-'use client';
-
 import { RouterProvider, createMemoryRouter } from 'react-router-dom';
 
 import AdminPage from './routes/admin/adminPage';
@@ -14,8 +12,6 @@ import UserRolePage from './routes/booking/formPages/UserRolePage';
 import UserSectionPage from './routes/booking/formPages/UserSectionPage';
 import { createRoot } from 'react-dom/client';
 
-console.log('TEST IN INDEX.JS');
-
 const router = createMemoryRouter([
   {
     path: '/',

diff --git a/media_commons_booking_app/webpack.config.js b/media_commons_booking_app/webpack.config.js
@@ -189,6 +189,13 @@ const DynamicCdnWebpackPluginConfig = {
     if (!isProd && packageName === 'react') {
       return null;
     }
+    if (
+      packageName === 'react-router-dom' ||
+      packageName === 'react-router' ||
+      packageName === '@remix-run/router'
+    ) {
+      return null;
+    }
 
     // define custom CDN configuration for new packages
     // "name" should match the package being imported