Skip to content

Commit ddb93a3

Browse files
committed
Separate most styles from the Javascript
Set version of npm packages of Material to define compatibility
1 parent 1305368 commit ddb93a3

File tree

38 files changed

+125
-115
lines changed

38 files changed

+125
-115
lines changed

main.scss

Whitespace-only changes.

src/MatBlazor.Web/package.json

+58-51
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
"description": "MatBlazor.Web",
55
"scripts": {
66
"start": "webpack --config webpack/prod.config.js --watch",
7-
"build": "webpack --config webpack/prod.config.js"
7+
"build": "webpack --config webpack/prod.config.js",
8+
"audit": "npm audit",
9+
"audit-fix": "npm audit fix"
810
},
911
"keywords": [
1012
"matblazor",
@@ -14,66 +16,71 @@
1416
"author": "SamProf",
1517
"license": "MIT",
1618
"dependencies": {
17-
"@material/base": "latest",
18-
"@material/button": "latest",
19-
"@material/card": "latest",
20-
"@material/checkbox": "latest",
21-
"@material/chips": "latest",
22-
"@material/dialog": "latest",
23-
"@material/drawer": "latest",
24-
"@material/elevation": "latest",
25-
"@material/fab": "latest",
26-
"@material/form-field": "latest",
27-
"@material/icon-button": "latest",
28-
"@material/layout-grid": "latest",
29-
"@material/linear-progress": "latest",
30-
"@material/list": "latest",
31-
"@material/menu": "latest",
32-
"@material/radio": "latest",
33-
"@material/ripple": "latest",
34-
"@material/select": "latest",
35-
"@material/slider": "latest",
36-
"@material/snackbar": "latest",
37-
"@material/switch": "latest",
38-
"@material/tab-bar": "latest",
39-
"@material/tab-scroller": "latest",
40-
"@material/textfield": "latest",
41-
"@material/theme": "latest",
42-
"@material/top-app-bar": "latest",
43-
"@material/typography": "latest",
19+
"@material/base": "3.1.0",
20+
"@material/button": "3.2.0",
21+
"@material/card": "3.2.0",
22+
"@material/checkbox": "3.2.0",
23+
"@material/chips": "3.2.0",
24+
"@material/data-table": "3.2.0",
25+
"@material/dialog": "3.2.0",
26+
"@material/drawer": "3.2.0",
27+
"@material/elevation": "3.1.0",
28+
"@material/fab": "3.2.0",
29+
"@material/form-field": "3.2.0",
30+
"@material/icon-button": "3.2.0",
31+
"@material/layout-grid": "3.1.0",
32+
"@material/linear-progress": "3.2.0",
33+
"@material/list": "3.2.0",
34+
"@material/menu": "3.2.0",
35+
"@material/radio": "3.2.0",
36+
"@material/ripple": "3.2.0",
37+
"@material/select": "3.2.0",
38+
"@material/slider": "3.2.0",
39+
"@material/snackbar": "3.2.0",
40+
"@material/switch": "3.2.0",
41+
"@material/tab-bar": "3.2.0",
42+
"@material/tab-scroller": "3.2.0",
43+
"@material/textfield": "3.2.0",
44+
"@material/theme": "3.1.0",
45+
"@material/top-app-bar": "3.2.0",
46+
"@material/typography": "3.1.0",
4447
"babel-polyfill": "^6.26.0",
45-
"flatpickr": "^4.6.2",
46-
"install": "^0.12.2",
47-
"mini-css-extract-plugin": "^0.8.0",
48-
"npm": "^6.9.0",
49-
"uglifyjs-webpack-plugin": "^2.2.0"
48+
"flatpickr": "^4.6.3",
49+
"install": "^0.13.0",
50+
"npm": "^6.13.4"
5051
},
5152
"devDependencies": {
52-
"autoprefixer": "^7.1.2",
53+
"autoprefixer": "^9.7.3",
5354
"babel-core": "^6.25.0",
5455
"babel-eslint": "^7.2.3",
5556
"babel-loader": "^7.1.1",
5657
"babel-plugin-transform-class-properties": "^6.24.1",
5758
"babel-plugin-transform-object-rest-spread": "^6.23.0",
5859
"babel-preset-env": "^1.6.0",
59-
"clean-webpack-plugin": "^0.1.16",
60-
"copy-webpack-plugin": "^4.0.1",
61-
"cross-env": "^5.0.1",
62-
"css-loader": "^0.28.4",
63-
"eslint": "^4.2.0",
64-
"eslint-loader": "^1.9.0",
60+
"clean-webpack-plugin": "^3.0.0",
61+
"copy-webpack-plugin": "^5.1.1",
62+
"cross-env": "^6.0.3",
63+
"css-loader": "^3.4.0",
64+
"eslint": "^6.8.0",
65+
"eslint-loader": "^3.0.3",
6566
"eslint-plugin-react": "^7.13.0",
67+
"fibers": "^4.0.2",
6668
"file-loader": "^0.11.2",
67-
"html-webpack-plugin": "^2.29.0",
68-
"json-loader": "^0.5.4",
69-
"license-webpack-plugin": "^2.1.1",
70-
"node-sass": "^4.12.0",
71-
"postcss-loader": "^2.0.6",
72-
"sass-loader": "^6.0.6",
73-
"style-loader": "^0.18.2",
74-
"url-loader": "^0.5.9",
75-
"webpack": "^4.39.1",
76-
"webpack-cli": "^3.3.6",
77-
"webpack-merge": "^4.1.0"
69+
"html-webpack-plugin": "^3.2.0",
70+
"json-loader": "^0.5.7",
71+
"license-webpack-plugin": "^2.1.3",
72+
"mini-css-extract-plugin": "^0.9.0",
73+
"node-sass": "^4.13.0",
74+
"optimize-css-assets-webpack-plugin": "^5.0.3",
75+
"postcss-loader": "^3.0.0",
76+
"sass": "^1.24.0",
77+
"sass-loader": "^8.0.0",
78+
"style-loader": "^1.1.1",
79+
"terser-webpack-plugin": "^2.3.1",
80+
"uglifyjs-webpack-plugin": "^2.2.0",
81+
"url-loader": "^3.0.0",
82+
"webpack": "^4.41.4",
83+
"webpack-cli": "^3.3.10",
84+
"webpack-merge": "^4.2.2"
7885
}
7986
}

