Skip to content

Commit 804472d

Browse files
clydinhansl
authored andcommitted
refactor(@angular/cli): remove denodeify dependency
1 parent 0a1a85c commit 804472d

File tree

11 files changed

+16
-42
lines changed

11 files changed

+16
-42
lines changed

package-lock.json

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
"common-tags": "^1.3.1",
5555
"copy-webpack-plugin": "~4.4.1",
5656
"core-object": "^3.1.0",
57-
"denodeify": "^1.2.1",
5857
"ember-cli-string-utils": "^1.0.0",
5958
"enhanced-resolve": "^3.4.1",
6059
"extract-text-webpack-plugin": "^3.0.2",
@@ -110,7 +109,6 @@
110109
"@angular/service-worker": "^5.2.0",
111110
"@types/common-tags": "^1.2.4",
112111
"@types/copy-webpack-plugin": "^4.0.0",
113-
"@types/denodeify": "^1.2.30",
114112
"@types/express": "^4.0.32",
115113
"@types/fs-extra": "^4.0.0",
116114
"@types/glob": "^5.0.29",

packages/@angular/cli/ember-cli/lib/models/project.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/**
44
@module ember-cli
55
*/
6-
const denodeify = require('denodeify');
76
const path = require('path');
87
const findUp = require('../../../utilities/find-up').findUp;
9-
let resolve = denodeify(require('resolve'));
8+
const { promisify } = require('util');
9+
let resolve = promisify(require('resolve'));
1010
const fs = require('fs-extra');
1111
const _ = require('lodash');
1212
const nodeModulesPath = require('node-modules-path');

packages/@angular/cli/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"common-tags": "^1.3.1",
4343
"copy-webpack-plugin": "~4.4.1",
4444
"core-object": "^3.1.0",
45-
"denodeify": "^1.2.1",
4645
"ember-cli-string-utils": "^1.0.0",
4746
"extract-text-webpack-plugin": "^3.0.2",
4847
"file-loader": "^1.1.5",

packages/@angular/cli/plugins/glob-copy-webpack-plugin.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import * as fs from 'fs';
22
import * as path from 'path';
33
import * as glob from 'glob';
4-
import * as denodeify from 'denodeify';
4+
import { promisify } from 'util';
55
import { AssetPattern } from '../models/webpack-configs/utils';
66
import { isDirectory } from '../utilities/is-directory';
77

88
const flattenDeep = require('lodash/flattenDeep');
9-
const globPromise = <any>denodeify(glob);
10-
const statPromise = <any>denodeify(fs.stat);
9+
const globPromise = <any>promisify(glob);
10+
const statPromise = promisify(fs.stat);
1111

1212
interface Asset {
1313
originPath: string;

packages/@angular/cli/tasks/eject.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as fs from 'fs';
22
import * as path from 'path';
3+
import { promisify } from 'util';
34
import * as webpack from 'webpack';
45
import chalk from 'chalk';
56

@@ -13,11 +14,10 @@ import { AotPlugin, AngularCompilerPlugin } from '@ngtools/webpack';
1314
import { PurifyPlugin } from '@angular-devkit/build-optimizer';
1415
import { LicenseWebpackPlugin } from 'license-webpack-plugin';
1516

16-
import denodeify = require('denodeify');
1717
import {oneLine, stripIndent} from 'common-tags';
1818

1919
const exists = (p: string) => Promise.resolve(fs.existsSync(p));
20-
const writeFile = (denodeify(fs.writeFile) as (...args: any[]) => Promise<any>);
20+
const writeFile = promisify(fs.writeFile);
2121
const angularCliPlugins = require('../plugins/webpack');
2222

2323

packages/@angular/cli/utilities/check-package-manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import chalk from 'chalk';
22
import {exec} from 'child_process';
3+
import { promisify } from 'util';
34
import {CliConfig} from '../models/config';
4-
import denodeify = require('denodeify');
55

6-
const execPromise = denodeify(exec);
6+
const execPromise = promisify(exec);
77
const packageManager = CliConfig.fromGlobal().get('packageManager');
88

99

packages/@angular/cli/utilities/check-port.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import * as denodeify from 'denodeify';
1+
import { promisify } from 'util';
22

33
const SilentError = require('silent-error');
44
const PortFinder = require('portfinder');
5-
const getPort = denodeify<{host: string, port: number}, number>(PortFinder.getPort);
5+
const getPort = promisify<{host: string, port: number}, number>(PortFinder.getPort);
66

77
export function checkPort(port: number, host: string, basePort = 49152): Promise<number> {
88
PortFinder.basePort = basePort;

scripts/publish/validate_dependencies.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,7 @@ const path = require('path');
1212
const IMPORT_RE = /(^|\n)\s*import\b(?:.|\n)*?\'[^\']*\'/g;
1313
const REQUIRE_RE = /\brequire\('[^)]+?'\)/g;
1414
const IGNORE_RE = /\s+@ignoreDep\s+\S+/g;
15-
const NODE_PACKAGES = [
16-
'child_process',
17-
'crypto',
18-
'fs',
19-
'https',
20-
'os',
21-
'path',
22-
'process',
23-
'url',
24-
'vm',
25-
'zlib'
26-
];
15+
const NODE_PACKAGES = Object.keys(process.binding('natives'));
2716
const ANGULAR_PACKAGES = [
2817
'@angular/compiler',
2918
'@angular/compiler-cli',

tests/e2e/tests/commands/new/existing-directory.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import * as fs from 'fs';
2-
import denodeify = require('denodeify');
3-
2+
import { promisify } from 'util';
43
import {ng} from '../../../utils/process';
54
import {getGlobalVariable} from '../../../utils/env';
65

7-
const mkdir = denodeify(fs.mkdir);
6+
const mkdir = promisify(fs.mkdir);
87

98

109
export default function() {

0 commit comments

Comments
 (0)