2.0.0-next.11

Author: bobby.li

.eslintrc.js

@@ -1,37 +1,38 @@
 module.exports = {
-	"env": {
-		"node": true,
-		"es6": true
-	},
-	"extends": [
-		"eslint:recommended",
-		"plugin:@typescript-eslint/eslint-recommended"
-	],
-	"globals": {
-		"Atomics": "readonly",
-		"SharedArrayBuffer": "readonly"
-	},
-	"parser": "@typescript-eslint/parser",
-	"parserOptions": {
-		"ecmaFeatures": {
-			module: true,
-			ts: true,
-			tsx: true
-		},
-		"ecmaVersion": 2018,
-		"sourceType": "module"
-	},
-	"plugins": [
-		"@typescript-eslint"
-	],
-	"rules": {
-		"no-console": ["error", {
-			"allow": ["warn", "error", "info"]
-		}],
-		"@typescript-eslint/indent": ["warn", 2],
-		"quotes": ["error", "single"],
-		"semi": ["error", "always"],
-		"no-unused-vars": ["off"],
-		"no-useless-escape": ["off"]
-	}
-};
+  env: {
+    node: true,
+    es6: true,
+  },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+  ],
+  globals: {
+    Atomics: 'readonly',
+    SharedArrayBuffer: 'readonly',
+  },
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaFeatures: {
+      module: true,
+      ts: true,
+      tsx: true,
+    },
+    ecmaVersion: 2018,
+    sourceType: 'module',
+  },
+  plugins: ['@typescript-eslint'],
+  rules: {
+    'no-console': [
+      'error',
+      {
+        allow: ['warn', 'error', 'info'],
+      },
+    ],
+    '@typescript-eslint/indent': ['warn', 2],
+    quotes: ['error', 'single'],
+    semi: ['error', 'always'],
+    'no-unused-vars': ['off'],
+    'no-useless-escape': ['off']
+  },
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omni-door/cli",
-  "version": "2.0.0-next.10",
+  "version": "2.0.0-next.11",
   "description": "A tool set for set up the standard JS project",
   "bin": {
     "omni": "./bin/omni-door.js"
@@ -103,7 +103,7 @@
     "webpack-merge": "^4.2.2"
   },
   "dependencies": {
-    "@omni-door/utils": "~1.0.2",
+    "@omni-door/utils": "~1.0.6",
     "@types/express": "4.17.7",
     "@types/express-serve-static-core": "4.17.9",
     "@types/http-proxy-middleware": "0.19.3",

src/commands/servers/koa-next.ts

@@ -60,27 +60,24 @@ export default function ({
 
     linkPage (pageName: string, params: { [param: string]: string; }) {
       const route = this.routes.find((currentRoute: OmniRouter[0]) => currentRoute.page === pageName);
-  
       const obj = {
         as: '',
         href: `/${pageName}${this.paramsToQueryString(params)}`
       };
-  
       if (route && route.prettyUrl) {
         obj.as = this.root + (typeof route.prettyUrl === 'string' ? route.prettyUrl : route.prettyUrl(params));
       }
-  
       return obj;
     }
 
-    forEachPattern (apply: (params: Pick<OmniRouter[0], 'page' | 'beforeRender'> & { pattern: string; defaultParams: ANYOBJECT; }) => any) {
+    forEachPattern (apply: (params: Pick<OmniRouter[0], 'page' | 'beforeRender'> & { pattern: string; defaultParams?: ANYOBJECT; }) => any) {
       this.routes.forEach((route: OmniRouter[0]) => {
-        this.getPrettyUrlPatterns(route).forEach((pattern: any) =>
+        this.getPrettyUrlPatterns(route).forEach((prettyPattern: { pattern: string, defaultParams?: ANYOBJECT }) =>
           apply({
             page: route.page,
             beforeRender: route.beforeRender,
-            pattern: this.root + pattern.pattern,
-            defaultParams: pattern.defaultParams
+            pattern: this.root + prettyPattern.pattern,
+            defaultParams: prettyPattern.defaultParams
           })
         );
       });

yarn.lock

@@ -387,17 +387,17 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
-"@omni-door/utils@~1.0.2":
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/@omni-door/utils/-/utils-1.0.2.tgz#6ba17ba1fe731a956c58c8a480f7ae66a5881f42"
-  integrity sha512-gMpGIoJitUn3kroPgctIbn1sU5N2z3hO86yBU7N0RAv4zNNJ8OH73q6XJd8dImw1Zyi3Aom9+jkOWG8qAoZNXA==
+"@omni-door/utils@~1.0.6":
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/@omni-door/utils/-/utils-1.0.6.tgz#33913350ca73697ac9eddbcbe0b11dc997b3b09d"
+  integrity sha512-e8ttJaWKvAvZ/49jHoTVMhthPmjn5wQiaFLXcdze2K1nMhzsg9c468x+9KG8KPEaZvL4DarRYKy3gyNbj6BDlw==
   dependencies:
-    "@types/signale" "^1.2.1"
-    chalk "^3.0.0"
-    fs-extra "^8.1.0"
-    ora "^4.0.3"
-    shelljs "^0.8.3"
-    signale "^1.4.0"
+    "@types/signale" "1.4.0"
+    chalk "3.0.0"
+    fs-extra "8.1.0"
+    ora "4.0.3"
+    shelljs "0.8.3"
+    signale "1.4.0"
 
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.0"
@@ -703,10 +703,10 @@
     "@types/glob" "*"
     "@types/node" "*"
 
-"@types/signale@^1.2.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@types/signale/-/signale-1.4.1.tgz#6137a6fd7960b48703dd2793c5b795480368b246"
-  integrity sha512-05d9fUDqRnt36rizLgo38SbPTrkMzdhXpvSHSAhxzokgIUPGNUoXHV0zYjPpTd4IryDADJ0mGHpfJ/Yhjyh9JQ==
+"@types/signale@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/@types/signale/-/signale-1.4.0.tgz#2d461d51a91eee0fc9de8398f0f2cda7cd1333bb"
+  integrity sha512-9CA+KU3yjiBbmZRnQ3zcmvYzat3Ph+RzqeHBdZJ/NAZkmByrcIboJ8Aq1Bzq7btNTaaiDx6g0jAPM9Jzz/yQZQ==
   dependencies:
     "@types/node" "*"
 
@@ -1762,7 +1762,7 @@ [email protected], chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-[email protected], chalk@^4.0.0, chalk@^4.1.0:
+[email protected], chalk@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
   integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -1879,9 +1879,9 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-spinners@^2.4.0:
+cli-spinners@^2.2.0:
   version "2.4.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f"
+  resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f"
   integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==
 
 cli-truncate@^0.2.1:
@@ -3256,7 +3256,7 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-[email protected], fs-extra@^8.1.0:
+[email protected]:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
   integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
@@ -4665,13 +4665,6 @@ log-symbols@^3.0.0:
   dependencies:
     chalk "^2.4.2"
 
-log-symbols@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
-  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
-  dependencies:
-    chalk "^4.0.0"
-
 log-update@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
@@ -5480,16 +5473,16 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-ora@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-4.1.0.tgz#1fa5b17d2952ec9651be79ba32a328684870fc5d"
-  integrity sha512-PhDvXi7I+dLVyFekgqXt0iBDdo5ARzOxJNoj72TysoXkW4/oi1lRaeakr4skciyWgPpk6JPPGwO1V4zPr6YRZA==
+[email protected]:
+  version "4.0.3"
+  resolved "https://registry.npmjs.org/ora/-/ora-4.0.3.tgz#752a1b7b4be4825546a7a3d59256fa523b6b6d05"
+  integrity sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg==
   dependencies:
-    chalk "^4.1.0"
+    chalk "^3.0.0"
     cli-cursor "^3.1.0"
-    cli-spinners "^2.4.0"
+    cli-spinners "^2.2.0"
     is-interactive "^1.0.0"
-    log-symbols "^4.0.0"
+    log-symbols "^3.0.0"
     mute-stream "0.0.8"
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
@@ -6746,23 +6739,14 @@ [email protected]:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-shelljs@^0.8.3:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
-  integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
-signale@^1.4.0:
+[email protected]:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/signale/-/signale-1.4.0.tgz#c4be58302fb0262ac00fc3d886a7c113759042f1"
+  resolved "https://registry.npmjs.org/signale/-/signale-1.4.0.tgz#c4be58302fb0262ac00fc3d886a7c113759042f1"
   integrity sha512-iuh+gPf28RkltuJC7W5MRi6XAjTDCAPC/prJUpQoG4vIP3MJZ+GTydVnodXA7pwvTKb2cA0m9OFZW/cdWy/I/w==
   dependencies:
     chalk "^2.3.2"