Skip to content

Update JS packages to latest versions (#9811) #9921

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

Merged
kaxil merged 17 commits into from
Aug 6, 2020
Merged

Update JS packages to latest versions (#9811) #9921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a9534b0
Update JS packages to latest versions
retornam Jul 23, 2020
2842a7e
Update JS packages to latest versions
retornam Jul 23, 2020
c231c32
Update JS packages to latest versions
retornam Jul 23, 2020
af76a59
Update JS packages to latest versions
retornam Jul 23, 2020
35daac9
Update JS packages to latest versions
retornam Jul 23, 2020
b865361
Update JS packages to latest versions
retornam Jul 23, 2020
07eec85
Update JS packages to latest versions
retornam Jul 23, 2020
7d414d9
Update JS packages to latest versions
retornam Jul 23, 2020
fc3689a
Update JS packages to latest versions
retornam Jul 23, 2020
ba0a458
Update JS packages to latest versions
retornam Jul 23, 2020
37ddd6e
Update JS packages to latest versions
retornam Jul 23, 2020
a44bb73
Update JS packages to latest versions
retornam Jul 23, 2020
1983f74
Update JS packages to latest versions
retornam Jul 23, 2020
5ea55b2
Update JS packages to latest versions
retornam Jul 23, 2020
904abcc
Update JS packages to latest versions
retornam Jul 23, 2020
552bd59
Update JS packages to latest versions
retornam Jul 23, 2020
7633d45
fix formatting
retornam Jul 24, 2020
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
50 changes: 25 additions & 25 deletions airflow/www/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,32 @@
"devDependencies": {
"babel": "^6.23.0",
"babel-core": "^6.26.3",
"babel-eslint": "^8.2.6",
"babel-loader": "^7.1.4",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"babel-plugin-css-modules-transform": "^1.6.1",
"babel-polyfill": "^6.26.0",
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^5.1.1",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^6.0.3",
"css-loader": "^3.4.2",
"eslint": "^4.19.1",
"eslint-config-airbnb-base": "^13.0.0",
"eslint-plugin-html": "^4.0.5",
"eslint-plugin-import": "^2.13.0",
"eslint-plugin-node": "^7.0.1",
"eslint-plugin-promise": "^3.8.0",
"eslint-plugin-standard": "^3.1.0",
"file-loader": "^1.1.11",
"handlebars": "^4.5.3",
"imports-loader": "^0.8.0",
"eslint": "^7.5.0",
"eslint-config-airbnb-base": "^14.2.0",
"eslint-plugin-html": "^6.0.2",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"file-loader": "^6.0.0",
"handlebars": "^4.7.6",
"imports-loader": "^1.1.0",
"jquery": ">=3.4.0",
"js-yaml": ">=3.13.1",
"lodash": "^4.17.13",
"mini-css-extract-plugin": "^0.4.1",
"js-yaml": "^3.14.0",
"lodash": "^4.17.19",
"mini-css-extract-plugin": "0.9.0",
"moment-locales-webpack-plugin": "^1.2.0",
"style-loader": "^0.21.0",
"stylelint": "^13.3.1",
"style-loader": "^1.2.1",
"stylelint": "^13.6.1",
"stylelint-config-standard": "^20.0.0",
"url-loader": "^1.0.1",
"url-loader": "4.1.0",
"webpack": "^4.16.3",
"webpack-cli": "^3.1.0",
"webpack-manifest-plugin": "^2.2.0"
Expand All @@ -64,15 +64,15 @@
"d3": "^3.4.4",
"d3-tip": "^0.9.1",
"dagre-d3": "^0.6.4",
"datatables.net": "^1.10.19",
"datatables.net-bs": "^1.10.19",
"datatables.net": "^1.10.21",
"datatables.net-bs": "^1.10.21",
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
"jquery": ">=3.4.0",
"js-yaml": ">=3.13.1",
"lodash": "^4.17.13",
"js-yaml": "^3.14.0",
"lodash": "^4.17.19",
"moment-timezone": "^0.5.28",
"nvd3": "^1.8.6",
"redoc": "^2.0.0-rc.30",
"url-search-params-polyfill": "^6.0.0"
"url-search-params-polyfill": "^8.1.0"
}
}
109 changes: 70 additions & 39 deletions airflow/www/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
const webpack = require('webpack');
const path = require('path');
const ManifestPlugin = require('webpack-manifest-plugin');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const cwplg = require('clean-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
Expand Down Expand Up @@ -58,12 +58,10 @@ const config = {
],
},
module: {
rules: [
{
rules: [{
test: /datatables\.net.*/,
loader: 'imports-loader?define=>false',
},
{
}, {
test: /\.jsx?$/,
exclude: /node_modules/,
loader: 'babel-loader',
Expand All @@ -72,39 +70,49 @@ const config = {
{
test: /\.css$/,
include: STATIC_DIR,
use: [
MiniCssExtractPlugin.loader,
use: [{
loader: MiniCssExtractPlugin.loader,
options: {
esModule: true,
},
},
'css-loader',
],
},
/* for css linking images */
{
test: /\.png$/,
loader: 'url-loader?limit=100000',
},
{
test: /\.jpg$/,
loader: 'file-loader',
},
{
test: /\.gif$/,
loader: 'file-loader',
test: /\.(png|jpg|gif)$/i,
use: [{
loader: 'url-loader',
options: {
limit: 100000,
},
}, ],
},
/* for font-awesome */
{
test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
loader: 'url-loader?limit=10000&mimetype=application/font-woff',
},
{
use: [{
loader: 'url-loader',
options: {
limit: 100000,
mimetype: 'application/font-woff',
},
}, ],
}, {
test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
loader: 'file-loader',
},
],
},
plugins: [
new ManifestPlugin(),
new CleanWebpackPlugin(['static/dist']),
new MiniCssExtractPlugin({ filename: '[name].[chunkhash].css' }),
new cwplg.CleanWebpackPlugin({
verbose: true,
}),
new MiniCssExtractPlugin({
filename: '[name].[chunkhash].css'
}),

// MomentJS loads all the locale, making it a huge JS file.
// This will ignore the locales from momentJS
Expand All @@ -118,23 +126,46 @@ const config = {
// Since we have all the dependencies separated from hard-coded JS within HTML,
// this seems like an efficient solution for now. Will update that once
// we'll have the dependencies imported within the custom JS
new CopyWebpackPlugin([
{ from: 'node_modules/nvd3/build/*.min.*', flatten: true },
// Update this when upgrade d3 package, as the path in new D3 is different
{ from: 'node_modules/d3/d3.min.*', flatten: true },
{ from: 'node_modules/dagre-d3/dist/*.min.*', flatten: true },
{ from: 'node_modules/d3-tip/dist/index.js', to: 'd3-tip.js', flatten: true },
{ from: 'node_modules/bootstrap-3-typeahead/*min.*', flatten: true },
{
from: 'node_modules/bootstrap-toggle/**/*bootstrap-toggle.min.*',
flatten: true,
},
{ from: 'node_modules/datatables.net/**/**.min.*', flatten: true },
{ from: 'node_modules/datatables.net-bs/**/**.min.*', flatten: true },
{ from: 'node_modules/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css', flatten: true },
{ from: 'node_modules/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js', flatten: true },
{ from: 'node_modules/redoc/bundles/redoc.standalone.*', flatten: true },
], { copyUnmodified: true }),
new CopyWebpackPlugin({
patterns: [{
from: 'node_modules/nvd3/build/*.min.*',
flatten: true
},
// Update this when upgrade d3 package, as the path in new D3 is different
{
from: 'node_modules/d3/d3.min.*',
flatten: true
}, {
from: 'node_modules/dagre-d3/dist/*.min.*',
flatten: true
}, {
from: 'node_modules/d3-tip/dist/index.js',
to: 'd3-tip.js',
flatten: true
}, {
from: 'node_modules/bootstrap-3-typeahead/*min.*',
flatten: true
}, {
from: 'node_modules/bootstrap-toggle/**/*bootstrap-toggle.min.*',
flatten: true,
}, {
from: 'node_modules/datatables.net/**/**.min.*',
flatten: true
}, {
from: 'node_modules/datatables.net-bs/**/**.min.*',
flatten: true
}, {
from: 'node_modules/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css',
flatten: true
}, {
from: 'node_modules/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js',
flatten: true
}, {
from: 'node_modules/redoc/bundles/redoc.standalone.*',
flatten: true
},
],
}),
],
};

Expand Down
Loading