Merge 4ee7e34f6e into fbe9728f36

.prettierignore

@@ -83,4 +83,4 @@ app/javascript/styles/mastodon/reset.scss
 AUTHORS.md
 
 # Process a few selected JS files
-!lint-staged.config.js
+!/*.js

.prettierrc.js

@@ -1,4 +1,4 @@
 module.exports = {
   singleQuote: true,
-  jsxSingleQuote: true
+  jsxSingleQuote: true,
 };

babel.config.js

@@ -7,8 +7,8 @@ module.exports = (api) => {
   };
 
   const envOptions = {
-    useBuiltIns: "usage",
-    corejs: { version: "3.30" },
+    useBuiltIns: 'usage',
+    corejs: { version: '3.30' },
     debug: false,
     include: [
       'transform-numeric-separator',
@@ -18,45 +18,42 @@ module.exports = (api) => {
     ],
   };
 
-  const plugins = [
-    ['formatjs'],
-    'preval',
-  ];
+  const plugins = [['formatjs'], 'preval'];
 
   switch (env) {
-  case 'production':
-    plugins.push(...[
-      'lodash',
-      [
-        'transform-react-remove-prop-types',
-        {
-          mode: 'remove',
-          removeImport: true,
-          additionalLibraries: [
-            'react-immutable-proptypes',
+    case 'production':
+      plugins.push(
+        ...[
+          'lodash',
+          [
+            'transform-react-remove-prop-types',
+            {
+              mode: 'remove',
+              removeImport: true,
+              additionalLibraries: ['react-immutable-proptypes'],
+            },
           ],
-        },
-      ],
-      '@babel/transform-react-inline-elements',
-      [
-        '@babel/transform-runtime',
-        {
-          helpers: true,
-          regenerator: false,
-          useESModules: true,
-        },
-      ],
-    ]);
-    break;
+          '@babel/transform-react-inline-elements',
+          [
+            '@babel/transform-runtime',
+            {
+              helpers: true,
+              regenerator: false,
+              useESModules: true,
+            },
+          ],
+        ],
+      );
+      break;
 
-  case 'development':
-    reactOptions.development = true;
-    envOptions.debug = true;
+    case 'development':
+      reactOptions.development = true;
+      envOptions.debug = true;
 
-    // We need Babel to not inject polyfills in dev, as this breaks `preval` files
-    envOptions.useBuiltIns = false;
-    envOptions.corejs = undefined;
-    break;
+      // We need Babel to not inject polyfills in dev, as this breaks `preval` files
+      envOptions.useBuiltIns = false;
+      envOptions.corejs = undefined;
+      break;
   }
 
   const config = {
@@ -69,9 +66,7 @@ module.exports = (api) => {
     overrides: [
       {
         test: [/tesseract\.js/, /fuzzysort\.js/],
-        presets: [
-          ['@babel/env', { ...envOptions, modules: 'commonjs' }],
-        ],
+        presets: [['@babel/env', { ...envOptions, modules: 'commonjs' }]],
       },
     ],
   };

ide-helper.js

@@ -6,7 +6,7 @@ jetbrains://WebStorm/settings?name=Languages+%26+Frameworks--JavaScript--Webpack
 module.exports = {
   resolve: {
     alias: {
-      'mastodon': path.resolve(__dirname, 'app/javascript/mastodon'),
+      mastodon: path.resolve(__dirname, 'app/javascript/mastodon'),
     },
   },
 };

postcss.config.js

@@ -5,8 +5,8 @@ const config = ({ env }) => ({
   plugins: [
     postcssPresetEnv({
       features: {
-        'logical-properties-and-values': false
-      }
+        'logical-properties-and-values': false,
+      },
     }),
     env === 'production' ? require('cssnano') : '',
   ],

stylelint.config.js

@@ -31,14 +31,13 @@ module.exports = {
   },
   overrides: [
     {
-      'files': ['app/javascript/styles/mailer.scss'],
+      files: ['app/javascript/styles/mailer.scss'],
       rules: {
         'property-no-unknown': [
           true,
           {
-            ignoreProperties: [
-              '/^mso-/',
-            ] },
+            ignoreProperties: ['/^mso-/'],
+          },
         ],
       },
     },