From a7830693af9f88359dfe4a7f2961de0ed611b86f Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 17 Sep 2018 15:14:37 +0200 Subject: [PATCH] chore(scripts): remove fs-extra-promise --- package-lock.json | 45 ++++++++++++++++---------------------- package.json | 5 ++--- scripts/build/build.js | 10 ++++----- scripts/build/publish.js | 4 ++-- scripts/docs/gulp-tasks.js | 2 +- 5 files changed, 29 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d8784e6f..49bcb35db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3784,36 +3784,23 @@ "dev": true }, "fs-extra": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz", - "integrity": "sha1-M3NSve1KC3FPPrhN6M6nZenTdgA=", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz", + "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==", "dev": true, "requires": { "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0" - } - }, - "fs-extra-promise": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/fs-extra-promise/-/fs-extra-promise-0.4.1.tgz", - "integrity": "sha1-rCjNLPa6ckjYI13ziHts9u3fNC8=", - "dev": true, - "requires": { - "bluebird": "^3.4.6", - "fs-extra": "^0.30.0" + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" }, "dependencies": { - "fs-extra": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", - "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" + "graceful-fs": "^4.1.6" } } } @@ -7717,9 +7704,9 @@ } }, "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", "dev": true }, "lodash._basecopy": { @@ -11247,6 +11234,12 @@ "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=", "dev": true }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", diff --git a/package.json b/package.json index a8cbd806a..04fb66698 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,7 @@ "cz-conventional-changelog": "^2.1.0", "dgeni": "0.4.7", "dgeni-packages": "0.16.10", - "fs-extra": "2.0.0", - "fs-extra-promise": "0.4.1", + "fs-extra": "^7.0.0", "gulp": "3.9.1", "gulp-rename": "^1.4.0", "gulp-replace": "^1.0.0", @@ -31,7 +30,7 @@ "karma-phantomjs-launcher": "^1.0.4", "karma-typescript": "^3.0.13", "karma-typescript-es6-transform": "^1.0.4", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "minimist": "1.2.0", "node-html-encoder": "0.0.2", "q": "^1.5.1", diff --git a/scripts/build/build.js b/scripts/build/build.js index e65d2db3d..1604f28dc 100644 --- a/scripts/build/build.js +++ b/scripts/build/build.js @@ -1,6 +1,6 @@ 'use strict'; // Node module dependencies -const fs = require('fs-extra-promise').useFs(require('fs-extra')), +const fs = require('fs-extra'), queue = require('queue'), path = require('path'), exec = require('child_process').exec; @@ -84,8 +84,8 @@ const addPluginToQueue = pluginName => { let tsConfigPath; - fs.mkdirpAsync(PLUGIN_BUILD_DIR) // create tmp build dir - .then(() => fs.mkdirpAsync(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir + fs.mkdirp(PLUGIN_BUILD_DIR) // create tmp build dir + .then(() => fs.mkdirp(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir .then(() => { // Write tsconfig.json const tsConfig = JSON.parse(JSON.stringify(PLUGIN_TS_CONFIG)); @@ -94,7 +94,7 @@ const addPluginToQueue = pluginName => { tsConfigPath = path.resolve(PLUGIN_BUILD_DIR, 'tsconfig.json'); - return fs.writeJsonAsync(tsConfigPath, tsConfig); + return fs.writeJson(tsConfigPath, tsConfig); }) .then(() => { // clone package.json @@ -103,7 +103,7 @@ const addPluginToQueue = pluginName => { packageJson.name = `@ionic-native/${pluginName}`; packageJson.version = IONIC_NATIVE_VERSION; - return fs.writeJsonAsync( + return fs.writeJson( path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'), packageJson ); diff --git a/scripts/build/publish.js b/scripts/build/publish.js index 114bbb7f0..449b7a195 100644 --- a/scripts/build/publish.js +++ b/scripts/build/publish.js @@ -1,6 +1,6 @@ 'use strict'; // Node module dependencies -const fs = require('fs-extra-promise').useFs(require('fs-extra')), +const fs = require('fs-extra'), queue = require('queue'), path = require('path'), exec = require('child-process-promise').exec; @@ -10,7 +10,7 @@ const ROOT = path.resolve(path.join(__dirname, '../../')), const FLAGS = '--access public'; // add any flags here if you want... (example: --tag alpha) -const PACKAGES = fs.readdirSync(DIST); +const PACKAGES = fs.readdir(DIST); const failedPackages = []; diff --git a/scripts/docs/gulp-tasks.js b/scripts/docs/gulp-tasks.js index 81a10aa45..698a60d58 100644 --- a/scripts/docs/gulp-tasks.js +++ b/scripts/docs/gulp-tasks.js @@ -2,7 +2,7 @@ const config = require('../config.json'), projectPackage = require('../../package.json'), path = require('path'), - fs = require('fs-extra-promise').useFs(require('fs-extra')), + fs = require('fs-extra'), Dgeni = require('dgeni'); module.exports = gulp => {