src/MatBlazor.Web/src/main.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// global css
2-
import './theme/theme.scss';
3-
import './matTable/matTable.scss';
4-
import './matToast/matToast.scss';
5-
import './matNavMenu/matNavMenu.scss';
1+
// global js
62
import * as matButton from './matButton/matButton';
73
import * as matCheckbox from './matCheckbox/matCheckbox';
84
import * as matTextField from './matTextField/matTextField';

src/MatBlazor.Web/src/main.scss

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// global css
2+
@import '@material/theme/mdc-theme.scss';
3+
@import './matAccordion/matAccordion.scss';
4+
@import './matAppBar/matAppBar.scss';
5+
@import './matAutocompleteList/matAutocompleteList.scss';
6+
@import './matButton/matButton.scss';
7+
@import './matCard/matCard.scss';
8+
@import './matCheckbox/matCheckbox.scss';
9+
@import './matChipSet/matChipSet.scss';
10+
@import './matDatePicker/matDatePicker.scss';
11+
@import './matDialog/matDialog.scss';
12+
@import './matDrawer/matDrawer.scss';
13+
@import './matElevation/matElevation.scss';
14+
@import './matFAB/matFAB.scss';
15+
@import './matFileUpload/matFileUpload.scss';
16+
@import './matIconButton/matIconButton.scss';
17+
@import './matLayoutGrid/matLayoutGrid.scss';
18+
@import './matList/matList.scss';
19+
@import './matMenu/matMenu.scss';
20+
@import './matNavMenu/matNavMenu.scss';
21+
@import './matNumericUpDownField/matNumericUpDownField.scss';
22+
@import './matProgressBar/matProgressBar.scss';
23+
@import './matRadioButton/matRadioButton.scss';
24+
@import './matRipple/matRipple.scss';
25+
@import './matSelect/matSelect.scss';
26+
@import './matSlider/matSlider.scss';
27+
@import './matSlideToggle/matSlideToggle.scss';
28+
@import './matSnackbar/matSnackbar.scss';
29+
@import './matSplitter/matSplitter.scss';
30+
@import './matTabBar/matTabBar.scss';
31+
@import './matTable/matTable.scss';
32+
@import './matTextField/matTextField.scss';
33+
@import './matToast/matToast.scss';
34+
@import './matTooltip/matTooltip.scss';
35+
@import './matTypography/matTypography.scss';

src/MatBlazor.Web/src/matAccordion/matAccordion.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as styles from './matAccordion.scss';
21
import {MDCRipple} from '@material/ripple/component';
32

