[core] Drop _modules_ folder

.eslintignore

@@ -2,7 +2,7 @@
 /docs/.next
 /docs/export
 /lerna.json
-/packages/grid/_modules_/grid/lib
+/packages/grid/x-data-grid/src/internals/lib
 CHANGELOG.md
 dist
 node_modules

docs/data/data-grid/localization/localization.md

@@ -11,7 +11,7 @@ The default locale of MUI is English (United States). If you want to use other l
 ## Translation keys
 
 You can use the `localeText` prop to pass in your own text and translations.
-You can find all the translation keys supported in [the source](https://github.com/mui/mui-x/blob/HEAD/packages/grid/_modules_/grid/constants/localeTextConstants.ts) in the GitHub repository.
+You can find all the translation keys supported in [the source](https://github.com/mui/mui-x/blob/HEAD/packages/grid/x-data-grid/src/internals/constants/localeTextConstants.ts) in the GitHub repository.
 In the following example, the labels of the density selector are customized.
 
 {{"demo": "CustomLocaleTextGrid.js", "bg": "inline"}}
@@ -100,7 +100,7 @@ import { DataGrid, nlNL } from '@mui/x-data-grid';
 | Ukraine                 | uk-UA               | `ukUA`      |
 | Simplified Chinese      | zh-CN               | `zhCN`      |
 
-You can [find the source](https://github.com/mui/mui-x/tree/HEAD/packages/grid/_modules_/grid/locales) in the GitHub repository.
+You can [find the source](https://github.com/mui/mui-x/tree/HEAD/packages/grid/x-data-grid/src/internals/locales) in the GitHub repository.
 
 To create your own translation or to customize the English text, copy this file to your project, make any changes needed and import the locale from there.
 Note that these translations of the Data grid component depend on the [Localization strategy](/guides/localization/) of the whole library.

docs/scripts/api/buildApi.ts

@@ -1,56 +1,13 @@
 import * as yargs from 'yargs';
 import * as fse from 'fs-extra';
 import path from 'path';
-import * as ts from 'typescript';
 import buildComponentsDocumentation from './buildComponentsDocumentation';
 import buildInterfacesDocumentation from './buildInterfacesDocumentation';
 import buildExportsDocumentation from './buildExportsDocumentation';
 import buildSelectorsDocumentation from './buildSelectorsDocumentation';
 import buildEventsDocumentation from './buildEventsDocumentation';
-import { Project, Projects, ProjectNames } from './utils';
 import FEATURE_TOGGLE from '../../src/featureToggle';
-
-const workspaceRoot = path.resolve(__dirname, '../../../');
-
-interface CreateProgramOptions {
-  name: ProjectNames;
-  rootPath: string;
-  tsConfigPath: string;
-  entryPointPath: string;
-}
-
-const createProject = (options: CreateProgramOptions): Project => {
-  const { name, tsConfigPath, rootPath, entryPointPath } = options;
-
-  const compilerOptions = ts.parseJsonConfigFileContent(
-    ts.readConfigFile(tsConfigPath, ts.sys.readFile).config,
-    ts.sys,
-    rootPath,
-  );
-
-  const program = ts.createProgram({
-    rootNames: [entryPointPath],
-    options: compilerOptions.options,
-  });
-
-  const checker = program.getTypeChecker();
-  const sourceFile = program.getSourceFile(entryPointPath);
-
-  const exports = Object.fromEntries(
-    checker.getExportsOfModule(checker.getSymbolAtLocation(sourceFile!)!).map((symbol) => {
-      return [symbol.name, symbol];
-    }),
-  );
-
-  return {
-    name,
-    exports,
-    program,
-    checker,
-    workspaceRoot,
-    prettierConfigPath: path.join(workspaceRoot, 'prettier.config.js'),
-  };
-};
+import { getTypeScriptProjects } from '../getTypeScriptProjects';
 
 async function run() {
   let outputDirectories = ['./docs/pages/api-docs/data-grid'];
@@ -65,27 +22,7 @@ async function run() {
       const outputDirectory = path.resolve(dir);
       fse.mkdirSync(outputDirectory, { mode: 0o777, recursive: true });
 
-      const projects: Projects = new Map();
-
-      projects.set(
-        'x-data-grid-pro',
-        createProject({
-          name: 'x-data-grid-pro',
-          rootPath: path.join(workspaceRoot, 'packages/grid/x-data-grid-pro'),
-          tsConfigPath: path.join(workspaceRoot, 'packages/grid/x-data-grid-pro/tsconfig.json'),
-          entryPointPath: path.join(workspaceRoot, 'packages/grid/x-data-grid-pro/src/index.ts'),
-        }),
-      );
-
-      projects.set(
-        'x-data-grid',
-        createProject({
-          name: 'x-data-grid',
-          rootPath: path.join(workspaceRoot, 'packages/grid/x-data-grid'),
-          tsConfigPath: path.join(workspaceRoot, 'packages/grid/x-data-grid/tsconfig.json'),
-          entryPointPath: path.join(workspaceRoot, 'packages/grid/x-data-grid/src/index.ts'),
-        }),
-      );
+      const projects = getTypeScriptProjects();
 
       const documentedInterfaces = buildInterfacesDocumentation({
         projects,

docs/scripts/api/buildComponentsDocumentation.ts

@@ -478,6 +478,7 @@ export default async function buildComponentsDocumentation(
   const dataGridProProject = projects.get('x-data-grid-pro')!;
   const dataGridProject = projects.get('x-data-grid')!;
 
+  // TODO: Use the project fields instead of hard-coding the paths here
   const componentsToGenerateDocs = [
     path.resolve(dataGridProject.workspaceRoot, 'packages/grid/x-data-grid/src/DataGrid.tsx'),
     path.resolve(
@@ -487,7 +488,7 @@ export default async function buildComponentsDocumentation(
   ];
 
   // Uncomment below to generate documentation for all exported components
-  // const componentsFolder = path.resolve(workspaceRoot, 'packages/grid/_modules_/grid/components');
+  // const componentsFolder = path.resolve(workspaceRoot, 'packages/grid/x-data-grid/src/internals/components');
   // const components = findComponents(componentsFolder);
   // components.forEach((component) => {
   //   const componentName = path.basename(component.filename).replace('.tsx', '');

docs/scripts/api/utils.ts

@@ -12,6 +12,14 @@ export interface Project {
   checker: ts.TypeChecker;
   workspaceRoot: string;
   prettierConfigPath: string;
+  /**
+   * Folder containing all the components of this package
+   */
+  componentsFolder?: string;
+  /**
+   * Additional files containing components outside the components folder
+   */
+  otherComponentFiles?: string[];
 }
 
 export type ProjectNames = 'x-data-grid' | 'x-data-grid-pro';

docs/scripts/generateProptypes.ts

@@ -4,8 +4,7 @@ import * as fse from 'fs-extra';
 import * as prettier from 'prettier';
 import * as ttp from '@mui/monorepo/packages/typescript-to-proptypes/src';
 import { fixBabelGeneratorIssues, fixLineEndings } from 'docs/scripts/helpers';
-
-const tsconfig = ttp.loadConfig(path.resolve(__dirname, '../../tsconfig.json'));
+import { getTypeScriptProjects } from './getTypeScriptProjects';
 
 const prettierConfig = prettier.resolveConfig.sync(process.cwd(), {
   config: path.join(__dirname, '../../prettier.config.js'),
@@ -104,35 +103,31 @@ function findComponents(folderPath) {
 }
 
 async function run() {
-  const componentsToAddPropTypes = [
-    path.resolve(__dirname, '../../packages/grid/x-data-grid/src/DataGrid.tsx'),
-    path.resolve(__dirname, '../../packages/grid/x-data-grid-pro/src/DataGridPro.tsx'),
-  ];
-
-  const indexPath = path.resolve(__dirname, '../../packages/grid/_modules_/index.ts');
-  const program = ttp.createTSProgram([...componentsToAddPropTypes, indexPath], tsconfig);
-  const checker = program.getTypeChecker();
-  const indexFile = program.getSourceFile(indexPath)!;
-  const symbol = checker.getSymbolAtLocation(indexFile);
-  const exports = checker.getExportsOfModule(symbol!);
-
-  const componentsFolder = path.resolve(__dirname, '../../packages/grid/_modules_/grid/components');
-  const components = findComponents(componentsFolder);
-  components.forEach((component) => {
-    const componentName = path.basename(component).replace('.tsx', '');
-    const isExported = exports.find((e) => e.name === componentName);
-    if (isExported) {
-      componentsToAddPropTypes.push(component);
-    }
-  });
+  const projects = getTypeScriptProjects();
 
-  const promises = componentsToAddPropTypes.map<Promise<void>>(async (file) => {
-    try {
-      await generateProptypes(program, file);
-    } catch (error: any) {
-      error.message = `${file}: ${error.message}`;
-      throw error;
+  const promises = Array.from(projects.values()).flatMap((project) => {
+    const componentsToAddPropTypes: string[] = [];
+    if (project.otherComponentFiles) {
+      componentsToAddPropTypes.push(...project.otherComponentFiles);
     }
+
+    const components = findComponents(project.componentsFolder);
+    components.forEach((component) => {
+      const componentName = path.basename(component).replace('.tsx', '');
+      const isExported = !!project.exports[componentName];
+      if (isExported) {
+        componentsToAddPropTypes.push(component);
+      }
+    });
+
+    return componentsToAddPropTypes.map<Promise<void>>(async (file) => {
+      try {
+        await generateProptypes(project.program, file);
+      } catch (error: any) {
+        error.message = `${file}: ${error.message}`;
+        throw error;
+      }
+    });
   });
 
   const results = await Promise.allSettled(promises);

docs/scripts/getTypeScriptProjects.ts

@@ -0,0 +1,111 @@
+import path from 'path';
+import fs from 'fs';
+import * as ts from 'typescript';
+import { Project, ProjectNames, Projects } from './api/utils';
+
+const workspaceRoot = path.resolve(__dirname, '../../');
+
+interface CreateProgramOptions {
+  name: ProjectNames;
+  rootPath: string;
+  /**
+   * Config to use to build this package.
+   * The path must be relative to the root path.
+   */
+  tsConfigPath: string;
+  /**
+   * File used as root of the package.
+   * The path must be relative to the root path.
+   */
+  entryPointPath: string;
+  /**
+   * Folder containing all the components of this package.
+   * The path must be relative to the root path.
+   */
+  componentsFolder?: string;
+  /**
+   * Additional files containing components outside the component's folder.
+   * The path must be relative to the root path.
+   */
+  otherComponentFiles?: string[];
+}
+
+const createProject = (options: CreateProgramOptions): Project => {
+  const { name, tsConfigPath, rootPath, entryPointPath, componentsFolder, otherComponentFiles } =
+    options;
+
+  const tsConfigFile = ts.readConfigFile(tsConfigPath, (filePath) =>
+    fs.readFileSync(filePath).toString(),
+  );
+
+  if (tsConfigFile.error) {
+    throw tsConfigFile.error;
+  }
+
+  const tsConfigFileContent = ts.parseJsonConfigFileContent(
+    tsConfigFile.config,
+    ts.sys,
+    path.dirname(tsConfigPath),
+  );
+
+  if (tsConfigFileContent.errors.length > 0) {
+    throw tsConfigFileContent.errors[0];
+  }
+
+  const fullEntryPointPath = path.join(rootPath, entryPointPath);
+
+  const program = ts.createProgram({
+    rootNames: [fullEntryPointPath],
+    options: tsConfigFileContent.options,
+  });
+
+  const checker = program.getTypeChecker();
+  const sourceFile = program.getSourceFile(fullEntryPointPath);
+
+  const exports = Object.fromEntries(
+    checker.getExportsOfModule(checker.getSymbolAtLocation(sourceFile!)!).map((symbol) => {
+      return [symbol.name, symbol];
+    }),
+  );
+
+  return {
+    name,
+    exports,
+    program,
+    checker,
+    workspaceRoot,
+    componentsFolder: componentsFolder ? path.join(rootPath, componentsFolder) : undefined,
+    otherComponentFiles: otherComponentFiles?.map((file) => path.join(rootPath, file)),
+    prettierConfigPath: path.join(workspaceRoot, 'prettier.config.js'),
+  };
+};
+
+export const getTypeScriptProjects = () => {
+  const projects: Projects = new Map();
+
+  projects.set(
+    'x-data-grid-pro',
+    createProject({
+      name: 'x-data-grid-pro',
+      rootPath: path.join(workspaceRoot, 'packages/grid/x-data-grid-pro'),
+      tsConfigPath: 'tsconfig.json',
+      entryPointPath: 'src/index.ts',
+      componentsFolder: 'src/internals/components',
+      otherComponentFiles: ['src/DataGridPro.tsx'],
+    }),
+  );
+
+  projects.set(
+    'x-data-grid',
+    createProject({
+      name: 'x-data-grid',
+      rootPath: path.join(workspaceRoot, 'packages/grid/x-data-grid'),
+      tsConfigPath: 'tsconfig.json',
+      entryPointPath: 'src/index.ts',
+      componentsFolder: 'src/internals/components',
+      otherComponentFiles: ['src/DataGrid.tsx'],
+    }),
+  );
+
+  return projects;
+};

docs/translations/api-docs/data-grid/data-grid-pro-pt.json

@@ -59,7 +59,7 @@
     "isGroupExpandedByDefault": "Determines if a group should be expanded after its creation. This prop takes priority over the <code>defaultGroupingExpansionDepth</code> prop.<br><br><strong>Signature:</strong><br><code>function(node: GridRowTreeNodeConfig) =&gt; boolean</code><br><em>node:</em> The node of the group to test.<br> <em>returns</em> (boolean): A boolean indicating if the group is expanded.",
     "isRowSelectable": "Determines if a row can be selected.<br><br><strong>Signature:</strong><br><code>function(params: GridRowParams) =&gt; boolean</code><br><em>params:</em> With all properties from <a href=\"/api/data-grid/grid-row-params/\">GridRowParams</a>.<br> <em>returns</em> (boolean): A boolean indicating if the cell is selectable.",
     "loading": "If <code>true</code>, a  loading overlay is displayed.",
-    "localeText": "Set the locale text of the grid. You can find all the translation keys supported in <a href=\"https://github.com/mui/mui-x/blob/HEAD/packages/grid/_modules_/grid/constants/localeTextConstants.ts\">the source</a> in the GitHub repository.",
+    "localeText": "Set the locale text of the grid. You can find all the translation keys supported in <a href=\"https://github.com/mui/mui-x/blob/HEAD/packages/grid/x-data-grid/src/internals/constants/localeTextConstants.ts\">the source</a> in the GitHub repository.",
     "logger": "Pass a custom logger in the components that implements the Logger interface.",
     "logLevel": "Allows to pass the logging level or false to turn off logging.",
     "nonce": "Nonce of the inline styles for <a href=\"https://www.w3.org/TR/2016/REC-CSP2-20161215/#script-src-the-nonce-attribute\">Content Security Policy</a>.",

docs/translations/api-docs/data-grid/data-grid-pro-zh.json

@@ -59,7 +59,7 @@
     "isGroupExpandedByDefault": "Determines if a group should be expanded after its creation. This prop takes priority over the <code>defaultGroupingExpansionDepth</code> prop.<br><br><strong>Signature:</strong><br><code>function(node: GridRowTreeNodeConfig) =&gt; boolean</code><br><em>node:</em> The node of the group to test.<br> <em>returns</em> (boolean): A boolean indicating if the group is expanded.",
     "isRowSelectable": "Determines if a row can be selected.<br><br><strong>Signature:</strong><br><code>function(params: GridRowParams) =&gt; boolean</code><br><em>params:</em> With all properties from <a href=\"/api/data-grid/grid-row-params/\">GridRowParams</a>.<br> <em>returns</em> (boolean): A boolean indicating if the cell is selectable.",
     "loading": "If <code>true</code>, a  loading overlay is displayed.",
-    "localeText": "Set the locale text of the grid. You can find all the translation keys supported in <a href=\"https://github.com/mui/mui-x/blob/HEAD/packages/grid/_modules_/grid/constants/localeTextConstants.ts\">the source</a> in the GitHub repository.",
+    "localeText": "Set the locale text of the grid. You can find all the translation keys supported in <a href=\"https://github.com/mui/mui-x/blob/HEAD/packages/grid/x-data-grid/src/internals/constants/localeTextConstants.ts\">the source</a> in the GitHub repository.",
     "logger": "Pass a custom logger in the components that implements the Logger interface.",
     "logLevel": "Allows to pass the logging level or false to turn off logging.",
     "nonce": "Nonce of the inline styles for <a href=\"https://www.w3.org/TR/2016/REC-CSP2-20161215/#script-src-the-nonce-attribute\">Content Security Policy</a>.",

docs/translations/api-docs/data-grid/data-grid-pro.json

@@ -59,7 +59,7 @@
     "isGroupExpandedByDefault": "Determines if a group should be expanded after its creation. This prop takes priority over the <code>defaultGroupingExpansionDepth</code> prop.<br><br><strong>Signature:</strong><br><code>function(node: GridRowTreeNodeConfig) =&gt; boolean</code><br><em>node:</em> The node of the group to test.<br> <em>returns</em> (boolean): A boolean indicating if the group is expanded.",
     "isRowSelectable": "Determines if a row can be selected.<br><br><strong>Signature:</strong><br><code>function(params: GridRowParams) =&gt; boolean</code><br><em>params:</em> With all properties from <a href=\"/api/data-grid/grid-row-params/\">GridRowParams</a>.<br> <em>returns</em> (boolean): A boolean indicating if the cell is selectable.",
     "loading": "If <code>true</code>, a  loading overlay is displayed.",
-    "localeText": "Set the locale text of the grid. You can find all the translation keys supported in <a href=\"https://github.com/mui/mui-x/blob/HEAD/packages/grid/_modules_/grid/constants/localeTextConstants.ts\">the source</a> in the GitHub repository.",
+    "localeText": "Set the locale text of the grid. You can find all the translation keys supported in <a href=\"https://github.com/mui/mui-x/blob/HEAD/packages/grid/x-data-grid/src/internals/constants/localeTextConstants.ts\">the source</a> in the GitHub repository.",
     "logger": "Pass a custom logger in the components that implements the Logger interface.",
     "logLevel": "Allows to pass the logging level or false to turn off logging.",
     "nonce": "Nonce of the inline styles for <a href=\"https://www.w3.org/TR/2016/REC-CSP2-20161215/#script-src-the-nonce-attribute\">Content Security Policy</a>.",

docs/translations/api-docs/data-grid/data-grid-pt.json

@@ -41,7 +41,7 @@
     "isCellEditable": "Callback fired when a cell is rendered, returns true if the cell is editable.<br><br><strong>Signature:</strong><br><code>function(params: GridCellParams) =&gt; boolean</code><br><em>params:</em> With all properties from <a href=\"/api/data-grid/grid-cell-params/\">GridCellParams</a>.<br> <em>returns</em> (boolean): A boolean indicating if the cell is editable.",
     "isRowSelectable": "Determines if a row can be selected.<br><br><strong>Signature:</strong><br><code>function(params: GridRowParams) =&gt; boolean</code><br><em>params:</em> With all properties from <a href=\"/api/data-grid/grid-row-params/\">GridRowParams</a>.<br> <em>returns</em> (boolean): A boolean indicating if the cell is selectable.",
     "loading": "If <code>true</code>, a  loading overlay is displayed.",
-    "localeText": "Set the locale text of the grid. You can find all the translation keys supported in <a href=\"https://github.com/mui/mui-x/blob/HEAD/packages/grid/_modules_/grid/constants/localeTextConstants.ts\">the source</a> in the GitHub repository.",
+    "localeText": "Set the locale text of the grid. You can find all the translation keys supported in <a href=\"https://github.com/mui/mui-x/blob/HEAD/packages/grid/x-data-grid/src/internals/constants/localeTextConstants.ts\">the source</a> in the GitHub repository.",
     "logger": "Pass a custom logger in the components that implements the Logger interface.",
     "logLevel": "Allows to pass the logging level or false to turn off logging.",
     "nonce": "Nonce of the inline styles for <a href=\"https://www.w3.org/TR/2016/REC-CSP2-20161215/#script-src-the-nonce-attribute\">Content Security Policy</a>.",