Unverified Commit a3f1d65e authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

Fix ESLint Ignores and Extract Fn (#10205)

parent 7b0118a9
...@@ -61,6 +61,15 @@ ...@@ -61,6 +61,15 @@
"ignoreRestSiblings": true "ignoreRestSiblings": true
} }
], ],
"no-unused-expressions": "off",
"@typescript-eslint/no-unused-expressions": [
"error",
{
"allowShortCircuit": true,
"allowTernary": true,
"allowTaggedTemplates": true
}
],
"no-useless-constructor": "off", "no-useless-constructor": "off",
"@typescript-eslint/no-useless-constructor": "warn" "@typescript-eslint/no-useless-constructor": "warn"
} }
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
"@mdx-js/loader": "0.18.0", "@mdx-js/loader": "0.18.0",
"@types/jest": "24.0.13", "@types/jest": "24.0.13",
"@types/string-hash": "1.1.1", "@types/string-hash": "1.1.1",
"@typescript-eslint/eslint-plugin": "2.6.1", "@typescript-eslint/eslint-plugin": "2.17.0",
"@typescript-eslint/parser": "2.6.1", "@typescript-eslint/parser": "2.17.0",
"@zeit/next-css": "1.0.2-canary.2", "@zeit/next-css": "1.0.2-canary.2",
"@zeit/next-sass": "1.0.2-canary.2", "@zeit/next-sass": "1.0.2-canary.2",
"@zeit/next-typescript": "1.1.2-canary.0", "@zeit/next-typescript": "1.1.2-canary.0",
...@@ -60,9 +60,9 @@ ...@@ -60,9 +60,9 @@
"cross-env": "6.0.3", "cross-env": "6.0.3",
"cross-spawn": "6.0.5", "cross-spawn": "6.0.5",
"escape-string-regexp": "2.0.0", "escape-string-regexp": "2.0.0",
"eslint": "6.6.0", "eslint": "6.8.0",
"eslint-plugin-react": "7.16.0", "eslint-plugin-react": "7.18.0",
"eslint-plugin-react-hooks": "2.2.0", "eslint-plugin-react-hooks": "2.3.0",
"execa": "2.0.3", "execa": "2.0.3",
"express": "4.17.0", "express": "4.17.0",
"faunadb": "2.6.1", "faunadb": "2.6.1",
......
...@@ -28,7 +28,7 @@ import { ...@@ -28,7 +28,7 @@ import {
VALID_MIDDLEWARE, VALID_MIDDLEWARE,
} from './plugins/collect-plugins' } from './plugins/collect-plugins'
import { build as buildConfiguration } from './webpack/config' import { build as buildConfiguration } from './webpack/config'
import { __overrideCssConfiguration } from './webpack/config/blocks/css' import { __overrideCssConfiguration } from './webpack/config/blocks/css/overrideCssConfiguration'
// @ts-ignore: JS file // @ts-ignore: JS file
import { pluginLoaderOptions } from './webpack/loaders/next-plugin-loader' import { pluginLoaderOptions } from './webpack/loaders/next-plugin-loader'
import BuildManifestPlugin from './webpack/plugins/build-manifest-plugin' import BuildManifestPlugin from './webpack/plugins/build-manifest-plugin'
......
import curry from 'lodash.curry' import curry from 'lodash.curry'
import path from 'path' import path from 'path'
import webpack, { Configuration, RuleSetRule } from 'webpack' import webpack, { Configuration } from 'webpack'
import MiniCssExtractPlugin from '../../../plugins/mini-css-extract-plugin' import MiniCssExtractPlugin from '../../../plugins/mini-css-extract-plugin'
import { loader, plugin } from '../../helpers' import { loader, plugin } from '../../helpers'
import { ConfigurationContext, ConfigurationFn, pipe } from '../../utils' import { ConfigurationContext, ConfigurationFn, pipe } from '../../utils'
...@@ -69,38 +69,6 @@ function getClientStyleLoader({ ...@@ -69,38 +69,6 @@ function getClientStyleLoader({
} }
} }
export async function __overrideCssConfiguration(
rootDirectory: string,
isProduction: boolean,
config: Configuration
) {
const postCssPlugins = await getPostCssPlugins(rootDirectory, isProduction)
function patch(rule: RuleSetRule) {
if (
rule.options &&
typeof rule.options === 'object' &&
rule.options['ident'] === '__nextjs_postcss'
) {
rule.options.plugins = postCssPlugins
} else if (Array.isArray(rule.oneOf)) {
rule.oneOf.forEach(patch)
} else if (Array.isArray(rule.use)) {
rule.use.forEach(u => {
if (typeof u === 'object') {
patch(u)
}
})
}
}
// TODO: remove this rule, ESLint bug
// eslint-disable-next-line no-unused-expressions
config.module?.rules?.forEach(entry => {
patch(entry)
})
}
export const css = curry(async function css( export const css = curry(async function css(
enabled: boolean, enabled: boolean,
ctx: ConfigurationContext, ctx: ConfigurationContext,
......
import { Configuration, RuleSetRule } from 'webpack'
import { getPostCssPlugins } from './plugins'
export async function __overrideCssConfiguration(
rootDirectory: string,
isProduction: boolean,
config: Configuration
) {
const postCssPlugins = await getPostCssPlugins(rootDirectory, isProduction)
function patch(rule: RuleSetRule) {
if (
rule.options &&
typeof rule.options === 'object' &&
rule.options['ident'] === '__nextjs_postcss'
) {
rule.options.plugins = postCssPlugins
} else if (Array.isArray(rule.oneOf)) {
rule.oneOf.forEach(patch)
} else if (Array.isArray(rule.use)) {
rule.use.forEach(u => {
if (typeof u === 'object') {
patch(u)
}
})
}
}
config.module?.rules?.forEach(entry => {
patch(entry)
})
}
...@@ -8,11 +8,7 @@ const ErrorLoader: loader.Loader = function() { ...@@ -8,11 +8,7 @@ const ErrorLoader: loader.Loader = function() {
const { reason = 'An unknown error has occurred' } = options const { reason = 'An unknown error has occurred' } = options
// TODO: remove this ignore -- currently an ESLint bug
// eslint-disable-next-line @typescript-eslint/no-use-before-define
const resource = this._module?.issuer?.resource ?? null const resource = this._module?.issuer?.resource ?? null
// TODO: remove this ignore -- currently an ESLint bug
// eslint-disable-next-line @typescript-eslint/no-use-before-define
const context = this.rootContext ?? this._compiler?.context const context = this.rootContext ?? this._compiler?.context
const issuer = resource const issuer = resource
......
/* eslint-disable no-unused-expressions */ /* eslint-disable no-unused-expressions, @typescript-eslint/no-unused-expressions */
import React from 'react' import React from 'react'
import Router, { withRouter } from 'next/router' import Router, { withRouter } from 'next/router'
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment