Skip to content

Commit

Permalink
webpack reconfig, reorg with src dir
Browse files Browse the repository at this point in the history
  • Loading branch information
deliciousmonster committed Jan 21, 2019
1 parent 2bc4aa5 commit 731b61d
Show file tree
Hide file tree
Showing 27 changed files with 7,737 additions and 4,271 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ public

# Editor
.idea
/config.js
config.js
11,581 changes: 7,566 additions & 4,015 deletions package-lock.json

Large diffs are not rendered by default.

59 changes: 31 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,52 +11,55 @@
"author": "niolabs",
"license": "Apache-2.0",
"dependencies": {
"@nio/ui-kit": "^1.6.5",
"@pubkeeper/browser-client": "^4.0.0-alpha.3",
"@nio/ui-kit": "^1.6.6",
"@pubkeeper/browser-client": "^4.0.1",
"prop-types": "^15.6.2",
"react": "^16.5.1",
"react-dom": "^16.5.1",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1"
},
"devDependencies": {
"@babel/cli": "^7.1.0",
"@babel/core": "^7.1.0",
"@babel/plugin-proposal-decorators": "^7.1.0",
"@babel/plugin-proposal-function-bind": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.1.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"@babel/cli": "^7.2.3",
"@babel/core": "^7.2.2",
"@babel/plugin-proposal-decorators": "^7.2.3",
"@babel/plugin-proposal-function-bind": "^7.2.0",
"@babel/plugin-transform-runtime": "^7.2.0",
"@babel/polyfill": "^7.2.5",
"@babel/preset-env": "^7.2.3",
"@babel/preset-react": "^7.0.0",
"@babel/runtime": "^7.0.0",
"autoprefixer": "^9.1.5",
"babel-eslint": "^9.0.0",
"babel-loader": "^8.0.2",
"@babel/runtime": "^7.2.0",
"autoprefixer": "^9.4.6",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.5",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-imports": "^1.5.1",
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^4.5.2",
"css-loader": "^1.0.0",
"cssnano": "^4.1.0",
"eslint": "^5.6.0",
"clean-webpack-plugin": "^1.0.0",
"copy-webpack-plugin": "^4.6.0",
"css-loader": "^2.1.0",
"cssnano": "^4.1.8",
"eslint": "^5.12.1",
"eslint-config-airbnb": "^17.1.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-react": "^7.11.1",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-react": "^7.12.4",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"file-loader": "^2.0.0",
"file-loader": "^3.0.1",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^3.2.0",
"merge": "^1.2.1",
"node-sass": "^4.9.3",
"mini-css-extract-plugin": "^0.5.0",
"node-sass": "^4.11.0",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"postcss-flexbugs-fixes": "^4.1.0",
"postcss-loader": "^3.0.0",
"purgecss-webpack-plugin": "^1.4.0",
"sass-lint": "^1.12.1",
"sass-loader": "^7.1.0",
"style-loader": "^0.23.0",
"webpack": "^4.19.1",
"webpack-cli": "^3.1.0",
"webpack-dev-server": "^3.1.8"
"style-loader": "^0.23.1",
"webpack": "^4.29.0",
"webpack-cli": "^3.2.1",
"webpack-dev-server": "^3.1.14",
"webpack-merge": "^4.2.1"
}
}
6 changes: 3 additions & 3 deletions assets/app.scss → src/app.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '~@nio/ui-kit/dist/nio';
@import './css/vars';
@import './css/base';
@import '~@nio/ui-kit/dist/nio.css';
@import './assets/styles/vars';
@import './assets/styles/base';

/* place your app-specific css below (or make component/view */
/* specific scss files and throw them in the css folder) */
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion components/app.js → src/components/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { Component } from 'react';
import { Navbar, NavbarToggler, Nav, NavItem, Collapse } from '@nio/ui-kit';
import { NavLink } from 'react-router-dom';

import '../assets/app.scss';
import '../app.scss';
import Routes from './routes';

