Merge pull request #2418 from SylvainCorlay/drop-postcss

Drop postcss
jupyter-widgets · May 24, 2019 · 1aeb7ee · 1aeb7ee
2 parents 36fe375 + 15c045c
commit 1aeb7ee
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 49 deletions.
diff --git a/examples/web1/index.js b/examples/web1/index.js
@@ -1,7 +1,7 @@
 // Create a widget manager instance.
 var WidgetManager = require('./manager').WidgetManager;
 
-require('@jupyter-widgets/controls/css/widgets.built.css');
+require('@jupyter-widgets/controls/css/widgets.css');
 
 document.addEventListener("DOMContentLoaded", function(event) {
     var manager = new WidgetManager(document.body);

diff --git a/examples/web2/index.js b/examples/web2/index.js
@@ -3,7 +3,7 @@ require("codemirror/lib/codemirror.css");
 require("codemirror/mode/python/python");
 var WidgetManager = require("./manager").WidgetManager;
 
-require('@jupyter-widgets/controls/css/widgets.built.css');
+require('@jupyter-widgets/controls/css/widgets.css');
 require('font-awesome/css/font-awesome.css');
 
 document.addEventListener("DOMContentLoaded", function(event) {

diff --git a/packages/controls/css/widgets.css b/packages/controls/css/widgets.css
@@ -2,9 +2,5 @@
  * Distributed under the terms of the Modified BSD License.
  */
 
- /* We import all of these together in a single css file because the Webpack
-loader sees only one file at a time. This allows postcss to see the variable
-definitions when they are used. */
-
 @import "./labvariables.css";
 @import "./widgets-base.css";
diff --git a/packages/html-manager/package.json b/packages/html-manager/package.json
@@ -61,10 +61,6 @@
     "karma-mocha": "^1.3.0",
     "karma-mocha-reporter": "^2.2.3",
     "mocha": "^3.3.0",
-    "postcss": "^6.0.2",
-    "postcss-cssnext": "^3.0.2",
-    "postcss-import": "^10.0.0",
-    "postcss-loader": "^2.0.6",
     "rimraf": "^2.6.1",
     "style-loader": "^0.18.1",
     "tslint": "^5.8.0",

diff --git a/packages/html-manager/src/libembed.ts b/packages/html-manager/src/libembed.ts
@@ -6,7 +6,7 @@ __webpack_public_path__ = (window as any).__jupyter_widgets_assets_path__ || __w
 
 import 'font-awesome/css/font-awesome.css';
 import '@phosphor/widgets/style/index.css';
-import '@jupyter-widgets/controls/css/widgets.built.css';
+import '@jupyter-widgets/controls/css/widgets.css';
 
 // Used just for the typing. We must not import the javascript because we don't
 // want to include it in the require embedding.

diff --git a/packages/html-manager/webpack.config.js b/packages/html-manager/webpack.config.js
@@ -7,33 +7,10 @@ var path = require('path');
 
 var version = require('./package.json').version;
 
-var postcss = require('postcss');
-
 var rules = [
     { test: /\.css$/, use: [
         'style-loader',
-        'css-loader',
-        {
-            loader: 'postcss-loader',
-            options: {
-                plugins: [
-                    postcss.plugin('delete-tilde', function() {
-                        return function (css) {
-                            css.walkAtRules('import', function(rule) {
-                                rule.params = rule.params.replace('~', '');
-                            });
-                        };
-                    }),
-                    postcss.plugin('prepend', function() {
-                        return function(css) {
-                            css.prepend("@import '@jupyter-widgets/controls/css/labvariables.css';")
-                        }
-                    }),
-                    require('postcss-import')(),
-                    require('postcss-cssnext')()
-                ]
-            }
-        }
+        'css-loader'
     ]},
     // jquery-ui loads some images
     { test: /\.(jpg|png|gif)$/, use: 'file-loader' },

diff --git a/widgetsnbextension/package.json b/widgetsnbextension/package.json
@@ -34,9 +34,6 @@
   "devDependencies": {
     "css-loader": "^0.28.4",
     "json-loader": "^0.5.4",
-    "postcss-cssnext": "^3.0.2",
-    "postcss-import": "^10.0.0",
-    "postcss-loader": "^2.0.6",
     "rimraf": "^2.6.1",
     "style-loader": "^0.18.1",
     "webpack": "^3.5.5"

diff --git a/widgetsnbextension/webpack.config.js b/widgetsnbextension/webpack.config.js
@@ -11,16 +11,7 @@ module.exports = {
         rules: [
             { test: /\.css$/, use: [
                 'style-loader',
-                'css-loader',
-                {
-                    loader: 'postcss-loader',
-                    options: {
-                        plugins: [
-                            require('postcss-import'),
-                            require('postcss-cssnext')
-                        ]
-                    }
-                }
+                'css-loader'
             ]},
             // jquery-ui loads some images
             { test: /\.(jpg|png|gif)$/, use: 'file-loader' },
@@ -30,6 +21,6 @@ module.exports = {
             { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, use: 'url-loader?limit=10000&mimetype=application/octet-stream' },
             { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, use: 'file-loader' },
             { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, use: 'url-loader?limit=10000&mimetype=image/svg+xml' }
-              ]
+        ]
     },
 };