43
export function init(ref) {

src/MatBlazor.Web/src/matAppBar/matAppBar.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matAppBar.scss';
21
import {MDCTopAppBar} from '@material/top-app-bar';
32

43

src/MatBlazor.Web/src/matAutocompleteList/matAutocompleteList.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import './matAutocompleteList.scss';
2-
31
// export class MatAutocompleteList {
42
//
53
// }

src/MatBlazor.Web/src/matButton/matButton.js

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import * as styles from './matButton.scss';
2-
3-
41
import {MDCRipple} from '@material/ripple';
52

63

src/MatBlazor.Web/src/matCard/matCard.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import './matCard.scss';
2-
31
// alert(111);
42
export function init(ref) {
53

src/MatBlazor.Web/src/matCheckbox/matCheckbox.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matCheckbox.scss';
21
import {MDCFormField} from '@material/form-field';
32
import {MDCCheckbox} from '@material/checkbox';
43
import {getMatBlazorInstance, setMatBlazorInstance} from '../utils/base';

src/MatBlazor.Web/src/matChipSet/matChipSet.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matChipSet.scss';
21
import {MDCChipSet} from '@material/chips';
32

43

src/MatBlazor.Web/src/matDatePicker/matDatePicker.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import './matDatePicker.scss';
2-
31
import flatpickr from 'flatpickr';
42
import {getMatBlazorInstance, setMatBlazorInstance} from '../utils/base';
53

src/MatBlazor.Web/src/matDialog/matDialog.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import './matDialog.scss';
2-
31
import { MDCDialog } from '@material/dialog';
42

53

src/MatBlazor.Web/src/matDrawer/matDrawer.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matDrawer.scss';
21
import {MDCDrawer} from '@material/drawer/index';
32

43

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
import './matElevation.scss';
2-
31
export function init() {
42
};

src/MatBlazor.Web/src/matFAB/matFAB.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as styles from './matFAB.scss';
21
import {MDCRipple} from '@material/ripple/component';
32

43

src/MatBlazor.Web/src/matFileUpload/matFileUpload.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as styles from './matFileUpload.scss';
21
import * as matRipple from '../matRipple/matRipple';
32

43

src/MatBlazor.Web/src/matIconButton/matIconButton.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import './matIconButton.scss';
2-
31
import {MDCRipple} from '@material/ripple';
42
import {MatButton} from '../matButton/matButton';
53

Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
import './matLayoutGrid.scss';

src/MatBlazor.Web/src/matList/matList.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matList.scss';
21
import {MDCList} from '@material/list';
32
import {MDCRipple} from '@material/ripple';
43

src/MatBlazor.Web/src/matMenu/matMenu.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matMenu.scss';
21
import {MDCMenu} from '@material/menu';
32
import {Corner} from '@material/menu-surface/constants';
43

src/MatBlazor.Web/src/matNumericUpDownField/matNumericUpDownField.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matNumericUpDownField.scss';
21
import {MDCTextField} from '@material/textfield';
32

43
export class MatNumericUpDownField {

src/MatBlazor.Web/src/matProgressBar/matProgressBar.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matProgressBar.scss';
21
import {MDCLinearProgress} from '@material/linear-progress/component';
32

43

src/MatBlazor.Web/src/matRadioButton/matRadioButton.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matRadioButton.scss';
21
import {MDCFormField} from '@material/form-field';
32
import {MDCRadio} from '@material/radio';
43

src/MatBlazor.Web/src/matRipple/matRipple.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matRipple.scss';
21
import {MDCRipple} from '@material/ripple/component';
32

43

src/MatBlazor.Web/src/matSelect/matSelect.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matSelect.scss';
21
import {MDCSelect} from '@material/select';
32

43

src/MatBlazor.Web/src/matSlideToggle/matSlideToggle.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matSlideToggle.scss';
21
import {MDCSwitch} from '@material/switch';
32

43

src/MatBlazor.Web/src/matSlider/matSlider.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matSlider.scss';
21
import {MDCSlider} from '@material/slider';
32

43
export class MatSlider {

src/MatBlazor.Web/src/matSnackbar/matSnackbar.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matSnackbar.scss';
21
import {MDCSnackbar} from '@material/snackbar/component';
32

43

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import * as styles from './matSplitter.scss';
2-
31
export function init(ref) {
42

53
}

src/MatBlazor.Web/src/matTabBar/matTabBar.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matTabBar.scss';
21
import {MDCTabBar} from '@material/tab-bar/component';
32
import {MDCTabScroller} from '@material/tab-scroller/component';
43

src/MatBlazor.Web/src/matTable/matTable.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "@material/data-table/mdc-data-table";
2+
13
.mdc-table, .mdc-table--striped {
24
width: 100%;
35
max-width: 100%;

src/MatBlazor.Web/src/matTextField/matTextField.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import './matTextField.scss';
21
import {MDCTextField} from '@material/textfield';
32

43
export class MatTextField {

src/MatBlazor.Web/src/matTooltip/matTooltip.js

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import * as styles from './matTooltip.scss';
2-
3-
41
export const matTooltipRefKey = '$matBlazor.matTooltipRef';
52
export const matTooltipTargetRefKey = '$matBlazor.matTooltipTargetRef';
63

Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
import './matTypography.scss';

0 commit comments

Comments
 (0)