Merge branch 'main' of https://github.com/mfe-module-federation-vue/root

into feat/user-package
mfe-module-federation-vue · Aug 26, 2021 · 112d440 · 112d440
2 parents 0ad0afe + 8e35cac
commit 112d440
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/.env b/.env
@@ -7,3 +7,4 @@ REMOTE_CART=cart@http://localhost:3001/remoteEntry.js
 REMOTE_PRODUCTS=products@http://localhost:3002/remoteEntry.js
 REMOTE_PROFILE=profile@http://localhost:3003/remoteEntry.js
 REMOTE_AUTH=auth@http://localhost:3006/remoteEntry.js
+REMOTE_DS=ds@http://localhost:3007/remoteEntry.js
diff --git a/.env.other b/.env.other
@@ -6,4 +6,5 @@ REMOTE_ROOT=root@http://localhost:3000/remoteEntry.js
 REMOTE_CART=cart@http://localhost:3001/remoteEntry.js
 REMOTE_PRODUCTS=products@http://localhost:3002/remoteEntry.js
 REMOTE_PROFILE=profile@http://localhost:3003/remoteEntry.js
-REMOTE_AUTH=auth@http://localhost:3006/remoteEntry.js
+REMOTE_AUTH=auth@http://localhost:3006/remoteEntry.js
+REMOTE_DS=ds@http://localhost:3007/remoteEntry.js
diff --git a/.env.production b/.env.production
@@ -6,4 +6,6 @@ REMOTE_ROOT=root@https://mfe-module-federation-vue-root.netlify.app/remoteEntry.
 REMOTE_CART=cart@https://mfe-module-federation-vue-cart.netlify.app/remoteEntry.js
 REMOTE_PRODUCTS=products@https://mfe-module-federation-vue-products.netlify.app/remoteEntry.js
 REMOTE_PROFILE=profile@https://mfe-module-federation-vue-profile.netlify.app/remoteEntry.js
-REMOTE_AUTH=
+REMOTE_STORE=store@https://mfe-module-federation-vue-store.netlify.app/remoteEntry.js
+REMOTE_AUTH=auth@https://mfe-module-federation-vue-auth.netlify.app/remoteEntry.js
+REMOTE_DS=ds@https://mfe-module-federation-vue-ds.netlify.app/remoteEntry.js
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+//registry.npmjs.org/:_authToken=97e78321-793c-445b-9d68-436004455287
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@microfrontend-vue/root",
+  "name": "@mfe-module-federation-vue/root",
   "version": "0.1.0",
   "private": true,
   "scripts": {

diff --git a/src/bootstrap.js b/src/bootstrap.js
@@ -1,11 +1,11 @@
 import Vue from "vue";
 import App from "./App.vue";
-import vuetify from "./plugins/vuetify";
 import VueRouter from "vue-router";
 import router from "./router";
 import store from "./store";
 import userConfig from "./helper-modules/user.module";
 import UserTools from "auth/UserTools";
+import { frameworkConfig } from "ds/DSConfig";
 
 Vue.config.productionTip = false;
 Vue.use(VueRouter);
@@ -17,7 +17,7 @@ const initApp = async () => {
   new Vue({
     router,
     store,
-    vuetify,
+    ...frameworkConfig,
     render: (h) => h(App),
   }).$mount("#app");
 };

diff --git a/src/plugins/vuetify.js b/src/plugins/vuetify.js
diff --git a/vue.config.js b/vue.config.js
@@ -21,6 +21,8 @@ module.exports = {
           profile: process.env.REMOTE_PROFILE,
           root: process.env.REMOTE_ROOT,
           auth: process.env.REMOTE_AUTH,
+          store: process.env.REMOTE_STORE,
+          ds: process.env.REMOTE_DS,
         },
         shared: dependencies,
       }),

diff --git a/yarn.lock b/yarn.lock
@@ -8240,9 +8240,9 @@ vm-browserify@^1.0.1:
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
 vue-cli-plugin-vuetify@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.1.tgz#a31a9ddb274c8e512aeca7dc2f29d828a18df0af"
-  integrity sha512-ZfhvQ13X41atsCSKdSGiHnSJlhAccv4QIFOZmd8kyq6NktpeeWlvQz/dEKBf6u1AWKmKdwiCDuxS2VNT9fxhOA==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.2.tgz#f5c54a853cd5b06633da4a508ff4aa5b6b6275e0"
+  integrity sha512-aJXkzz3CbN/D1/aJ53slsp8hGaruQHhj/mkNjsfpkqhGglLex7UBnvcDwi5+D1tNk+XlddANLgRe9tmCFMorVA==
   dependencies:
     null-loader "^3.0.0"
     semver "^7.1.2"
@@ -8316,9 +8316,9 @@ vuetify-loader@^1.7.0:
     loader-utils "^2.0.0"
 
 vuetify@^2.4.0:
-  version "2.5.6"
-  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.6.tgz#9cbb1eacece6c42028216312b9be23e35a7f5cf4"
-  integrity sha512-2T8ML5PYuJ/AdMVH3ZIvzHnsM0nX8t4Xzj+0HFFGfLT7jLlptCFpG+JE8+kyrgGZlbUgulyOwCUu8hJkVsReFA==
+  version "2.5.8"
+  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.8.tgz#a23e6a7e77b77de0744b53cf1e7c9d40efac0635"
+  integrity sha512-paLmNhKTYFD41+14rIHnCo+P1jHbUzwBiMowxs5qXVq8RdRMqRmcy05Sfse1WUu90amPGK2fIFQq5rL2N8zqZg==
 
 vuex@^3.6.2:
   version "3.6.2"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		//registry.npmjs.org/:_authToken=97e78321-793c-445b-9d68-436004455287