class App extends Component {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions assets/index.js → src/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { render } from 'react-dom';
import { BrowserRouter } from 'react-router-dom';
import App from '../components/app';
import { PubkeeperProvider } from '../providers/pubkeeper';
import App from './components/app';
import { PubkeeperProvider } from './providers/pubkeeper';

render((<PubkeeperProvider><BrowserRouter><App /></BrowserRouter></PubkeeperProvider>), document.getElementById('app'));
File renamed without changes.
2 changes: 1 addition & 1 deletion providers/pubkeeper.js → src/providers/pubkeeper.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { PubkeeperClient, WebSocketBrew } from '@pubkeeper/browser-client';

import config from '../config';
import config from '../../config';

const PubkeeperContext = React.createContext();

Expand Down
122 changes: 122 additions & 0 deletions webpack.common.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
/* eslint-disable import/no-extraneous-dependencies */
const path = require('path');
const autoprefixer = require('autoprefixer');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const postCssFlexbugFixes = require('postcss-flexbugs-fixes');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const cssNano = require('cssnano');
const CopyWebpackPlugin = require('copy-webpack-plugin');
/* eslint-enable import/no-extraneous-dependencies */

module.exports = {
entry: ['@babel/polyfill', path.join(__dirname, 'src/index.js')],

output: {
path: path.join(__dirname, 'public'),
filename: '[chunkhash].min.js',
publicPath: '/',
},

plugins: [
new CleanWebpackPlugin(['public']),
new HtmlWebpackPlugin({
template: path.join(__dirname, 'src/index.html'),
favicon: path.join(__dirname, 'src/favicon.ico'),
inject: 'body',
minify: {
caseSensitive: true,
collapseInlineTagWhitespace: true,
collapseWhitespace: true,
minifyJS: true,
keepClosingSlash: true,
collapseBooleanAttributes: true,
removeComments: true,
removeOptionalTags: true,
removeRedundantAttributes: true,
removeScriptTypeAttributes: true,
removeStyleLinkTypeAttributes: true,
trimCustomFragments: true,
useShortDoctype: true,
},
}),
new ExtractTextPlugin('[chunkhash].min.css'),
new OptimizeCssAssetsPlugin({ assetNameRegExp: /\.css$/g, cssProcessor: cssNano, cssProcessorOptions: { discardComments: { removeAll: true } }, canPrint: true }),
new CopyWebpackPlugin([
{ from: path.join(__dirname, '/src/assets/images/'), to: 'images/' },
{ from: path.join(__dirname, '/src/assets/fonts/'), to: 'fonts/' },
]),
],

module: {
rules: [
{
test: /\.js$/,
exclude: /node_modules/,
loader: 'babel-loader',
options: {
presets: ['@babel/preset-env'],
},
},
{
test: /\.html$/,
use: [
{
loader: 'html-loader',
options: { minimize: true },
},
],
},
{
include: [/\.(ttf|woff|woff2|eot|svg)$/],
loader: require.resolve('file-loader'),
options: {
name: 'fonts/[name].[ext]',
},
},
{
test: /\.s?css$/,
loader: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: [
{
loader: 'css-loader',
options: {
importLoaders: 1,
},
},
{
loader: 'postcss-loader',
options: {
ident: 'postcss', // https://webpack.js.org/guides/migrating/#complex-options
plugins: () => [
postCssFlexbugFixes,
autoprefixer({
browsers: [
'>1%',
'last 4 versions',
'Firefox ESR',
'not ie < 9', // React doesn't support IE8 anyway
],
flexbox: 'no-2009',
}),
],
},
},
{
loader: 'sass-loader',
},
],
}),
},
{
test: /\.less$/,
loader: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: ['css-loader', 'less-loader'],
}),
},
],
},
};
106 changes: 5 additions & 101 deletions webpack.dev.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
/* eslint-disable import/no-extraneous-dependencies */
const path = require('path');
const autoprefixer = require('autoprefixer');
const postCssFlexbugFixes = require('postcss-flexbugs-fixes');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const merge = require('webpack-merge');
const common = require('./webpack.common.js');
/* eslint-enable import/no-extraneous-dependencies */

module.exports = {
entry: ['@babel/polyfill', path.join(__dirname, 'assets/index.js')],

output: {
path: path.join(__dirname, 'public'),
filename: '[chunkhash].min.js',
publicPath: '/',
},

module.exports = merge(common, {
mode: 'production',
devServer: {
host: '0.0.0.0',
contentBase: path.join(__dirname, 'public'),
Expand All @@ -28,89 +17,4 @@ module.exports = {
disableHostCheck: true,
inline: false,
},

plugins: [
new HtmlWebpackPlugin({
template: path.join(__dirname, 'assets/index.html'),
favicon: path.join(__dirname, 'assets/favicon.ico'),
inject: 'body',
}),
new ExtractTextPlugin('[chunkhash].min.css'),
new OptimizeCssAssetsPlugin({ assetNameRegExp: /\.css$/g, cssProcessorOptions: { discardComments: { removeAll: true } }, canPrint: true }),
new CopyWebpackPlugin([
{ from: path.join(__dirname, '/assets/images/'), to: 'images/' },
{ from: path.join(__dirname, '/assets/fonts/'), to: 'fonts/' },
]),
],

module: {
rules: [
{
test: /\.js$/,
exclude: /node_modules/,
loader: 'babel-loader',
options: {
presets: ['@babel/preset-env'],
},
},
{
test: /\.html$/,
use: [
{
loader: 'html-loader',
options: { minimize: true },
},
],
},
{
include: [/\.(ttf|woff|woff2|eot|svg)$/],
loader: require.resolve('file-loader'),
options: {
name: 'fonts/[name].[ext]',
},
},
{
test: /\.s?css$/,
loader: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: [
{
loader: 'css-loader',
options: {
importLoaders: 1,
},
},
{
loader: 'postcss-loader',
options: {
ident: 'postcss', // https://webpack.js.org/guides/migrating/#complex-options
plugins: () => [
postCssFlexbugFixes,
autoprefixer({
browsers: [
'>1%',
'last 4 versions',
'Firefox ESR',
'not ie < 9', // React doesn't support IE8 anyway
],
flexbox: 'no-2009',
}),
],
},
},
{
loader: 'sass-loader',
},
],
}),
},
{
test: /\.less$/,
loader: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: ['css-loader', 'less-loader'],
}),
},
],
},
};
});
Loading

0 comments on commit 731b61d

Please sign in to comment.