@mui/internal-code-infra 0.0.4-canary.67 → 0.0.4-canary.69

package/build/utils/build.d.mts

@@ -11,35 +11,28 @@ export declare const BASE_IGNORES: string[];
  * @param {BundleType} bundle
  * @param {Object} [options]
  * @param {boolean} [options.isType=false] - Whether to get the extension for type declaration files.
- * @param {boolean} [options.isFlat=false] - Whether to get the extension for a flat build structure.
  * @param {'module' | 'commonjs'} [options.packageType='commonjs'] - The package.json type field.
  * @returns {string}
  */
 export declare function getOutExtension(bundle: BundleType, options?: {
     isType?: boolean;
-    isFlat?: boolean;
     packageType?: 'module' | 'commonjs';
 }): string;
 /**
  * @param {import('../cli/packageJson').PackageJson['exports']} packageExports
  * @param {Object} options
- * @param {{type: BundleType; dir: string}[]} options.bundles
+ * @param {BundleType[]} options.bundles
  * @param {string} options.outputDir
  * @param {string} options.cwd
  * @param {boolean} [options.addTypes]
- * @param {boolean} [options.isFlat]
  * @param {boolean} [options.expand] - Whether to enumerate glob patterns into concrete entries.
  * @param {'module' | 'commonjs'} [options.packageType]
  */
