Merge with upstream

2025-11-08 14:35:45 +01:00 · 2019-08-30 09:19:43 +02:00
parent 23d1a0a18b b8265eef1a
commit 3daec67ca4
14 changed files with 37 additions and 58 deletions
--- a/scm-plugins/scm-git-plugin/package.json
+++ b/scm-plugins/scm-git-plugin/package.json
@@ -12,6 +12,6 @@
    "@scm-manager/ui-extensions": "^0.1.2"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.30"
+    "@scm-manager/ui-bundler": "^0.0.31"
  }
 }
--- a/scm-plugins/scm-git-plugin/yarn.lock
+++ b/scm-plugins/scm-git-plugin/yarn.lock
@@ -707,10 +707,10 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.30.tgz#29fcc7246efc7fafc69905144c41adb6e4eb985b"
-  integrity sha512-lQYCroIQbpbVLOa5eNH6PLicHVXlpc1Bgb3HuC643z9ne4lunQDMkbqJG5s5n8h5ZFiLALuPZ3DMMCht8cKeaw==
+"@scm-manager/ui-bundler@^0.0.31":
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.31.tgz#f655db205058e99d8c13a08b555f993ec0573e4f"
+  integrity sha512-tgppy8Gp3iBIg4WqyrNXzMjUprNUN5i3n3UZ18AWjVys4p+CHxLBbd5ooyoeMJ67trxea1C1yB8MItjOVsdQOA==
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"
--- a/scm-plugins/scm-hg-plugin/package.json
+++ b/scm-plugins/scm-hg-plugin/package.json
@@ -9,6 +9,6 @@
    "@scm-manager/ui-extensions": "^0.1.2"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.30"
+    "@scm-manager/ui-bundler": "^0.0.31"
  }
 }
--- a/scm-plugins/scm-hg-plugin/yarn.lock
+++ b/scm-plugins/scm-hg-plugin/yarn.lock
@@ -641,10 +641,10 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.30.tgz#29fcc7246efc7fafc69905144c41adb6e4eb985b"
-  integrity sha512-lQYCroIQbpbVLOa5eNH6PLicHVXlpc1Bgb3HuC643z9ne4lunQDMkbqJG5s5n8h5ZFiLALuPZ3DMMCht8cKeaw==
+"@scm-manager/ui-bundler@^0.0.31":
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.31.tgz#f655db205058e99d8c13a08b555f993ec0573e4f"
+  integrity sha512-tgppy8Gp3iBIg4WqyrNXzMjUprNUN5i3n3UZ18AWjVys4p+CHxLBbd5ooyoeMJ67trxea1C1yB8MItjOVsdQOA==
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"
--- a/scm-plugins/scm-legacy-plugin/package.json
+++ b/scm-plugins/scm-legacy-plugin/package.json
@@ -11,10 +11,9 @@
  "dependencies": {
    "@scm-manager/ui-components": "latest",
    "@scm-manager/ui-extensions": "^0.1.1",
-    "react-redux": "^5.0.7",
    "@scm-manager/ui-types": "latest"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.30"
+    "@scm-manager/ui-bundler": "^0.0.31"
  }
 }
--- a/scm-plugins/scm-legacy-plugin/yarn.lock
+++ b/scm-plugins/scm-legacy-plugin/yarn.lock
@@ -817,10 +817,10 @@
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
  integrity sha512-0Xp8yMaK4RA7nxgF5/Q8hC7ATfwHZLtGogPeEAEHyT+HI5HqWeQpwd+vPuoD1QveoypNDjqDoctmFKdzi26Q+Q==

-"@scm-manager/ui-bundler@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.30.tgz#29fcc7246efc7fafc69905144c41adb6e4eb985b"
-  integrity sha512-lQYCroIQbpbVLOa5eNH6PLicHVXlpc1Bgb3HuC643z9ne4lunQDMkbqJG5s5n8h5ZFiLALuPZ3DMMCht8cKeaw==
+"@scm-manager/ui-bundler@^0.0.31":
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.31.tgz#f655db205058e99d8c13a08b555f993ec0573e4f"
+  integrity sha512-tgppy8Gp3iBIg4WqyrNXzMjUprNUN5i3n3UZ18AWjVys4p+CHxLBbd5ooyoeMJ67trxea1C1yB8MItjOVsdQOA==
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"
@@ -4266,13 +4266,6 @@ hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
  integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==

-hoist-non-react-statics@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
-  integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
-  dependencies:
-    react-is "^16.7.0"
-
 home-or-tmp@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -7133,7 +7126,7 @@ react-input-autosize@^2.2.1:
  dependencies:
    prop-types "^15.5.8"

-react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1:
+react-is@^16.8.1:
  version "16.9.0"
  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
  integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==
@@ -7149,7 +7142,7 @@ react-jss@^8.6.1:
    prop-types "^15.6.0"
    theming "^1.3.0"

-react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
+react-lifecycles-compat@^3.0.4:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
@@ -7167,19 +7160,6 @@ react-markdown@^4.0.6:
    unist-util-visit "^1.3.0"
    xtend "^4.0.1"

