Skip to content

Commit

Permalink
[core] Add prettier command (mui#24)
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari authored Jun 25, 2020
1 parent 26cd07b commit d4ad680
Show file tree
Hide file tree
Showing 53 changed files with 679 additions and 575 deletions.
9 changes: 9 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/.git
CHANGELOG.md
dist
node_modules
package-lock.json
packages/demo-app/public/static-data
packages/grid/lib/lodash
packages/grid/x-grid-modules/lib/autosizer
packages/grid/x-grid-modules/lib/lodash
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# material-ui-x
# material-ui-x
6 changes: 1 addition & 5 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
"yes": true
}
},
"packages": [
"packages/*",
"!packages/grid",
"packages/grid/*"
],
"packages": ["packages/*", "!packages/grid", "packages/grid/*"],
"version": "0.1.35"
}
120 changes: 61 additions & 59 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,61 +1,63 @@
{
"name": "material-ui-x",
"version": "0.1.0",
"description": "Material-UI X Monorepo",
"author": "Damien Tassone",
"license": "MIT",
"private": true,
"devDependencies": {
"@material-ui/icons": "^4.9.1",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^25.1.2",
"@types/node": "^12.0.0",
"@types/react": "^16.9.25",
"@types/react-dom": "^16.9.5",
"@types/styled-components": "^5.0.1",
"@typescript-eslint/eslint-plugin": "^2.19.0",
"@typescript-eslint/parser": "^2.19.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-react": "^7.18.3",
"eslint-plugin-react-hooks": "^2.5.0",
"eslint-plugin-unused-imports": "^0.1.2",
"jest": "^25.1.0",
"jest-cli": "^25.1.0",
"jest-transform-stub": "^2.0.0",
"lerna": "^3.20.2",
"prettier": "^1.19.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"stylelint": "^13.3.3",
"stylelint-config-recommended": "^3.0.0",
"stylelint-config-standard": "^20.0.0",
"stylelint-config-styled-components": "^0.1.1",
"stylelint-processor-styled-components": "^1.10.0",
"ts-jest": "^25.2.0"
},
"scripts": {
"hoist": "lerna bootstrap --hoist",
"bootstrap": "lerna bootstrap",
"build": "lerna run build --stream",
"start": "lerna run start --parallel",
"test": "lerna run test --parallel",
"lint": "lerna run lint --parallel"
},
"eslintConfig": {
"extends": "react-app"
},
"setupFiles": [
"<rootDir>/src/setupTests.js"
],
"dependencies": {
"styled-components": "^5.1.0"
}
"name": "material-ui-x",
"version": "0.1.0",
"description": "Material-UI X Monorepo",
"author": "Damien Tassone",
"license": "MIT",
"private": true,
"devDependencies": {
"@material-ui/icons": "^4.9.1",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^25.1.2",
"@types/node": "^12.0.0",
"@types/react": "^16.9.25",
"@types/react-dom": "^16.9.5",
"@types/styled-components": "^5.0.1",
"@typescript-eslint/eslint-plugin": "^2.19.0",
"@typescript-eslint/parser": "^2.19.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-react": "^7.18.3",
"eslint-plugin-react-hooks": "^2.5.0",
"eslint-plugin-unused-imports": "^0.1.2",
"glob-gitignore": "^1.0.14",
"jest": "^25.1.0",
"jest-cli": "^25.1.0",
"jest-transform-stub": "^2.0.0",
"lerna": "^3.20.2",
"prettier": "^1.19.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"stylelint": "^13.3.3",
"stylelint-config-recommended": "^3.0.0",
"stylelint-config-standard": "^20.0.0",
"stylelint-config-styled-components": "^0.1.1",
"stylelint-processor-styled-components": "^1.10.0",
"ts-jest": "^25.2.0"
},
"scripts": {
"hoist": "lerna bootstrap --hoist",
"bootstrap": "lerna bootstrap",
"build": "lerna run build --stream",
"start": "lerna run start --parallel",
"prettier": "node ./scripts/prettier.js",
"test": "lerna run test --parallel",
"lint": "lerna run lint --parallel"
},
"eslintConfig": {
"extends": "react-app"
},
"setupFiles": [
"<rootDir>/src/setupTests.js"
],
"dependencies": {
"styled-components": "^5.1.0"
}
}
7 changes: 5 additions & 2 deletions packages/demo-app/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
## App on https://FinUi.dev

### `yarn start`

Start webpack dev server

### `yarn test`

runs the test

### `yarn build`
build in dev mode

build in dev mode

### `yarn lint`
run eslint and prettier in fix mode

