Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 71cd428

Browse files
authoredOct 9, 2018
Merge pull request #122 from coreui/dev-vnext
v2.0.13
2 parents 07c7d3d + 1c86c3e commit 71cd428

File tree

11 files changed

+34
-9964
lines changed

11 files changed

+34
-9964
lines changed
 

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
## [CoreUI](https://coreui.io/) for [react](./REACT.md) changelog
22

3+
##### `v2.0.13`
4+
- refactor: migration to [Create React App 2.0](https://reactjs.org/blog/2018/10/01/create-react-app-v2.html) cleanup
5+
- cleanup `package.json` scripts
6+
- remove `babel-jest` dependency
7+
- remove `node-sass-chokidar` dependency
8+
- remove `npm-run-all` dependency
9+
- move `App.js` import styles to `App.scss`
10+
- replace imports from `node_modules/` with `~` prefix
11+
- chore: remove unused `src/scss/vendors/charts.js/` directory
12+
- chore: update `@coreui/coreui` to `^2.0.15`
13+
- chore: update `@coreui/react` to `^2.0.9`
14+
315
##### `v2.0.12`
416
fixes some issues with `rtl`, `ie11`, `sidebar-minimized` behaviour and `aside` responsiveness
517
- fix(DefaultAside): `ListGroup` with `tag="div"` works better with `rtl`

‎package.json

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-react-admin-template",
3-
"version": "2.0.12",
3+
"version": "2.0.13",
44
"description": "CoreUI React Open Source Bootstrap 4 Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "https://coreui.io",
@@ -12,10 +12,10 @@
1212
"url": "git@github.com:coreui/coreui-free-react-admin-template.git"
1313
},
1414
"dependencies": {
15-
"@coreui/coreui": "^2.0.14",
15+
"@coreui/coreui": "^2.0.15",
1616
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
1717
"@coreui/icons": "0.3.0",
18-
"@coreui/react": "^2.0.8",
18+
"@coreui/react": "^2.0.9",
1919
"bootstrap": "^4.1.3",
2020
"chart.js": "^2.7.2",
2121
"classnames": "^2.2.6",
@@ -38,18 +38,11 @@
3838
"simple-line-icons": "^2.4.1"
3939
},
4040
"devDependencies": {
41-
"babel-jest": "^23.6.0",
42-
"node-sass-chokidar": "^1.3.3",
43-
"npm-run-all": "^4.1.3",
4441
"react-scripts": "^2.0.4"
4542
},
4643
"scripts": {
47-
"build-css": "node-sass-chokidar --include-path ./node_modules ./src/scss -o ./src/scss",
48-
"watch-css": "npm run build-css && node-sass-chokidar --include-path ./node_modules ./src/scss -o ./src/scss --watch --recursive",
49-
"start-js": "react-scripts start",
50-
"start": "npm-run-all -p watch-css start-js",
51-
"build-js": "react-scripts build",
52-
"build": "npm-run-all build-css build-js",
44+
"start": "react-scripts start",
45+
"build": "react-scripts build",
5346
"test": "react-scripts test",
5447
"test:debug": "react-scripts --inspect-brk test --runInBand",
5548
"eject": "react-scripts eject"

‎src/App.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/App.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
import React, { Component } from 'react';
22
import { HashRouter, Route, Switch } from 'react-router-dom';
3-
import './App.css';
4-
// Styles
5-
// CoreUI Icons Set
6-
import '@coreui/icons/css/coreui-icons.min.css';
7-
// Import Flag Icons Set
8-
import 'flag-icon-css/css/flag-icon.min.css';
9-
// Import Font Awesome Icons Set
10-
import 'font-awesome/css/font-awesome.min.css';
11-
// Import Simple Line Icons Set
12-
import 'simple-line-icons/css/simple-line-icons.css';
13-
// Import Main styles for this application
14-
import './scss/style.css'
3+
import './App.scss';
154

165
// Containers
176
import { DefaultLayout } from './containers';

‎src/App.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Styles
2+
// CoreUI Icons Set
3+
@import '~@coreui/icons/css/coreui-icons.css';
4+
// Import Flag Icons Set
5+
@import '~flag-icon-css/css/flag-icon.min.css';
6+
// Import Font Awesome Icons Set
7+
@import '~font-awesome/css/font-awesome.min.css';
8+
// Import Simple Line Icons Set
9+
@import '~simple-line-icons/css/simple-line-icons.css';
10+
// Import Main styles for this application
11+
@import './scss/style.scss';

‎src/scss/style.css

Lines changed: 0 additions & 9843 deletions
This file was deleted.

‎src/scss/style.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
@import "variables";
33

44
// Import styles
5-
@import "@coreui/coreui/scss/coreui.scss";
5+
@import "~@coreui/coreui/scss/coreui.scss";
6+
67
// Temp fix for reactstrap
7-
@import '@coreui/coreui/scss/_dropdown-menu-right.scss';
8+
@import '~@coreui/coreui/scss/_dropdown-menu-right.scss';
89

910
// If you want to add something do it here
1011
@import "custom";

‎src/scss/vendors/.gitkeep

Whitespace-only changes.

‎src/scss/vendors/_variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// Override Boostrap variables
22
@import "../variables";
3-
@import "node_modules/bootstrap/scss/mixins";
4-
@import "node_modules/@coreui/coreui/scss/variables";
3+
@import "~bootstrap/scss/mixins";
4+
@import "~@coreui/coreui/scss/variables";

‎src/scss/vendors/chart.js/chart.css

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/scss/vendors/chart.js/chart.scss

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.