Skip to content

Commit

Permalink
Merge pull request #39 from gregoranders/feature/38-add-materialui
Browse files Browse the repository at this point in the history
Feature/38 add materialui
  • Loading branch information
gregoranders authored Jun 15, 2020
2 parents 8b03885 + d0b7707 commit 7c8630f
Show file tree
Hide file tree
Showing 24 changed files with 28,264 additions and 31 deletions.
21 changes: 0 additions & 21 deletions .appveyor.yml

This file was deleted.

10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

##### Build System / Dependencies

- **ci:** remove appveyor ([d52cd699](https://github.com/gregoranders/ts-react-playground/commit/d52cd6995a48baaaf4140643df471888942ea6d8))
- **travis:** remove ([8b038851](https://github.com/gregoranders/ts-react-playground/commit/8b03885175f0552fb728d286896cb1afd7aa56b2))
- **feature:** run on node 14 only ([b9ac2205](https://github.com/gregoranders/ts-react-playground/commit/b9ac2205aaa9d7e106ae1f5d21df49b28dab78fe))

##### Chores
Expand All @@ -16,9 +18,15 @@

##### Documentation Changes

- **CHANGELOG:** update ([bb72fc2e](https://github.com/gregoranders/ts-react-playground/commit/bb72fc2ece2a2d154c78c19549fc6f6c557d34e4))
- **CHANGELOG:**
- update ([c90544cb](https://github.com/gregoranders/ts-react-playground/commit/c90544cbe1ed914207ccfbd3679f7bca8462daad))
- update ([bb72fc2e](https://github.com/gregoranders/ts-react-playground/commit/bb72fc2ece2a2d154c78c19549fc6f6c557d34e4))
- **SECURITY:** add next release ([f0bca9fd](https://github.com/gregoranders/ts-react-playground/commit/f0bca9fdc29fa671590e35e303239b1ca2dfbc52))

##### New Features

- **materialui:** add Material-Ui ([6c9c8206](https://github.com/gregoranders/ts-react-playground/commit/6c9c8206276c004f1b81dc61afe1238d16d38a0a))

##### Bug Fixes

- **eslint:** fix config ([eec8b6ca](https://github.com/gregoranders/ts-react-playground/commit/eec8b6ca02cbf74d0f40da781cdeccbbb1b3bb9b))
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@
- Webpack (development or build)
- Rollup for Vendor as ESM
- GitHub CI Integration (feature, development, master, release)
- Circle CI Integration
- Code Quality via Code Climate
- Docker Container (nginx with ssl)

| GitHub | Travis | CircleCI | AppVeyor | Coveralls | |
| ---------------------------------------------------------------- | ------------------------------------------------------------ | ---------------------------------------------------------------- | ---------------------------------------------------------------- | -------------------------------------------------------------------------- | ---------------------------------------------------------------------------- |
| [![ReleaseMaster Build][release-build-image]][release-url] | | | | | [![Release][release-image]][release-url] |
| [![Master Build][master-build-image]][master-url] | [![Master Build][travis-master-image]][travis-url] | [![Master Build][circleci-master-image]][circleci-url] | [![Master Build][appveyor-master-image]][appveyor-url] | [![Master Coverage][master-coveralls-image]][master-coveralls-url] | [![Master Version][master-version-image]][master-version-url] |
| [![Development Build][development-build-image]][development-url] | [![Development Build][travis-development-image]][travis-url] | [![Development Build][circleci-development-image]][circleci-url] | [![Development Build][appveyor-development-image]][appveyor-url] | [![Test Coverage][development-coveralls-image]][development-coveralls-url] | [![Development Version][development-version-image]][development-version-url] |
| GitHub | Coveralls | |
| ---------------------------------------------------------------- | -------------------------------------------------------------------------- | ---------------------------------------------------------------------------- |
| [![ReleaseMaster Build][release-build-image]][release-url] | | [![Release][release-image]][release-url] |
| [![Master Build][master-build-image]][master-url] | [![Master Coverage][master-coveralls-image]][master-coveralls-url] | [![Master Version][master-version-image]][master-version-url] |
| [![Development Build][development-build-image]][development-url] | [![Test Coverage][development-coveralls-image]][development-coveralls-url] | [![Development Version][development-version-image]][development-version-url] |

### Clone repository

Expand Down
18 changes: 16 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "npm run build:webpack",
"prebuild:esm": "npm run prevendor && npm run prescript && npm run preserviceWorker && npm run prescss && npm run prefavicon",
"build:esm": "npm run vendor && npm run script && npm run scss && npm run favicon && npm run serviceWorker",
"postbuild:esm": "ts-node ./scripts/minify.ts",
"postbuild:esm": "ts-node ./scripts/minify.ts ./public/vendor",
"prebuild:webpack": "rimraf ./dist",
"build:webpack": "cross-env NODE_ENV=production webpack --config webpack.config.js",
"pretest": "rimraf ./test",
Expand All @@ -31,13 +31,18 @@
"prefavicon": "rimraf ./public/assets ./public/favicon.html",
"favicon": "ts-node ./scripts/favicon.ts",
"prevendor": "rimraf ./public/vendor ./public/es-module-shims.js",
"vendor": "rimraf ./public/vendor && npm run vendor:base && npm run vendor:faker && npm run vendor:fontawesome && npm run vendor:react && npm run vendor:recharts && npm run vendor:esmoduleshims",
"vendor": "rimraf ./public/vendor && npm run vendor:base && npm run vendor:faker && npm run vendor:fontawesome && npm run vendor:react && npm run vendor:recharts && npm run vendor:esmoduleshims && npm run vendor:materialui",
"vendor:base": "cross-env NODE_ENV=production rollup -c ./src/vendor/rollup-base.config.js",
"vendor:faker": "cross-env NODE_ENV=production rollup -c ./src/vendor/rollup-faker.config.js",
"vendor:fontawesome": "cross-env NODE_ENV=production rollup -c ./src/vendor/rollup-fontawesome.config.js",
"vendor:react": "cross-env NODE_ENV=production rollup -c ./src/vendor/rollup-react.config.js",
"vendor:recharts": "cross-env NODE_ENV=production rollup -c ./src/vendor/rollup-recharts.config.js",
"vendor:esmoduleshims": "tsc --project ./src/vendor/es-module-shims",
"vendor:materialui": "npm run vendor:materialui-base && npm run vendor:materialui-icons && npm run vendor:mdi-material-ui && npm run vendor:devexpress",
"vendor:materialui-base": "cross-env NODE_ENV=production rollup -c ./src/vendor/rollup-materialui.config.js",
"vendor:materialui-icons": "cross-env NODE_ENV=production rollup -c ./src/vendor/rollup-materialui-icons.config.js",
"vendor:mdi-material-ui": "cross-env NODE_ENV=production rollup -c ./src/vendor/rollup-mdi-material-ui.config.js",
"vendor:devexpress": "cross-env NODE_ENV=production rollup -c ./src/vendor/rollup-devexpress.config.js",
"preserviceWorker": "rimraf ./public/serviceWorker.js",
"serviceWorker": "tsc --project ./src/service --outFile ./public/serviceWorker.js",
"postserviceWorker": "workbox injectManifest workbox-config.js",
Expand Down Expand Up @@ -239,6 +244,13 @@
},
"devDependencies": {
"@babel/core": "7.10.2",
"@devexpress/dx-react-chart": "2.6.3",
"@devexpress/dx-react-chart-material-ui": "2.6.3",
"@devexpress/dx-react-core": "2.6.3",
"@material-ui/core": "4.10.2",
"@material-ui/icons": "4.9.1",
"@material-ui/lab": "4.0.0-alpha.56",
"@material-ui/styles": "4.10.0",
"@rollup/plugin-commonjs": "13.0.0",
"@rollup/plugin-html": "0.2.0",
"@rollup/plugin-json": "4.1.0",
Expand Down Expand Up @@ -310,6 +322,7 @@
"favicons": "6.1.0",
"file-loader": "6.0.0",
"generate-changelog": "1.8.0",
"gsap": "3.3.3",
"html-webpack-plugin": "4.3.0",
"husky": "4.2.5",
"identity-obj-proxy": "3.0.0",
Expand All @@ -324,6 +337,7 @@
"jest-spec-reporter": "1.0.13",
"lint-staged": "10.2.10",
"livereloadx": "0.3.10",
"mdi-material-ui": "6.16.0",
"mini-css-extract-plugin": "0.9.0",
"minify": "5.1.1",
"node-sass": "4.14.1",
Expand Down
3 changes: 2 additions & 1 deletion scripts/minify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { join } from 'path';
import { readdirSync, statSync, writeFileSync, Stats } from 'fs';
const minify = require('minify');

const basePath = './public';
const basePath = process.argv[2];

const options = {
js: {
ecma: 2016,
Expand Down
37 changes: 37 additions & 0 deletions src/vendor/@devexpress/dx-react-chart-material-ui/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import * as DxReactChartMaterialUi from '@devexpress/dx-react-chart-material-ui';

import {
AreaSeries,
BarSeries,
LineSeries,
PieSeries,
SplineSeries,
ArgumentAxis,
Chart,
Legend,
ScatterSeries,
Title,
Tooltip,
ValueAxis,
ZoomAndPan,
} from '@devexpress/dx-react-chart-material-ui';

export {
DxReactChartMaterialUi,
/* */
AreaSeries,
BarSeries,
LineSeries,
PieSeries,
SplineSeries,
ArgumentAxis,
Chart,
Legend,
ScatterSeries,
Title,
Tooltip,
ValueAxis,
ZoomAndPan,
};

export default DxReactChartMaterialUi;
28 changes: 28 additions & 0 deletions src/vendor/@devexpress/dx-react-chart-material-ui/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"allowJs": true,
"jsx": "react",
"declaration": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"forceConsistentCasingInFileNames": true,
"importHelpers": true,
"noEmitHelpers": true,
"lib": ["DOM", "ES2015"],
"target": "ES2015",
"module": "ES2015",
"moduleResolution": "Node",
"noEmitOnError": true,
"noFallthroughCasesInSwitch": true,
"noImplicitAny": true,
"noImplicitReturns": true,
"noImplicitThis": true,
"noUnusedLocals": true,
"strict": true,
"pretty": true,
"removeComments": true,
"sourceMap": false
},
"files": ["index.tsx"]
}
55 changes: 55 additions & 0 deletions src/vendor/@devexpress/dx-react-chart/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import * as DxReactChart from '@devexpress/dx-react-chart';

import {
Animation,
AreaSeries,
ArgumentAxis,
ArgumentScale,
Axis,
BarSeries,
Chart,
EventTracker,
HoverState,
Legend,
LineSeries,
Palette,
PieSeries,
ScatterSeries,
SelectionState,
SplineSeries,
Stack,
Title,
Tooltip,
ValueAxis,
ValueScale,
ZoomAndPan,
} from '@devexpress/dx-react-chart';

export {
DxReactChart,
/* */
Animation,
AreaSeries,
ArgumentAxis,
ArgumentScale,
Axis,
BarSeries,
Chart,
EventTracker,
HoverState,
Legend,
LineSeries,
Palette,
PieSeries,
ScatterSeries,
SelectionState,
SplineSeries,
Stack,
Title,
Tooltip,
ValueAxis,
ValueScale,
ZoomAndPan,
};

export default DxReactChart;
28 changes: 28 additions & 0 deletions src/vendor/@devexpress/dx-react-chart/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"allowJs": true,
"jsx": "react",
"declaration": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"forceConsistentCasingInFileNames": true,
"importHelpers": true,
"noEmitHelpers": true,
"lib": ["DOM", "ES2015"],
"target": "ES2015",
"module": "ES2015",
"moduleResolution": "Node",
"noEmitOnError": true,
"noFallthroughCasesInSwitch": true,
"noImplicitAny": true,
"noImplicitReturns": true,
"noImplicitThis": true,
"noUnusedLocals": true,
"strict": true,
"pretty": true,
"removeComments": true,
"sourceMap": false
},
"files": ["index.tsx"]
}
27 changes: 27 additions & 0 deletions src/vendor/@devexpress/dx-react-core/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import * as DxReactCore from '@devexpress/dx-react-core';

import {
Action,
Getter,
Plugin,
PluginHost,
Template,
TemplateConnector,
TemplatePlaceholder,
connectProps,
} from '@devexpress/dx-react-core';

export {
DxReactCore,
/* */
Action,
Getter,
Plugin,
PluginHost,
Template,
TemplateConnector,
TemplatePlaceholder,
connectProps,
};

export default DxReactCore;
28 changes: 28 additions & 0 deletions src/vendor/@devexpress/dx-react-core/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"allowJs": true,
"jsx": "react",
"declaration": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"forceConsistentCasingInFileNames": true,
"importHelpers": true,
"noEmitHelpers": true,
"lib": ["DOM", "ES2015"],
"target": "ES2015",
"module": "ES2015",
"moduleResolution": "Node",
"noEmitOnError": true,
"noFallthroughCasesInSwitch": true,
"noImplicitAny": true,
"noImplicitReturns": true,
"noImplicitThis": true,
"noUnusedLocals": true,
"strict": true,
"pretty": true,
"removeComments": true,
"sourceMap": false
},
"files": ["index.tsx"]
}
Loading

0 comments on commit 7c8630f

Please sign in to comment.