Merge pull request #1352 from syucream/fix/externalize-notistack

Make notistack externals to allow custom views to use/customize the notifications

Author: userlocalhost

.gitignore

@@ -172,6 +172,7 @@ node_modules
 static/js/ui.js*
 coverage
 frontend/dist
+*.tgz
 
 # local django configuration
 airone/settings.py

frontend/src/App.tsx

@@ -2,6 +2,7 @@ import { ThemeProvider } from "@mui/material";
 import React, { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 
+import { AironeSnackbarProvider } from "AironeSnackbarProvider";
 import { AppBase } from "AppBase";
 import { theme } from "Theme";
 
@@ -13,7 +14,9 @@ const root = createRoot(container);
 root.render(
   <StrictMode>
     <ThemeProvider theme={theme}>
-      <AppBase />
+      <AironeSnackbarProvider>
+        <AppBase />
+      </AironeSnackbarProvider>
     </ThemeProvider>
   </StrictMode>
 );

frontend/src/AppBase.tsx

@@ -1,6 +1,5 @@
 import React, { FC } from "react";
 
-import { AironeSnackbarProvider } from "AironeSnackbarProvider";
 import { ErrorHandler } from "ErrorHandler";
 import { CheckTerms } from "components/common/CheckTerms";
 import { AppRouter } from "routes/AppRouter";
@@ -15,12 +14,10 @@ interface Props {
 
 export const AppBase: FC<Props> = ({ customRoutes }) => {
   return (
-    <AironeSnackbarProvider>
-      <ErrorHandler>
-        <CheckTerms>
-          <AppRouter customRoutes={customRoutes} />
-        </CheckTerms>
-      </ErrorHandler>
-    </AironeSnackbarProvider>
+    <ErrorHandler>
+      <CheckTerms>
+        <AppRouter customRoutes={customRoutes} />
+      </CheckTerms>
+    </ErrorHandler>
   );
 };

frontend/src/apiclient/autogenerated/.gitkeep

@@ -1,5 +1,5 @@
 export * from "./AppBase";
-
+export * from "./AironeSnackbarProvider";
 export * from "./components";
 export * from "./hooks";
 export * from "./i18n";

frontend/src/index.ts

@@ -1,6 +1,6 @@
 {
   "name": "@dmm-com/pagoda-core",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "[![CircleCI](https://circleci.com/gh/dmm-com/airone.svg?style=svg&circle-token=2e12c068b0ed1bab9d0c2d72529d5ee1da9b53b4)](https://circleci.com/gh/dmm-com/airone)",
   "main": "frontend/dist/pagoda-core.js",
   "types": "frontend/dist/index.d.ts",
@@ -27,7 +27,7 @@
     "fix": "npx eslint --fix frontend ; npx prettier --write frontend",
     "test": "TZ=UTC npx jest --coverage frontend",
     "test:update": "TZ=UTC npx jest -u frontend",
-    "build:lib": "npm run build:lib:code && npm run build:lib:types",
+    "build:lib": "rm -rf frontend/dist && npm run build:lib:code && npm run build:lib:types",
     "build:lib:code": "webpack --config webpack.library.config.js --mode development",
     "build:lib:types": "tsc --project tsconfig.lib.json"
   },
@@ -91,7 +91,6 @@
     "js-file-download": "^0.4.12",
     "material-ui-popup-state": "^5.0.10",
     "msw": "^2.0.11",
-    "notistack": "^3.0.1",
     "prettier": "2.3.2",
     "prop-types": "^15.7.2",
     "react": "^18.2.0",
@@ -119,6 +118,7 @@
   },
   "peerDependencies": {
     "@mui/material": "^5.11.3",
+    "notistack": "^3.0.1",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-router-dom": "^6.0.0"

package-lock.json

@@ -39,5 +39,5 @@ module.exports = {
       'node_modules',
     ],
   },
-  externals: ['@mui/material', 'react', 'react-dom', 'react-router-dom'],
+  externals: ['@mui/material', 'react', 'react-dom', 'react-router-dom', 'notistack'],
 }