Skip to content

Commit

Permalink
updates to WP4 version [appends #247]
Browse files Browse the repository at this point in the history
  • Loading branch information
bignamehere committed Jun 6, 2018
1 parent 1b58cb5 commit b0bc1a9
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url-loader": "^1.0.1",
"webpack": "^4.8.3",
"webpack-cli": "^2.1.3",
"webpack-dev-server": "3.1.4",
"webpack-dev-server": "^3.1.4",
"webpack-merge": "^4.1.2"
}
}
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ <h1 class="docs__bd docs__title">FSA Style <span class="docs__title__version">2.
<p class="fsa-text--lead">An open source HTML/CSS Framework for the next generation of FSA digital products, setting a new bar for simplicity and consistency across the USDA Farm Service Agency.</p>
<ul>
<li>View the <strong><a href="http://usda-fsa.github.io/fsa-design-system/">FSA Design Sytem</a></strong> for documentation</li>
<li><strong><a href="https://github.com/USDA-FSA/fsa-style/blob/master/README.md#using-fsa-style-assets">Install or Download</a></strong></li>
<li><strong><a href="https://github.com/USDA-FSA/fsa-style/blob/master/README.md#using-fsa-style-assets">Install or Download FSA Style</a></strong></li>
</ul>
</div>
</section>
Expand Down
1 change: 0 additions & 1 deletion webpack.common.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//
//
//
//const ExtractTextPlugin = require('extract-text-webpack-plugin');
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const CopyWebpackPlugin = require('copy-webpack-plugin');
const HTMLWebpackPlugin = require('html-webpack-plugin');
Expand Down
10 changes: 8 additions & 2 deletions webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
//
//
const path = require('path');
const webpack = require('webpack');
const merge = require('webpack-merge');
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
var StyleLintPlugin = require('stylelint-webpack-plugin');
var CopyWebpackPlugin = require('copy-webpack-plugin');
const common = require('./webpack.common.js');
Expand All @@ -17,7 +19,6 @@ module.exports = merge(common, {
watchContentBase: true,
publicPath: '/',
port: 8888,
hot: true,
inline: true,
open: true
},
Expand All @@ -27,7 +28,12 @@ module.exports = merge(common, {
{
test: /\.css$/,
exclude: /node_modules/,
use: ['style-loader','css-loader']
use: [
MiniCssExtractPlugin.loader,
'css-loader',
'postcss-loader',
'sass-loader'
]
},
]
},
Expand Down
1 change: 0 additions & 1 deletion webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
const webpack = require('webpack');
const merge = require('webpack-merge');
const path = require('path');
//const ExtractTextPlugin = require('extract-text-webpack-plugin');
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const CleanWebpackPlugin = require('clean-webpack-plugin');
const common = require('./webpack.common.js');
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7494,7 +7494,7 @@ [email protected]:
url-join "^4.0.0"
webpack-log "^1.0.1"

[email protected]:
webpack-dev-server@^3.1.4:
version "3.1.4"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.4.tgz#9a08d13c4addd1e3b6d8ace116e86715094ad5b4"
dependencies:
Expand Down

0 comments on commit b0bc1a9

Please sign in to comment.