mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

[stable14] Update config and babel for ie11
This commit is contained in:
Roeland Jago Douma 2018-10-01 12:01:40 +02:00 committed by GitHub
parent b7b91ba8b0 01b0a74df6
commit 7529d43e7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 1608 additions and 1413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
settings/.babelrc
View File

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

12
settings/.babelrc.js Normal file
View File

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

24
settings/js/settings-vue.js
View File

File diff suppressed because one or more lines are too long

2
settings/js/settings-vue.js.map
View File

File diff suppressed because one or more lines are too long

2941
settings/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

25
settings/package.json
View File

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

2
settings/src/main.js
View File

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