From 65f8380cf62c963f3477d3e8021e3554a1528bac Mon Sep 17 00:00:00 2001 From: zhoushaw Date: Mon, 24 May 2021 17:14:40 +0800 Subject: [PATCH] feat: add new subapp --- dev/main/index.ts | 3 +- dev/subApp/.gitignore | 23 ++++++ dev/subApp/.npmrc | 1 + dev/subApp/README.md | 24 ++++++ dev/subApp/babel.config.js | 3 + dev/subApp/linkdeps.js | 21 +++++ dev/subApp/package.json | 42 ++++++++++ dev/subApp/public/async.js | 3 + dev/subApp/public/css/xxx/xx.css | 4 + dev/subApp/public/favicon.ico | Bin 0 -> 4286 bytes dev/subApp/public/index.html | 69 ++++++++++++++++ dev/subApp/public/module.js | 4 + dev/subApp/src/App.vue | 53 +++++++++++++ dev/subApp/src/assets/logo.png | Bin 0 -> 6849 bytes dev/subApp/src/components/HelloWorld.vue | 35 +++++++++ dev/subApp/src/components/test.vue | 50 ++++++++++++ dev/subApp/src/components/todo.vue | 50 ++++++++++++ dev/subApp/src/main.js | 50 ++++++++++++ dev/subApp/src/store/index.js | 6 ++ dev/subApp/src/store/store.js | 27 +++++++ dev/subApp/vue.config.js | 32 ++++++++ dev/vue/public/index.html | 12 +-- dev/vue/src/App.vue | 16 ++-- dev/vue/src/main.js | 39 ++++------ dev/vue/src/microApp.vue | 54 +++++++++++++ dev/vue/vue.config.js | 3 +- packages/runtime/core/src/garfish.ts | 15 +++- packages/runtime/core/src/index.ts | 78 ++++++++++++++++--- packages/runtime/core/src/interface/index.ts | 1 + 29 files changed, 660 insertions(+), 58 deletions(-) create mode 100644 dev/subApp/.gitignore create mode 100644 dev/subApp/.npmrc create mode 100644 dev/subApp/README.md create mode 100644 dev/subApp/babel.config.js create mode 100644 dev/subApp/linkdeps.js create mode 100644 dev/subApp/package.json create mode 100644 dev/subApp/public/async.js create mode 100644 dev/subApp/public/css/xxx/xx.css create mode 100644 dev/subApp/public/favicon.ico create mode 100644 dev/subApp/public/index.html create mode 100644 dev/subApp/public/module.js create mode 100644 dev/subApp/src/App.vue create mode 100644 dev/subApp/src/assets/logo.png create mode 100644 dev/subApp/src/components/HelloWorld.vue create mode 100644 dev/subApp/src/components/test.vue create mode 100644 dev/subApp/src/components/todo.vue create mode 100644 dev/subApp/src/main.js create mode 100644 dev/subApp/src/store/index.js create mode 100644 dev/subApp/src/store/store.js create mode 100644 dev/subApp/vue.config.js create mode 100644 dev/vue/src/microApp.vue diff --git a/dev/main/index.ts b/dev/main/index.ts index c115c46a7..faab2c9bc 100644 --- a/dev/main/index.ts +++ b/dev/main/index.ts @@ -1,4 +1,4 @@ -import GarfishInstance, { Garfish } from '@garfish/core'; +import GarfishInstance from '@garfish/core'; GarfishInstance.run({ basename: '/garfish_master', @@ -57,6 +57,7 @@ document.getElementById('reactBtn').onclick = async () => { } }; +export function provider() {} // setTimeout(() => { // throw new Error('main error'); // }, 3000); diff --git a/dev/subApp/.gitignore b/dev/subApp/.gitignore new file mode 100644 index 000000000..0ee0aefa8 --- /dev/null +++ b/dev/subApp/.gitignore @@ -0,0 +1,23 @@ +.DS_Store +node_modules +/dist + +# local env files +.env.local +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? +package-lock.json diff --git a/dev/subApp/.npmrc b/dev/subApp/.npmrc new file mode 100644 index 000000000..73d02cbc9 --- /dev/null +++ b/dev/subApp/.npmrc @@ -0,0 +1 @@ +registry = 'https://registry.npmjs.org' diff --git a/dev/subApp/README.md b/dev/subApp/README.md new file mode 100644 index 000000000..3e912e48d --- /dev/null +++ b/dev/subApp/README.md @@ -0,0 +1,24 @@ +# vue + +## Project setup +``` +npm install +``` + +### Compiles and hot-reloads for development +``` +npm run serve +``` + +### Compiles and minifies for production +``` +npm run build +``` + +### Lints and fixes files +``` +npm run lint +``` + +### Customize configuration +See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/dev/subApp/babel.config.js b/dev/subApp/babel.config.js new file mode 100644 index 000000000..078c0056f --- /dev/null +++ b/dev/subApp/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: ['@vue/cli-plugin-babel/preset'], +}; diff --git a/dev/subApp/linkdeps.js b/dev/subApp/linkdeps.js new file mode 100644 index 000000000..f37329156 --- /dev/null +++ b/dev/subApp/linkdeps.js @@ -0,0 +1,21 @@ +const { exec } = require('child_process'); + +[ + '@garfish/core', + '@garfish/router', + '@garfish/browser-snapshot', + '@garfish/browser-vm', + '@garfish/core', + '@garfish/loader', + '@garfish/cjs-app', +].forEach((item) => { + console.log(`link ${item}`); + exec(`yarn link ${item}`, (error, stdout, stderr) => { + if (error) { + console.error(`执行的错误: ${error}`); + return; + } + stdout && console.log(`stdout: ${stdout}`); + stderr && console.error(`stderr: ${stderr}`); + }); +}); diff --git a/dev/subApp/package.json b/dev/subApp/package.json new file mode 100644 index 000000000..01d786444 --- /dev/null +++ b/dev/subApp/package.json @@ -0,0 +1,42 @@ +{ + "name": "vue", + "version": "0.1.0", + "private": true, + "scripts": { + "start": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint" + }, + "dependencies": { + "core-js": "^3.6.5", + "element-ui": "^2.14.1", + "vue": "^2.6.11", + "vue-router": "^3.4.3", + "vuex": "^3.5.1", + "@garfish/core": "0.0.8-alpha.5" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "~4.4.0", + "@vue/cli-plugin-eslint": "~4.4.0", + "@vue/cli-service": "~4.4.0", + "babel-eslint": "^10.1.0", + "eslint": "^6.7.2", + "eslint-plugin-vue": "^6.2.2", + "vue-template-compiler": "^2.6.11" + }, + "eslintConfig": { + "root": true, + "env": { + "node": true, + "browser": true + }, + "extends": [ + "plugin:vue/essential", + "eslint:recommended" + ], + "parserOptions": { + "parser": "babel-eslint" + }, + "rules": {} + } +} diff --git a/dev/subApp/public/async.js b/dev/subApp/public/async.js new file mode 100644 index 000000000..a2570b310 --- /dev/null +++ b/dev/subApp/public/async.js @@ -0,0 +1,3 @@ +console.log('async'); + +throw 121; diff --git a/dev/subApp/public/css/xxx/xx.css b/dev/subApp/public/css/xxx/xx.css new file mode 100644 index 000000000..cf805b283 --- /dev/null +++ b/dev/subApp/public/css/xxx/xx.css @@ -0,0 +1,4 @@ +body { + margin: 10px; + background: url(../../favicon.ico) no-repeat; +} diff --git a/dev/subApp/public/favicon.ico b/dev/subApp/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..df36fcfb72584e00488330b560ebcf34a41c64c2 GIT binary patch literal 4286 zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56 zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei z@g6Xq-pDoPl=MANPiR7%172VA%r)kevtV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp= zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8 zx!=3<4seY*%=OlbCbcae?5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3 z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD zsW0Ab)ZK@0cIW%W7z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6 z={Xwx{TKxD#iCLfl2vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S literal 0 HcmV?d00001 diff --git a/dev/subApp/public/index.html b/dev/subApp/public/index.html new file mode 100644 index 000000000..a0e0c640b --- /dev/null +++ b/dev/subApp/public/index.html @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + +
+ + + + diff --git a/dev/subApp/public/module.js b/dev/subApp/public/module.js new file mode 100644 index 000000000..37f0e5f5b --- /dev/null +++ b/dev/subApp/public/module.js @@ -0,0 +1,4 @@ +const a = { + esmodule: true, +}; +export default a; diff --git a/dev/subApp/src/App.vue b/dev/subApp/src/App.vue new file mode 100644 index 000000000..defb77c91 --- /dev/null +++ b/dev/subApp/src/App.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/dev/subApp/src/assets/logo.png b/dev/subApp/src/assets/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43 GIT binary patch literal 6849 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 +
+

{{ msg }}

+

+ Thank you for using Gar +

+
+ + + + + + diff --git a/dev/subApp/src/components/test.vue b/dev/subApp/src/components/test.vue new file mode 100644 index 000000000..15e56b47b --- /dev/null +++ b/dev/subApp/src/components/test.vue @@ -0,0 +1,50 @@ + + + + diff --git a/dev/subApp/src/components/todo.vue b/dev/subApp/src/components/todo.vue new file mode 100644 index 000000000..c0f72c6e0 --- /dev/null +++ b/dev/subApp/src/components/todo.vue @@ -0,0 +1,50 @@ + + + + diff --git a/dev/subApp/src/main.js b/dev/subApp/src/main.js new file mode 100644 index 000000000..8ca9ec211 --- /dev/null +++ b/dev/subApp/src/main.js @@ -0,0 +1,50 @@ +import Vue from 'vue'; +import App from './App.vue'; +import store from './store'; +import VueRouter from 'vue-router'; +import ToDoList from './components/todo.vue'; +import HelloWorld from './components/HelloWorld.vue'; +import Test from './components/test.vue'; +import ElementUI from 'element-ui'; +import 'element-ui/lib/theme-chalk/index.css'; +import GarfishInstance from '@garfish/core'; + +Vue.use(ElementUI); +Vue.use(VueRouter); +Vue.config.productionTip = false; + +let vm; +const render = ({ dom, basename = '/' }) => { + const router = new VueRouter({ + mode: 'history', + base: basename, + router, + routes: [ + { path: '/', component: HelloWorld }, + { path: '/todo', component: ToDoList }, + { path: '/test', component: Test }, + ], + }); + + vm = new Vue({ + store, + router, + render: (h) => h(App), + }).$mount(); + (dom || document).querySelector('#app').appendChild(vm.$el); +}; + +if (!window.__GARFISH__) { + render({}); +} else { +} + +export function provider({ basename, dom }) { + return { + render: () => render({ basename, dom }), + destroy() { + vm.$destroy(); + vm.$el.parentNode && vm.$el.parentNode.removeChild(vm.$el); + }, + }; +} diff --git a/dev/subApp/src/store/index.js b/dev/subApp/src/store/index.js new file mode 100644 index 000000000..1fb603b5e --- /dev/null +++ b/dev/subApp/src/store/index.js @@ -0,0 +1,6 @@ +import store from './store'; +import Vue from 'vue'; +import Vuex from 'vuex'; +Vue.use(Vuex); + +export default new Vuex.Store(store); diff --git a/dev/subApp/src/store/store.js b/dev/subApp/src/store/store.js new file mode 100644 index 000000000..8ad0e6074 --- /dev/null +++ b/dev/subApp/src/store/store.js @@ -0,0 +1,27 @@ +export default { + state: { + id: 1, + todos: [{ id: 1, text: 'write a vue mudole demo', done: false }], + }, + mutations: { + done(state, id) { + state.todos.forEach((item) => item.id === id && (item.done = true)); + }, + add(state, item) { + state.id += 1; + item.id = state.id; + state.todos.push(item); + }, + }, + actions: { + done(context, id) { + context.commit('done', id); + }, + add(context, item) { + context.commit('add', item); + }, + }, + getters: { + doneTodos: (state) => state.todos.filter((todo) => todo.done), + }, +}; diff --git a/dev/subApp/vue.config.js b/dev/subApp/vue.config.js new file mode 100644 index 000000000..69d2f2855 --- /dev/null +++ b/dev/subApp/vue.config.js @@ -0,0 +1,32 @@ +// const SlardarWebpackPlugin = require('@slardar/webpack-plugin'); +// const GarfishPlugin = require('../../packages/tool/webpack-plugin'); +const webpack = require('webpack'); + +module.exports = { + devServer: { + open: false, + port: '8000', + headers: { + 'Access-Control-Allow-Origin': '*', + 'Access-Control-Allow-Headers': '*', + }, + }, + + publicPath: 'http://localhost:8000', + configureWebpack: (config) => { + config.output.library = `sub-app-garfish-exports`; + config.output.libraryTarget = 'umd'; + config.output.globalObject = 'window'; + config.devtool = 'source-map'; + config.mode = 'production'; + + config.plugins = [ + ...config.plugins, + new webpack.BannerPlugin('garfish'), + // new GarfishPlugin({ + // webpackInstance: webpack, + // appId: 'vue_app', + // }), + ]; + }, +}; diff --git a/dev/vue/public/index.html b/dev/vue/public/index.html index b7ec943b8..3cecb59c3 100644 --- a/dev/vue/public/index.html +++ b/dev/vue/public/index.html @@ -5,8 +5,8 @@ - - + + diff --git a/dev/vue/vue.config.js b/dev/vue/vue.config.js index b85c40199..9741b8f73 100644 --- a/dev/vue/vue.config.js +++ b/dev/vue/vue.config.js @@ -14,7 +14,8 @@ module.exports = { publicPath: 'http://localhost:9090', configureWebpack: (config) => { - config.output.library = `vue-garfish-exports`; + // config.output.library = `vue-garfish-exports`; + config.output.jsonpFunction = `vue-jsonp`; config.output.libraryTarget = 'umd'; config.output.globalObject = 'window'; config.devtool = 'source-map'; diff --git a/packages/runtime/core/src/garfish.ts b/packages/runtime/core/src/garfish.ts index 18c36d2c5..9fde90a7c 100644 --- a/packages/runtime/core/src/garfish.ts +++ b/packages/runtime/core/src/garfish.ts @@ -8,6 +8,7 @@ import { error, validURL, hasOwn, + def, } from '@garfish/utils'; import { Loader } from './module/loader'; import { interfaces } from './interface'; @@ -16,10 +17,12 @@ import GarfishBrowserVm from '@garfish/browser-vm'; import GarfishBrowserSnapshot from '@garfish/browser-snapshot'; import GarfishPreloadPlugin from './plugins/preload'; import { RouterInterface } from 'packages/runtime/router/src/context'; +import { __GARFISH_FLAG__ } from './utils/tool'; export class Garfish implements interfaces.Garfish { public version = __VERSION__; private running = false; + public flag = __GARFISH_FLAG__; // A unique identifier public options = getDefaultOptions(); public appInfos: Record = {}; public activeApps: Record = {}; @@ -28,6 +31,8 @@ export class Garfish implements interfaces.Garfish { public plugins: Array = []; public loader: Loader; public hooks: Hooks; + public subInstances: Record = {}; + router: RouterInterface; setExternal: ( nameOrExtObj: string | Record, @@ -50,7 +55,7 @@ export class Garfish implements interfaces.Garfish { this.hooks.lifecycle.initialize.call(this.options); } - private injectDefaultPlugin(options?: interfaces.Options) { + private injectOptionalPlugin(options?: interfaces.Options) { const defaultPlugin = []; // Preload plugin if (!options.disablePreloadApp) defaultPlugin.push(GarfishPreloadPlugin()); @@ -114,6 +119,12 @@ export class Garfish implements interfaces.Garfish { warn('Garfish is already running now, Cannot run Garfish repeatedly.'); return this; } + + // Nested scene add logo + if (options.nested) { + def(window, '__GARFISH__PARENT__', true); + } + this.hooks.lifecycle.beforeBootstrap.call(this.options); this.setOptions(options); @@ -123,7 +134,7 @@ export class Garfish implements interfaces.Garfish { this.usePlugin(pluginCb, this); }); - this.injectDefaultPlugin(options); + this.injectOptionalPlugin(options); this.running = true; this.hooks.lifecycle.bootstrap.call(this.options); diff --git a/packages/runtime/core/src/index.ts b/packages/runtime/core/src/index.ts index 06f9a4930..e1838458c 100644 --- a/packages/runtime/core/src/index.ts +++ b/packages/runtime/core/src/index.ts @@ -3,19 +3,75 @@ import GarfishRouter from '@garfish/router'; import GarfishCjsExternal from '@garfish/cjs-external'; import GarfishHMRPlugin from './plugins/fixHMR'; import GarfishOptionsLife from './plugins/lifecycle'; +import { def, hasOwn, warn } from '@garfish/utils'; +import { __GARFISH_FLAG__ } from './utils/tool'; -const GarfishInstance = new Garfish({ - plugins: [ - GarfishCjsExternal(), - GarfishRouter(), - GarfishHMRPlugin(), - GarfishOptionsLife(), - ], -}); +// Initialize the Garfish, currently existing environment to allow only one instance (export to is for test) +export function createContext() { + let fresh = false; + const GarfishInstance = new Garfish({ + plugins: [ + GarfishCjsExternal(), + GarfishRouter(), + GarfishHMRPlugin(), + GarfishOptionsLife(), + ], + }); -window.Garfish = GarfishInstance; -window.__GARFISH__ = true; + type globalValue = boolean | Garfish | Record; + const set = (namespace: string, val: globalValue = GarfishInstance) => { + if (hasOwn(window, namespace)) { + if (!(window[namespace] && window[namespace].flag === __GARFISH_FLAG__)) { + const next = () => { + fresh = true; + if (__DEV__) { + warn( + `"Window.${namespace}" will be overwritten by "@garfish/core".`, + ); + } + }; + const desc = Object.getOwnPropertyDescriptor(window, namespace); + if (desc) { + if (desc.configurable) { + def(window, namespace, val); + next(); + } else if (desc.writable) { + window[namespace] = val; + next(); + } + } + } else if ( + window[namespace] && + window[namespace].flag === __GARFISH_FLAG__ + ) { + // Nested scene + window[namespace].subInstances.push(GarfishInstance); + } + } else { + fresh = true; + def(window, namespace, val); + } + }; + + set('Gar'); + set('Garfish'); + + // 全局标识符 + set('__GAR__', true); + set('__GARFISH__', true); + + if (fresh) { + if (__DEV__) { + if (__VERSION__ !== window['Garfish'].version) { + warn( + 'The "garfish version" used by the main and sub-applications is inconsistent.', + ); + } + } + } + return window['Garfish']; +} export { interfaces } from './interface'; export { Garfish } from './garfish'; -export default GarfishInstance; +export default createContext(); diff --git a/packages/runtime/core/src/interface/index.ts b/packages/runtime/core/src/interface/index.ts index 00e9125ef..6bf3b135c 100644 --- a/packages/runtime/core/src/interface/index.ts +++ b/packages/runtime/core/src/interface/index.ts @@ -96,6 +96,7 @@ export namespace interfaces { disableStatistics?: boolean; disablePreloadApp?: boolean; domGetter?: DomGetter; + nested?: boolean; } export interface HooksLifecycle {