[DRE-commits] [gitlab] 06/07: use imports-loader and url-loader from system

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 15182258951756ef016bd5b867fdec35fd767adb
Author: Pirate Praveen <praveen at debian.org>
Date:   Fri Sep 15 17:31:42 2017 +0530

    use imports-loader and url-loader from system
---
 debian/patches/0420-use-system-libs.patch | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/patches/0420-use-system-libs.patch b/debian/patches/0420-use-system-libs.patch
index dc7b8b1..0706039 100644
--- a/debian/patches/0420-use-system-libs.patch
+++ b/debian/patches/0420-use-system-libs.patch
@@ -1,14 +1,15 @@
 --- a/package.json
 +++ b/package.json
-@@ -13,7 +13,6 @@
+@@ -13,16 +13,13 @@
    },
    "dependencies": {
      "axios": "^0.16.2",
 -    "babel-core": "^6.22.1",
      "babel-eslint": "^7.2.1",
-     "babel-loader": "^7.1.1",
+-    "babel-loader": "^7.1.1",
      "babel-plugin-transform-define": "^1.2.0",
-@@ -22,7 +21,6 @@
+     "babel-preset-latest": "^6.24.0",
+     "babel-preset-stage-2": "^6.22.0",
      "bootstrap-sass": "^3.3.6",
      "compression-webpack-plugin": "^0.3.2",
      "copy-webpack-plugin": "^4.0.1",
@@ -16,14 +17,14 @@
      "cropper": "^2.3.0",
      "css-loader": "^0.28.0",
      "d3": "^3.5.11",
-@@ -30,17 +28,11 @@
+@@ -30,17 +27,10 @@
      "document-register-element": "^1.3.0",
      "dropzone": "^4.2.0",
      "emoji-unicode-version": "^0.2.1",
 -    "eslint-plugin-html": "^2.0.1",
 -    "exports-loader": "^0.6.4",
 -    "file-loader": "^0.11.1",
-     "imports-loader": "^0.7.1",
+-    "imports-loader": "^0.7.1",
 -    "jed": "^1.1.1",
      "jquery": "^2.2.1",
      "jquery-ujs": "^1.2.1",
@@ -34,7 +35,7 @@
      "monaco-editor": "0.8.3",
      "mousetrap": "^1.4.6",
      "name-all-modules-plugin": "^1.0.1",
-@@ -48,7 +40,6 @@
+@@ -48,7 +38,6 @@
      "prismjs": "^1.6.0",
      "raphael": "^2.2.7",
      "raven-js": "^3.14.0",
@@ -42,12 +43,12 @@
      "react-dev-utils": "^0.5.2",
      "select2": "3.5.2-browserify",
      "sql.js": "^0.4.0",
-@@ -56,14 +47,12 @@
+@@ -56,14 +45,11 @@
      "three-orbit-controls": "^82.1.0",
      "three-stl-loader": "^1.0.4",
      "timeago.js": "^2.0.5",
 -    "underscore": "^1.8.3",
-     "url-loader": "^0.5.8",
+-    "url-loader": "^0.5.8",
      "visibilityjs": "^1.2.4",
      "vue": "^2.2.6",
      "vue-loader": "^11.3.4",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git