chore: Always lint types folder and JSON (rollup#233)

LarsDenBakker · Sep 12, 2020 · b1f4ffa · b1f4ffa
1 parent 1b664e9
commit b1f4ffa
Show file tree

Hide file tree

Showing 47 changed files with 135 additions and 165 deletions.
diff --git a/package.json b/package.json
@@ -6,9 +6,10 @@
     "ci:coverage:submit": "node scripts/codecov",
     "ci:lint": "node scripts/run-changed.js ci:lint",
     "ci:test": "node scripts/run-changed.js ci:test",
-    "lint": "pnpm run lint:docs && pnpm run lint:package && node scripts/run-changed.js lint",
-    "lint:docs": "prettier --write README.md",
+    "lint": "pnpm run lint:docs && npm run lint:json && pnpm run lint:package && node scripts/run-changed.js lint",
+    "lint:docs": "prettier --single-quote --write README.md",
     "lint:js": "eslint scripts util",
+    "lint:json": "prettier --single-quote --write tsconfig.*.json codecov.yml pnpm-workspace.yaml",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "preinstall": "node scripts/disallow-npm.js",
     "pub": "node scripts/pub.js",

diff --git a/packages/alias/package.json b/packages/alias/package.json
@@ -22,7 +22,7 @@
     "ci:test": "pnpm run test -- --verbose",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write README.md",
-    "lint:js": "eslint --fix --cache src test --ext .js,.ts",
+    "lint:js": "eslint --fix --cache src test types --ext .js,.ts",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "prebuild": "del-cli dist",
     "prepare": "pnpm run build",

diff --git a/packages/alias/tsconfig.json b/packages/alias/tsconfig.json
@@ -1,9 +1,5 @@
 {
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "lib": ["es6"],
-    "module": "esnext"
-  },
   "include": [
     "src/**/*",
     "types/**/*"

diff --git a/packages/alias/types/index.d.ts b/packages/alias/types/index.d.ts
@@ -1,35 +1,35 @@
 import { Plugin, ResolveIdResult } from 'rollup';
 
 export interface Alias {
-    find: string | RegExp;
-    replacement: string;
-    customResolver?: ResolverFunction | ResolverObject | null;
+  find: string | RegExp;
+  replacement: string;
+  customResolver?: ResolverFunction | ResolverObject | null;
 }
 
 export type ResolverFunction = (
-    source: string,
-    importer: string | undefined
+  source: string,
+  importer: string | undefined
 ) => Promise<ResolveIdResult> | ResolveIdResult;
 
 export interface ResolverObject {
-    resolveId: ResolverFunction;
+  resolveId: ResolverFunction;
 }
 
 export interface RollupAliasOptions {
-    /**
-     * Instructs the plugin to use an alternative resolving algorithm,
-     * rather than the Rollup's resolver.
-     * @default null
-     */
-    customResolver?: ResolverFunction | ResolverObject | null;
+  /**
+   * Instructs the plugin to use an alternative resolving algorithm,
+   * rather than the Rollup's resolver.
+   * @default null
+   */
+  customResolver?: ResolverFunction | ResolverObject | null;
 
-    /**
-     * Specifies an `Object`, or an `Array` of `Object`,
-     * which defines aliases used to replace values in `import` or `require` statements.
-     * With either format, the order of the entries is important,
-     * in that the first defined rules are applied first.
-     */
-    entries?: readonly Alias[] | { [find: string]: string };
+  /**
+   * Specifies an `Object`, or an `Array` of `Object`,
+   * which defines aliases used to replace values in `import` or `require` statements.
+   * With either format, the order of the entries is important,
+   * in that the first defined rules are applied first.
+   */
+  entries?: readonly Alias[] | { [find: string]: string };
 }
 
 /**

diff --git a/packages/auto-install/tsconfig.json b/packages/auto-install/tsconfig.json
@@ -1,9 +1,5 @@
 {
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "lib": ["es6"],
-    "module": "esnext"
-  },
   "include": [
     "src/**/*",
     "types/**/*"

diff --git a/packages/beep/package.json b/packages/beep/package.json
@@ -21,7 +21,7 @@
     "ci:test": "ava --verbose",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write README.md",
-    "lint:js": "eslint --fix --cache lib test --ext .js,.ts",
+    "lint:js": "eslint --fix --cache lib test types --ext .js,.ts",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "test": "ava"
   },

diff --git a/packages/beep/types/index.d.ts b/packages/beep/types/index.d.ts
@@ -1,6 +1,6 @@
-import { Plugin } from 'rollup';
-
-/**
- * 🍣 A Rollup plugin that beeps when a build ends with errors.
- */
-export default function beep(): Plugin;
+import { Plugin } from 'rollup';
+
+/**
+ * 🍣 A Rollup plugin that beeps when a build ends with errors.
+ */
+export default function beep(): Plugin;
diff --git a/packages/buble/tsconfig.json b/packages/buble/tsconfig.json
@@ -1,13 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "lib": ["es6"],
-    "module": "esnext",
-    "allowJs": true
-  },
   "include": [
     "src/**/*",
-    "types/**/*",
-    "typings-test.js"
+    "types/**/*"
   ]
 }
