ESLint Plugin: Fix dependency group checking for CommonJS (#22230)

* Packages: Resolve dependency group errors

* ESLint Plugin: Fix dependency group checking for CommonJS

* ESLint Plugin: Move changelog entry to Unreleased

bin/api-docs/are-api-docs-unstaged.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * Node dependencies.
+ * External dependencies
  */
 const { extname } = require( 'path' );
 const chalk = require( 'chalk' );

bin/generate-public-grammar.js

@@ -1,5 +1,13 @@
 #!/usr/bin/env node
+
+/**
+ * Internal dependencies
+ */
 const parser = require( '../node_modules/pegjs/lib/parser.js' );
+
+/**
+ * External dependencies
+ */
 const fs = require( 'fs' );
 const path = require( 'path' );
 const grammarSource = fs.readFileSync(

bin/plugin/commands/changelog.js

@@ -1,10 +1,10 @@
-/*
+/**
  * External dependencies
  */
 const { groupBy } = require( 'lodash' );
 const Octokit = require( '@octokit/rest' );
 
-/*
+/**
  * Internal dependencies
  */
 const { getNextMajorVersion } = require( '../lib/version' );

bin/plugin/commands/common.js

@@ -5,7 +5,7 @@ const fs = require( 'fs' );
 const rimraf = require( 'rimraf' );
 const semver = require( 'semver' );
 
-/*
+/**
  * Internal dependencies
  */
 const { log, formats } = require( '../lib/logger' );

bin/plugin/lib/utils.js

@@ -9,7 +9,7 @@ const { v4: uuid } = require( 'uuid' );
 const path = require( 'path' );
 const os = require( 'os' );
 
-/*
+/**
  * Internal dependencies
  */
 const { log, formats } = require( './logger' );

docs/tool/index.js

@@ -1,5 +1,5 @@
 /**
- * Node dependencies
+ * External dependencies
  */
 const fs = require( 'fs' );
 const path = require( 'path' );

docs/tool/manifest.js

@@ -1,5 +1,5 @@
 /**
- * Node dependencies
+ * External dependencies
  */
 const { camelCase, nth, upperFirst } = require( 'lodash' );
 const fs = require( 'fs' );

package.json

@@ -89,6 +89,8 @@
  "@storybook/react": "5.3.2",
  "@testing-library/react": "10.0.2",
  "@types/classnames": "2.2.10",
+ "@types/eslint": "6.8.0",
+ "@types/estree": "0.0.44",
  "@types/lodash": "4.14.149",
  "@types/prettier": "1.19.0",
  "@types/qs": "6.9.1",

packages/block-serialization-spec-parser/bin/create-php-parser.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 
+/**
+ * External dependencies
+ */
 const pegjs = require( 'pegjs' );
 const phpegjs = require( 'phpegjs' );
 const fs = require( 'fs' );

packages/custom-templated-path-webpack-plugin/test/fixtures/webpack.config.js

@@ -1,13 +1,11 @@
 /**
  * External dependencies
  */
-
 const { basename } = require( 'path' );
 
 /**
- * Internal dependencies
+ * WordPress dependencies
  */
-
 const CustomTemplatedPathPlugin = require( '@wordpress/custom-templated-path-webpack-plugin' );
 
 module.exports = {

packages/dependency-extraction-webpack-plugin/test/fixtures/combine-assets/webpack.config.js

@@ -1,3 +1,6 @@
+/**
+ * Internal dependencies
+ */
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {

packages/dependency-extraction-webpack-plugin/test/fixtures/dynamic-import/webpack.config.js

@@ -1,3 +1,6 @@
+/**
+ * Internal dependencies
+ */
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {

packages/dependency-extraction-webpack-plugin/test/fixtures/function-output-filename/webpack.config.js

@@ -1,3 +1,6 @@
+/**
+ * Internal dependencies
+ */
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {

packages/dependency-extraction-webpack-plugin/test/fixtures/no-default/webpack.config.js

@@ -1,3 +1,6 @@
+/**
+ * Internal dependencies
+ */
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {

packages/dependency-extraction-webpack-plugin/test/fixtures/no-deps/webpack.config.js

@@ -1,3 +1,6 @@
+/**
+ * Internal dependencies
+ */
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {

packages/dependency-extraction-webpack-plugin/test/fixtures/output-format-json/webpack.config.js

@@ -1,3 +1,6 @@
+/**
+ * Internal dependencies
+ */
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {

packages/dependency-extraction-webpack-plugin/test/fixtures/overrides/webpack.config.js

@@ -1,3 +1,6 @@
+/**
+ * Internal dependencies
+ */
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {

packages/dependency-extraction-webpack-plugin/test/fixtures/with-externs/webpack.config.js

@@ -1,3 +1,6 @@
+/**
+ * Internal dependencies
+ */
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {

packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-require/webpack.config.js

@@ -1,3 +1,6 @@
+/**
+ * Internal dependencies
+ */
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {

packages/docgen/bin/cli.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 
+/**
+ * Internal dependencies
+ */
 const docgen = require( '../src' );
 
 const optionator = require( 'optionator' )( {

packages/docgen/src/engine.js

@@ -1,11 +1,11 @@
 /**
- * External dependencies.
+ * External dependencies
  */
 const babel = require( '@babel/core' );
 const { flatten } = require( 'lodash' );
 
 /**
- * Internal dependencies.
+ * Internal dependencies
  */
 const getIntermediateRepresentation = require( './get-intermediate-representation' );
 

packages/docgen/src/get-intermediate-representation.js

@@ -1,10 +1,10 @@
 /**
- * External dependencies.
+ * External dependencies
  */
 const { get } = require( 'lodash' );
 
 /**
- * Internal dependencies.
+ * Internal dependencies
  */
 const getExportEntries = require( './get-export-entries' );
 const getJSDocFromToken = require( './get-jsdoc-from-token' );

packages/docgen/src/get-jsdoc-from-token.js

@@ -1,10 +1,10 @@
 /**
- * External dependencies.
+ * External dependencies
  */
 const doctrine = require( 'doctrine' );
 
 /**
- * Internal dependencies.
+ * Internal dependencies
  */
 const getLeadingComments = require( './get-leading-comments' );
 const getTypeAsString = require( './get-type-as-string' );

packages/docgen/src/get-leading-comments.js

@@ -1,5 +1,5 @@
 /**
- * External dependencies.
+ * External dependencies
  */
 const { last } = require( 'lodash' );
 

packages/docgen/src/markdown/index.js

@@ -1,5 +1,5 @@
 /**
- * External dependencies.
+ * External dependencies
  */
 const remark = require( 'remark' );
 const unified = require( 'unified' );
@@ -8,7 +8,7 @@ const inject = require( 'mdast-util-inject' );
 const fs = require( 'fs' );
 
 /**
- * Internal dependencies.
+ * Internal dependencies
  */
 const formatter = require( './formatter' );
 const embed = require( './embed' );

packages/docgen/src/test/engine.js

@@ -1,5 +1,5 @@
 /**
- * Internal dependencies.
+ * Internal dependencies
  */
 const engine = require( '../engine' );
 

packages/docgen/src/test/formatter-markdown.js

@@ -1,5 +1,5 @@
 /**
- * Internal dependencies.
+ * Internal dependencies
  */
 const formatter = require( '../markdown/formatter' );
 

packages/docgen/src/test/get-export-entries.js

@@ -1,11 +1,11 @@
 /**
- * Node dependencies.
+ * External dependencies
  */
 const fs = require( 'fs' );
 const path = require( 'path' );
 
 /**
- * Internal dependencies.
+ * Internal dependencies
  */
 const getExportEntries = require( '../get-export-entries' );
 

packages/docgen/src/test/get-intermediate-representation.js

@@ -1,11 +1,11 @@
 /**
- * Node dependencies.
+ * External dependencies
  */
 const fs = require( 'fs' );
 const path = require( 'path' );
 
 /**
- * Internal dependencies.
+ * Internal dependencies
  */
 const getIntermediateRepresentation = require( '../get-intermediate-representation' );
 

packages/docgen/src/test/get-jsdoc-from-token.js

@@ -1,5 +1,5 @@
 /**
- * Internal dependencies.
+ * Internal dependencies
  */
 const getJSDocFromToken = require( '../get-jsdoc-from-token' );
 

packages/docgen/src/test/get-type-as-string.js

@@ -1,5 +1,5 @@
 /**
- * Internal dependencies.
+ * Internal dependencies
  */
 const getType = require( '../get-type-as-string' );
 

packages/e2e-tests/config/performance-reporter.js

@@ -1,3 +1,6 @@
+/**
+ * External dependencies
+ */
 const { readFileSync, existsSync } = require( 'fs' );
 const chalk = require( 'chalk' );
 

packages/eslint-plugin/CHANGELOG.md

@@ -2,11 +2,15 @@
 
 ## Unreleased
 
+### Bug Fixes
+
+- `@wordpress/dependency-group` will now correctly identify issues associated with CommonJS (`require`) module imports.
+
 ## 6.0.0 (2020-05-14)
 
 ### Breaking Changes
 
--  The severity of the rule, `jsdoc/no-undefined-types`, has been increased from `warn` to `error`. In addition, `JSX` has been added to the default list of defined types.
+- The severity of the rule, `jsdoc/no-undefined-types`, has been increased from `warn` to `error`. In addition, `JSX` has been added to the default list of defined types.
 
 ### Improvements