From 0d2b4c515d2637c9303a1e7756c30f47d635ba61 Mon Sep 17 00:00:00 2001 From: Rafi Date: Thu, 15 Oct 2020 02:35:38 +0530 Subject: [PATCH] Replace globals with node env (#10767) --- app/assets/javascripts/.eslintrc.js | 2 ++ babel.config.js | 2 +- bin/generate-css-utility-classes-docs.js | 3 ++- config/webpack/custom.js | 2 ++ config/webpack/development.js | 2 +- config/webpack/environment.js | 13 +++++++------ config/webpack/loaders/erb.js | 19 ++++++++++++------- config/webpack/production.js | 2 +- config/webpack/test.js | 2 +- jest.config.js | 2 +- 10 files changed, 30 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/.eslintrc.js b/app/assets/javascripts/.eslintrc.js index a090bbfcb..749333696 100644 --- a/app/assets/javascripts/.eslintrc.js +++ b/app/assets/javascripts/.eslintrc.js @@ -1,3 +1,5 @@ +/* eslint-env node */ + module.exports = { extends: ['eslint:recommended', 'prettier'], parserOptions: { diff --git a/babel.config.js b/babel.config.js index 108abe942..c90815dda 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,4 +1,4 @@ -/* global module */ +/* eslint-env node */ module.exports = function (api) { var validEnv = ['development', 'test', 'production']; diff --git a/bin/generate-css-utility-classes-docs.js b/bin/generate-css-utility-classes-docs.js index b4ec30736..4880eabe8 100755 --- a/bin/generate-css-utility-classes-docs.js +++ b/bin/generate-css-utility-classes-docs.js @@ -1,6 +1,7 @@ #!/usr/bin/env node -/* globals module process require __dirname */ +/* eslint-env node */ +/* eslint-disable no-console */ const fs = require('fs'); const path = require('path'); diff --git a/config/webpack/custom.js b/config/webpack/custom.js index 68bb6c30e..ef733c4b8 100644 --- a/config/webpack/custom.js +++ b/config/webpack/custom.js @@ -1,3 +1,5 @@ +/* eslint-env node */ + module.exports = { resolve: { alias: { diff --git a/config/webpack/development.js b/config/webpack/development.js index d17f02706..0784f2e8d 100644 --- a/config/webpack/development.js +++ b/config/webpack/development.js @@ -1,4 +1,4 @@ -/* global process, module, require */ +/* eslint-env node */ process.env.NODE_ENV = process.env.NODE_ENV || 'development'; diff --git a/config/webpack/environment.js b/config/webpack/environment.js index 2f91be3a7..fac1b32a2 100644 --- a/config/webpack/environment.js +++ b/config/webpack/environment.js @@ -1,4 +1,5 @@ -/* global require module process */ +/* eslint-env node */ + const path = require('path'); const { environment } = require('@rails/webpacker'); const HoneybadgerSourceMapPlugin = require('@honeybadger-io/webpack'); @@ -19,10 +20,7 @@ environment.splitChunks((config) => { ...config.resolve, alias: { ...(config.resolve ? config.resolve.alias : {}), - '@crayons': path.resolve( - __dirname, - '../../app/javascript/crayons', - ) /* global __dirname */, + '@crayons': path.resolve(__dirname, '../../app/javascript/crayons'), '@utilities': path.resolve(__dirname, '../../app/javascript/utilities'), }, }, @@ -61,7 +59,10 @@ if (process.env.HONEYBADGER_API_KEY && process.env.ASSETS_URL) { assetsUrl: process.env.ASSETS_URL, silent: false, ignoreErrors: false, - revision: process.env.RELEASE_FOOTPRINT || process.env.HEROKU_SLUG_COMMIT || 'master', + revision: + process.env.RELEASE_FOOTPRINT || + process.env.HEROKU_SLUG_COMMIT || + 'master', }), ); } diff --git a/config/webpack/loaders/erb.js b/config/webpack/loaders/erb.js index a4049f132..047a34e42 100644 --- a/config/webpack/loaders/erb.js +++ b/config/webpack/loaders/erb.js @@ -1,11 +1,16 @@ +/* eslint-env node */ + module.exports = { test: /\.erb$/, enforce: 'pre', exclude: /node_modules/, - use: [{ - loader: 'rails-erb-loader', - options: { - runner: (/^win/.test(process.platform) ? 'ruby ' : '') + 'bin/rails runner' - } - }] -} + use: [ + { + loader: 'rails-erb-loader', + options: { + runner: + (/^win/.test(process.platform) ? 'ruby ' : '') + 'bin/rails runner', + }, + }, + ], +}; diff --git a/config/webpack/production.js b/config/webpack/production.js index 404e684a7..01f9ec862 100644 --- a/config/webpack/production.js +++ b/config/webpack/production.js @@ -1,4 +1,4 @@ -/* global process, module, require */ +/* eslint-env node */ process.env.NODE_ENV = process.env.NODE_ENV || 'production'; diff --git a/config/webpack/test.js b/config/webpack/test.js index b38fa463d..e38690ffc 100644 --- a/config/webpack/test.js +++ b/config/webpack/test.js @@ -1,4 +1,4 @@ -/* global process, module, require */ +/* eslint-env node */ process.env.NODE_ENV = process.env.NODE_ENV || 'development'; diff --git a/jest.config.js b/jest.config.js index 24bc78a82..878a34703 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,7 +1,7 @@ // Consistent timezone for testing. // This does not work on windows, see https://github.com/nodejs/node/issues/4230 -/* global process, module */ +/* eslint-env node */ process.env.TZ = 'UTC';