f

index-old.d.ts

@@ -32,7 +32,6 @@
 //   BaseContextClass as CoreBaseContextClass,
 // } from 'egg-core';
 // import EggCookies = require('egg-cookies');
-// import 'egg-view';
 
 // declare module 'egg' {
 //   export type EggLogger = Logger;
@@ -1042,20 +1041,6 @@
 
 //   export function start(options?: StartOptions): Promise<Application>;
 
-//   /**
-//    * Powerful Partial, Support adding ? modifier to a mapped property in deep level
-//    * @example
-//    * import { PowerPartial, EggAppConfig } from 'egg';
-//    *
-//    * // { view: { defaultEngines: string } } => { view?: { defaultEngines?: string } }
-//    * type EggConfig = PowerPartial<EggAppConfig>
-//    */
-//   export type PowerPartial<T> = {
-//     [U in keyof T]?: T[U] extends object
-//       ? PowerPartial<T[U]>
-//       : T[U]
-//   };
-
 //   // send data can be number|string|boolean|object but not Set|Map
 //   export interface Messenger extends EventEmitter {
 //     /**

package.json

@@ -33,12 +33,12 @@
     "@eggjs/session": "^4.0.1",
     "@eggjs/static": "^3.0.0",
     "@eggjs/utils": "^4.2.5",
+    "@eggjs/view": "^3.0.1",
     "@eggjs/watcher": "^4.0.4",
     "circular-json-for-egg": "^1.0.0",
     "cluster-client": "^3.7.0",
     "egg-errors": "^2.3.2",
     "egg-logger": "^3.6.1",
-    "egg-view": "^2.1.4",
     "extend2": "^4.0.0",
     "graceful": "^2.0.0",
     "humanize-ms": "^2.0.0",

site/docs/advanced/view-plugin.zh-CN.md

@@ -8,6 +8,7 @@ order: 5
 本文将阐述框架对 View 插件的规范约束。我们可以依此来封装对应的模板引擎插件。以下以 [egg-view-ejs](https://github.com/eggjs/egg-view-ejs) 为例。
 
 ## 插件目录结构
+
 ```bash
 egg-view-ejs
 ├── config

site/docs/core/view.md

@@ -222,4 +222,4 @@ The built-in plugin [@eggjs/security] provides common security helper functions,
 
 [@eggjs/security]: https://github.com/eggjs/security
 [egg-view-nunjucks]: https://github.com/eggjs/egg-view-nunjucks
-[egg-view]: https://github.com/eggjs/egg-view
+[egg-view]: https://github.com/eggjs/view

site/docs/tutorials/index.md

@@ -51,7 +51,7 @@ Official maintained ORM model is [egg-orm] base on [Leoric], and the following d
 [egg-sequelize]: https://github.com/eggjs/egg-sequelize
 [egg-mongoose]: https://github.com/eggjs/egg-mongoose
 [egg-mysql]: https://github.com/eggjs/egg-mysql
-[egg-view]: https://github.com/eggjs/egg-view
+[egg-view]: https://github.com/eggjs/view
 [egg-view-nunjucks]: https://github.com/eggjs/egg-view-nunjucks
 [egg-view-ejs]: https://github.com/eggjs/egg-view-ejs
 [egg-view-handlebars]: https://github.com/eggjs/egg-view-handlebars

site/docs/tutorials/index.zh-CN.md

@@ -53,7 +53,7 @@ $ npm init egg --type=simple
 [egg-sequelize]: https://github.com/eggjs/egg-sequelize
 [egg-mongoose]: https://github.com/eggjs/egg-mongoose
 [egg-mysql]: https://github.com/eggjs/egg-mysql
-[egg-view]: https://github.com/eggjs/egg-view
+[egg-view]: https://github.com/eggjs/view
 [egg-view-nunjucks]: https://github.com/eggjs/egg-view-nunjucks
 [egg-view-ejs]: https://github.com/eggjs/egg-view-ejs
 [egg-view-handlebars]: https://github.com/eggjs/egg-view-handlebars

site/docs/tutorials/typescript.zh-CN.md

@@ -706,8 +706,9 @@ describe('typescript', () => {
 以下几个项目可作为单元测试参考：
 
 - [https://github.com/eggjs/egg](https://github.com/eggjs/egg)
-- [https://github.com/eggjs/egg-view](https://github.com/eggjs/egg-view)
+- [https://github.com/eggjs/view](https://github.com/eggjs/view)
 - [https://github.com/eggjs/egg-logger](https://github.com/eggjs/egg-logger)
+
 ### 编译速度慢？
 
 根据我们的实践，`ts-node` 是目前相对较优的解决方案，既不用另起终端执行 `tsc`，也能获得还能接受的启动速度（仅限于 `ts-node@7`，新的版本由于把文件缓存去掉了，导致特别慢（[#754](https://github.com/TypeStrong/ts-node/issues/754)），因此未升级）。

src/config/plugin.ts

@@ -127,6 +127,6 @@ export default {
    */
   view: {
     enable: true,
-    package: 'egg-view',
+    package: '@eggjs/view',
   },
 };

src/lib/types.ts

@@ -28,6 +28,7 @@ import '@eggjs/session';
 import '@eggjs/onerror';
 import '@eggjs/logrotator';
 import '@eggjs/multipart';
+import '@eggjs/view';
 
 export type {
   EggAppInfo,

test/index.test-d.ts

@@ -91,6 +91,15 @@ expectType<string>(app.config.multipart.cleanSchedule.cron);
 expectType<string>(app.config.multipart.defaultCharset);
 expectType<'file' | 'stream'>(app.config.multipart.mode);
 
+// view plugin types
+expectType<string>(app.config.view.defaultViewEngine);
+expectType<string>(app.config.view.root);
+expectType<string>(app.config.view.mapping.html);
+expectType<string>(app.config.view.defaultExtension);
+expectType<string>(await ctx.renderString('hello'));
+expectType<string>(await ctx.view.renderString('hello'));
+const ViewEngine = app.view.get('html')!;
+expectType<string>(await new ViewEngine(ctx).render('hello'));
 
 class AppBoot implements ILifecycleBoot {
   private readonly app: Application;