-react-redux@^5.0.7:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.1.tgz#88e368682c7fa80e34e055cd7ac56f5936b0f52f"
-  integrity sha512-LE7Ned+cv5qe7tMV5BPYkGQ5Lpg8gzgItK07c67yHvJ8t0iaD9kPFPAli/mYkiyJYrs2pJgExR2ZgsGqlrOApg==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-    hoist-non-react-statics "^3.1.0"
-    invariant "^2.2.4"
-    loose-envify "^1.1.0"
-    prop-types "^15.6.1"
-    react-is "^16.6.0"
-    react-lifecycles-compat "^3.0.0"
-
 react-router-dom@^4.3.1:
  version "4.3.1"
  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"
--- a/scm-plugins/scm-svn-plugin/package.json
+++ b/scm-plugins/scm-svn-plugin/package.json
@@ -9,6 +9,6 @@
    "@scm-manager/ui-extensions": "^0.1.2"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.30"
+    "@scm-manager/ui-bundler": "^0.0.31"
  }
 }
--- a/scm-plugins/scm-svn-plugin/yarn.lock
+++ b/scm-plugins/scm-svn-plugin/yarn.lock
@@ -641,10 +641,10 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.30.tgz#29fcc7246efc7fafc69905144c41adb6e4eb985b"
-  integrity sha512-lQYCroIQbpbVLOa5eNH6PLicHVXlpc1Bgb3HuC643z9ne4lunQDMkbqJG5s5n8h5ZFiLALuPZ3DMMCht8cKeaw==
+"@scm-manager/ui-bundler@^0.0.31":
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.31.tgz#f655db205058e99d8c13a08b555f993ec0573e4f"
+  integrity sha512-tgppy8Gp3iBIg4WqyrNXzMjUprNUN5i3n3UZ18AWjVys4p+CHxLBbd5ooyoeMJ67trxea1C1yB8MItjOVsdQOA==
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"
--- a/scm-ui-components/packages/ui-components/package.json
+++ b/scm-ui-components/packages/ui-components/package.json
@@ -14,7 +14,7 @@
    "eslint-fix": "eslint src --fix"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.30",
+    "@scm-manager/ui-bundler": "^0.0.31",
    "create-index": "^2.3.0",
    "enzyme": "^3.5.0",
    "enzyme-adapter-react-16": "^1.3.1",
--- a/scm-ui-components/packages/ui-components/yarn.lock
+++ b/scm-ui-components/packages/ui-components/yarn.lock
@@ -693,10 +693,10 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.30.tgz#29fcc7246efc7fafc69905144c41adb6e4eb985b"
-  integrity sha512-lQYCroIQbpbVLOa5eNH6PLicHVXlpc1Bgb3HuC643z9ne4lunQDMkbqJG5s5n8h5ZFiLALuPZ3DMMCht8cKeaw==
+"@scm-manager/ui-bundler@^0.0.31":
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.31.tgz#f655db205058e99d8c13a08b555f993ec0573e4f"
+  integrity sha512-tgppy8Gp3iBIg4WqyrNXzMjUprNUN5i3n3UZ18AWjVys4p+CHxLBbd5ooyoeMJ67trxea1C1yB8MItjOVsdQOA==
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"
--- a/scm-ui-components/packages/ui-types/package.json
+++ b/scm-ui-components/packages/ui-types/package.json
@@ -14,7 +14,7 @@
    "check": "flow check"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.30"
+    "@scm-manager/ui-bundler": "^0.0.31"
  },
  "browserify": {
    "transform": [
--- a/scm-ui-components/packages/ui-types/yarn.lock
+++ b/scm-ui-components/packages/ui-types/yarn.lock
@@ -707,10 +707,10 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.30.tgz#29fcc7246efc7fafc69905144c41adb6e4eb985b"
-  integrity sha512-lQYCroIQbpbVLOa5eNH6PLicHVXlpc1Bgb3HuC643z9ne4lunQDMkbqJG5s5n8h5ZFiLALuPZ3DMMCht8cKeaw==
+"@scm-manager/ui-bundler@^0.0.31":
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.31.tgz#f655db205058e99d8c13a08b555f993ec0573e4f"
+  integrity sha512-tgppy8Gp3iBIg4WqyrNXzMjUprNUN5i3n3UZ18AWjVys4p+CHxLBbd5ooyoeMJ67trxea1C1yB8MItjOVsdQOA==
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -56,7 +56,7 @@
    "pre-commit": "jest && flow && eslint src"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.30",
+    "@scm-manager/ui-bundler": "^0.0.31",
    "concat": "^1.0.3",
    "copyfiles": "^2.0.0",
    "enzyme": "^3.3.0",
--- a/scm-ui/yarn.lock
+++ b/scm-ui/yarn.lock
@@ -698,10 +698,10 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.30.tgz#29fcc7246efc7fafc69905144c41adb6e4eb985b"
-  integrity sha512-lQYCroIQbpbVLOa5eNH6PLicHVXlpc1Bgb3HuC643z9ne4lunQDMkbqJG5s5n8h5ZFiLALuPZ3DMMCht8cKeaw==
+"@scm-manager/ui-bundler@^0.0.31":
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.31.tgz#f655db205058e99d8c13a08b555f993ec0573e4f"
+  integrity sha512-tgppy8Gp3iBIg4WqyrNXzMjUprNUN5i3n3UZ18AWjVys4p+CHxLBbd5ooyoeMJ67trxea1C1yB8MItjOVsdQOA==
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"