From 9b444d169e877eefd98891bde4d4fdcce78ad1ef Mon Sep 17 00:00:00 2001 From: Charles Lyding Date: Sun, 29 Jan 2017 22:18:05 -0500 Subject: [PATCH] refactor: remove use of dual temp packages --- package.json | 1 - packages/angular-cli/ember-cli/lib/commands/test.js | 10 ---------- .../angular-cli/ember-cli/lib/models/edit-file-diff.js | 8 +++----- packages/angular-cli/package.json | 1 - 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 5923c23943ce..527d3514a382 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,6 @@ "portfinder": "1.0.9", "postcss-discard-comments": "^2.0.4", "postcss-loader": "^0.9.1", - "quick-temp": "0.1.5", "raw-loader": "^0.5.1", "reflect-metadata": "^0.1.8", "remap-istanbul": "^0.6.4", diff --git a/packages/angular-cli/ember-cli/lib/commands/test.js b/packages/angular-cli/ember-cli/lib/commands/test.js index 87363a93bf42..c644238fa6ab 100644 --- a/packages/angular-cli/ember-cli/lib/commands/test.js +++ b/packages/angular-cli/ember-cli/lib/commands/test.js @@ -31,22 +31,12 @@ module.exports = Command.extend({ init: function() { this.assign = require('lodash/assign'); - this.quickTemp = require('quick-temp'); if (!this.testing) { process.env.EMBER_CLI_TEST_COMMAND = true; } }, - tmp: function() { - return this.quickTemp.makeOrRemake(this, '-testsDist'); - }, - - rmTmp: function() { - this.quickTemp.remove(this, '-testsDist'); - this.quickTemp.remove(this, '-customConfigFile'); - }, - _generateCustomConfigs: function(options) { var config = {}; if (!options.filter && !options.module && !options.launch && !options.query && !options['test-page']) { return config; } diff --git a/packages/angular-cli/ember-cli/lib/models/edit-file-diff.js b/packages/angular-cli/ember-cli/lib/models/edit-file-diff.js index eeeb5d155ccf..d81d89920445 100644 --- a/packages/angular-cli/ember-cli/lib/models/edit-file-diff.js +++ b/packages/angular-cli/ember-cli/lib/models/edit-file-diff.js @@ -5,15 +5,13 @@ var Promise = require('../ext/promise'); var readFile = Promise.denodeify(fs.readFile); var writeFile = Promise.denodeify(fs.writeFile); var jsdiff = require('diff'); -var quickTemp = require('quick-temp'); +var temp = require('temp').track(); var path = require('path'); var SilentError = require('silent-error'); var openEditor = require('../utilities/open-editor'); function EditFileDiff(options) { this.info = options.info; - - quickTemp.makeOrRemake(this, 'tmpDifferenceDir'); } EditFileDiff.prototype.edit = function() { @@ -27,7 +25,7 @@ EditFileDiff.prototype.edit = function() { }; function cleanUp() { - quickTemp.remove(this, 'tmpDifferenceDir'); // jshint ignore:line + temp.cleanupSync(); } function applyPatch(resultHash) { @@ -51,7 +49,7 @@ function applyPatch(resultHash) { function invokeEditor(result) { var info = this.info; // jshint ignore:line var diff = jsdiff.createPatch(info.outputPath, result.output.toString(), result.input); - var diffPath = path.join(this.tmpDifferenceDir, 'currentDiff.diff'); // jshint ignore:line + var diffPath = path.join(temp.mkdirSync(), 'currentDiff.diff'); return writeFile(diffPath, diff).then(function() { return openEditor(diffPath); diff --git a/packages/angular-cli/package.json b/packages/angular-cli/package.json index d20f08d39bd6..434e4eb01bc6 100644 --- a/packages/angular-cli/package.json +++ b/packages/angular-cli/package.json @@ -72,7 +72,6 @@ "portfinder": "1.0.9", "postcss-discard-comments": "^2.0.4", "postcss-loader": "^0.9.1", - "quick-temp": "0.1.5", "raw-loader": "^0.5.1", "remap-istanbul": "^0.6.4", "resolve": "^1.1.7",