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

Merge pull request #13492 from nextcloud/refactor/es6-shim-babel-polyfill 

Use @babel/polyfill instead of es6-shim
This commit is contained in:
John Molakvoæ 2019-01-14 14:59:59 +01:00 committed by GitHub
parent c6cf8715ac 07760b83fc
commit 36b8c9aaef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/js/dist/main.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

3
core/src/main.js
View File

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// TODO: use babel polyfill instead
import 'es6-shim'
import '@babel/polyfill'
import './globals'

16
package-lock.json generated
View File

@ -728,7 +728,6 @@
"version": "7.2.5",
"resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz",
"integrity": "sha512-8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug==",
"dev": true,
"requires": {
"core-js": "^2.5.7",
"regenerator-runtime": "^0.12.0"
@ -1765,10 +1764,9 @@
"dev": true
},
"core-js": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz",
"integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==",
"dev": true
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.2.tgz",
"integrity": "sha512-NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g=="
},
"core-util-is": {
"version": "1.0.2",
@ -2213,11 +2211,6 @@
"is-symbol": "^1.0.2"
}
},
"es6-shim": {
"version": "0.35.4",
"resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.4.tgz",
"integrity": "sha512-oJidbXjN/VWXZJs41E9JEqWzcFbjt43JupimIoVX82Thzt5qy1CiYezdhRmWkj3KOuwJ106IG/ZZrcFC6fgIUQ=="
},
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@ -4693,8 +4686,7 @@
"regenerator-runtime": {
"version": "0.12.1",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
"integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==",
"dev": true
"integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
},
"regenerator-transform": {
"version": "0.13.3",

3
package.json
View File

@ -20,6 +20,7 @@
],
"license": "AGPL-3.0-or-later",
"dependencies": {
"@babel/polyfill": "^7.2.5",
"Select2": "git+https://github.com/select2/select2.git#3.4.8",
"autosize": "^4.0.2",
"backbone": "^1.3.3",
@ -29,7 +30,6 @@
"css-vars-ponyfill": "^1.16.2",
"davclient.js": "git+https://github.com/owncloud/davclient.js.git#0.1.2",
"dompurify": "^1.0.4",
"es6-shim": "^0.35.4",
"handlebars": "^4.0.5",
"jcrop": "git+https://github.com/ChristophWurst/Jcrop.git#v0.9.12-npm",
"jquery": "^2.1.4",
@ -45,7 +45,6 @@
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/polyfill": "^7.2.5",
"@babel/preset-env": "^7.2.0",
"babel-loader": "^8.0.5",
"css-loader": "^2.1.0",