Merge branch 'miniprogram' into dev

CODESTYLE.md

@@ -0,0 +1,49 @@
+# Style Guide
+
+In order to maintain a project's simplicity  in the long term, these rules should be followed.
+
+
+## Every file should have it's own type file
+
+```
+// bad
+types.js
+a.js
+b.js
+
+// good
+a.js
+a.type.js
+b.js
+b.type.js
+types.js // re-export a.types.js & b.types.js
+```
+
+### why
+
+If `a.js` has been deleted, it will be easier to delete it's type.
+
+
+
+## Don't access module with subpath
+
+```
+// bad
+|- a
+  |- a1.js
+  |- a2.js
+
+import a1 from 'a/a1';
+
+// good
+|- a
+  |- a1.js
+  |- a2.js
+  |- index.js // re-export a1.js & a2.js
+
+import { a1 } from 'a';
+```
+
+### why
+
+Every folder is aslo module, only exports what are necessary and hide everything esle.

CONTRIBUTING.md

@@ -25,7 +25,7 @@ Core components.
 
 Core runtime of application.
 
-### runtime-react
+### platform-react
 
 React runtime for application.
 

TODO.md

@@ -4,7 +4,7 @@
 
 - [ ] @shuvi/core
   - [ ] app (liximomo)
-- [ ] @shuvi/runtime-react
+- [ ] @shuvi/platform-react
   - [ ] dynamic (liximomo)
   - [ ] head (kayne)
 - [x] @shuvi/utils (zhengyutay)

package.json

@@ -11,7 +11,7 @@
   "scripts": {
     "dev": "lerna run dev --stream --parallel",
     "clean": "lerna exec rimraf lib esm shuvi-app --stream --parallel",
-    "shuvi": "node ./packages/shuvi/lib/cli/cli.js",
+    "shuvi": "SHUVI_DEV_DISABLE_CACHE=true node ./packages/shuvi/lib/cli/cli.js",
     "build": "lerna run build --stream",
     "jest": "jest",
     "test": "yarn test:fixtures && yarn test:unit",
@@ -57,7 +57,7 @@
     "lint-staged": "^10.1.2",
     "lodash": "^4.17.15",
     "memfs": "^3.1.2",
-    "node-sass": "^4.14.1",
+    "node-sass": "^6.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.4",
     "puppeteer-core": "4.0.1",

packages/app/core/apiRoutes.d.ts

@@ -1,4 +1,4 @@
-import { Runtime } from '@shuvi/types';
+import { Runtime } from '@shuvi/service';
 
 declare const apiRoutes: Runtime.IApiRouteConfig[];
 

packages/app/core/client/application.d.ts

@@ -1,3 +1,14 @@
-import { Runtime } from '@shuvi/types';
-
-export const create: Runtime.ApplicationCreater;
+import { IAppRenderFn, IApplication } from '@shuvi/runtime-core'
+export interface IApplicationCreaterContext {
+  routeProps?: { [x: string]: any };
+  [x: string]: any;
+}
+export interface ApplicationCreater {
+  (
+    context: IApplicationCreaterContext,
+    options: {
+      render: IAppRenderFn;
+    }
+  ): IApplication;
+}
+export const create: ApplicationCreater;

packages/app/core/platform.d.ts

@@ -1,4 +1,4 @@
-import { Runtime } from '@shuvi/types';
+import { Runtime } from '@shuvi/service';
 
 export declare const getRoutes: Runtime.IGetRoutes;
 export declare const view: Runtime.IViewClient;

packages/app/core/plugins.d.ts

@@ -1,3 +1,3 @@
-import { Runtime } from '@shuvi/types';
+import { IAppPluginRecord } from '@shuvi/runtime-core';
 
-export const pluginRecord: Runtime.IAppPluginRecord;
+export const pluginRecord: IAppPluginRecord;

packages/app/core/routes.d.ts

@@ -1,4 +1,4 @@
-import { Runtime } from '@shuvi/types';
+import { Runtime } from '@shuvi/service';
 
 declare const routes: Runtime.IAppRouteConfig[];
 

packages/app/core/runtimeConfig.d.ts

@@ -1,4 +1,4 @@
-import { IRuntimeConfig } from '@shuvi/types';
+import { IRuntimeConfig } from '@shuvi/service/lib/api';
 
 declare const runtimneConfig: IRuntimeConfig | null;
 

packages/app/core/server/application.d.ts

@@ -1,4 +1,4 @@
-import { Runtime } from '@shuvi/types';
+import { Runtime } from '@shuvi/service';
 
 import IApplicationModule = Runtime.IApplicationModule;
 

packages/app/core/setRuntimeConfig.d.ts

@@ -1,3 +1,3 @@
-import { IRuntimeConfig } from '@shuvi/types';
+import { IRuntimeConfig } from '@shuvi/service/lib/api';
 
 export default function setRuntimeConfig(config: IRuntimeConfig): void;

packages/app/index.d.ts

@@ -1,4 +1,4 @@
-import { Runtime } from '@shuvi/types';
+import { Runtime } from '@shuvi/service';
 
 export declare function getPageData<T = unknown>(
   key: string,

packages/app/package.json

@@ -12,6 +12,7 @@
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@shuvi/types": "^0.0.1-rc.32"
+    "@shuvi/runtime-core": "^0.0.1-rc.32",
+    "@shuvi/service": "^0.0.1-rc.32"
   }
 }

