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 dependencies [WIP] #143

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update dependencies [WIP] #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b56f4c
Update to webpack 4 and babel 7
HeroProtagonist Oct 26, 2019
f924411
Update loaders for styles
HeroProtagonist Oct 26, 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
74 changes: 35 additions & 39 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,40 @@
"env": {
"commonjs": {
"presets": [
"es2015",
"react",
"stage-0"
"@babel/env",
"@babel/react"
]
},
"development": {
"plugins": [
"typecheck",
[
"react-transform",
{
"transforms": [
{
"transform": "react-transform-hmr",
"imports": [
"react"
],
"locals": [
"module"
]
},
{
"transform": "react-transform-catch-errors",
"imports": [
"react",
"redbox-react"
]
}
]
}
]
// "typecheck",
// [
// "react-transform",
// {
// "transforms": [
// {
// "transform": "react-transform-hmr",
// "imports": [
// "react"
// ],
// "locals": [
// "module"
// ]
// },
// {
// "transform": "react-transform-catch-errors",
// "imports": [
// "react",
// "redbox-react"
// ]
// }
// ]
// }
// ]
],
"presets": [
"es2015",
"react",
"stage-0"
"@babel/env",
"@babel/react"
]
},
"es": {
Expand All @@ -46,8 +44,7 @@
],
"presets": [
"es2015-rollup",
"react",
"stage-0"
"@babel/react"
]
},
"production": {
Expand All @@ -57,9 +54,8 @@
"transform-runtime"
],
"presets": [
"es2015",
"react",
"stage-0"
"@babel/env",
"@babel/react"
]
},
"test": {
Expand All @@ -68,13 +64,13 @@
"__coverage__"
],
"presets": [
"es2015",
"react",
"stage-0"
"@babel/env",
"@babel/react"
]
}
},
"plugins": [
"transform-decorators-legacy"
["@babel/plugin-proposal-decorators", { "legacy": true }],
["@babel/plugin-proposal-class-properties", { "loose" : true }]
]
}
52 changes: 25 additions & 27 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,32 +62,28 @@
]
},
"devDependencies": {
"autoprefixer": "^6.2.3",
"babel-cli": "6.5.1",
"babel-core": "^6.5.1",
"babel-eslint": "^5.0.0",
"babel-loader": "^6.2.3",
"@babel/core": "^7.6.4",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-proposal-decorators": "^7.6.0",
"@babel/preset-env": "^7.6.3",
"@babel/preset-react": "^7.6.3",
"autoprefixer": "^9.7.0",
"babel-cli": "^6.26.0",
"babel-eslint": "^10.0.3",
"babel-loader": "^8.0.6",
"babel-plugin-__coverage__": "^0.1111.1",
"babel-plugin-react-transform": "^2.0.0",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-react-inline-elements": "^6.6.5",
"babel-plugin-transform-runtime": "^6.15.0",
"babel-plugin-typecheck": "^3.6.1",
"babel-polyfill": "^6.5.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-es2015-rollup": "^3.0.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-0": "^6.5.0",
"babel-plugin-react-transform": "^3.0.0",
"bluebird": "^3.0.5",
"codecov": "^1.0.1",
"core-js": "^3.3.4",
"cross-env": "^1.0.7",
"css-loader": "^0.23.0",
"css-loader": "^3.2.0",
"express": "^4.13.3",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.8.5",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^4.2.0",
"fs-extra": "^0.26.2",
"gh-pages": "^0.6.0",
"html-webpack-plugin": "^1.7.0",
"html-webpack-plugin": "^3.2.0",
"jasmine": "^2.3.2",
"jasmine-core": "^2.3.4",
"karma": "^0.13.22",
Expand All @@ -99,23 +95,25 @@
"karma-spec-reporter": "0.0.23",
"karma-webpack": "^1.7.0",
"phantomjs": "^1.9.19",
"postcss": "^5.0.14",
"postcss-cli": "^2.3.3",
"postcss-loader": "^0.8.0",
"postcss": "^7.0.21",
"postcss-cli": "^6.1.3",
"postcss-loader": "^3.0.0",
"react": "^15.3.0",
"react-addons-test-utils": "^15.3.0",
"react-dom": "^15.3.0",
"react-select": "^1.0.0",
"react-transform-catch-errors": "^1.0.2",
"react-transform-hmr": "^1.0.2",
"react-transform-hmr": "^1.0.4",
"react-virtualized": "^9.0.0",
"redbox-react": "^1.0.1",
"regenerator-runtime": "^0.13.3",
"rimraf": "^2.4.3",
"standard": "^5.4.1",
"style-loader": "^0.13.0",
"standard": "^14.3.1",
"style-loader": "^1.0.0",
"watch": "^0.16.0",
"webpack": "^1.9.6",
"webpack-dev-server": "^1.14.0",
"webpack": "^4.41.2",
"webpack-cli": "^3.3.9",
"webpack-dev-server": "^3.9.0",
"whatwg-fetch": "^2.0.1"
},
"dependencies": {
Expand Down
5 changes: 5 additions & 0 deletions postcss.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
plugins: [
require('autoprefixer')
]
}
5 changes: 3 additions & 2 deletions source/demo/Application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Polyfill a full ES6 environment
import 'babel-polyfill'
import "core-js/stable"
import "regenerator-runtime/runtime"

