build: replace/remove node6 promisify helpers

Co-authored-by: Taranveer Virk <[email protected]>
loopbackio · Feb 1, 2018 · df338ad · df338ad
1 parent 5471694
commit df338ad
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 68 deletions.
diff --git a/.nycrc b/.nycrc
@@ -3,9 +3,6 @@
       "packages/example-codehub/src/**",
       "packages/*/dist*/*"
     ],
-    "exclude": [
-      "packages/core/*/promisify.*"
-    ],
     "extension": [
       ".js",
       ".ts"

diff --git a/packages/cli/docs.json b/packages/cli/docs.json
@@ -5,7 +5,6 @@
     "lib/base-generator.js",
     "lib/debug.js",
     "lib/project-generator.js",
-    "lib/promisify.js",
     "lib/utils.js"
   ],
   "codeSectionDepth": 4

diff --git a/packages/cli/generators/example/clone-example.js b/packages/cli/generators/example/clone-example.js
@@ -5,8 +5,6 @@
 
 'use strict';
 
-const promisify = require('../../lib/utils').promisify;
-
 const gunzip = require('gunzip-maybe');
 const path = require('path');
 const request = require('request');

diff --git a/packages/cli/lib/utils.js b/packages/cli/lib/utils.js
@@ -12,7 +12,7 @@ const util = require('util');
 const regenerate = require('regenerate');
 const _ = require('lodash');
 const pascalCase = require('change-case').pascalCase;
-const promisify = util.promisify || require('util.promisify/implementation');
+const promisify = require('util').promisify;
 const camelCase = require('change-case').camelCase;
 const validate = require('validate-npm-package-name');
 const Conflicter = require('yeoman-generator/lib/util/conflicter');

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -49,7 +49,6 @@
     "request": "^2.83.0",
     "tar-fs": "^1.16.0",
     "unicode-10.0.0": "^0.7.4",
-    "util.promisify": "^1.0.0",
     "validate-npm-package-name": "^3.0.0",
     "yeoman-generator": "^2.0.1"
   },

diff --git a/packages/cli/test/clone-example.test.js b/packages/cli/test/clone-example.test.js
@@ -5,15 +5,13 @@
 
 ('use strict');
 
-const promisify = require('../lib/utils').promisify;
+const promisify = require('util').promisify;
 
 const cloneExampleFromGitHub = require('../generators/example/clone-example');
 const expect = require('@loopback/testlab').expect;
 const TestSandbox = require('@loopback/testlab').TestSandbox;
-const fs = require('fs');
 const glob = promisify(require('glob'));
 const path = require('path');
-const rimraf = promisify(require('rimraf'));
 
 const VALID_EXAMPLE = 'getting-started';
 const SANDBOX_PATH = path.resolve(__dirname, 'sandbox');

diff --git a/packages/core/docs.json b/packages/core/docs.json
@@ -5,7 +5,6 @@
     "src/component.ts",
     "src/index.ts",
     "src/keys.ts",
-    "src/promisify.ts",
     "src/server.ts"
   ],
   "codeSectionDepth": 4

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -26,8 +26,7 @@
   "dependencies": {
     "@loopback/context": "^4.0.0-alpha.29",
     "lodash": "^4.17.4",
-    "topo": "^3.0.0",
-    "util.promisify": "^1.0.0"
+    "topo": "^3.0.0"
   },
   "devDependencies": {
     "@loopback/build": "^4.0.0-alpha.12",

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -10,6 +10,5 @@ export {Component, ProviderMap} from './component';
 export {inject, Context} from '@loopback/context';
 export {Server} from './server';
 export * from './application';
-export * from './promisify';
 export * from './component';
 export * from './keys';
diff --git a/packages/core/src/promisify.ts b/packages/core/src/promisify.ts
diff --git a/packages/rest/src/parser.ts b/packages/rest/src/parser.ts
@@ -6,7 +6,7 @@
 import {ServerRequest} from 'http';
 import * as HttpErrors from 'http-errors';
 import {OperationObject, ParameterObject} from '@loopback/openapi-spec';
-import {promisify} from '@loopback/core';
+import {promisify} from 'util';
 import {
   OperationArgs,
   ParsedRequest,
@@ -15,19 +15,10 @@ import {
 import {ResolvedRoute} from './router/routing-table';
 type HttpError = HttpErrors.HttpError;
 
-type jsonBodyFn = (
-  req: ServerRequest,
-  cb: (err?: Error, body?: {}) => void,
-) => void;
-const jsonBody: jsonBodyFn = require('body/json');
-
-// tslint:disable:no-any
+// tslint:disable-next-line:no-any
 type MaybeBody = any | undefined;
-// tslint:enable:no-any
 
-const parseJsonBody: (req: ServerRequest) => Promise<MaybeBody> = promisify(
-  jsonBody,
-);
+const jsonBodyAsync = promisify(require('body/json'));
 
 /**
  * Get the content-type header value from the request
@@ -76,7 +67,7 @@ function loadRequestBodyIfNeeded(
     return Promise.reject(err);
   }
 
-  return parseJsonBody(request).catch((err: HttpError) => {
+  return jsonBodyAsync(request).catch((err: HttpError) => {
     err.statusCode = 400;
     return Promise.reject(err);
   });