From 323f72f7a9392566df1726358d94adbbfc9a09c8 Mon Sep 17 00:00:00 2001 From: Charles Lyding Date: Tue, 31 Jan 2017 17:58:32 -0500 Subject: [PATCH] refactor: move `exists-sync` to a dev dependency --- package.json | 2 +- packages/@angular/cli/ember-cli/lib/commands/test.js | 1 - packages/@angular/cli/ember-cli/lib/models/addon.js | 11 ++++++++++- .../@angular/cli/ember-cli/lib/models/blueprint.js | 11 ++++++++++- .../cli/ember-cli/lib/models/installation-checker.js | 11 ++++++++++- packages/@angular/cli/ember-cli/lib/models/project.js | 11 ++++++++++- .../lib/tasks/create-and-step-into-directory.js | 11 ++++++++++- packages/@angular/cli/package.json | 1 - 8 files changed, 51 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index d1921c920aca..77b3b57bad37 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "ember-cli-normalize-entity-name": "^1.0.0", "ember-cli-string-utils": "^1.0.0", "enhanced-resolve": "^2.3.0", - "exists-sync": "0.0.3", "extract-text-webpack-plugin": "^2.0.0-rc.1", "file-loader": "^0.8.5", "findup": "0.1.5", @@ -136,6 +135,7 @@ "conventional-changelog": "^1.1.0", "dtsgenerator": "^0.7.1", "eslint": "^2.8.0", + "exists-sync": "0.0.3", "express": "^4.14.0", "jasmine": "^2.4.1", "jasmine-spec-reporter": "^2.7.0", diff --git a/packages/@angular/cli/ember-cli/lib/commands/test.js b/packages/@angular/cli/ember-cli/lib/commands/test.js index c644238fa6ab..6839207c6996 100644 --- a/packages/@angular/cli/ember-cli/lib/commands/test.js +++ b/packages/@angular/cli/ember-cli/lib/commands/test.js @@ -3,7 +3,6 @@ var Command = require('../models/command'); var SilentError = require('silent-error'); var path = require('path'); -var existsSync = require('exists-sync'); var defaultPort = 7357; diff --git a/packages/@angular/cli/ember-cli/lib/models/addon.js b/packages/@angular/cli/ember-cli/lib/models/addon.js index 2b764992427e..071bc0c0ffd6 100644 --- a/packages/@angular/cli/ember-cli/lib/models/addon.js +++ b/packages/@angular/cli/ember-cli/lib/models/addon.js @@ -4,7 +4,7 @@ @module ember-cli */ -var existsSync = require('exists-sync'); +var fs = require('fs'); var path = require('path'); var assign = require('lodash/assign'); var SilentError = require('silent-error'); @@ -14,6 +14,15 @@ var CoreObject = require('../ext/core-object'); var walkSync = require('walk-sync'); +function existsSync(path) { + try { + fs.accessSync(path); + return true; + } + catch (e) { + return false; + } +} /** diff --git a/packages/@angular/cli/ember-cli/lib/models/blueprint.js b/packages/@angular/cli/ember-cli/lib/models/blueprint.js index a5ab7e5cdba5..d5ba75852dca 100644 --- a/packages/@angular/cli/ember-cli/lib/models/blueprint.js +++ b/packages/@angular/cli/ember-cli/lib/models/blueprint.js @@ -10,7 +10,6 @@ var printableProperties = require('../utilities/printable-properties').blueprint var sequence = require('../utilities/sequence'); var printCommand = require('../utilities/print-command'); var fs = require('fs-extra'); -var existsSync = require('exists-sync'); var inflector = require('inflection'); var minimatch = require('minimatch'); var path = require('path'); @@ -35,6 +34,16 @@ var EOL = require('os').EOL; var debug = require('debug')('ember-cli:blueprint'); var normalizeEntityName = require('ember-cli-normalize-entity-name'); +function existsSync(path) { + try { + fs.accessSync(path); + return true; + } + catch (e) { + return false; + } +} + module.exports = Blueprint; /** diff --git a/packages/@angular/cli/ember-cli/lib/models/installation-checker.js b/packages/@angular/cli/ember-cli/lib/models/installation-checker.js index 2037aca45b72..9eb82c27c8a7 100644 --- a/packages/@angular/cli/ember-cli/lib/models/installation-checker.js +++ b/packages/@angular/cli/ember-cli/lib/models/installation-checker.js @@ -2,10 +2,19 @@ var debug = require('debug')('ember-cli:installation-checker'); var fs = require('fs'); -var existsSync = require('exists-sync'); var path = require('path'); var SilentError = require('silent-error'); +function existsSync(path) { + try { + fs.accessSync(path); + return true; + } + catch (e) { + return false; + } +} + module.exports = InstallationChecker; function InstallationChecker(options) { diff --git a/packages/@angular/cli/ember-cli/lib/models/project.js b/packages/@angular/cli/ember-cli/lib/models/project.js index 56221b5a5330..e73efb7d1efb 100644 --- a/packages/@angular/cli/ember-cli/lib/models/project.js +++ b/packages/@angular/cli/ember-cli/lib/models/project.js @@ -8,7 +8,6 @@ var path = require('path'); var findup = Promise.denodeify(require('findup')); var resolve = Promise.denodeify(require('resolve')); var fs = require('fs'); -var existsSync = require('exists-sync'); var find = require('lodash/find'); var assign = require('lodash/assign'); var forOwn = require('lodash/forOwn'); @@ -19,6 +18,16 @@ var UI = require('../ui'); var nodeModulesPath = require('node-modules-path'); var getPackageBaseName = require('../utilities/get-package-base-name'); +function existsSync(path) { + try { + fs.accessSync(path); + return true; + } + catch (e) { + return false; + } +} + /** The Project model is tied to your package.json. It is instiantiated by giving Project.closest the path to your project. diff --git a/packages/@angular/cli/ember-cli/lib/tasks/create-and-step-into-directory.js b/packages/@angular/cli/ember-cli/lib/tasks/create-and-step-into-directory.js index b4fea890fbb8..c853649301ec 100644 --- a/packages/@angular/cli/ember-cli/lib/tasks/create-and-step-into-directory.js +++ b/packages/@angular/cli/ember-cli/lib/tasks/create-and-step-into-directory.js @@ -5,11 +5,20 @@ var Promise = require('../ext/promise'); var fs = require('fs'); -var existsSync = require('exists-sync'); var mkdir = Promise.denodeify(fs.mkdir); var Task = require('../models/task'); var SilentError = require('silent-error'); +function existsSync(path) { + try { + fs.accessSync(path); + return true; + } + catch (e) { + return false; + } +} + module.exports = Task.extend({ // Options: String directoryName, Boolean: dryRun diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json index bc2acbdcf51e..e29455dc567d 100644 --- a/packages/@angular/cli/package.json +++ b/packages/@angular/cli/package.json @@ -44,7 +44,6 @@ "diff": "^2.2.2", "ember-cli-normalize-entity-name": "^1.0.0", "ember-cli-string-utils": "^1.0.0", - "exists-sync": "0.0.3", "extract-text-webpack-plugin": "^2.0.0-rc.1", "file-loader": "^0.8.5", "findup": "0.1.5",