Merge branch 'master' into feat-ssr

Author: aceHubert

lerna.json

@@ -4,7 +4,7 @@
   "useWorkspaces": true,
   "command": {
     "publish": {
-      "conventionalCommits": false,
+      "conventionalCommits": true,
       "gitTagVersion": false,
       "gitReset": false,
       "allowBranch": ["master"],

packages/module-loader/dev/plugins/module-loader.ts

@@ -4,11 +4,11 @@ import VueRouter, { RouteConfig } from 'vue-router';
 import ModuleLoader, { Modules } from '@vue-async/module-loader';
 import { root, megreRoutes, lazyLoadView } from '../router/utils';
 
-Vue.use(ModuleLoader);
-
 // Types
 import { Plugin } from '@nuxt/types';
 
+Vue.use(ModuleLoader);
+
 const plugin: Plugin = async (cxt) => {
   const { app, store } = cxt;
 

packages/module-loader/src/ability/dynamicComponent/storeModule.ts

@@ -1,4 +1,6 @@
 import { getComponentName, error } from '@vue-async/utils';
+
+// Types
 import { DynamicComponent } from 'types/module';
 
 export type State = {

packages/module-loader/src/install.ts

@@ -2,6 +2,7 @@ import dynamicComponent, {
   namespaces as dynamicComponentPath,
   storeModule as dynamicComponentStoreModule,
 } from './ability/dynamicComponent';
+
 import createEventBus from './ability/eventBus';
 import createModuleLoader from './ability/moduleLoader';
 import createComponentLoader from './ability/componentLoader';

packages/module-loader/tsconfig.json

@@ -3,9 +3,6 @@
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "dist",
-    "declaration": true,
-    // "declarationDir": "types",
-    // "paths": {},
     "composite": true
   },
   "include": ["src", "types"],

packages/resource-manager/src/Suspense.ts

@@ -1,7 +1,9 @@
 import Vue, { CreateElement, VNode, VNodeChildren } from 'vue';
 import { error } from '@vue-async/utils';
 import { pushSuspenseInstance, popSuspenseInstance, currentSuspenseInstance } from './currentInstance';
-import { UseOptions, AsyncFactory } from '../types';
+
+// Types
+import { UseOptions, AsyncFactory } from 'types/resource-mananger';
 
 export const RESOLVED = 'resolved';
 export const REJECTED = 'rejected';

packages/resource-manager/src/createResource.ts

@@ -3,7 +3,9 @@ import { error } from '@vue-async/utils';
 import { del, add } from './Suspense';
 import { currentInstance, currentSuspenseInstance, setCurrentInstance } from './currentInstance';
 import findSuspenseInstance from './findSuspenseInstance';
-import { AsyncFactory, ResourceOptions, ResourceResult } from '../types';
+
+// Types
+import { AsyncFactory, ResourceOptions, ResourceResult } from 'types/resource-mananger';
 
 Vue.mixin({
   created(this: Vue) {

packages/resource-manager/src/extend.vue.d.ts

@@ -1,5 +1,5 @@
 import Vue, { VNode } from 'vue';
-import { UseOptions, AsyncFactory, SuspenseComponent } from '../types';
+import { UseOptions, AsyncFactory, SuspenseComponent } from 'types/resource-mananger';
 
 declare module 'vue/types/vue' {
   interface Vue {

packages/resource-manager/src/install.ts

@@ -1,6 +1,8 @@
-import { VueConstructor } from 'vue';
 import Suspense, { COMPONENT_NAME } from './Suspense';
-import { UseOptions } from '../types';
+
+// Types
+import { VueConstructor } from 'vue';
+import { UseOptions } from 'types/resource-mananger';
 
 export default function install(Vue: VueConstructor, options: UseOptions = {}) {
   if ((install as any).installed) return;

packages/resource-manager/src/lazy.ts

@@ -4,7 +4,9 @@ import { PropsDefinition, DefaultProps } from 'vue/types/options';
 import { del, add, has } from './Suspense';
 import { currentSuspenseInstance } from './currentInstance';
 import findSuspenseInstance from './findSuspenseInstance';
-import { AsyncFactory, SuspenseComponent } from '../types';
+
+// Types
+import { AsyncFactory, SuspenseComponent } from 'types/resource-mananger';
 
 export default function Lazy<PropsDef = PropsDefinition<DefaultProps>>(
   asyncFactory: AsyncFactory,