From ad43f39d04247c6ee6adf8c7a601ecd067801e86 Mon Sep 17 00:00:00 2001 From: Alan Schio <6757777+schirrel@users.noreply.github.com> Date: Fri, 20 Aug 2021 10:16:14 -0300 Subject: [PATCH 1/4] chore: add .npmrc for package --- .npmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..ae64359 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +//registry.npmjs.org/:_authToken=${NPM_TOKEN} From a00f1967d340002fdbb068a5e00658ed244aaac5 Mon Sep 17 00:00:00 2001 From: Alan Date: Sat, 21 Aug 2021 18:20:59 -0400 Subject: [PATCH 2/4] chore: missing remotes links --- .env.production | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.env.production b/.env.production index 87c3742..bf87c87 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,6 @@ PUBLIC_PATH=https://mfe-module-federation-vue-root.netlify.app/ REMOTE_ROOT=root@https://mfe-module-federation-vue-root.netlify.app/remoteEntry.js 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 \ No newline at end of file +REMOTE_PROFILE=profile@https://mfe-module-federation-vue-profile.netlify.app/remoteEntry.js +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 From bb2e16d7290c220e74367a5785d73e84b204be64 Mon Sep 17 00:00:00 2001 From: Alan Date: Sun, 22 Aug 2021 18:46:00 -0400 Subject: [PATCH 3/4] chore: using design system --- .env | 1 + .env.other | 3 ++- .env.production | 1 + .npmrc | 2 +- package.json | 2 +- src/bootstrap.js | 4 ++-- src/plugins/vuetify.js | 7 ------- vue.config.js | 2 ++ yarn.lock | 12 ++++++------ 9 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 src/plugins/vuetify.js diff --git a/.env b/.env index 8d2627f..6d4f7ba 100644 --- a/.env +++ b/.env @@ -8,3 +8,4 @@ REMOTE_PRODUCTS=products@http://localhost:3002/remoteEntry.js REMOTE_PROFILE=profile@http://localhost:3003/remoteEntry.js REMOTE_STORE=store@http://localhost:3005/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 index 9ee24fe..728310a 100644 --- a/.env.other +++ b/.env.other @@ -5,4 +5,5 @@ PUBLIC_PATH=http://localhost:3000/ 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 \ No newline at end of file +REMOTE_PROFILE=profile@http://localhost:3003/remoteEntry.js +REMOTE_DS=ds@http://localhost:3007/remoteEntry.js \ No newline at end of file diff --git a/.env.production b/.env.production index bf87c87..81a9702 100644 --- a/.env.production +++ b/.env.production @@ -8,3 +8,4 @@ REMOTE_PRODUCTS=products@https://mfe-module-federation-vue-products.netlify.app/ REMOTE_PROFILE=profile@https://mfe-module-federation-vue-profile.netlify.app/remoteEntry.js 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@http://mfe-module-federation-vue-ds.netlify.app/remoteEntry.js diff --git a/.npmrc b/.npmrc index ae64359..4a58124 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1 @@ -//registry.npmjs.org/:_authToken=${NPM_TOKEN} +//registry.npmjs.org/:_authToken=97e78321-793c-445b-9d68-436004455287 diff --git a/package.json b/package.json index 6743dd3..90f0d89 100644 --- 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 index c18ab83..054795d 100644 --- 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 deleted file mode 100644 index 5bdec19..0000000 --- a/src/plugins/vuetify.js +++ /dev/null @@ -1,7 +0,0 @@ -import Vue from 'vue'; -import Vuetify from 'vuetify/lib/framework'; - -Vue.use(Vuetify); - -export default new Vuetify({ -}); diff --git a/vue.config.js b/vue.config.js index 7441f61..7940d03 100644 --- a/vue.config.js +++ b/vue.config.js @@ -22,6 +22,8 @@ module.exports = { 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 index 0fbbdd3..b37f9da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8228,9 +8228,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" @@ -8304,9 +8304,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" From 8e35cac3cbbc8d9cddde8ad5fcc2086c76ab9c7b Mon Sep 17 00:00:00 2001 From: Alan Schio <6757777+schirrel@users.noreply.github.com> Date: Mon, 23 Aug 2021 19:36:02 -0400 Subject: [PATCH 4/4] chore: missing https for ds --- .env.production | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.production b/.env.production index 81a9702..556f444 100644 --- a/.env.production +++ b/.env.production @@ -8,4 +8,4 @@ REMOTE_PRODUCTS=products@https://mfe-module-federation-vue-products.netlify.app/ REMOTE_PROFILE=profile@https://mfe-module-federation-vue-profile.netlify.app/remoteEntry.js 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@http://mfe-module-federation-vue-ds.netlify.app/remoteEntry.js +REMOTE_DS=ds@https://mfe-module-federation-vue-ds.netlify.app/remoteEntry.js