diff --git a/packages/dsv/package.json b/packages/dsv/package.json
@@ -19,7 +19,7 @@
     "ci:test": "pnpm run test -- --verbose",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write README.md",
-    "lint:js": "eslint --fix --cache src test",
+    "lint:js": "eslint --fix --cache src test --ext .js,.ts",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "prebuild": "del-cli dist",
     "prepare": "pnpm run build",

diff --git a/packages/html/package.json b/packages/html/package.json
@@ -21,7 +21,7 @@
     "ci:test": "pnpm run test -- --verbose",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write *.md",
-    "lint:js": "eslint --fix --cache lib test",
+    "lint:js": "eslint --fix --cache lib test --ext .js,.ts",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "prepublishOnly": "pnpm run lint",
     "test": "ava"

diff --git a/packages/image/package.json b/packages/image/package.json
@@ -22,7 +22,7 @@
     "ci:test": "pnpm run test -- --verbose",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write *.md",
-    "lint:js": "eslint --fix --cache src test",
+    "lint:js": "eslint --fix --cache src test --ext .js,.ts",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "prebuild": "del-cli dist",
     "prepare": "pnpm run build",

diff --git a/packages/inject/package.json b/packages/inject/package.json
@@ -19,7 +19,7 @@
     "ci:test": "pnpm run test -- --verbose && pnpm run test:ts",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write README.md",
-    "lint:js": "eslint --fix --cache src test",
+    "lint:js": "eslint --fix --cache src test --ext .js,.ts",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "prebuild": "del-cli dist",
     "prepare": "pnpm run build",

diff --git a/packages/inject/test/types.ts b/packages/inject/test/types.ts
@@ -1,24 +1,22 @@
-// @ts-check
-import { dirname } from "path";
+import { RollupOptions } from 'rollup';
 
-import inject, { RollupInjectOptions } from "..";
+import inject from '..';
 
