diff options
| -rw-r--r-- | apps/files_sharing/webpack.js | 2 | ||||
| -rw-r--r-- | core/js/tests/specHelper.js | 3 | ||||
| -rw-r--r-- | package-lock.json | 27 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | tests/karma.config.js | 2 |
5 files changed, 32 insertions, 3 deletions
diff --git a/apps/files_sharing/webpack.js b/apps/files_sharing/webpack.js index 3dd6d833f2d..4b641329ec6 100644 --- a/apps/files_sharing/webpack.js +++ b/apps/files_sharing/webpack.js @@ -32,7 +32,7 @@ module.exports = { loader: 'babel-loader', exclude: /node_modules/, options: { - plugins: ['@babel/plugin-syntax-dynamic-import'] + plugins: ['@babel/plugin-syntax-dynamic-import', 'transform-es2015-arrow-functions'] } }, { diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js index 45a0f04db00..5d4a7b81b5e 100644 --- a/core/js/tests/specHelper.js +++ b/core/js/tests/specHelper.js @@ -90,7 +90,8 @@ window.oc_isadmin = false; // FIXME: oc_webroot is supposed to be only the path!!! window.oc_webroot = location.href + '/'; window.oc_appswebroots = { - "files": window.oc_webroot + '/apps/files/' + "files": window.oc_webroot + '/apps/files/', + "files_sharing": window.oc_webroot + '/apps/files_sharing/' }; window.oc_config = { session_lifetime: 600 * 1000, diff --git a/package-lock.json b/package-lock.json index 125106b686a..11bf0251998 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1252,6 +1252,33 @@ "util.promisify": "^1.0.0" } }, + "babel-plugin-transform-es2015-arrow-functions": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", + "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", + "dev": true, + "requires": { + "babel-runtime": "^6.22.0" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true + } + } + }, "backbone": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.4.0.tgz", diff --git a/package.json b/package.json index 728704a033d..8c63f72320f 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/preset-env": "^7.3.4", "babel-loader": "^8.0.5", + "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", "css-loader": "^2.1.0", "exports-loader": "^0.7.0", "file-loader": "^3.0.1", diff --git a/tests/karma.config.js b/tests/karma.config.js index 81627abba0a..e86f3d397bd 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -54,7 +54,7 @@ module.exports = function(config) { // up with the global namespace/classes/state 'apps/files_sharing/js/app.js', 'apps/files_sharing/js/sharedfilelist.js', - 'apps/files_sharing/js/additionalScripts.js', + 'apps/files_sharing/js/dist/additionalScripts.js', 'apps/files_sharing/js/public.js', 'apps/files_sharing/js/files_drop.js', 'apps/files_sharing/js/templates.js', |