Merge branches 'master' and 'detached' of github.com:Tulip-Tech/micro…

…-frontend-builder # Conflicts: # package.json # pages/_app.tsx
Tulip-Tech · Sep 20, 2024 · b405806 · b405806
2 parents 64c5160 + 2fc7515
commit b405806
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -9,56 +9,52 @@
         "url": "github.com/mmarifat"
     },
     "scripts": {
-        "dev": "cross-env NODE_ENV=development NEXT_PRIVATE_LOCAL_WEBPACK=TRUE next dev -p 7100",
-        "build": "cross-env NODE_ENV=production NEXT_PRIVATE_LOCAL_WEBPACK=TRUE next build",
+        "dev": "cross-env NODE_ENV=development NEXT_PRIVATE_LOCAL_WEBPACK=true next dev -p 7100",
+        "build": "cross-env NODE_ENV=production NEXT_PRIVATE_LOCAL_WEBPACK=true next build",
         "start": "next start -p 7100",
         "lint": "next lint",
         "format": "prettier --write components/**/*.tsx pages/**/*.ts pages/**/*.tsx styles/**/*.scss",
         "prepare": "husky install"
     },
     "dependencies": {
         "@module-federation/nextjs-mf": "8.5.5",
-        "antd": "5.20.6",
+        "antd": "5.1.7",
         "cross-env": "7.0.3",
-        "googleapis": "144.0.0",
-        "mongoose": "8.6.3",
+        "googleapis": "114.0.0",
+        "mongoose": "7.0.2",
         "next": "14.2.13",
         "nextjs-cors": "2.2.0",
-        "nodemailer": "6.9.15",
-        "react": "18.3.1",
+        "nodemailer": "6.8.0",
+        "react": "18.2.0",
         "react-copy-to-clipboard": "5.1.0",
-        "react-dom": "18.3.1",
-        "react-email-editor": "1.7.11",
-        "react-router-dom": "6.26.2",
+        "react-dom": "18.2.0",
+        "react-email-editor": "1.6.3",
+        "react-router-dom": "6.8.0",
         "sass": "1.79.2",
-        "webpack": "5.94.0",
-        "yarn": "1.22.22"
+        "webpack": "5.94.0"
     },
     "devDependencies": {
-        "@types/node": "22.5.5",
-        "@types/nodemailer": "6.4.16",
-        "@types/nprogress": "0.2.3",
-        "@types/react": "18.3.8",
-        "@types/react-copy-to-clipboard": "5.0.7",
-        "@types/react-dom": "18.3.0",
-        "@types/react-email-editor": "1.5.6",
+        "@types/node": "18.11.18",
+        "@types/nodemailer": "6.4.6",
+        "@types/nprogress": "0.2.0",
+        "@types/react": "18.0.27",
+        "@types/react-copy-to-clipboard": "5.0.4",
+        "@types/react-dom": "18.0.10",
+        "@types/react-email-editor": "1.5.1",
         "@typescript-eslint/eslint-plugin": "6.21.0",
         "@typescript-eslint/parser": "6.21.0",
-        "autoprefixer": "10.4.20",
-        "eslint": "8.57.1",
-        "eslint-config-next": "14.2.13",
-        "eslint-config-prettier": "9.1.0",
-        "eslint-plugin-prettier": "5.2.1",
-        "husky": "9.1.6",
+        "autoprefixer": "10.4.13",
+        "eslint": "8.33.0",
+        "eslint-config-next": "13.1.6",
+        "eslint-config-prettier": "8.6.0",
+        "eslint-plugin-prettier": "4.2.1",
+        "husky": "8.0.3",
         "postcss": "8.4.47",
-        "prettier": "3.3.3",
-        "tailwindcss": "3.4.12",
-        "typescript": "5.6.2"
+        "prettier": "2.8.3",
+        "tailwindcss": "3.2.4",
+        "typescript": "5.3.3"
     },
     "peerDependencies": {
         "webpack": "*"
-    },
-    "engines": {
-        "node": ">=18"
     }
 }
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-// import '@module-federation/nextjs-mf/src/include-defaults';
 import type { AppProps } from 'next/app';
 import { useRouter } from 'next/router';
 import { ConfigProvider } from 'antd';