From e3377d0074dd2c860c543f6e94bd43a6b074dc12 Mon Sep 17 00:00:00 2001 From: Chris Thoburn Date: Tue, 28 Jan 2020 20:00:40 -0800 Subject: [PATCH] fix rimraf --- node-tests/addon-test.js | 3 ++- package.json | 1 + yarn.lock | 11 +++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/node-tests/addon-test.js b/node-tests/addon-test.js index 71436f47..36c5bdcc 100644 --- a/node-tests/addon-test.js +++ b/node-tests/addon-test.js @@ -17,6 +17,7 @@ const createTempDir = BroccoliTestHelper.createTempDir; const terminateWorkerPool = require('./utils/terminate-workers'); const path = require('path'); const fs = require('fs'); +const rimraf = require('rimraf'); function prepareAddon(addon) { addon.pkg.keywords.push('ember-addon'); @@ -1255,7 +1256,7 @@ describe('EmberData Packages Polyfill', function() { let linkPath = path.join(fixturifyProject.root, '/whatever/node_modules/ember-cli-babel'); let addonPath = path.resolve(__dirname, '../'); - fs.rmdirSync(linkPath, { recursive: true }); + rimraf.sync(linkPath); fs.symlinkSync(addonPath, linkPath); unlink = () => { fs.unlinkSync(linkPath); diff --git a/package.json b/package.json index 3c288969..b4b4b8ad 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "ember-cli-version-checker": "^4.1.0", "ensure-posix-path": "^1.0.2", "fixturify-project": "^1.10.0", + "rimraf": "^3.0.1", "semver": "^5.5.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 33166e73..d883274c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -149,7 +149,7 @@ "@babel/template" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helper-get-function-arity@^7.8.3": +"@babel/helper-get-function-arity@^7.7.4", "@babel/helper-get-function-arity@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA== @@ -782,7 +782,7 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/template@^7.8.3": +"@babel/template@^7.7.4", "@babel/template@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8" integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ== @@ -8323,6 +8323,13 @@ rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimra dependencies: glob "^7.1.3" +rimraf@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.1.tgz#48d3d4cb46c80d388ab26cd61b1b466ae9ae225a" + integrity sha512-IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw== + dependencies: + glob "^7.1.3" + rimraf@~2.2.6: version "2.2.8" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"