From e6ef21fa9d7235da8271805e14072ff51bf4d5d6 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Wed, 5 Jul 2017 14:48:02 +0200 Subject: [PATCH] replaced fs-promise with mz/fs --- terminus-settings/webpack.config.js | 2 -- terminus-terminal/package.json | 1 - terminus-terminal/src/colorSchemes.ts | 2 +- terminus-terminal/src/persistenceProviders.ts | 2 +- terminus-terminal/src/services/sessions.service.ts | 2 +- terminus-terminal/webpack.config.js | 2 +- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/terminus-settings/webpack.config.js b/terminus-settings/webpack.config.js index b5db26b4..0bcfd12f 100644 --- a/terminus-settings/webpack.config.js +++ b/terminus-settings/webpack.config.js @@ -38,10 +38,8 @@ module.exports = { }, externals: [ 'fs', - 'fs-promise', 'path', 'node-pty', - 'fs-promise', /^rxjs/, /^@angular/, /^@ng-bootstrap/, diff --git a/terminus-terminal/package.json b/terminus-terminal/package.json index ee30b39a..fab7c0a7 100644 --- a/terminus-terminal/package.json +++ b/terminus-terminal/package.json @@ -37,7 +37,6 @@ }, "dependencies": { "font-manager": "0.2.2", - "fs-promise": "2.0.2", "hterm-umdjs": "1.2.0", "mz": "^2.6.0", "node-pty": "0.6.2", diff --git a/terminus-terminal/src/colorSchemes.ts b/terminus-terminal/src/colorSchemes.ts index b494d883..90d6b2c9 100644 --- a/terminus-terminal/src/colorSchemes.ts +++ b/terminus-terminal/src/colorSchemes.ts @@ -1,4 +1,4 @@ -import * as fs from 'fs-promise' +import * as fs from 'mz/fs' import * as path from 'path' import { Injectable } from '@angular/core' import { TerminalColorSchemeProvider, ITerminalColorScheme } from './api' diff --git a/terminus-terminal/src/persistenceProviders.ts b/terminus-terminal/src/persistenceProviders.ts index d0154079..a20a975f 100644 --- a/terminus-terminal/src/persistenceProviders.ts +++ b/terminus-terminal/src/persistenceProviders.ts @@ -1,4 +1,4 @@ -import * as fs from 'fs-promise' +import * as fs from 'mz/fs' import { exec, spawn } from 'mz/child_process' import { exec as execCallback } from 'child_process' diff --git a/terminus-terminal/src/services/sessions.service.ts b/terminus-terminal/src/services/sessions.service.ts index bc66370a..cb84846b 100644 --- a/terminus-terminal/src/services/sessions.service.ts +++ b/terminus-terminal/src/services/sessions.service.ts @@ -1,5 +1,5 @@ import * as nodePTY from 'node-pty' -import * as fs from 'fs-promise' +import * as fs from 'mz/fs' import { Subject } from 'rxjs' import { Injectable } from '@angular/core' import { Logger, LogService } from 'terminus-core' diff --git a/terminus-terminal/webpack.config.js b/terminus-terminal/webpack.config.js index 69618828..6eead6e0 100644 --- a/terminus-terminal/webpack.config.js +++ b/terminus-terminal/webpack.config.js @@ -38,10 +38,10 @@ module.exports = { }, externals: [ 'fs', - 'fs-promise', 'font-manager', 'path', 'node-pty', + 'mz/fs', 'mz/child_process', 'winreg', /^rxjs/,