Merge pull request #11490 from nextcloud/stable14-babel-npm-webpack-fixes

[stable14] Update config and babel for ie11

settings/.babelrc

@@ -1,15 +0,0 @@
-{
-	"presets": [
-		[
-			"env",
-			{
-				"targets": {
-					"browsers": ["last 2 versions", "ie >= 11"]
-				},
-				"modules": false,
-        "blacklist": ["useStrict"],
-        "useBuiltIns": true
-			}
-		]
-	]
-}

settings/.babelrc.js

@@ -0,0 +1,12 @@
+module.exports = {
+	presets: [
+		[
+			'@babel/preset-env',
+			{
+				targets: {
+					browsers: ['last 2 versions', 'ie >= 11']
+				}
+			}
+		]
+	]
+}

settings/package.json

@@ -1,7 +1,7 @@
 {
   "name": "settings",
   "description": "Nextcloud settings",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "author": "John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>",
   "license": "AGPL3",
   "private": true,
@@ -11,12 +11,12 @@
     "build": "webpack --progress --hide-modules --config webpack.prod.js"
   },
   "dependencies": {
+    "@babel/polyfill": "^7.0.0",
     "axios": "^0.18.0",
-    "babel-polyfill": "^6.26.0",
     "v-tooltip": "^2.0.0-rc.33",
-    "vue": "^2.5.16",
+    "vue": "^2.5.17",
     "vue-click-outside": "^1.0.7",
-    "vue-infinite-loading": "^2.3.1",
+    "vue-infinite-loading": "^2.3.3",
     "vue-localstorage": "^0.6.2",
     "vue-multiselect": "^2.1.0",
     "vue-router": "^3.0.1",
@@ -28,16 +28,15 @@
     "ie >= 11"
   ],
   "devDependencies": {
-    "babel-core": "^6.26.3",
-    "babel-loader": "^7.1.5",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-stage-3": "^6.24.1",
+    "@babel/core": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "babel-loader": "^8.0.0",
     "css-loader": "^1.0.0",
     "file-loader": "^1.1.11",
-    "vue-loader": "^15.2.6",
-    "vue-template-compiler": "^2.5.16",
-    "webpack": "^4.16.1",
-    "webpack-cli": "^3.1.0",
-    "webpack-merge": "^4.1.3"
+    "vue-loader": "^15.4.2",
+    "vue-template-compiler": "^2.5.17",
+    "webpack": "^4.20.2",
+    "webpack-cli": "^3.1.2",
+    "webpack-merge": "^4.1.4"
   }
 }

settings/src/main.js

@@ -19,13 +19,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+ import '@babel/polyfill'
 
 import Vue from 'vue';
 import { sync } from 'vuex-router-sync';
 import App from './App.vue';
 import router from './router';
 import store from './store';
-require("babel-polyfill");
 
 
 sync(store, router);