Skip to content

Commit 19759be

Browse files
authored
Merge pull request #45 from udaypydi/feat/tailwind-css
Feat/tailwind css
2 parents 83852e0 + c5f2ffc commit 19759be

File tree

20 files changed

+72943
-95
lines changed

20 files changed

+72943
-95
lines changed

.eslintrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ module.exports = {
77
'plugin:react/recommended',
88
'airbnb',
99
],
10+
settings: {
11+
"import/resolver": {
12+
node: {
13+
extensions: ['.js', '.jsx', '.scss', '.css'],
14+
moduleDirectory: ['node_modules', 'src/'],
15+
},
16+
},
17+
},
1018
globals: {
1119
Atomics: 'readonly',
1220
SharedArrayBuffer: 'readonly',

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
node_modules/
22
build/
33
.gitignore
4-
coverage/
4+
coverage/

config/paths.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const path = require('path');
33
const paths = {
44
entry: path.resolve(__dirname, '../index'),
55
output: path.resolve(__dirname, '../build'),
6+
assets: path.resolve(__dirname, '../src/assets'),
67
template: path.resolve(__dirname, './template.html'),
78
uielements: path.resolve(__dirname, '../src/uielements'),
89
};

config/webpack.base.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = function({ plugins }) {
2828
},
2929
{
3030
test: /\.css$/i,
31-
use: ['style-loader', 'css-loader'],
31+
use: ['style-loader', 'css-loader', 'postcss-loader'],
3232
},
3333
{
3434
test: /\.(png|jpe?g|gif)$/i,
@@ -56,6 +56,7 @@ module.exports = function({ plugins }) {
5656
extensions: ['.js', '.jsx', '.scss', '.css'],
5757
alias: {
5858
uielements: paths.uielements,
59+
assets: paths.assets,
5960
}
6061
},
6162
});

index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { Suspense } from 'react';
22
import ReactDOM from 'react-dom';
33
import Loader from 'uielements/loader/loader.component';
4+
45
const App = React.lazy(() => import('./src/app'));
56

67
const Index = () => (

package.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
"description": "Simple react boilerplate with support for travis ci, webpack, sass etc.",
55
"main": "index.js",
66
"scripts": {
7-
"build": "webpack ---config ./config/webpack.prod.config.js",
8-
"dev": "webpack-dev-server --config ./config/webpack.dev.config.js --open",
7+
"build": "npm run build:css && webpack ---config ./config/webpack.prod.config.js",
8+
"dev": "npm run watch:css && webpack-dev-server --config ./config/webpack.dev.config.js --open",
99
"lint": "./node_modules/.bin/eslint --ext .js,.jsx src/",
10+
"lint: fix": "./node_modules/.bin/eslint --ext .js,.jsx src/ --fix",
11+
"build:css": "postcss src/assets/css/styles.css -o src/assets/css/main.css",
12+
"watch:css": "postcss src/assets/css/styles.css -o src/assets/css/main.css",
1013
"test": "jest --collect-coverage",
1114
"test:watch": "jest --watch"
1215
},
@@ -25,9 +28,13 @@
2528
"@babel/core": "^7.9.0",
2629
"@babel/preset-env": "^7.9.0",
2730
"@babel/preset-react": "^7.9.4",
31+
"autoprefixer": "^9.7.6",
2832
"babel-loader": "^8.1.0",
33+
"postcss-cli": "^7.1.0",
34+
"prop-types": "^15.7.2",
2935
"react": "^16.13.1",
3036
"react-dom": "^16.13.1",
37+
"tailwindcss": "^1.3.4",
3138
"webpack": "^4.42.1",
3239
"webpack-cli": "^3.3.11"
3340
},
@@ -48,6 +55,7 @@
4855
"jest": "^25.3.0",
4956
"mini-css-extract-plugin": "^0.9.0",
5057
"node-sass": "^4.13.1",
58+
"postcss-loader": "^3.0.0",
5159
"sass-loader": "^8.0.2",
5260
"style-loader": "^1.1.3",
5361
"webpack-bundle-analyzer": "^3.6.1",

postcss.config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
const tailwindcss = require('tailwindcss');
2+
module.exports = {
3+
plugins: [
4+
tailwindcss('./tailwind.config.js'),
5+
require('autoprefixer'),
6+
],
7+
};

src/__tests__/__snapshots__/app.spec.js.snap

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

src/__tests__/app.spec.js

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

src/app.jsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import React from 'react';
2+
import Button from 'uielements/button/button.component';
23
import logo from './logo.png';
4+
import 'assets/css/main.css';
35
import './app.scss';
46

57
export default function App() {
68
return (
7-
<div className="App--Container">
8-
<p className="App--Title">Welcome To React Boilerplate!</p>
9-
<img src={logo} alt="React Logo" className="App--Image" />
9+
<div className="bg-blue-900 flex flex-col justify-center items-center p-20">
10+
<p className="text-4xl text-blue-100">Welcom To React Boilerplate!</p>
11+
<img src={logo} className="app--image" alt="logo" />
12+
<Button buttonText="Get Started!" />
1013
</div>
1114
);
1215
}

0 commit comments

Comments
 (0)