import React, { Component } from 'react'
import ReactDOM from 'react-dom'
Expand Down Expand Up @@ -47,4 +48,4 @@ ReactDOM.render(
)

// Import and attach the favicon
document.querySelector('[rel="shortcut icon"]').href = require('file!./favicon.png')
document.querySelector('[rel="shortcut icon"]').href = require('file-loader!./favicon.png')
15 changes: 7 additions & 8 deletions webpack.config.demo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const HtmlWebpackPlugin = require('html-webpack-plugin')
const autoprefixer = require('autoprefixer')
const path = require('path')
const webpack = require('webpack')

Expand All @@ -25,25 +24,25 @@ module.exports = {
})
],
module: {
loaders: [
rules: [
{
test: /\.js$/,
loaders: ['babel'],
loader: 'babel',
include: path.join(__dirname, 'source')
},
{
test: /\.css$/,
loaders: ['style', 'css?modules&importLoaders=1', 'postcss'],
use: ['style', 'css?modules&importLoaders=1', 'postcss'],
include: path.join(__dirname, 'source')
},
{
test: /\.css$/,
loaders: ['style', 'css?importLoaders=1'],
use: ['style', 'css?importLoaders=1'],
include: path.join(__dirname, 'styles.css')
}
]
},
postcss: function () {
return [autoprefixer]
}
// postcss: function () {
// return [autoprefixer]
// }
}
48 changes: 34 additions & 14 deletions webpack.config.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,68 @@
const HtmlWebpackPlugin = require('html-webpack-plugin')
const autoprefixer = require('autoprefixer')
const path = require('path')
const webpack = require('webpack')

module.exports = {
devtool: 'eval',
entry: {
demo: './source/demo/Application'
},
output: {
path: 'build',
filename: '/static/[name].js'
path: path.join(__dirname, 'build'),
// path: './build',
filename: 'static/[name].js'
},
plugins: [
new HtmlWebpackPlugin({
filename: 'index.html',
inject: true,
template: './index.html'
}),
new webpack.NoErrorsPlugin(),
new webpack.optimize.UglifyJsPlugin()
})
// new webpack.NoErrorsPlugin(),
// new webpack.optimize.UglifyJsPlugin()
],
module: {
loaders: [
rules: [
{
test: /\.js$/,
loaders: ['babel'],
use: {
loader: 'babel-loader',
options: {
presets: ['@babel/preset-env']
}
},
include: path.join(__dirname, 'source')
},
{
test: /\.css$/,
loaders: ['style', 'css?modules&importLoaders=1', 'postcss'],
use: [
'style-loader',
{
loader: 'css-loader',
options: {
importLoaders: 1,
modules: true
}
},
'postcss-loader'
],
include: path.join(__dirname, 'source')
},
{
test: /\.css$/,
loaders: ['style', 'css?importLoaders=1'],
use: [
'style-loader',
{
loader: 'css-loader',
options: {
importLoaders: 1,
modules: true
}
}
],
include: path.join(__dirname, 'styles.css')
}
]
},
postcss: function () {
return [autoprefixer]
},
devServer: {
contentBase: 'build',
port: 3002
Expand Down
7 changes: 3 additions & 4 deletions webpack.config.umd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,16 @@ module.exports = {
})
],
module: {
loaders: [
rules: [
{
test: /\.js$/,
loaders: ['babel'],
loader: 'babel',
include: path.join(__dirname, 'source')
},
{
test: /\.css$/,
loader: ExtractTextPlugin.extract('css-loader!autoprefixer-loader?{browsers:["last 2 version", "Firefox 15"]}'),
use: ExtractTextPlugin.extract('css-loader!autoprefixer-loader?{browsers:["last 2 version", "Firefox 15"]}'),
include: path.join(__dirname, 'source')

}
]
}
Expand Down
Loading