Skip to content

Commit

Permalink
chore(deps): update webpack dev server and the remaining packages to …
Browse files Browse the repository at this point in the history
…their latest versions
  • Loading branch information
Algram committed Apr 22, 2019
1 parent 7dd8a04 commit 036a1ee
Show file tree
Hide file tree
Showing 7 changed files with 6,001 additions and 4,083 deletions.
10,004 changes: 5,957 additions & 4,047 deletions package-lock.json

Large diffs are not rendered by default.

35 changes: 19 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,27 @@
"@hapi/hapi": "^18.3.1",
"@hapi/inert": "^5.2.0",
"@microlink/youtube-dl": "^1.13.2",
"extract-text-webpack-plugin": "^1.0.1",
"fluent-ffmpeg": "^2.1.0",
"react": "^15.3.1",
"react-dom": "^15.3.1",
"validator": "^5.6.0"
"extract-text-webpack-plugin": "^3.0.2",
"fluent-ffmpeg": "^2.1.2",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"validator": "^10.11.0"
},
"devDependencies": {
"babel-core": "^6.14.0",
"babel-loader": "^6.2.5",
"babel-preset-es2015": "^6.14.0",
"babel-preset-react": "^6.11.1",
"css-loader": "^0.24.0",
"node-sass": "^3.8.0",
"postcss-loader": "^0.11.1",
"sass-loader": "^4.0.0",
"@babel/core": "^7.4.3",
"@babel/preset-env": "^7.4.3",
"@babel/preset-react": "^7.0.0",
"babel-loader": "^8.0.5",
"css-loader": "^2.1.1",
"mini-css-extract-plugin": "^0.6.0",
"node-sass": "^4.11.0",
"postcss-loader": "^3.0.0",
"sass-loader": "^7.1.0",
"standard": "^12.0.1",
"style-loader": "^0.13.1",
"webpack": "^1.13.2",
"webpack-dev-server": "^1.15.0"
"style-loader": "^0.23.1",
"webpack": "^4.30.0",
"webpack-cli": "^3.3.1",
"webpack-dev-server": "^3.3.1"
}
}
3 changes: 2 additions & 1 deletion src/components/DownloadForm.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import '../stylesheets/DownloadForm.scss'

class DownloadForm extends Component {
Expand Down
3 changes: 2 additions & 1 deletion src/components/DownloadList.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import '../stylesheets/DownloadList.scss'

class DownloadList extends Component {
Expand Down
1 change: 1 addition & 0 deletions src/components/DownloadPanel.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* global document */

import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { isURL } from 'validator'
import DownloadForm from './DownloadForm'
import DownloadList from './DownloadList'
Expand Down
2 changes: 1 addition & 1 deletion src/server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const path = require('path')
const youtube = require('./handlers/youtube')

const server = new Hapi.Server({
port: 3000,
port: process.env.PORT || 3000,
routes: {
files: {
relativeTo: path.join(__dirname, '../../public')
Expand Down
36 changes: 19 additions & 17 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const path = require('path');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const path = require('path')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')

module.exports = {
entry: './src/main.js',
Expand All @@ -10,22 +10,24 @@ module.exports = {
},

module: {
loaders: [{
test: /\.jsx?$/,
exclude: /node_modules/,
loader: 'babel',
query: {
presets: ['react', 'es2015']
rules: [
{
test: /\.jsx?$/,
exclude: /node_modules/,
use: {
loader: 'babel-loader',
options: {
presets: ['@babel/preset-react', '@babel/preset-env']
}
}
},
{
test: /\.scss$/,
loader: 'style-loader!css-loader!sass-loader'
}
},
{
test: /\.scss$/,
loader: 'style!css!postcss!sass'
/* loader: ExtractTextPlugin.extract(
'style-loader', 'css-loader!autoprefixer-loader!sass-loader')*/
}]
]
},
plugins: [
new ExtractTextPlugin('style.css', { allChunks: true })
new MiniCssExtractPlugin({ filename: 'style.css'})
]
};
}

0 comments on commit 036a1ee

Please sign in to comment.