diff --git a/.gitignore b/.gitignore index 00a1f6b3..46b8ae32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ .nyc_output coverage +docs/vendor +docs/.bundle dist logs node_modules diff --git a/History.md b/History.md index 6b6bc474..b96a045b 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,13 @@ +2.11.2 / 2023-08-31 +=================== + +## What's Changed +* docs: introduce @midwayjs/leoric by @cyjake in https://github.com/cyjake/leoric/pull/399 +* fix: don't overwrite primaryKey with LAST_INSERT_ID() if exists by @cyjake in https://github.com/cyjake/leoric/pull/398 + + +**Full Changelog**: https://github.com/cyjake/leoric/compare/v2.11.1...v2.11.2 + 2.11.1 / 2023-06-10 =================== diff --git a/docs/_layouts/en.html b/docs/_layouts/en.html index 9b5fa783..c5ecb4eb 100644 --- a/docs/_layouts/en.html +++ b/docs/_layouts/en.html @@ -30,6 +30,7 @@
  • Summary
  • Setup with Egg / Chair
  • [wip] Setup with Express
  • +
  • Setup with Midway
  • Setup with MySQL
  • Setup with SQLite
  • Setup with PostgreSQL
  • diff --git a/docs/_layouts/zh.html b/docs/_layouts/zh.html index f69142c4..3d991843 100644 --- a/docs/_layouts/zh.html +++ b/docs/_layouts/zh.html @@ -30,6 +30,7 @@
  • 概要
  • Egg / Chair 配置
  • [wip] Express 配置
  • +
  • Midway 配置
  • MySQL 配置
  • SQLite 配置
  • PostgreSQL 配置
  • diff --git a/docs/setup/index.md b/docs/setup/index.md index f370b792..7e70ab38 100644 --- a/docs/setup/index.md +++ b/docs/setup/index.md @@ -7,6 +7,7 @@ title: Setup - [Setup with Egg / Chair]({{ '/setup/egg' | relative_url }}) - [Setup with Express]({{ '/setup/express' | relative_url }}) +- [Setup wtih Midway]({{ '/setup/midway' | relative_url }}) ## RDMS / dialects diff --git a/docs/zh/setup/index.md b/docs/zh/setup/index.md index a070d75c..f5b3198d 100644 --- a/docs/zh/setup/index.md +++ b/docs/zh/setup/index.md @@ -7,6 +7,7 @@ title: 快速配置 - [在 Egg / Chair 应用中配置]({{ '/zh/setup/egg' | relative_url }}) - [在 Express 应用中配置]({{ '/zh/setup/express' | relative_url }}) +- [在 Midway 应用中配置]({{ '/zh/setup/midway' | relative_url }}) ## 数据库 diff --git a/package.json b/package.json index b4f5c198..48e0e8ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leoric", - "version": "2.11.1", + "version": "2.11.2", "description": "JavaScript Object-relational mapping alchemy", "main": "index.js", "browser": "dist/browser.js",