Add/implement Webpack plugin to minify CSS files on-compile (#11564)

2020-10-16 03:59:09 -04:00 · 2020-10-16 03:59:09 -04:00 · 8372ab1375
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -63,7 +63,7 @@ repos:
        exclude: ^\.github/.*$
        args:
          - --comment-style
-          - "/**| *| */"
+          - "/*!| *| */"
          - --license-filepath
          - license-templates/LICENSE.txt
          - --fuzzy-match-generates-todo
--- a/airflow/www/package.json
+++ b/airflow/www/package.json
@ -50,6 +50,7 @@
    "lodash": "^4.17.20",
    "mini-css-extract-plugin": "0.9.0",
    "moment-locales-webpack-plugin": "^1.2.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.4",
    "style-loader": "^1.2.1",
    "stylelint": "^13.6.1",
    "stylelint-config-standard": "^20.0.0",
--- a/airflow/www/static/css/bootstrap-theme.css
+++ b/airflow/www/static/css/bootstrap-theme.css
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/css/flash.css
+++ b/airflow/www/static/css/flash.css
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/css/gantt.css
+++ b/airflow/www/static/css/gantt.css
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/css/graph.css
+++ b/airflow/www/static/css/graph.css
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/css/loading-dots.css
+++ b/airflow/www/static/css/loading-dots.css
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/css/main.css
+++ b/airflow/www/static/css/main.css
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/css/material-icons.css
+++ b/airflow/www/static/css/material-icons.css
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/css/switch.css
+++ b/airflow/www/static/css/switch.css
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/css/tree.css
+++ b/airflow/www/static/css/tree.css
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/js/base.js
+++ b/airflow/www/static/js/base.js
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/js/connection_form.js
+++ b/airflow/www/static/js/connection_form.js
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/js/datetime-utils.js
+++ b/airflow/www/static/js/datetime-utils.js
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/js/gantt-chart-d3v2.js
+++ b/airflow/www/static/js/gantt-chart-d3v2.js
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/js/graph.js
+++ b/airflow/www/static/js/graph.js
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/js/ie.js
+++ b/airflow/www/static/js/ie.js
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/static/js/task-instances.js
+++ b/airflow/www/static/js/task-instances.js
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/airflow/www/webpack.config.js
+++ b/airflow/www/webpack.config.js
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
@ -16,6 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
+
 const webpack = require('webpack');
 const path = require('path');
 const ManifestPlugin = require('webpack-manifest-plugin');
@ -23,6 +24,7 @@ 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');
+const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');

 // Input Directory (airflow/www)
 // noinspection JSUnresolvedVariable
@ -188,6 +190,9 @@ const config = {
      ],
    }),
  ],
+  optimization: {
+    minimizer: [new OptimizeCSSAssetsPlugin({})],
+  },
 };

 module.exports = config;
--- a/airflow/www/yarn.lock
+++ b/airflow/www/yarn.lock
--- a/docs/img/run_task_on_celery_executor.puml
+++ b/docs/img/run_task_on_celery_executor.puml
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/docs/static/exampleinclude.css
+++ b/docs/static/exampleinclude.css
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
--- a/docs/static/jira-links.js
+++ b/docs/static/jira-links.js
@ -1,4 +1,4 @@
-/**
+/*!
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information