Skip to content

Commit

Permalink
bump rimraf to 5
Browse files Browse the repository at this point in the history
  • Loading branch information
JLHwung committed Jul 26, 2023
1 parent 8c0f583 commit 92efc8d
Show file tree
Hide file tree
Showing 8 changed files with 353 additions and 274 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
"eslint": "^8.45.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^5.0.0",
"husky": "^4.3.0",
"lint-staged": "^10.5.1",
"pnp-webpack-plugin": "^1.6.4",
"husky": "^8.0.3",
"lint-staged": "^13.2.3",
"pnp-webpack-plugin": "^1.7.0",
"prettier": "^3.0.0",
"react": "^17.0.1",
"react-intl": "^5.9.4",
"react-intl-webpack-plugin": "^0.3.0",
"rimraf": "^3.0.0",
"rimraf": "^5.0.1",
"semver": "7.5.2",
"webpack": "^5.74.0"
},
Expand Down
7 changes: 3 additions & 4 deletions test/cache.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import test from "ava";
import fs from "fs";
import path from "path";
import rimraf from "rimraf";
import { rimraf } from "rimraf";
import webpack from "webpack";
import createTestDirectory from "./helpers/createTestDirectory";

Expand Down Expand Up @@ -48,9 +48,8 @@ test.beforeEach.cb(t => {
t.end();
});
});
test.beforeEach.cb(t => rimraf(defaultCacheDir, t.end));
test.afterEach.cb(t => rimraf(t.context.directory, t.end));
test.afterEach.cb(t => rimraf(t.context.cacheDirectory, t.end));
test.beforeEach(() => rimraf(defaultCacheDir));
test.afterEach(t => rimraf([t.context.directory, t.context.cacheDirectory]));

test.cb("should output files to cache directory", t => {
const config = Object.assign({}, globalConfig, {
Expand Down
17 changes: 10 additions & 7 deletions test/helpers/createTestDirectory.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import path from "path";
import fs from "fs";
import rimraf from "rimraf";
import { rimraf } from "rimraf";

export default function createTestDirectory(baseDirectory, testTitle, cb) {
const directory = path.join(baseDirectory, escapeDirectory(testTitle));

rimraf(directory, err => {
if (err) return cb(err);
fs.mkdir(directory, { recursive: true }, mkdirErr =>
cb(mkdirErr, directory),
);
});
rimraf(directory)
.then(() => {
fs.mkdir(directory, { recursive: true }, mkdirErr =>
cb(mkdirErr, directory),
);
})
.catch(err => {
cb(err);
});
}

function escapeDirectory(directory) {
Expand Down
4 changes: 2 additions & 2 deletions test/loader.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import test from "ava";
import fs from "fs";
import path from "path";
import rimraf from "rimraf";
import { rimraf } from "rimraf";
import { satisfies } from "semver";
import webpack from "webpack";
import createTestDirectory from "./helpers/createTestDirectory";
Expand Down Expand Up @@ -38,7 +38,7 @@ test.beforeEach.cb(t => {
});
});

test.afterEach.cb(t => rimraf(t.context.directory, t.end));
test.afterEach(t => rimraf(t.context.directory));

test.cb("should transpile the code snippet", t => {
const config = Object.assign({}, globalConfig, {
Expand Down
4 changes: 2 additions & 2 deletions test/metadata.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import test from "ava";
import fs from "fs";
import path from "path";
import rimraf from "rimraf";
import { rimraf } from "rimraf";
import webpack from "webpack";
import PnpWebpackPlugin from "pnp-webpack-plugin";
import createTestDirectory from "./helpers/createTestDirectory";
Expand Down Expand Up @@ -48,7 +48,7 @@ test.beforeEach.cb(t => {
});
});

test.afterEach.cb(t => rimraf(t.context.directory, t.end));
test.afterEach(t => rimraf(t.context.directory));

test.cb("should pass metadata code snippet", t => {
const config = Object.assign({}, globalConfig, {
Expand Down
4 changes: 2 additions & 2 deletions test/options.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import test from "ava";
import fs from "fs";
import path from "path";
import rimraf from "rimraf";
import { rimraf } from "rimraf";
import webpack from "webpack";
import createTestDirectory from "./helpers/createTestDirectory";

Expand Down Expand Up @@ -34,7 +34,7 @@ test.beforeEach.cb(t => {
});
});

test.afterEach.cb(t => rimraf(t.context.directory, t.end));
test.afterEach(t => rimraf(t.context.directory));

test.cb("should interpret options given to the loader", t => {
const config = Object.assign({}, globalConfig, {
Expand Down
4 changes: 2 additions & 2 deletions test/sourcemaps.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import test from "ava";
import fs from "fs";
import path from "path";
import rimraf from "rimraf";
import { rimraf } from "rimraf";
import webpack from "webpack";
import createTestDirectory from "./helpers/createTestDirectory";
import isWebpack5 from "./helpers/isWebpack5";
Expand Down Expand Up @@ -32,7 +32,7 @@ test.beforeEach.cb(t => {
});
});

test.afterEach.cb(t => rimraf(t.context.directory, t.end));
test.afterEach(t => rimraf(t.context.directory));

test.cb("should output webpack's sourcemap", t => {
const config = Object.assign({}, globalConfig, {
Expand Down

0 comments on commit 92efc8d

Please sign in to comment.