Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update to webpack 4, update dependencies, update node, fix some eslint warnings #95

Merged
merged 3 commits into from
Jul 15, 2019
Merged

update to webpack 4, update dependencies, update node, fix some eslint warnings #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
014f658
update to webpack 4
glebtv Jun 17, 2019
d48a9a4
use node as test environment https://github.com/facebook/jest/issues/…
glebtv Jul 5, 2019
6fb28fc
fix remaining eslint problems
glebtv Jul 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": ["es2015"]
"presets": ["@babel/preset-env"]
}
2 changes: 0 additions & 2 deletions .eslintrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ globals:
env:
jest: true

ecmaFeatures:
restParams: true
7 changes: 1 addition & 6 deletions example/.babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{
"presets": ["es2015", "react"],
"env": {
"development": {
"presets": ["react-hmre"]
}
}
"presets": ["@babel/preset-env", "@babel/preset-react"]
}
3 changes: 3 additions & 0 deletions example/app/assets/styles/test.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
body {
font-size: 20px;
}
1 change: 1 addition & 0 deletions example/app/layout/Layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Hero from '../components/Hero/Hero';
import Content from '../components/Content/Content';

import css from './Layout.scss';
import '../assets/styles/test.css';

export default class Layout extends React.Component {

Expand Down
1 change: 1 addition & 0 deletions example/app/markup/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<head>
<title>sass-resources-loader example</title>
<script src="/assets/app.js" defer></script>
<link type="text/css" rel="stylesheet" href="/assets/main.css"></link>
</head>

<body>
Expand Down
47 changes: 23 additions & 24 deletions example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"version": "0.0.1",
"description": "Example usage of sass-resources-loader and CSS Modules",
"engines": {
"node": "5"
"node": ">=10"
},
"scripts": {
"start": "nodemon --watch server.js server.js",
"build": "webpack --config webpack.prod.config.js",
"build": "cross-env NODE_ENV=production webpack --config webpack.config.js",
"lint": "eslint --ext .js,.jsx ."
},
"authors": [
Expand All @@ -29,34 +29,33 @@
"webpack"
],
"dependencies": {
"react": "^0.14.6",
"react-dom": "^0.14.6"
"cross-env": "^5.2.0",
"react": "^16.2.0",
"react-dom": "^16.2.0"
},
"devDependencies": {
"autoprefixer": "^6.3.1",
"babel-cli": "^6.4.5",
"babel-core": "^6.21.0",
"babel-eslint": "^5.0.0-beta6",
"babel-loader": "^6.2.10",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-react-hmre": "^1.0.1",
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"autoprefixer": "^9.0.0",
"babel-eslint": "^10.0.2",
"babel-loader": "^8.0.6",
"body-parser": "^1.14.2",
"css-loader": "^0.26.1",
"eslint": "^1.10.3",
"eslint-config-airbnb": "^4.0.0",
"eslint-config-shakacode": "0.0.1",
"eslint-plugin-react": "^3.15.0",
"css-loader": "^3.0.0",
"eslint": "^5.16.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-shakacode": "17.0.0",
"eslint-plugin-react": "^7.13.0",
"express": "^4.13.4",
"extract-text-webpack-plugin": "2.0.0-beta.5",
"extract-css-chunks-webpack-plugin": "^4.5.1",
"node-sass": "^4.1.1",
"nodemon": "^1.8.1",
"postcss-loader": "^1.2.1",
"sass-loader": "^4.1.1",
"sass-resources-loader": "file:../.",
"style-loader": "^0.13.1",
"webpack": "2.2.0",
"webpack-dev-middleware": "^1.9.0",
"postcss-loader": "^3.0.0",
"sass-loader": "^7.1.0",
"sass-resources-loader": "file:..",
"style-loader": "^0.23.1",
"webpack": "4.34.0",
"webpack-dev-middleware": "^3.7.0",
"webpack-hot-middleware": "^2.14.0"
}
}
22 changes: 18 additions & 4 deletions example/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
const webpack = require('webpack');
const path = require('path');

var production = process.env.NODE_ENV === 'production';
const ExtractCssChunks = require("extract-css-chunks-webpack-plugin")

module.exports = {
mode: production ? "production" : "development",

entry: [
'webpack-hot-middleware/client',
Expand All @@ -21,6 +25,12 @@ module.exports = {
plugins: [
new webpack.HotModuleReplacementPlugin(),
new webpack.NoEmitOnErrorsPlugin(),
new ExtractCssChunks(
{
filename: "[name].css",
chunkfilename: "[name].css",
}
),
],

module: {
Expand All @@ -31,15 +41,19 @@ module.exports = {
exclude: /node_modules/,
},
{
test: /\.scss$/,
test: /\.(sass|scss|css)$/,
use: [
'style-loader',
{
loader: ExtractCssChunks.loader,
options: {
hot: production ? false : true,
modules: false,
reloadAll: true
}
}, {
loader: 'css-loader',
options: {
modules: true,
importLoaders: 2,
localIdentName: '[path]__[local]__[hash:base64:5]',
},
},
'postcss-loader',
Expand Down
58 changes: 0 additions & 58 deletions example/webpack.prod.config.js
View file
Open in desktop

This file was deleted.

Loading