From 83194f616b91752153cf113d9024dd24168f88c4 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 29 Jul 2018 09:52:36 +0200 Subject: [PATCH] Revert "chore(package): upgrade fs-extra" This reverts commit 4297c3d43e3a28504657b5e81d2a0c9b0f56286a. --- package-lock.json | 39 ++++++++++++++++++++++---------------- package.json | 3 ++- scripts/build/build.js | 10 +++++----- scripts/build/publish.js | 2 +- scripts/docs/gulp-tasks.js | 2 +- 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index dc6806118..5c45a4079 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3846,23 +3846,36 @@ "dev": true }, "fs-extra": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz", - "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz", + "integrity": "sha1-M3NSve1KC3FPPrhN6M6nZenTdgA=", "dev": true, "requires": { "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "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" }, "dependencies": { - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "fs-extra": { + "version": "0.30.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", + "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" } } } @@ -11296,12 +11309,6 @@ "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 0b4d5eebe..41943fc27 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,8 @@ "cz-conventional-changelog": "^2.1.0", "dgeni": "0.4.7", "dgeni-packages": "0.16.10", - "fs-extra": "^7.0.0", + "fs-extra": "2.0.0", + "fs-extra-promise": "0.4.1", "gulp": "3.9.1", "gulp-rename": "^1.4.0", "gulp-replace": "^1.0.0", diff --git a/scripts/build/build.js b/scripts/build/build.js index cc4b4ab3b..cae297b8b 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'), +const fs = require('fs-extra-promise').useFs(require('fs-extra')), queue = require('queue'), path = require('path'), exec = require('child_process').exec; @@ -84,8 +84,8 @@ const addPluginToQueue = pluginName => { let tsConfigPath; - fs.mkdirp(PLUGIN_BUILD_DIR) // create tmp build dir - .then(() => fs.mkdirs(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir + fs.mkdirpAsync(PLUGIN_BUILD_DIR) // create tmp build dir + .then(() => fs.mkdirpAsync(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir .then(() => { // Write tsconfig.json @@ -95,7 +95,7 @@ const addPluginToQueue = pluginName => { tsConfigPath = path.resolve(PLUGIN_BUILD_DIR, 'tsconfig.json'); - return fs.writeJson(tsConfigPath, tsConfig); + return fs.writeJsonAsync(tsConfigPath, tsConfig); }) .then(() => { // clone package.json @@ -104,7 +104,7 @@ const addPluginToQueue = pluginName => { packageJson.name = `@ionic-native/${pluginName}`; packageJson.version = IONIC_NATIVE_VERSION; - return fs.writeJson(path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'), packageJson); + return fs.writeJsonAsync(path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'), packageJson); }) .then(() => { diff --git a/scripts/build/publish.js b/scripts/build/publish.js index 3bf5f1b4e..184dda82d 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'), +const fs = require('fs-extra-promise').useFs(require('fs-extra')), queue = require('queue'), path = require('path'), exec = require('child-process-promise').exec; diff --git a/scripts/docs/gulp-tasks.js b/scripts/docs/gulp-tasks.js index 698a60d58..81a10aa45 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'), + fs = require('fs-extra-promise').useFs(require('fs-extra')), Dgeni = require('dgeni'); module.exports = gulp => {