diff --git a/commands/eject.js b/commands/eject.js index d893616b..f945b0a8 100755 --- a/commands/eject.js +++ b/commands/eject.js @@ -69,36 +69,35 @@ function displayHelp() { function validateEject() { return prompts({ - type: 'confirm', - name: 'shouldEject', - message: 'Are you sure you want to eject? This action is permanent.', - default: false - }) - .then(answer => { - if (!answer.shouldEject) { - console.log(chalk.cyan('Close one! Eject aborted.')); - return {abort: true}; - } else { - checkGitStatus(); + type: 'confirm', + name: 'shouldEject', + message: 'Are you sure you want to eject? This action is permanent.', + default: false + }).then(answer => { + if (!answer.shouldEject) { + console.log(chalk.cyan('Close one! Eject aborted.')); + return {abort: true}; + } else { + checkGitStatus(); - // Make shallow array of files paths - const files = assets.reduce((list, dir) => { - return list.concat( - fs - .readdirSync(dir.src) - // set full relative path - .map(file => ({ - src: path.join(dir.src, file), - dest: path.join(dir.dest, file) - })) - // omit dirs from file list - .filter(file => fs.lstatSync(file.src).isFile()) - ); - }, []); - files.forEach(verifyAbsent); - return {files}; - } - }); + // Make shallow array of files paths + const files = assets.reduce((list, dir) => { + return list.concat( + fs + .readdirSync(dir.src) + // set full relative path + .map(file => ({ + src: path.join(dir.src, file), + dest: path.join(dir.dest, file) + })) + // omit dirs from file list + .filter(file => fs.lstatSync(file.src).isFile()) + ); + }, []); + files.forEach(verifyAbsent); + return {files}; + } + }); } function checkGitStatus() { diff --git a/package-lock.json b/package-lock.json index ef7f53e2..be71b1ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3430,16 +3430,23 @@ } }, "@pmmmwh/react-refresh-webpack-plugin": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.3.3.tgz", - "integrity": "sha512-uc6FmPEegAZawSHjUMFQwU7EjaDn7zy1iD/KD/wBROL9F4378OES8MKMYHoRAKT61Fk7LxVKZSDR5VespMQiqw==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz", + "integrity": "sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==", "requires": { "ansi-html": "^0.0.7", "error-stack-parser": "^2.0.6", "html-entities": "^1.2.1", - "lodash.debounce": "^4.0.8", "native-url": "^0.2.6", - "schema-utils": "^2.6.5" + "schema-utils": "^2.6.5", + "source-map": "^0.7.3" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + } } }, "@sinonjs/commons": { @@ -11347,11 +11354,6 @@ "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" - }, "lodash.escape": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz", diff --git a/package.json b/package.json index 6049fc3e..e3a291c4 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@babel/runtime": "7.12.1", "@enact/dev-utils": "3.1.0", "@enact/template-moonstone": "3.1.0", - "@pmmmwh/react-refresh-webpack-plugin": "0.3.3", + "@pmmmwh/react-refresh-webpack-plugin": "0.4.3", "@typescript-eslint/eslint-plugin": "4.5.0", "@typescript-eslint/parser": "4.5.0", "@wojtekmaj/enzyme-adapter-react-17": "0.3.2",