Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable14] Update config and babel for ie11 #11490

Merged
merged 1 commit into from
Oct 1, 2018
Merged

[stable14] Update config and babel for ie11 #11490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions settings/.babelrc
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions settings/.babelrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = {
presets: [
[
'@babel/preset-env',
{
targets: {
browsers: ['last 2 versions', 'ie >= 11']
}
}
]
]
}
24 changes: 15 additions & 9 deletions settings/js/settings-vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings/js/settings-vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2,797 changes: 1,495 additions & 1,302 deletions settings/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 12 additions & 13 deletions settings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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",
Expand All @@ -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"
}
}
2 changes: 1 addition & 1 deletion settings/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down