-export declare function createPackageExports(packageExports: import('../cli/packageJson').PackageJson['exports'], { bundles, outputDir, cwd, addTypes, isFlat, expand, packageType, }: {
-    bundles: {
-        type: BundleType;
-        dir: string;
-    }[];
+export declare function createPackageExports(packageExports: import('../cli/packageJson').PackageJson['exports'], { bundles, outputDir, cwd, addTypes, expand, packageType }: {
+    bundles: BundleType[];
     outputDir: string;
     cwd: string;
     addTypes?: boolean;
-    isFlat?: boolean;
     expand?: boolean;
     packageType?: 'module' | 'commonjs';
 }): Promise<{
@@ -58,42 +51,32 @@ export declare function createPackageExports(packageExports: import('../cli/pack
  * unchanged, since the `imports` field commonly aliases dependencies.
  * @param {import('../cli/packageJson').PackageJson['imports']} packageImports
  * @param {Object} options
- * @param {{type: BundleType; dir: string}[]} options.bundles
+ * @param {BundleType[]} options.bundles
  * @param {string} options.cwd
  * @param {string} [options.outputDir] - Used to verify non-source passthrough paths exist in the build output.
  * @param {boolean} [options.addTypes]
- * @param {boolean} [options.isFlat]
  * @param {boolean} [options.expand] - Whether to enumerate glob patterns into concrete entries.
  * @param {'module' | 'commonjs'} [options.packageType]
  * @returns {Promise<import('../cli/packageJson').PackageJson.Imports | undefined>}
  */
-export declare function createPackageImports(packageImports: import('../cli/packageJson').PackageJson['imports'], { bundles, cwd, outputDir, addTypes, isFlat, expand, packageType, }: {
-    bundles: {
-        type: BundleType;
-        dir: string;
-    }[];
+export declare function createPackageImports(packageImports: import('../cli/packageJson').PackageJson['imports'], { bundles, cwd, outputDir, addTypes, expand, packageType }: {
+    bundles: BundleType[];
     cwd: string;
     outputDir?: string;
     addTypes?: boolean;
-    isFlat?: boolean;
     expand?: boolean;
     packageType?: 'module' | 'commonjs';
 }): Promise<import('../cli/packageJson').PackageJson.Imports | undefined>;
 /**
  * @param {import('../cli/packageJson').PackageJson['bin']} bin
  * @param {Object} options
- * @param {{type: BundleType; dir: string}[]} options.bundles
+ * @param {BundleType[]} options.bundles
  * @param {string} options.cwd
- * @param {boolean} [options.isFlat]
  * @param {'module' | 'commonjs'} [options.packageType]
  */
-export declare function createPackageBin(bin: import('../cli/packageJson').PackageJson['bin'], { bundles, cwd, isFlat, packageType }: {
-    bundles: {
-        type: BundleType;
-        dir: string;
-    }[];
+export declare function createPackageBin(bin: import('../cli/packageJson').PackageJson['bin'], { bundles, cwd, packageType }: {
+    bundles: BundleType[];
     cwd: string;
-    isFlat?: boolean;
     packageType?: 'module' | 'commonjs';
 }): Promise<string | Record<string, string> | undefined>;
 /**

package/build/utils/typescript.d.mts

@@ -22,19 +22,14 @@ export declare function copyDeclarations(sourceDirectory: string, destinationDir
  * @param {Object} param0
  * @param {string} param0.inputDir
  * @param {string} param0.buildDir
- * @param {{type: import('../utils/build.mjs').BundleType, dir: string}[]} param0.bundles
- * @param {boolean} [param0.isFlat]
+ * @param {import('../utils/build.mjs').BundleType[]} param0.bundles
  * @param {'module' | 'commonjs'} [param0.packageType]
  * @returns
  */
-export declare function moveAndTransformDeclarations({ inputDir, buildDir, bundles, isFlat, packageType, }: {
+export declare function moveAndTransformDeclarations({ inputDir, buildDir, bundles, packageType }: {
     inputDir: string;
     buildDir: string;
-    bundles: {
-        type: import('../utils/build.mjs').BundleType;
-        dir: string;
-    }[];
-    isFlat?: boolean;
+    bundles: import('../utils/build.mjs').BundleType[];
     packageType?: 'module' | 'commonjs';
 }): Promise<void>;
 /**
@@ -43,9 +38,8 @@ export declare function moveAndTransformDeclarations({ inputDir, buildDir, bundl
  * After copying, babel transformations are applied to the copied files because they need to be alongside the actual js files for proper resolution.
  *
  * @param {Object} param0
- * @param {boolean} [param0.isFlat = false] - Whether to place generated declaration files in a flattened directory.
  * @param {boolean} [param0.verbose = false] - Whether to log additional information while generating and moving declaration files.
- * @param {{type: import('../utils/build.mjs').BundleType, dir: string}[]} param0.bundles - The bundles to create declarations for.
+ * @param {import('../utils/build.mjs').BundleType[]} param0.bundles - The bundles to create declarations for.
  * @param {string} param0.srcDir - The source directory.
  * @param {string} param0.buildDir - The build directory.
  * @param {string} param0.cwd - The current working directory.
@@ -53,13 +47,9 @@ export declare function moveAndTransformDeclarations({ inputDir, buildDir, bundl
  * @param {boolean} [param0.useTsgo=false] - Whether to build types using typescript native (tsgo).
  * @param {'module' | 'commonjs'} [param0.packageType] - The package.json type field.
  */
-export declare function createTypes({ bundles, srcDir, buildDir, cwd, skipTsc, useTsgo, isFlat, packageType, verbose, }: {
-    isFlat?: boolean;
+export declare function createTypes({ bundles, srcDir, buildDir, cwd, skipTsc, useTsgo, packageType, verbose, }: {
     verbose?: boolean;
-    bundles: {
-        type: import('../utils/build.mjs').BundleType;
-        dir: string;
-    }[];
+    bundles: import('../utils/build.mjs').BundleType[];
     srcDir: string;
     buildDir: string;
     cwd: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.4-canary.67",
+  "version": "0.0.4-canary.69",
   "author": "MUI Team",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "license": "MIT",
@@ -83,7 +83,7 @@
     "babel-plugin-transform-remove-imports": "^1.8.1",
     "chalk": "^5.6.2",
     "clipboardy": "^5.3.1",
-    "content-type": "^1.0.5",
+    "content-type": "^2.0.0",
     "env-ci": "^11.2.0",
     "es-toolkit": "^1.46.1",
     "eslint-config-prettier": "^10.1.8",
@@ -135,8 +135,8 @@
     "unist-util-visit": "^5.1.0",
     "yaml": "^2.9.0",
     "yargs": "^18.0.0",
-    "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.36",
     "@mui/internal-babel-plugin-display-name": "1.0.4-canary.20",
+    "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.36",
     "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.27"
   },
   "peerDependencies": {
@@ -158,7 +158,6 @@
     "@octokit/types": "16.0.0",
     "@types/babel__core": "7.20.5",
     "@types/babel__preset-env": "7.10.0",
-    "@types/content-type": "1.1.9",
     "@types/env-ci": "3.1.4",
     "@types/eslint-plugin-jsx-a11y": "6.10.1",
     "@types/estree": "1.0.9",
@@ -187,7 +186,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "b0b08ac265cb2f9411c8cc32b09a8d0bd5093fac",
+  "gitSha": "8fa07fb68e1c06938b589899e0445b5daf8d26f0",
   "scripts": {
     "build": "tsgo -p tsconfig.build.json",
     "typescript": "tsgo -noEmit",

package/src/brokenLinksChecker/crawlWorker.mjs

@@ -1,6 +1,6 @@
 import { workerData, parentPort } from 'node:worker_threads';
 import { parse } from 'node-html-parser';
-import contentType from 'content-type';
+import { parse as parseContentType } from 'content-type';
 import { HtmlValidate, StaticConfigLoader, staticResolver } from 'html-validate';
 import { unified } from 'unified';
 import remarkParse from 'remark-parse';
@@ -111,7 +111,7 @@ let type = 'text/html';
 
 if (contentTypeHeader) {
   try {
-    const parsed = contentType.parse(contentTypeHeader);
+    const parsed = parseContentType(contentTypeHeader);
     type = parsed.type;
   } catch {
     // invalid content-type, default to text/html

package/src/cli/cmdBuild.mjs

@@ -31,7 +31,7 @@ import {
  * @property {string[]} [copy] - Files/Directories to be copied. Can be a glob pattern.
  * @property {boolean} [enableReactCompiler] - Whether to use the React compiler.
  * @property {boolean} [tsgo] - Whether to build types using typescript native (tsgo).
- * @property {boolean} [flat] - Builds the package in a flat structure without subdirectories for each module type.
+ * @property {boolean} [flat] - Deprecated no-op; flat builds are always used.
  * @property {boolean} expand - Whether to enumerate glob patterns in exports/imports into concrete entries.
  */
 
@@ -47,13 +47,12 @@ const validBundles = [
  * @param {string} options.name - The name of the package.
  * @param {string} options.version - The version of the package.
  * @param {string} options.license - The license of the package.
- * @param {boolean} options.isFlat - Whether the build is flat structure.
  * @param {'module' | 'commonjs'} options.packageType - The package.json type field.
  * @param {import('../utils/build.mjs').BundleType} options.bundle
  * @param {string} options.outputDir
  */
-async function addLicense({ name, version, license, bundle, outputDir, isFlat, packageType }) {
-  const outExtension = getOutExtension(bundle, { isFlat, packageType });
+async function addLicense({ name, version, license, bundle, outputDir, packageType }) {
+  const outExtension = getOutExtension(bundle, { packageType });
   const file = path.join(outputDir, `index${outExtension}`);
   if (
     !(await fs.stat(file).then(
@@ -82,11 +81,10 @@ ${content}`,
 /**
  * @param {Object} param0
  * @param {import('./packageJson').PackageJson} param0.packageJson - The package.json content.
- * @param {{type: import('../utils/build.mjs').BundleType; dir: string}[]} param0.bundles
+ * @param {import('../utils/build.mjs').BundleType[]} param0.bundles
  * @param {string} param0.outputDir
  * @param {string} param0.cwd
  * @param {boolean} param0.addTypes - Whether to add type declarations for the package.
- * @param {boolean} param0.isFlat - Whether the build is flat structure.
  * @param {boolean} [param0.expand] - Whether to enumerate glob patterns into concrete entries.
  * @param {'module' | 'commonjs'} param0.packageType - The package.json type field.
  */
@@ -96,7 +94,6 @@ async function writePackageJson({
   outputDir,
   cwd,
   addTypes = false,
-  isFlat = false,
   expand = true,
   packageType,
 }) {
@@ -120,7 +117,6 @@ async function writePackageJson({
       outputDir,
       cwd,
       addTypes,
-      isFlat,
       expand,
       packageType: resolvedPackageType,
     }),
@@ -130,7 +126,6 @@ async function writePackageJson({
           cwd,
           outputDir,
           addTypes,
-          isFlat,
           expand,
           packageType: resolvedPackageType,
         })
@@ -151,7 +146,6 @@ async function writePackageJson({
   const bin = await createPackageBin(originalBin, {
     bundles,
     cwd,
-    isFlat,
     packageType: resolvedPackageType,
   });
   if (bin) {
@@ -241,9 +235,11 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
       })
       .option('flat', {
         type: 'boolean',
-        default: process.env.MUI_BUILD_FLAT === '1',
+        deprecated:
+          'Flat builds are now always used; this flag is a no-op and will be removed in a future release.',
+        default: true,
         description:
-          'Builds the package in a flat structure without subdirectories for each module type.',
+          '@deprecated Flat builds are always used now. The package is always built in a flat structure without subdirectories for each module type.',
       })
       .option('expand', {
         type: 'boolean',
@@ -256,7 +252,6 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
     const {
       bundle: bundles,
       hasLargeFiles,
-      skipBundlePackageJson,
       verbose = false,
       ignore: extraIgnores,
       buildTypes,
@@ -277,9 +272,6 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
     const packageType = packageJson.type === 'module' ? 'module' : 'commonjs';
 
     console.log(`Selected output directory: "${buildDirBase}"`);
-    if (args.flat) {
-      console.log('Building package in flat structure.');
-    }
 
     await fs.rm(buildDir, { recursive: true, force: true });
 
@@ -304,15 +296,6 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
     }
 
     const { build: babelBuild, cjsCopy } = await import('../utils/babel.mjs');
-    const relativeOutDirs = !args.flat
-      ? {
-          cjs: '.',
-          esm: 'esm',
-        }
-      : {
-          cjs: '.',
-          esm: '.',
-        };
     const sourceDir = path.join(cwd, 'src');
     const reactVersion =
       semver.minVersion(packageJson.peerDependencies?.react || '')?.version ?? 'latest';
@@ -328,13 +311,10 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
     await Promise.all(
       bundles.map(async (bundle) => {
         const outExtension = getOutExtension(bundle, {
-          isFlat: !!args.flat,
           isType: false,
           packageType,
         });
-        const relativeOutDir = relativeOutDirs[bundle];
-        const outputDir = path.join(buildDir, relativeOutDir);
-        await fs.mkdir(outputDir, { recursive: true });
+        await fs.mkdir(buildDir, { recursive: true });
 
         const promises = [];
 
@@ -342,7 +322,7 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
           babelBuild({
             cwd,
             sourceDir,
-            outDir: outputDir,
+            outDir: buildDir,
             babelRuntimeVersion,
             hasLargeFiles,
             bundle,
@@ -362,61 +342,28 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
           }),
         );
 
-        if (buildDir !== outputDir && !skipBundlePackageJson && !args.flat) {
-          // @TODO - Not needed if the output extension is .mjs. Remove this before PR merge.
-          promises.push(
-            fs.writeFile(
-              path.join(outputDir, 'package.json'),
-              JSON.stringify({
-                type: bundle === 'esm' ? 'module' : 'commonjs',
-                sideEffects: packageJson.sideEffects ?? false,
-              }),
-            ),
-          );
-        }
-
-        if (!args.flat) {
-          // cjs for reexporting from commons only modules.
-          // @NOTE: If we need to rely more on this we can think about setting up
-          // a separate commonjs => commonjs build for .cjs files to .cjs
-          // `--extensions-.cjs --out-file-extension .cjs`
-          promises.push(cjsCopy({ from: sourceDir, to: outputDir }));
-        }
-
         await Promise.all(promises);
         await addLicense({
           bundle,
           license: packageJson.license,
           name: packageJson.name,
           version: packageJson.version,
-          outputDir,
-          isFlat: !!args.flat,
+          outputDir: buildDir,
           packageType,
         });
       }),
     );
 
-    if (args.flat) {
-      await cjsCopy({ from: sourceDir, to: buildDir });
-    }
+    await cjsCopy({ from: sourceDir, to: buildDir });
     // js build end
 
     if (buildTypes) {
       const tsMod = await import('../utils/typescript.mjs');
-      /**
-       * @type {{type: import('../utils/build.mjs').BundleType, dir: string}[]};
-       */
-      const bundleMap = bundles.map((type) => ({
-        type,
-        dir: relativeOutDirs[type],
-      }));
-
       await tsMod.createTypes({
-        bundles: bundleMap,
+        bundles,
         srcDir: sourceDir,
         cwd,
         skipTsc,
-        isFlat: !!args.flat,
         buildDir,
         useTsgo,
         packageType,
@@ -431,13 +378,9 @@ export default /** @type {import('yargs').CommandModule<{}, Args>} */ ({
     await writePackageJson({
       cwd,
       packageJson,
-      bundles: bundles.map((type) => ({
-        type,
-        dir: relativeOutDirs[type],
-      })),
+      bundles,
       outputDir: buildDir,
       addTypes: buildTypes,
-      isFlat: !!args.flat,
       expand: args.expand,
       packageType,
     });

package/src/utils/build.mjs

@@ -40,16 +40,12 @@ export const BASE_IGNORES = [
  * @param {BundleType} bundle
  * @param {Object} [options]
  * @param {boolean} [options.isType=false] - Whether to get the extension for type declaration files.
- * @param {boolean} [options.isFlat=false] - Whether to get the extension for a flat build structure.
  * @param {'module' | 'commonjs'} [options.packageType='commonjs'] - The package.json type field.
  * @returns {string}
  */
 export function getOutExtension(bundle, options = {}) {
-  const { isType = false, isFlat = false, packageType = 'commonjs' } = options;
+  const { isType = false, packageType = 'commonjs' } = options;
   const normalizedPackageType = packageType === 'module' ? 'module' : 'commonjs';
-  if (!isFlat) {
-    return isType ? '.d.ts' : '.js';
-  }
   if (isType) {
     if (normalizedPackageType === 'module') {
       return bundle === 'esm' ? '.d.ts' : '.d.cts';
@@ -590,43 +586,33 @@ async function expandExportGlobs(originalExports, cwd) {
 /**
  * Builds the per-bundle metadata (output extensions + the `import`/`require`
  * condition each bundle maps to).
- * @param {{type: BundleType; dir: string}[]} bundles
- * @param {boolean} isFlat
+ * @param {BundleType[]} bundles
  * @param {'module' | 'commonjs'} packageType
  * @returns {BundleMeta[]}
  */
-function createBundleMetas(bundles, isFlat, packageType) {
-  return bundles.map(({ type, dir }) => ({
+function createBundleMetas(bundles, packageType) {
+  return bundles.map((type) => ({
     type,
-    dir,
+    dir: '.',
     condition: type === 'cjs' ? 'require' : 'import',
-    outExtension: getOutExtension(type, { isFlat, packageType }),
-    typeOutExtension: getOutExtension(type, { isFlat, isType: true, packageType }),
+    outExtension: getOutExtension(type, { packageType }),
+    typeOutExtension: getOutExtension(type, { isType: true, packageType }),
   }));
 }
 
 /**
  * @param {import('../cli/packageJson').PackageJson['exports']} packageExports
  * @param {Object} options
- * @param {{type: BundleType; dir: string}[]} options.bundles
+ * @param {BundleType[]} options.bundles
  * @param {string} options.outputDir
  * @param {string} options.cwd
  * @param {boolean} [options.addTypes]
- * @param {boolean} [options.isFlat]
  * @param {boolean} [options.expand] - Whether to enumerate glob patterns into concrete entries.
  * @param {'module' | 'commonjs'} [options.packageType]
  */
 export async function createPackageExports(
   packageExports,
-  {
-    bundles,
-    outputDir,
-    cwd,
-    addTypes = false,
-    isFlat = false,
-    expand = true,
-    packageType = 'commonjs',
-  },
+  { bundles, outputDir, cwd, addTypes = false, expand = true, packageType = 'commonjs' },
 ) {
   const resolvedPackageType = packageType === 'module' ? 'module' : 'commonjs';
   /**
@@ -637,7 +623,7 @@ export async function createPackageExports(
       ? { '.': packageExports }
       : packageExports || {};
   const originalExports = expand ? await expandExportGlobs(rawExports, cwd) : rawExports;
-  const bundleMetas = createBundleMetas(bundles, isFlat, resolvedPackageType);
+  const bundleMetas = createBundleMetas(bundles, resolvedPackageType);
   /**
    * @type {import('../cli/packageJson').PackageJson.ExportConditions}
    */
@@ -695,12 +681,6 @@ export async function createPackageExports(
     }),
   );
 
-  bundles.forEach(({ dir }) => {
-    if (dir !== '.') {
-      newExports[`./${dir}`] = null;
-    }
-  });
-
   finalizeConditions(newExports, addTypes, 'export');
 
   return result;
@@ -717,26 +697,17 @@ export async function createPackageExports(
  * unchanged, since the `imports` field commonly aliases dependencies.
  * @param {import('../cli/packageJson').PackageJson['imports']} packageImports
  * @param {Object} options
- * @param {{type: BundleType; dir: string}[]} options.bundles
+ * @param {BundleType[]} options.bundles
  * @param {string} options.cwd
  * @param {string} [options.outputDir] - Used to verify non-source passthrough paths exist in the build output.
  * @param {boolean} [options.addTypes]
- * @param {boolean} [options.isFlat]
  * @param {boolean} [options.expand] - Whether to enumerate glob patterns into concrete entries.
  * @param {'module' | 'commonjs'} [options.packageType]
  * @returns {Promise<import('../cli/packageJson').PackageJson.Imports | undefined>}
  */
 export async function createPackageImports(
   packageImports,
-  {
-    bundles,
-    cwd,
-    outputDir,
-    addTypes = false,
-    isFlat = false,
-    expand = true,
-    packageType = 'commonjs',
-  },
+  { bundles, cwd, outputDir, addTypes = false, expand = true, packageType = 'commonjs' },
 ) {
   if (!packageImports || Object.keys(packageImports).length === 0) {
     return undefined;
@@ -755,7 +726,7 @@ export async function createPackageImports(
     packageImports
   );
   const originalImports = expand ? await expandExportGlobs(rawImports, cwd) : rawImports;
-  const bundleMetas = createBundleMetas(bundles, isFlat, resolvedPackageType);
+  const bundleMetas = createBundleMetas(bundles, resolvedPackageType);
 
   const newImports = await rewriteConditionsMap(originalImports, {
     bundleMetas,
@@ -773,19 +744,17 @@ export async function createPackageImports(
 /**
  * @param {import('../cli/packageJson').PackageJson['bin']} bin
  * @param {Object} options
- * @param {{type: BundleType; dir: string}[]} options.bundles
+ * @param {BundleType[]} options.bundles
  * @param {string} options.cwd
- * @param {boolean} [options.isFlat]
  * @param {'module' | 'commonjs'} [options.packageType]
  */
-export async function createPackageBin(bin, { bundles, cwd, isFlat = false, packageType }) {
+export async function createPackageBin(bin, { bundles, cwd, packageType }) {
   if (!bin) {
     return undefined;
   }
   // Use mjs files if present, otherwise fallback to the first bundle type
-  const bundleToUse = bundles.find((b) => b.type === 'esm') || bundles[0];
-  const binOutExtension = getOutExtension(bundleToUse.type, {
-    isFlat,
+  const bundleToUse = bundles.find((type) => type === 'esm') || bundles[0];
+  const binOutExtension = getOutExtension(bundleToUse, {
     packageType,
   });
 
@@ -813,7 +782,7 @@ export async function createPackageBin(bin, { bundles, cwd, isFlat = false, pack
     }
     const ext = path.extname(binPath);
     newBin[binKey] = binPath
-      .replace(/(\.\/)?src\//, bundleToUse.dir === '.' ? './' : `./${bundleToUse.dir}/`)
+      .replace(/(\.\/)?src\//, './')
       .replace(new RegExp(`\\${ext}$`), binOutExtension);
   }
   // eslint-disable-next-line no-underscore-dangle