packages/app/user/document.d.ts

@@ -1,4 +1,4 @@
-import { Runtime } from '@shuvi/types';
+import { Runtime } from '@shuvi/service';
 
 declare const document: Runtime.IDocumentModule;
 

packages/app/user/plugin.d.ts

@@ -1,5 +1,5 @@
-import { Runtime } from '@shuvi/types';
+import { IInitAppPlugins } from '@shuvi/runtime-core';
 
-declare const initPlugins: Runtime.IInitAppPlugins;
+declare const initPlugins: IInitAppPlugins;
 
 export default initPlugins;

packages/app/user/server.d.ts

@@ -1,4 +1,4 @@
-import { Runtime } from '@shuvi/types';
+import { Runtime } from '@shuvi/service';
 
 declare const server: Runtime.IServerModule;
 

packages/hook/.gitignore

@@ -0,0 +1,4 @@
+*.log
+.DS_Store
+node_modules
+dist

packages/hook/README.md

@@ -0,0 +1 @@
+# @shuvi/hook

packages/hook/package.json

@@ -0,0 +1,26 @@
+{
+  "name": "@shuvi/hook",
+  "version": "0.0.1-rc.32",
+  "license": "MIT",
+  "main": "lib/index.js",
+  "module": "esm/index.js",
+  "types": "lib/index.d.ts",
+  "files": [
+    "dist",
+    "src"
+  ],
+  "engines": {
+    "node": ">= 12.0.0"
+  },
+  "scripts": {
+    "dev": "run-p watch:*",
+    "watch:esm": "tsc -p tsconfig.build.esm.json -w",
+    "watch:cjs": "tsc -p tsconfig.build.cjs.json -w",
+    "prebuild": "rimraf lib esm",
+    "build": "run-p build:*",
+    "build:esm": "tsc -p tsconfig.build.esm.json",
+    "build:cjs": "tsc -p tsconfig.build.cjs.json"
+  },
+  "author": "Zheng Yu Tay",
+  "dependencies": {}
+}

packages/hook/src/AsyncParallelHook.ts

@@ -0,0 +1,9 @@
+import { IHookOpts } from './types';
+
+export const executeAsyncParallelHook = async (
+  tapFns: IHookOpts['fn'][],
+  ...args: any[]
+) => {
+  const results = await Promise.all(tapFns.map(fn => fn(...args)));
+  return results;
+};

packages/hook/src/AsyncSeriesBailHook.ts

@@ -0,0 +1,21 @@
+import { IHookOpts } from './types';
+
+export const executeAsyncSeriesBailHook = async (
+  tapFns: IHookOpts['fn'][],
+  ...args: any[]
+) => {
+  let result: unknown = [];
+
+  for (let i = 0; i < tapFns.length; i++) {
+    result = tapFns[i](...args);
+
+    if (Promise.resolve(result) === result) {
+      result = await result;
+    }
+
+    if (result) {
+      break;
+    }
+  }
+  return result;
+};

packages/hook/src/AsyncSeriesHook.ts

@@ -0,0 +1,14 @@
+import { IHookOpts } from './types';
+
+export const executeAsyncSeriesHook = async (
+  tapFns: IHookOpts['fn'][],
+  ...args: any[]
+) => {
+  let results: unknown[] = [];
+
+  for (let i = 0; i < tapFns.length; i++) {
+    results.push(await tapFns[i](...args));
+  }
+
+  return results;
+};

packages/hook/src/AsyncSeriesWaterfallHook.ts

@@ -0,0 +1,22 @@
+import { IHookOpts } from './types';
+
+export const executeAsyncSeriesWaterfallHook = async (
+  tapFns: IHookOpts['fn'][],
+  ...args: any[]
+) => {
+  for (let i = 0; i < tapFns.length; i++) {
+    let fn = tapFns[i];
+    let promiseResult = await fn(...args);
+    if (typeof args[0] !== 'undefined') {
+      if (typeof promiseResult !== 'undefined') {
+        args[0] = promiseResult;
+      } else {
+        console.warn(
+          `Expected return value from hook "${fn.hookName}" but is undefined`
+        );
+      }
+    }
+  }
+
+  return args[0];
+};