run eslint and prettier in fix mode
116 changes: 58 additions & 58 deletions packages/demo-app/package.json
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
{
"name": "demo-app",
"version": "0.1.37",
"private": true,
"dependencies": {
"@material-ui/x-grid": "^0.1.35",
"@material-ui/x-grid-data-generator": "^0.1.32",
"@material-ui-x/panel": "^0.1.28",
"@material-ui-x/splitter": "^0.1.32",
"@material-ui/core": "^4.9.12",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.54",
"@trendmicro/react-interpolate": "^0.5.5",
"lodash": "^4.17.15",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router-dom": "^5.1.2",
"react-select": "^3.1.0",
"rxjs": "^6.5.5",
"styled-components": "^5.1.0"
},
"devDependencies": {
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^25.1.2",
"@types/lodash": "^4.14.149",
"@types/node": "^12.0.0",
"@types/react": "^16.9.25",
"@types/react-dom": "^16.9.5",
"@types/react-router-dom": "^5.1.3",
"@types/react-window": "^1.8.1",
"@types/styled-components": "^5.0.1",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.4.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"html-webpack-plugin": "^3.2.0",
"less": "^3.10.3",
"less-loader": "^5.0.0",
"node-fetch": "^2.6.0",
"source-map-loader": "^0.2.4",
"style-loader": "^1.1.3",
"ts-loader": "^7.0.1",
"typescript": "^3.8.3",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.9.0",
"webpack-merge": "^4.2.2"
},
"scripts": {
"build": "./node_modules/.bin/webpack -p --config ./webpack.prod.js",
"start": "./node_modules/.bin/webpack-dev-server --config webpack.dev.js",
"lint": "../../node_modules/.bin/tsc --noEmit && eslint 'src/**/*.{ts,tsx}' --quiet --fix -c ../../.eslintrc.js && npm run lint:css",
"lint:css": "stylelint 'src/**/*.{ts,tsx}' ../../.stylelintrc.js"
},
"setupFiles": [
"<rootDir>/src/setupTests.js"
]
"name": "demo-app",
"version": "0.1.37",
"private": true,
"dependencies": {
"@material-ui/x-grid": "^0.1.35",
"@material-ui/x-grid-data-generator": "^0.1.32",
"@material-ui-x/panel": "^0.1.28",
"@material-ui-x/splitter": "^0.1.32",
"@material-ui/core": "^4.9.12",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.54",
"@trendmicro/react-interpolate": "^0.5.5",
"lodash": "^4.17.15",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router-dom": "^5.1.2",
"react-select": "^3.1.0",
"rxjs": "^6.5.5",
"styled-components": "^5.1.0"
},
"devDependencies": {
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^25.1.2",
"@types/lodash": "^4.14.149",
"@types/node": "^12.0.0",
"@types/react": "^16.9.25",
"@types/react-dom": "^16.9.5",
"@types/react-router-dom": "^5.1.3",
"@types/react-window": "^1.8.1",
"@types/styled-components": "^5.0.1",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.4.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"html-webpack-plugin": "^3.2.0",
"less": "^3.10.3",
"less-loader": "^5.0.0",
"node-fetch": "^2.6.0",
"source-map-loader": "^0.2.4",
"style-loader": "^1.1.3",
"ts-loader": "^7.0.1",
"typescript": "^3.8.3",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.9.0",
"webpack-merge": "^4.2.2"
},
"scripts": {
"build": "./node_modules/.bin/webpack -p --config ./webpack.prod.js",
"start": "./node_modules/.bin/webpack-dev-server --config webpack.dev.js",
"lint": "../../node_modules/.bin/tsc --noEmit && eslint 'src/**/*.{ts,tsx}' --quiet --fix -c ../../.eslintrc.js && npm run lint:css",
"lint:css": "stylelint 'src/**/*.{ts,tsx}' ../../.stylelintrc.js"
},
"setupFiles": [
"<rootDir>/src/setupTests.js"
]
}
80 changes: 40 additions & 40 deletions packages/demo-app/public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
{
"name": "App",
"icons": [
{
"src": "\/android-icon-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
"src": "\/android-icon-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
"src": "\/android-icon-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
"src": "\/android-icon-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
},
{
"src": "\/android-icon-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.0"
},
{
"src": "\/android-icon-192x192.png",
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"
}
]
}
"name": "App",
"icons": [
{
"src": "/android-icon-36x36.png",
"sizes": "36x36",
"type": "image/png",
"density": "0.75"
},
{
"src": "/android-icon-48x48.png",
"sizes": "48x48",
"type": "image/png",
"density": "1.0"
},
{
"src": "/android-icon-72x72.png",
"sizes": "72x72",
"type": "image/png",
"density": "1.5"
},
{
"src": "/android-icon-96x96.png",
"sizes": "96x96",
"type": "image/png",
"density": "2.0"
},
{
"src": "/android-icon-144x144.png",
"sizes": "144x144",
"type": "image/png",
"density": "3.0"
},
{
"src": "/android-icon-192x192.png",
"sizes": "192x192",
"type": "image/png",
"density": "4.0"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useTheme } from '../../theme/useTheme';
import KeyboardArrowRightIcon from '@material-ui/icons/KeyboardArrowRight';

export interface SettingsPanelProps {
onApply: (settings: { size: number; type: string; selectedTheme: string, pagesize: number }) => void;
onApply: (settings: { size: number; type: string; selectedTheme: string; pagesize: number }) => void;
type: string;
size: number;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
import { AppBreadcrumbs } from '../../app-breadcrumbs';
import { Grid, LicenseInfo, RowModel, Columns, GridOptions} from '@material-ui/x-grid';
import { Grid, LicenseInfo, RowModel, Columns, GridOptions } from '@material-ui/x-grid';
import pkg from '@material-ui/x-grid/package.json';
import { MainContainer } from './components/main-container';
import { SettingsPanel } from './components/settings-panel';
Expand Down
Loading

0 comments on commit d4ad680

Please sign in to comment.