Fix ESLint issues for webpack/*

octogonz · octogonz · commit 62deb9bb0628 · 2019-10-21T00:20:34.000-07:00
diff --git a/apps/rush-lib/src/logic/JsonSchemaUrls.ts b/apps/rush-lib/src/logic/JsonSchemaUrls.ts
@@ -5,9 +5,9 @@
  * JSON schema URLs that Rush writes into config files.
  */
 export class JsonSchemaUrls {
-  public readonly approvedPackages: string
+  public static readonly approvedPackages: string
     = 'https://developer.microsoft.com/json-schemas/rush/v5/approved-packages.schema.json';
 
-  public readonly commonVersions: string
+  public static readonly commonVersions: string
     = 'https://developer.microsoft.com/json-schemas/rush/v5/common-versions.schema.json';
 }
diff --git a/webpack/loader-load-themed-styles/.eslintrc.js b/webpack/loader-load-themed-styles/.eslintrc.js
@@ -0,0 +1,7 @@
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+require("@rushstack/eslint-config/patch-eslint6");
+
+module.exports = {
+  extends: [ "@rushstack/eslint-config" ],
+  parserOptions: { tsconfigRootDir: __dirname },
+};
diff --git a/webpack/loader-load-themed-styles/src/LoadThemedStylesLoader.ts b/webpack/loader-load-themed-styles/src/LoadThemedStylesLoader.ts
@@ -82,7 +82,7 @@ export class LoadThemedStylesLoader {
     ].join('\n');
   }
 
-  constructor() {
+  public constructor() {
     throw new Error('Constructing "LoadThemedStylesLoader" is not supported.');
   }
 }
