From e4b8cddf0237b29d8ccf3d10ad26ba78b0460032 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Mon, 18 May 2020 21:18:11 -0230 Subject: [PATCH] Disallow all anonymous default export, aside from CSF and migrations (#8535) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CSF = Storybook’s Component Story Format (CSF) See https://storybook.js.org/docs/formats/component-story-format/ Note that the migrations still use CommonJS require, so the default export as an object is quite ergonomic (& I don't want to touch the migrations). --- .eslintrc.js | 12 +++++++++++- test/lib/mock-encryptor.js | 4 +++- ui/app/selectors/tests/send-selectors-test-data.js | 4 +++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 882d80238..677ca3d98 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -50,7 +50,7 @@ module.exports = { 'import/newline-after-import': 'error', 'import/no-absolute-path': 'error', 'import/no-amd': 'error', - 'import/no-anonymous-default-export': ['error', { 'allowObject': true }], + 'import/no-anonymous-default-export': 'error', 'import/no-duplicates': 'error', 'import/no-dynamic-require': 'error', 'import/no-mutable-exports': 'error', @@ -92,6 +92,16 @@ module.exports = { 'mocha/no-setup-in-describe': 'off', }, + overrides: [{ + files: [ + 'app/scripts/migrations/*.js', + '*.stories.js', + ], + rules: { + 'import/no-anonymous-default-export': ['error', { 'allowObject': true }], + }, + }], + settings: { 'react': { 'version': 'detect', diff --git a/test/lib/mock-encryptor.js b/test/lib/mock-encryptor.js index 95c1e32f1..5ea48e1e8 100644 --- a/test/lib/mock-encryptor.js +++ b/test/lib/mock-encryptor.js @@ -2,7 +2,7 @@ const mockHex = '0xabcdef0123456789' const mockKey = Buffer.alloc(32) let cacheVal -export default { +const mockEncryptor = { encrypt (_, dataObj) { cacheVal = dataObj @@ -34,3 +34,5 @@ export default { }, } + +export default mockEncryptor diff --git a/ui/app/selectors/tests/send-selectors-test-data.js b/ui/app/selectors/tests/send-selectors-test-data.js index 18d525fd3..cc042a23f 100644 --- a/ui/app/selectors/tests/send-selectors-test-data.js +++ b/ui/app/selectors/tests/send-selectors-test-data.js @@ -1,4 +1,4 @@ -export default { +const state = { 'metamask': { 'isInitialized': true, 'isUnlocked': true, @@ -218,3 +218,5 @@ export default { 'errors': { 'someError': null }, }, } + +export default state