Skip to content

Commit

Permalink
feat: update rimraf to 5.x, closes #11456
Browse files Browse the repository at this point in the history
  • Loading branch information
barisusakli committed Apr 10, 2023
1 parent c3cedef commit 43c6087
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 15 deletions.
2 changes: 1 addition & 1 deletion install/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"ioredis": "5.3.1",
"request": "2.88.2",
"request-promise-native": "1.0.9",
"rimraf": "4.4.1",
"rimraf": "5.0.0",
"rss": "1.2.2",
"rtlcss": "4.0.0",
"sanitize-html": "2.10.0",
Expand Down
6 changes: 2 additions & 4 deletions src/meta/js.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
const path = require('path');
const fs = require('fs');
const mkdirp = require('mkdirp');
const rimraf = require('rimraf');

const file = require('../file');
const plugins = require('../plugins');
Expand Down Expand Up @@ -66,7 +65,7 @@ async function clearModules() {
p => path.join(__dirname, '../../build/public/src', p)
);
await Promise.all(
builtPaths.map(builtPath => rimraf(builtPath))
builtPaths.map(builtPath => fs.promises.rm(builtPath, { recursive: true, force: true }))
);
}

Expand All @@ -83,8 +82,7 @@ JS.buildModules = async function () {
};

JS.linkStatics = async function () {
await rimraf(path.join(__dirname, '../../build/public/plugins'));

await fs.promises.rm(path.join(__dirname, '../../build/public/plugins'), { recursive: true, force: true });
await Promise.all(Object.keys(plugins.staticDirs).map(async (mappedPath) => {
const sourceDir = plugins.staticDirs[mappedPath];
const destDir = path.join(__dirname, '../../build/public/plugins', mappedPath);
Expand Down
3 changes: 1 addition & 2 deletions src/meta/languages.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const nconf = require('nconf');
const path = require('path');
const fs = require('fs');
const mkdirp = require('mkdirp');
const rimraf = require('rimraf');


const file = require('../file');
Expand Down Expand Up @@ -133,7 +132,7 @@ async function assignFileToTranslations(translations, path) {
}

exports.build = async function buildLanguages() {
await rimraf(buildLanguagesPath);
await fs.promises.rm(buildLanguagesPath, { recursive: true, force: true });
const data = await getTranslationMetadata();
await buildTranslations(data);
};
3 changes: 1 addition & 2 deletions src/meta/templates.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict';

const mkdirp = require('mkdirp');
const rimraf = require('rimraf');
const winston = require('winston');
const path = require('path');
const fs = require('fs');
Expand Down Expand Up @@ -109,7 +108,7 @@ async function compileTemplate(filename, source) {
Templates.compileTemplate = compileTemplate;

async function compile() {
await rimraf(viewsPath);
await fs.promises.rm(viewsPath, { recursive: true, force: true });
await mkdirp(viewsPath);

let files = await plugins.getActive();
Expand Down
2 changes: 1 addition & 1 deletion src/user/delete.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const async = require('async');
const _ = require('lodash');
const path = require('path');
const nconf = require('nconf');
const rimraf = require('rimraf');
const { rimraf } = require('rimraf');

const db = require('../database');
const posts = require('../posts');
Expand Down
4 changes: 1 addition & 3 deletions test/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ const path = require('path');
const fs = require('fs');
const assert = require('assert');
const mkdirp = require('mkdirp');
const rimraf = require('rimraf');
const async = require('async');

const db = require('./mocks/databasemock');
const file = require('../src/file');
Expand Down Expand Up @@ -89,7 +87,7 @@ describe('Build', () => {
const build = require('../src/meta/build');

before(async () => {
await rimraf(path.join(__dirname, '../build/public'));
await fs.promises.rm(path.join(__dirname, '../build/public'), { recursive: true, force: true });
await db.sortedSetAdd('plugins:active', Date.now(), 'nodebb-plugin-markdown');
});

Expand Down
5 changes: 3 additions & 2 deletions test/mocks/databasemock.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,9 @@ async function setupMockDefaults() {
id: 'nodebb-theme-persona',
});

const rimraf = require('rimraf');
await rimraf('test/uploads');
const fs = require('fs');
await fs.promises.rm('test/uploads', { recursive: true, force: true });


const mkdirp = require('mkdirp');

Expand Down

0 comments on commit 43c6087

Please sign in to comment.