Skip to content

Commit 3dbd3ad

Browse files
Charles Lydingfilipesilva
authored andcommitted
refactor(@angular/cli): remove unneeded rimraf dependency
1 parent 70713bf commit 3dbd3ad

File tree

6 files changed

+10
-17
lines changed

6 files changed

+10
-17
lines changed

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
"postcss-url": "^5.1.2",
8383
"raw-loader": "^0.5.1",
8484
"resolve": "^1.1.7",
85-
"rimraf": "^2.5.3",
8685
"rsvp": "^3.0.17",
8786
"rxjs": "^5.0.1",
8887
"sass-loader": "^6.0.3",
@@ -121,7 +120,6 @@
121120
"@types/mock-fs": "^3.6.30",
122121
"@types/node": "^6.0.36",
123122
"@types/request": "0.0.39",
124-
"@types/rimraf": "0.0.28",
125123
"@types/semver": "^5.3.30",
126124
"@types/source-map": "^0.5.0",
127125
"@types/webpack": "^2.2.15",

packages/@angular/cli/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
"postcss-url": "^5.1.2",
6868
"raw-loader": "^0.5.1",
6969
"resolve": "^1.1.7",
70-
"rimraf": "^2.5.3",
7170
"rsvp": "^3.0.17",
7271
"rxjs": "^5.0.1",
7372
"sass-loader": "^6.0.3",

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as rimraf from 'rimraf';
1+
import * as fs from 'fs-extra';
22
import * as path from 'path';
33
import * as webpack from 'webpack';
44

@@ -8,7 +8,6 @@ import { NgCliWebpackConfig } from '../models/webpack-config';
88
import { getWebpackStatsConfig } from '../models/webpack-configs/utils';
99
import { CliConfig } from '../models/config';
1010

11-
const fs = require('fs');
1211
const Task = require('../ember-cli/lib/models/task');
1312
const SilentError = require('silent-error');
1413

@@ -27,7 +26,7 @@ export default Task.extend({
2726
throw new SilentError('An ejected project cannot use the build command anymore.');
2827
}
2928
if (runTaskOptions.deleteOutputPath) {
30-
rimraf.sync(path.resolve(this.project.root, outputPath));
29+
fs.removeSync(path.resolve(this.project.root, outputPath));
3130
}
3231

3332
const webpackConfig = new NgCliWebpackConfig(runTaskOptions, app).buildConfig();

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import * as fs from 'fs';
1+
import * as fs from 'fs-extra';
22
import * as path from 'path';
33
import * as chalk from 'chalk';
4-
import * as rimraf from 'rimraf';
54
import * as webpack from 'webpack';
65
import * as url from 'url';
76
import { oneLine, stripIndents } from 'common-tags';
@@ -33,7 +32,7 @@ export default Task.extend({
3332
throw new SilentError('An ejected project cannot use the build command anymore.');
3433
}
3534
if (serveTaskOptions.deleteOutputPath) {
36-
rimraf.sync(path.resolve(this.project.root, outputPath));
35+
fs.removeSync(path.resolve(this.project.root, outputPath));
3736
}
3837

3938
const serveDefaults = {

tests/e2e/utils/fs.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import * as fs from 'fs';
2-
import * as rimrafPackage from 'rimraf';
1+
import * as fs from 'fs-extra';
32
import {dirname} from 'path';
43
import {stripIndents} from 'common-tags';
54

@@ -44,14 +43,14 @@ export function deleteFile(path: string) {
4443

4544
export function rimraf(path: string) {
4645
return new Promise<void>((resolve, reject) => {
47-
rimrafPackage(path, (err?: any) => {
46+
fs.remove(path, (err?: any) => {
4847
if (err) {
4948
reject(err);
5049
} else {
5150
resolve();
5251
}
53-
})
54-
}
52+
});
53+
});
5554
}
5655

5756

tools/publish/src/build.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import {Logger} from '@ngtools/logger';
2-
import * as fs from 'fs';
2+
import * as fs from 'fs-extra';
33
import * as path from 'path';
44
import {buildSchema} from './build-schema';
55

66
const denodeify = require('denodeify');
77
const glob = denodeify(require('glob'));
88
const npmRun = require('npm-run');
9-
const rimraf = denodeify(require('rimraf'));
109

1110

1211
const root = path.join(__dirname, '../../..');
@@ -65,7 +64,7 @@ export default function build(packagesToBuild: string[], _opts: any,
6564
.then(() => logger.info('Deleting dist folder...'))
6665
.then(() => {
6766
if (willBuildEverything) {
68-
return rimraf(dist);
67+
return fs.remove(dist);
6968
}
7069
})
7170
.then(() => logger.info('Creating schema.d.ts...'))

0 commit comments

Comments
 (0)