diff --git a/webpack/loader-load-themed-styles/src/test/LoadThemedStylesLoader.test.ts b/webpack/loader-load-themed-styles/src/test/LoadThemedStylesLoader.test.ts
@@ -61,7 +61,7 @@ describe('LoadThemedStylesLoader', () => {
     loaderResult = loaderResult.replace(/require\(\"!!/, 'require("');
     loaderResult = wrapResult(loaderResult);
 
-    const returnedModule: { exports: string } = eval(loaderResult); // tslint:disable-line:no-eval
+    const returnedModule: { exports: string } = eval(loaderResult); // eslint-disable-line no-eval
 
     assert.isTrue(LoadThemedStylesMock.loadedData.indexOf('STYLE 1') !== -1);
     assert.isTrue(LoadThemedStylesMock.loadedData.indexOf('STYLE 2') !== -1);
@@ -79,7 +79,7 @@ describe('LoadThemedStylesLoader', () => {
     loaderResult = loaderResult.replace(/require\(\"!!/, 'require("');
     loaderResult = wrapResult(loaderResult);
 
-    const returnedModule: { exports: string } = eval(loaderResult); // tslint:disable-line:no-eval
+    const returnedModule: { exports: string } = eval(loaderResult); // eslint-disable-line no-eval
 
     assert.isTrue(LoadThemedStylesMock.loadedData.indexOf('styles') !== -1);
     assert.equal(LoadThemedStylesMock.loadedData.length, 1);
@@ -94,7 +94,7 @@ describe('LoadThemedStylesLoader', () => {
     loaderResult = loaderResult.replace(/require\(\"!!/, 'require("');
     loaderResult = wrapResult(loaderResult);
 
-    const returnedModule: { exports: string } = eval(loaderResult); // tslint:disable-line:no-eval
+    const returnedModule: { exports: string } = eval(loaderResult); // eslint-disable-line no-eval
 
     assert.isTrue(LoadThemedStylesMock.loadedData.indexOf('STYLE 1') !== -1);
     assert.isTrue(LoadThemedStylesMock.loadedData.indexOf('STYLE 2') !== -1);
@@ -113,7 +113,7 @@ describe('LoadThemedStylesLoader', () => {
     loaderResult = loaderResult.replace(/require\(\"!!/, 'require("');
     loaderResult = wrapResult(loaderResult);
 
-    const returnedModule: { exports: string } = eval(loaderResult); // tslint:disable-line:no-eval
+    const returnedModule: { exports: string } = eval(loaderResult); // eslint-disable-line no-eval
 
     assert.isTrue(LoadThemedStylesMock.loadedData.indexOf('STYLE 1') !== -1);
     assert.isTrue(LoadThemedStylesMock.loadedData.indexOf('STYLE 2') !== -1);
@@ -131,7 +131,7 @@ describe('LoadThemedStylesLoader', () => {
     loaderResult = loaderResult.replace(/require\(\"!!/, 'require("');
     loaderResult = wrapResult(loaderResult);
 
-    const returnedModule: { exports: string } = eval(loaderResult); // tslint:disable-line:no-eval
+    const returnedModule: { exports: string } = eval(loaderResult); // eslint-disable-line no-eval
 
     assert.isTrue(LoadThemedStylesMock.loadedData.indexOf('STYLE 1') !== -1);
     assert.isTrue(LoadThemedStylesMock.loadedData.indexOf('STYLE 2') !== -1);
diff --git a/webpack/loader-load-themed-styles/src/test/testData/MockStyle1.ts b/webpack/loader-load-themed-styles/src/test/testData/MockStyle1.ts
@@ -1,12 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-/* tslint:disable:no-any */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const exportedObject: any = [['A', 'STYLE 1'], ['B', 'STYLE 2']];
-/* tslint:enable:no-any */
 
 exportedObject.locals = 'locals';
 
-/* tslint:disable:export-name */
 export = exportedObject;
-/* tslint:enable:export-name */
diff --git a/webpack/loader-load-themed-styles/tslint.json b/webpack/loader-load-themed-styles/tslint.json
diff --git a/webpack/loader-raw-script/.eslintrc.js b/webpack/loader-raw-script/.eslintrc.js
@@ -0,0 +1,7 @@
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+require("@rushstack/eslint-config/patch-eslint6");
+
+module.exports = {
+  extends: [ "@rushstack/eslint-config" ],
+  parserOptions: { tsconfigRootDir: __dirname },
+};
diff --git a/webpack/loader-raw-script/src/RawScriptLoader.ts b/webpack/loader-raw-script/src/RawScriptLoader.ts
@@ -18,6 +18,4 @@ const loaderFn: (content: string) => string = (content: string) => {
   return lines.join(EOL);
 };
 
-/* tslint:disable:export-name */
 export = loaderFn;
-/* tslint:enable:export-name */
diff --git a/webpack/loader-raw-script/src/index.ts b/webpack/loader-raw-script/src/index.ts
@@ -3,6 +3,4 @@
 
 import * as RawScriptLoader from './RawScriptLoader';
 
-/* tslint:disable:export-name */
 export = RawScriptLoader;
-/* tslint:enable:export-name */
diff --git a/webpack/loader-raw-script/src/test/RawScriptLoader.test.ts b/webpack/loader-raw-script/src/test/RawScriptLoader.test.ts
@@ -22,9 +22,8 @@ describe('RawScriptLoader', () => {
 
   it('correctly sets exported objects', () => {
     const testScript: string = 'var x = 123; this.exportedObject = x;';
-    /* tslint:disable:no-eval */
+    // eslint-disable-next-line no-eval
     const exports: { exportedObject: number } = eval(wrapResult(RawScriptLoader(testScript)));
-    /* tslint:enable:no-eval */
     assert.equal(exports.exportedObject, 123);
   });
 });
diff --git a/webpack/loader-raw-script/tslint.json b/webpack/loader-raw-script/tslint.json
diff --git a/webpack/loader-set-webpack-public-path/.eslintrc.js b/webpack/loader-set-webpack-public-path/.eslintrc.js
@@ -0,0 +1,7 @@
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+require("@rushstack/eslint-config/patch-eslint6");
+
+module.exports = {
+  extends: [ "@rushstack/eslint-config" ],
+  parserOptions: { tsconfigRootDir: __dirname },
+};
diff --git a/webpack/loader-set-webpack-public-path/src/SetWebpackPublicPathLoader.ts b/webpack/loader-set-webpack-public-path/src/SetWebpackPublicPathLoader.ts
@@ -2,7 +2,7 @@
 // See LICENSE in the project root for license information.
 
 import { merge } from 'lodash';
-const loaderUtils = require('loader-utils'); // tslint:disable-line:typedef
+const loaderUtils = require('loader-utils'); // eslint-disable-line
 
 import {
   IInternalOptions,
@@ -17,7 +17,7 @@ export interface ISetWebpackPublicPathLoaderOptions extends ISetWebpackPublicPat
 }
 
 export class SetWebpackPublicPathLoader {
-  private static staticOptions: ISetWebpackPublicPathLoaderOptions = {
+  private static _staticOptions: ISetWebpackPublicPathLoaderOptions = {
     systemJs: false,
     scriptName: undefined,
     urlPrefix: undefined,
@@ -29,23 +29,23 @@ export class SetWebpackPublicPathLoader {
   }
 
   public static setOptions(options: ISetWebpackPublicPathLoaderOptions): void {
-    this.staticOptions = options || {};
+    this._staticOptions = options || {};
   }
 
   public static pitch(remainingRequest: string): string {
-    /* tslint:disable:no-any */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const self: any = this;
-    /* tslint:enable:no-any */
 
-    const options: IInternalOptions = SetWebpackPublicPathLoader.getOptions(self);
+
+    const options: IInternalOptions = SetWebpackPublicPathLoader._getOptions(self);
     return getSetPublicPathCode(options, self.emitWarning);
   }
 
-  private static getOptions(context: any): IInternalOptions { // eslint-disable-line @typescript-eslint/no-explicit-any
+  private static _getOptions(context: any): IInternalOptions { // eslint-disable-line @typescript-eslint/no-explicit-any
     const queryOptions: ISetWebpackPublicPathLoaderOptions = loaderUtils.getOptions(context);
 
     const options: ISetWebpackPublicPathLoaderOptions & IInternalOptions =
-      merge(merge({}, SetWebpackPublicPathLoader.staticOptions), queryOptions);
+      merge(merge({}, SetWebpackPublicPathLoader._staticOptions), queryOptions);
 
     if (options.systemJs || options.publicPath) {
       // If ?systemJs or ?publicPath=... is set inline, override regexName
@@ -61,7 +61,7 @@ export class SetWebpackPublicPathLoader {
     return options;
   }
 
-  constructor() {
+  public constructor() {
     throw new Error('Constructing "LoadThemedStylesLoader" is not supported.');
   }
 }
diff --git a/webpack/loader-set-webpack-public-path/tslint.json b/webpack/loader-set-webpack-public-path/tslint.json
diff --git a/webpack/resolve-chunk-plugin/.eslintrc.js b/webpack/resolve-chunk-plugin/.eslintrc.js
@@ -0,0 +1,7 @@
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+require("@rushstack/eslint-config/patch-eslint6");
+
+module.exports = {
+  extends: [ "@rushstack/eslint-config" ],
+  parserOptions: { tsconfigRootDir: __dirname },
+};
diff --git a/webpack/resolve-chunk-plugin/src/ResolveChunkPlugin.ts b/webpack/resolve-chunk-plugin/src/ResolveChunkPlugin.ts
@@ -5,10 +5,10 @@
 
 import * as Webpack from 'webpack';
 
-// tslint:disable:variable-name
+// eslint-disable-next-line
 const ConstDependency: IConstDependency = require('webpack/lib/dependencies/ConstDependency');
+// eslint-disable-next-line
 const ParserHelpers: IParserHelper = require('webpack/lib/ParserHelpers');
-// tslint:enable:variable-name
 
 const EXPRESSION_NAME: string = 'resolveChunk';
 const PLUGIN_NAME: string = 'resolve-chunk-plugin';
diff --git a/webpack/resolve-chunk-plugin/tslint.json b/webpack/resolve-chunk-plugin/tslint.json
diff --git a/webpack/set-webpack-public-path-plugin/.eslintrc.js b/webpack/set-webpack-public-path-plugin/.eslintrc.js
@@ -0,0 +1,7 @@
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+require("@rushstack/eslint-config/patch-eslint6");
+
+module.exports = {
+  extends: [ "@rushstack/eslint-config" ],
+  parserOptions: { tsconfigRootDir: __dirname },
+};
diff --git a/webpack/set-webpack-public-path-plugin/src/SetPublicPathPlugin.ts b/webpack/set-webpack-public-path-plugin/src/SetPublicPathPlugin.ts
@@ -125,7 +125,7 @@ interface IStartupCodeOptions {
 export class SetPublicPathPlugin implements Webpack.Plugin {
   public options: ISetWebpackPublicPathPluginOptions;
 
-  constructor(options: ISetWebpackPublicPathPluginOptions) {
+  public constructor(options: ISetWebpackPublicPathPluginOptions) {
     this.options = options;
   }
 
@@ -169,7 +169,8 @@ export class SetPublicPathPlugin implements Webpack.Plugin {
         );
       });
     } else {
-      compiler.plugin('compilation', (compilation: IV3Compilation, params: Object): void => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      compiler.plugin('compilation', (compilation: IV3Compilation, params: any): void => {
         compilation.mainTemplate.plugin('startup', (source: string, chunk: IV3Chunk, hash: string) => {
           let assetOrChunkFound: boolean = this.options.skipDetection || chunk.chunks.length > 0;
           if (!assetOrChunkFound) {
diff --git a/webpack/set-webpack-public-path-plugin/src/codeGenerator.ts b/webpack/set-webpack-public-path-plugin/src/codeGenerator.ts
@@ -23,7 +23,7 @@ const varName: string = 'publicPath';
 
 export function getSetPublicPathCode(options: IInternalOptions, emitWarning: (warning: string) => void): string {
   if (!options.webpackPublicPathVariable) {
-    throw '"webpackPublicPathVariable" option must be defined.';
+    throw new Error('"webpackPublicPathVariable" option must be defined.');
   }
 
   let lines: string[] = [];
@@ -165,7 +165,7 @@ export function getGlobalRegisterCode(debug: boolean = false): string {
 
 function joinLines(lines: string[], linePrefix?: string): string {
   return lines.map((line: string) => {
-    if (!!line) {
+    if (line) {
       return `${linePrefix || ''}${line}`;
     } else {
       return line;
diff --git a/webpack/set-webpack-public-path-plugin/tslint.json b/webpack/set-webpack-public-path-plugin/tslint.json

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ export class LoadThemedStylesLoader {`
`82`	`82`	`].join('\n');`
`83`	`83`	`}`
`84`	`84`
`85`		`- constructor() {`
	`85`	`+ public constructor() {`
`86`	`86`	`throw new Error('Constructing "LoadThemedStylesLoader" is not supported.');`
`87`	`87`	`}`
`88`	`88`	`}`