Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docs] Fix imports for x-grid-data-generator #887

Merged
merged 14 commits into from
Jan 25, 2021
Merged

[docs] Fix imports for x-grid-data-generator #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
73042f5
Fix imports for x-grid-data-generator
DanailH Jan 20, 2021
9231c30
Merge branch 'sd
DanailH Jan 22, 2021
a565ffc
Remove data-grid or x-grid as a dep
DanailH Jan 22, 2021
d60e87c
Move x-grid-data-generator package under /grid in packages
DanailH Jan 22, 2021
1469add
Fix docs build
DanailH Jan 22, 2021
d41b34b
Interate on x-data-grid-generator build
DanailH Jan 22, 2021
bdfd0f6
Fix Rollup for x-data-grid-generator
DanailH Jan 22, 2021
5560953
Fix typescript checks
DanailH Jan 22, 2021
9967b3c
Fix root babel.config
DanailH Jan 22, 2021
42a1c89
Fix formatting
DanailH Jan 22, 2021
17c274b
Fix sandbox and storybook
DanailH Jan 22, 2021
7a1d33f
Fix path to entry file
DanailH Jan 22, 2021
87a21ed
Fix paths
DanailH Jan 22, 2021
e594b0a
Fix build
DanailH Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .codesandbox/ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"packages/x-license",
"packages/grid/data-grid",
"packages/grid/x-grid",
"packages/x-grid-data-generator"
"packages/grid/x-grid-data-generator"
],
"publishDirectory": {
"@material-ui/x-license": "packages/x-license",
"@material-ui/data-grid": "packages/grid/data-grid",
"@material-ui/x-grid": "packages/grid/x-grid",
"@material-ui/x-grid-data-generator": "packages/x-grid-data-generator"
"@material-ui/x-grid-data-generator": "packages/grid/x-grid-data-generator"
},
"sandboxes": [
"new",
Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (process.env.BABEL_ENV === 'es') {

const defaultAlias = {
'@material-ui/data-grid': './packages/grid/data-grid/src',
'@material-ui/x-grid-data-generator': './packages/x-grid-data-generator/src',
'@material-ui/x-grid-data-generator': './packages/grid/x-grid-data-generator/src',
'@material-ui/x-grid': './packages/grid/x-grid/src',
'@material-ui/x-license': './packages/x-license/src',
};
Expand Down
2 changes: 1 addition & 1 deletion docs/babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function resolvePath(sourcePath, currentFile, opts) {

const alias = {
'@material-ui/data-grid': '../packages/grid/data-grid/src',
'@material-ui/x-grid-data-generator': '../packages/x-grid-data-generator/src',
'@material-ui/x-grid-data-generator': '../packages/grid/x-grid-data-generator/src',
'@material-ui/x-grid': '../packages/grid/x-grid/src',
'@material-ui/x-license': '../packages/x-license/src',
// Help in the event npm and git are significantly desynchronized.
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"jsonlint": "node scripts/jsonlint.js",
"typescript": "lerna run --no-bail --parallel typescript",
"build:codesandbox": "yarn build",
"build": "cd packages/x-license && yarn build && cd ../grid/x-grid && yarn build && cd ../data-grid && yarn build && cd ../../x-grid-data-generator && yarn build",
"build": "cd packages/x-license && yarn build && cd ../grid/x-grid && yarn build && cd ../data-grid && yarn build && cd ../x-grid-data-generator && yarn build",
"release": "yarn build && lerna publish --no-changelog",
"release:dry-run": "yarn build && lerna publish --no-changelog --no-git-tag-version --no-push --registry=\"http://localhost:4873/\""
},
Expand Down
1 change: 1 addition & 0 deletions packages/grid/rollup.data-grid.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export default [
`rm -rf ./data-grid/dist/data-grid/`,
`rm -rf ./data-grid/dist/_modules_ `,
`rm -rf ./data-grid/dist/x-grid`,
`rm -rf ./data-grid/dist/x-grid-data-generator`,
],
{
exitOnFail: true,
Expand Down
63 changes: 63 additions & 0 deletions packages/grid/rollup.x-grid-data-generator.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import typescript from 'rollup-plugin-typescript2';
import cleaner from 'rollup-plugin-cleaner';
import sourceMaps from 'rollup-plugin-sourcemaps';
import { terser } from 'rollup-plugin-terser';
import commonjs from 'rollup-plugin-commonjs';
import dts from 'rollup-plugin-dts';
import command from 'rollup-plugin-command';
import pkg from './x-grid-data-generator/package.json';

// dev build if watching, prod build if not
const production = !process.env.ROLLUP_WATCH;
export default [
{
input: {
index: './x-grid-data-generator/src/index.ts',
'datagen-cli': './x-grid-data-generator/src/datagen-cli.ts',
},
output: [
{
dir: './x-grid-data-generator/dist/esm',
format: 'esm',
sourcemap: !production,
},
{
dir: './x-grid-data-generator/dist/cjs',
format: 'cjs',
sourcemap: !production,
},
],
external: [...Object.keys(pkg.peerDependencies || {})],
plugins: [
production &&
cleaner({
targets: ['./x-grid-data-generator/dist/'],
}),
typescript({ tsconfig: 'tsconfig.build.json' }),
commonjs(),
!production && sourceMaps(),
production && terser(),
],
},
{
input: './x-grid-data-generator/dist/esm/x-grid-data-generator/src/index.d.ts',
output: [{ file: './x-grid-data-generator/dist/esm/x-grid-data-generator.d.ts', format: 'es' }],
plugins: [
dts(),
!production && sourceMaps(),
production &&
command(
[
`rm -rf ./x-grid-data-generator/dist/data-grid/`,
`rm -rf ./x-grid-data-generator/dist/_modules_ `,
`rm -rf ./x-grid-data-generator/dist/x-grid`,
`rm -rf ./x-grid-data-generator/dist/x-grid-data-generator`,
],
{
exitOnFail: true,
wait: true,
},
),
],
},
];
1 change: 1 addition & 0 deletions packages/grid/rollup.x-grid.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export default [
`rm -rf ./x-grid/dist/x-grid`,
`rm -rf ./x-grid/dist/_modules_`,
`rm -rf ./x-grid/dist/data-grid`,
`rm -rf ./x-grid/dist/x-grid-data-generator`,
],
{
exitOnFail: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/tsconfig.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"types": ["jest", "node"],
"rootDir": "./"
},
"include": ["./data-grid/src", "./x-grid/src", "./_modules_/**/*"],
"include": ["./data-grid/src", "./x-grid/src", "./x-grid-data-generator/src", "./_modules_/**/*"],
DanailH marked this conversation as resolved.
Show resolved Hide resolved
"exclude": ["__tests__", "**/*.test.*", "node_modules"]
}
0 packages/x-grid-data-generator/LICENSE → packages/grid/x-grid-data-generator/LICENSE
View file
Open in desktop
File renamed without changes.
0 packages/x-grid-data-generator/README.md → ...ages/grid/x-grid-data-generator/README.md
View file
Open in desktop
File renamed without changes.
0 ...rid-data-generator/bin/data-gen-script.js → ...rid-data-generator/bin/data-gen-script.js
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions packages/x-grid-data-generator/package.json → ...s/grid/x-grid-data-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
},
"scripts": {
"precommit": "npm run lint",
"build": "rollup -c",
"start": "rollup -cw",
"lint": "../../../node_modules/.bin/tsc --noEmit && eslint 'src/**/*.{ts,tsx}' --quiet --fix -c ../../../.eslintrc.js"
"build": "cd ../ && rollup --config rollup.x-grid-data-generator.config.js",
"start": "cd ../ && rollup --cw rollup.x-grid-data-generator.config.js",
"lint": "../../../node_modules/.bin/tsc --noEmit && eslint 'src/**/*.{ts,tsx}' --quiet --fix -c ../../../.eslintrc.js",
"typescript": "tsc -p tsconfig.json"
},
"dependencies": {
"@types/chance": "^1.1.0",
Expand All @@ -36,7 +37,6 @@
"@material-ui/core": "^4.9.12 || ^5.0.0-alpha.22",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.54",
"@material-ui/x-grid": "^4.0.0-alpha.1",
"react": "^16.8.0 || ^17.0.0"
},
"setupFiles": [
Expand Down
0 packages/x-grid-data-generator/some.json → ...ages/grid/x-grid-data-generator/some.json
View file
Open in desktop
File renamed without changes.
0 ...ata-generator/src/commodities.columns.tsx → ...ata-generator/src/commodities.columns.tsx
View file
Open in desktop
File renamed without changes.
0 .../x-grid-data-generator/src/datagen-cli.ts → .../x-grid-data-generator/src/datagen-cli.ts
View file
Open in desktop
File renamed without changes.
0 ...-data-generator/src/employees.columns.tsx → ...-data-generator/src/employees.columns.tsx
View file
Open in desktop
File renamed without changes.
0 packages/x-grid-data-generator/src/index.ts → ...s/grid/x-grid-data-generator/src/index.ts
View file
Open in desktop
File renamed without changes.
0 ...grid-data-generator/src/renderer/index.ts → ...grid-data-generator/src/renderer/index.ts
View file
Open in desktop
File renamed without changes.
0 ...a-generator/src/renderer/renderAvatar.tsx → ...a-generator/src/renderer/renderAvatar.tsx
View file
Open in desktop
File renamed without changes.
0 ...-generator/src/renderer/renderCountry.tsx → ...-generator/src/renderer/renderCountry.tsx
View file
Open in desktop
File renamed without changes.
0 ...ata-generator/src/renderer/renderDone.tsx → ...ata-generator/src/renderer/renderDone.tsx
View file
Open in desktop
File renamed without changes.
0 ...ta-generator/src/renderer/renderEmail.tsx → ...ta-generator/src/renderer/renderEmail.tsx
View file
Open in desktop
File renamed without changes.
0 ...generator/src/renderer/renderIncoterm.tsx → ...generator/src/renderer/renderIncoterm.tsx
View file
Open in desktop
File renamed without changes.
0 ...ata-generator/src/renderer/renderLink.tsx → ...ata-generator/src/renderer/renderLink.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...data-generator/src/renderer/renderPnl.tsx → ...data-generator/src/renderer/renderPnl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import clsx from 'clsx';
import { makeStyles, createStyles, Theme } from '@material-ui/core/styles';
import { CellParams, getThemePaletteMode } from '@material-ui/x-grid';
import { CellParams, getThemePaletteMode } from '../../../_modules_/grid';

const useStyles = makeStyles((theme: Theme) =>
createStyles({
Expand Down
0 ...generator/src/renderer/renderProgress.tsx → ...generator/src/renderer/renderProgress.tsx
View file
Open in desktop
File renamed without changes.
0 ...a-generator/src/renderer/renderRating.tsx → ...a-generator/src/renderer/renderRating.tsx
View file
Open in desktop
File renamed without changes.
0 ...a-generator/src/renderer/renderStatus.tsx → ...a-generator/src/renderer/renderStatus.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nerator/src/renderer/renderTotalPrice.tsx → ...nerator/src/renderer/renderTotalPrice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import clsx from 'clsx';
import { makeStyles, createStyles, Theme } from '@material-ui/core/styles';
import { CellParams, muiStyleAlpha } from '@material-ui/x-grid';
import { CellParams, muiStyleAlpha } from '../../../_modules_/grid';

const useStyles = makeStyles((theme: Theme) =>
createStyles({
Expand Down
0 ...nerator/src/services/generatableColDef.ts → ...nerator/src/services/generatableColDef.ts
View file
Open in desktop
File renamed without changes.
0 ...grid-data-generator/src/services/index.ts → ...grid-data-generator/src/services/index.ts
View file
Open in desktop
File renamed without changes.
0 ...enerator/src/services/random-generator.ts → ...enerator/src/services/random-generator.ts
View file
Open in desktop
File renamed without changes.
0 ...nerator/src/services/real-data-service.ts → ...nerator/src/services/real-data-service.ts
View file
Open in desktop
File renamed without changes.
0 ...ata-generator/src/services/static-data.ts → ...ata-generator/src/services/static-data.ts
View file
Open in desktop
File renamed without changes.
0 ...generator/src/style/real-data-stories.css → ...generator/src/style/real-data-stories.css
View file
Open in desktop
File renamed without changes.
0 .../x-grid-data-generator/src/useDemoData.ts → .../x-grid-data-generator/src/useDemoData.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/x-grid-data-generator/tsconfig.json → .../grid/x-grid-data-generator/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../../tsconfig.json",
"compilerOptions": {
"noEmit": true
},
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook/.storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const config: StorybookConfig = {
'@material-ui/data-grid': path.resolve(__dirname, '../../../packages/grid/data-grid/src'),
'@material-ui/x-grid-data-generator': path.resolve(
__dirname,
'../../../packages/x-grid-data-generator/src',
'../../../packages/grid/x-grid-data-generator/src',
),
'@material-ui/x-grid': path.resolve(__dirname, '../../../packages/grid/x-grid/src'),
'@material-ui/x-license': path.resolve(__dirname, '../../../packages/x-license/src'),
Expand Down
43 changes: 0 additions & 43 deletions packages/x-grid-data-generator/rollup.config.js
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions packages/x-grid-data-generator/tsconfig.build.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"paths": {
"@material-ui/data-grid": ["./packages/grid/data-grid/src"],
"@material-ui/data-grid/*": ["./packages/grid/data-grid/src/*"],
"@material-ui/x-grid-data-generator": ["./packages/x-grid-data-generator/src/"],
"@material-ui/x-grid-data-generator/*": ["./packages/x-grid-data-generator/src/*"],
"@material-ui/x-grid-data-generator": ["./packages/grid/x-grid-data-generator/src/"],
"@material-ui/x-grid-data-generator/*": ["./packages/grid/x-grid-data-generator/src/*"],
"@material-ui/x-grid": ["./packages/grid/x-grid/src"],
"@material-ui/x-grid/*": ["./packages/grid/x-grid/src/*"],
"@material-ui/x-license": ["./packages/x-license/src"],
Expand Down
2 changes: 1 addition & 1 deletion webpackBaseConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
'@material-ui/data-grid': path.resolve(__dirname, './packages/grid/data-grid/src'),
'@material-ui/x-grid-data-generator': path.resolve(
__dirname,
'./packages/x-grid-data-generator/src',
'./packages/grid/x-grid-data-generator/src',
),
'@material-ui/x-grid': path.resolve(__dirname, './packages/grid/x-grid/src'),
'@material-ui/x-license': path.resolve(__dirname, './packages/x-license/src'),
Expand Down