-/** @type {import("rollup").RollupOptions} */
-const config = {
-  input: "main.js",
+const config: RollupOptions = {
+  input: 'main.js',
   output: {
-    file: "bundle.js",
-    format: "iife"
+    file: 'bundle.js',
+    format: 'iife'
   },
   plugins: [
     inject({
-      include: "config.js",
-      exclude: "node_modules/**",
-      Promise: ["es6-promise", "Promise"],
-      $: "jquery",
+      include: 'config.js',
+      exclude: 'node_modules/**',
+      Promise: ['es6-promise', 'Promise'],
+      $: 'jquery',
       modules: {
-        Promise: ["es6-promise", "Promise"],
-        $: "jquery"
+        Promise: ['es6-promise', 'Promise'],
+        $: 'jquery'
       }
     })
   ]

diff --git a/packages/json/package.json b/packages/json/package.json
@@ -17,9 +17,10 @@
     "ci:lint": "pnpm run build && pnpm run lint",
     "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}",
     "ci:test": "pnpm run test -- --verbose && pnpm run test:ts",
-    "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
+    "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:json && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write README.md",
     "lint:js": "eslint --fix --cache src test types --ext .js,.ts",
+    "lint:json": "prettier --write \"test/fixtures/!(garbage)/*.json\"",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "prebuild": "del-cli dist",
     "prepare": "pnpm run build",

diff --git a/packages/json/test/fixtures/array/config.json b/packages/json/test/fixtures/array/config.json
@@ -1,3 +1 @@
-[
-  1, 2, 3
-]
+[1, 2, 3]
diff --git a/packages/json/test/fixtures/basic/config.json b/packages/json/test/fixtures/basic/config.json
@@ -1,3 +1,3 @@
 {
-	"answer": 42
+  "answer": 42
 }
diff --git a/packages/json/test/fixtures/extensionless/config.json b/packages/json/test/fixtures/extensionless/config.json
@@ -1,3 +1,3 @@
 {
-	"answer": 42
+  "answer": 42
 }
diff --git a/packages/json/test/fixtures/extensionless/dir/index.json b/packages/json/test/fixtures/extensionless/dir/index.json
@@ -1,3 +1,3 @@
 {
-	"Are extensionless imports and /index resolutions a good idea?": "No."
+  "Are extensionless imports and /index resolutions a good idea?": "No."
 }
diff --git a/packages/json/test/fixtures/named/package.json b/packages/json/test/fixtures/named/package.json
@@ -1,4 +1,4 @@
 {
-	"name": "this-should-be-excluded",
-	"version": "1.33.7"
+  "name": "this-should-be-excluded",
+  "version": "1.33.7"
 }
diff --git a/packages/legacy/package.json b/packages/legacy/package.json
@@ -19,7 +19,7 @@
     "ci:test": "pnpm run test -- --verbose",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write README.md",
-    "lint:js": "eslint --fix --cache src test",
+    "lint:js": "eslint --fix --cache src test --ext .js,.ts",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "prebuild": "del-cli dist",
     "prepare": "pnpm run build",

diff --git a/packages/multi-entry/package.json b/packages/multi-entry/package.json
@@ -19,7 +19,7 @@
     "ci:test": "pnpm run test -- --verbose",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write README.md",
-    "lint:js": "eslint --fix --cache src test",
+    "lint:js": "eslint --fix --cache src test --ext .js,.ts",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "prebuild": "del-cli dist",
     "prepare": "pnpm run build",

diff --git a/packages/pluginutils/package.json b/packages/pluginutils/package.json
@@ -24,7 +24,7 @@
     "ci:test": "pnpm run test -- --verbose",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write README.md",
-    "lint:js": "eslint --fix --cache src --ext .js,.ts",
+    "lint:js": "eslint --fix --cache src test types --ext .js,.ts",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "prebuild": "del-cli dist",
     "prepare": "pnpm run build",
@@ -47,14 +47,14 @@
     "rollup": "^1.20.0"
   },
   "dependencies": {
+    "@types/estree": "0.0.39",
     "estree-walker": "^1.0.1",
     "micromatch": "^4.0.2"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^11.0.2",
     "@rollup/plugin-node-resolve": "^7.1.1",
     "@rollup/plugin-typescript": "^3.0.0",
-    "@types/estree": "0.0.39",
     "@types/jest": "^24.9.0",
     "@types/micromatch": "^3.1.1",
     "@types/node": "^12.12.25",

diff --git a/packages/pluginutils/rollup.config.js b/packages/pluginutils/rollup.config.js
@@ -9,7 +9,7 @@ export default {
   plugins: [
     resolve(),
     commonjs({ include: '../../node_modules/.pnpm/registry.npmjs.org/**' }),
-    typescript({ include: '**/*.{ts,js}' })
+    typescript({ include: '**/*.{ts,js}', module: 'esnext' })
   ],
   external: Object.keys(pkg.dependencies).concat('path', 'util'),
   output: [

diff --git a/packages/pluginutils/src/attachScopes.ts b/packages/pluginutils/src/attachScopes.ts
@@ -100,7 +100,7 @@ const attachScopes: AttachScopes = function attachScopes(ast, propertyName = 'sc
       }
 
       // create new block scope
-      if (node.type === 'BlockStatement' && !/Function/.test(parent!.type)) {
+      if (node.type === 'BlockStatement' && !/Function/.test(parent.type)) {
         newScope = new Scope({
           parent: scope,
           block: true

diff --git a/packages/pluginutils/tsconfig.json b/packages/pluginutils/tsconfig.json
@@ -1,11 +1,12 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "lib": ["es6"],
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "module": "commonjs"
   },
   "include": [
     "src/**/*",
+    "test/**/*",
     "types/**/*"
   ]
 }
diff --git a/packages/pluginutils/types/index.d.ts b/packages/pluginutils/types/index.d.ts
@@ -1,14 +1,11 @@
+// eslint-disable-next-line import/no-unresolved
 import { BaseNode } from 'estree';
 
 export interface AttachedScope {
   parent?: AttachedScope;
   isBlockScope: boolean;
   declarations: { [key: string]: boolean };
-  addDeclaration(
-    node: BaseNode,
-    isBlockDeclaration: boolean,
-    isVar: boolean
-  ): void;
+  addDeclaration(node: BaseNode, isBlockDeclaration: boolean, isVar: boolean): void;
   contains(name: string): boolean;
 }
 
@@ -35,10 +32,7 @@ export function addExtension(filename: string, ext?: string): string;
  * Each `Scope` object has a `scope.contains(name)` method that returns `true`
  * if a given name is defined in the current scope or a parent scope.
  */
-export function attachScopes(
-  ast: BaseNode,
-  propertyName?: string
-): AttachedScope;
+export function attachScopes(ast: BaseNode, propertyName?: string): AttachedScope;
 
 /**
  * Constructs a filter function which can be used to determine whether or not

diff --git a/packages/strip/package.json b/packages/strip/package.json
@@ -19,7 +19,7 @@
     "ci:test": "pnpm run test -- --verbose",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write README.md",
-    "lint:js": "eslint --fix --cache src test/test.js",
+    "lint:js": "eslint --fix --cache src test --ext .js,.ts",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "pretest": "pnpm run build",
     "test": "ava"

diff --git a/packages/strip/test/fixtures/assert/input.js b/packages/strip/test/fixtures/assert/input.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
 function foo(message) {
   assert.equal(arguments.length, 1);
   assert.equal(typeof arguments[0], 'string');

diff --git a/packages/strip/test/fixtures/super-method/input.js b/packages/strip/test/fixtures/super-method/input.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
 class Foo {
   bar() {
     a();

diff --git a/packages/strip/test/snapshots/test.js.md b/packages/strip/test/snapshots/test.js.md
@@ -40,7 +40,8 @@ Generated by [AVA](https://ava.li).
 
 > Snapshot 1
 
-    `function foo(message) {␊
+    `/* eslint-disable */␊
+    function foo(message) {␊
       bar(message);␊
     }␊
     `
@@ -113,7 +114,8 @@ Generated by [AVA](https://ava.li).
 
 > Snapshot 1
 
-    `class Foo {␊
+    `/* eslint-disable */␊
+    class Foo {␊
       bar() {␊
         a();␊
         b();␊

diff --git a/packages/strip/test/snapshots/test.js.snap b/packages/strip/test/snapshots/test.js.snap
diff --git a/packages/sucrase/package.json b/packages/sucrase/package.json
@@ -22,7 +22,7 @@
     "ci:test": "pnpm run test -- --verbose",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
     "lint:docs": "prettier --single-quote --write README.md",
-    "lint:js": "eslint --fix --cache src test",
+    "lint:js": "eslint --fix --cache src test --ext .js,.ts",
     "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
     "prebuild": "del-cli dist",
     "prepare": "pnpm run build",