Merge pull request #7240 from p12tic/www-dont-duplicate-mobx-react

www: Don't include multiple copies of mobx-react
buildbot · Dec 4, 2023 · 305ed0e · 305ed0e
2 parents ce7ea0a + dae3e4f
commit 305ed0e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/www/react-base/src/globals.ts b/www/react-base/src/globals.ts
@@ -3,6 +3,7 @@
 
 import axios from 'axios';
 import * as mobx from 'mobx';
+import * as mobxReact from 'mobx-react';
 import moment from 'moment';
 import React from 'react';
 import ReactDOM from 'react-dom';
@@ -14,6 +15,7 @@ declare global {
   interface Window {
     axios: any;
     mobx: any;
+    mobxReact: any;
     React: any;
     ReactRouterDOM: any;
     jQuery: any;
@@ -24,6 +26,7 @@ declare global {
 
 window.axios = axios;
 window.mobx = mobx;
+window.mobxReact = mobxReact;
 window.moment = moment;
 window.React = React;
 window.ReactDOM = ReactDOM as any;

diff --git a/www/react-base/vite.config.ts b/www/react-base/vite.config.ts
@@ -125,6 +125,7 @@ export default defineConfig({
     dedupe: [
       'axios',
       'mobx',
+      'mobx-react',
       'moment',
       'react',
       'react-dom',

diff --git a/www/react-console_view/vite.config.ts b/www/react-console_view/vite.config.ts
@@ -31,6 +31,7 @@ export default defineConfig({
         'buildbot-plugin-support',
         'buildbot-ui',
         'mobx',
+        'mobx-react',
         'moment',
         'react',
         'react-dom',
@@ -45,6 +46,7 @@ export default defineConfig({
           "buildbot-plugin-support": "BuildbotPluginSupport",
           "buildbot-ui": "BuildbotUi",
           mobx: "mobx",
+          "mobx-react": "mobxReact",
           react: "React",
           moment: "moment",
           "react-dom": "ReactDOM",

diff --git a/www/react-grid_view/vite.config.ts b/www/react-grid_view/vite.config.ts
@@ -31,6 +31,7 @@ export default defineConfig({
         'buildbot-data-js',
         'buildbot-ui',
         'mobx',
+        'mobx-react',
         'moment',
         'react',
         'react-dom',
@@ -46,6 +47,7 @@ export default defineConfig({
           "buildbot-plugin-support": "BuildbotPluginSupport",
           "buildbot-ui": "BuildbotUi",
           mobx: "mobx",
+          "mobx-react": "mobxReact",
           react: "React",
           moment: "moment",
           "react-dom": "ReactDOM",

diff --git a/www/react-ui/vite.config.ts b/www/react-ui/vite.config.ts
@@ -36,6 +36,7 @@ export default defineConfig({
         'axios',
         'buildbot-data-js',
         'mobx',
+        'mobx-react',
         'moment',
         'react',
         'react-dom',
@@ -46,6 +47,7 @@ export default defineConfig({
           axios: "axios",
           "buildbot-data-js": "BuildbotDataJs",
           mobx: "mobx",
+          "mobx-react": "mobxReact",
           react: "React",
           moment: "moment",
           "react-dom": "ReactDOM",

diff --git a/www/react-waterfall_view/vite.config.ts b/www/react-waterfall_view/vite.config.ts
@@ -31,6 +31,7 @@ export default defineConfig({
         'buildbot-plugin-support',
         'buildbot-ui',
         'mobx',
+        'mobx-react',
         'moment',
         'react',
         'react-dom',
@@ -45,6 +46,7 @@ export default defineConfig({
           "buildbot-plugin-support": "BuildbotPluginSupport",
           "buildbot-ui": "BuildbotUi",
           mobx: "mobx",
+          "mobx-react": "mobxReact",
           react: "React",
           moment: "moment",
           "react-dom": "ReactDOM",