From 7f886541473fb73591a8930e322250cdc6496bfc Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sun, 3 Feb 2019 19:56:44 +0100 Subject: [PATCH] Move of files_versions to webpack * Move CSS into bundle * Old merged.json no longer needed! * No need to load the style still Signed-off-by: Roeland Jago Douma --- .gitattributes | 2 + apps/files_versions/.l10nignore | 3 +- apps/files_versions/appinfo/app.php | 2 - apps/files_versions/js/files_versions.js | Bin 0 -> 18146 bytes apps/files_versions/js/files_versions.js.map | Bin 0 -> 63344 bytes apps/files_versions/js/merged.json | 7 ---- apps/files_versions/lib/Hooks.php | 2 +- .../files_versions/{ => src}/css/versions.css | 0 apps/files_versions/src/files_versions.js | 8 ++++ .../files_versions/{js => src}/filesplugin.js | 0 apps/files_versions/{js => src}/templates.js | 0 .../{js => src}/templates/item.handlebars | 0 .../{js => src}/templates/template.handlebars | 0 .../{js => src}/versioncollection.js | 0 .../{js => src}/versionmodel.js | 0 .../{js => src}/versionstabview.js | 0 apps/files_versions/webpack.js | 37 ++++++++++++++++++ core/js/core.json | 2 - tests/karma.config.js | 15 +------ webpack.common.js | 7 +++- 20 files changed, 58 insertions(+), 27 deletions(-) create mode 100644 apps/files_versions/js/files_versions.js create mode 100644 apps/files_versions/js/files_versions.js.map delete mode 100644 apps/files_versions/js/merged.json rename apps/files_versions/{ => src}/css/versions.css (100%) create mode 100644 apps/files_versions/src/files_versions.js rename apps/files_versions/{js => src}/filesplugin.js (100%) rename apps/files_versions/{js => src}/templates.js (100%) rename apps/files_versions/{js => src}/templates/item.handlebars (100%) rename apps/files_versions/{js => src}/templates/template.handlebars (100%) rename apps/files_versions/{js => src}/versioncollection.js (100%) rename apps/files_versions/{js => src}/versionmodel.js (100%) rename apps/files_versions/{js => src}/versionstabview.js (100%) create mode 100644 apps/files_versions/webpack.js diff --git a/.gitattributes b/.gitattributes index b2dea06fd7..32f68e85b5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,6 +3,8 @@ /apps/accessibility/js/accessibility.js binary /apps/accessibility/js/accessibility.js.map binary +/apps/files_versions/js/files_versions.js binary +/apps/files_versions/js/files_versions.js.map binary /apps/oauth2/js/oauth2.js binary /apps/oauth2/js/oauth2.js.map binary /apps/twofactor_backupcodes/js/*.js binary diff --git a/apps/files_versions/.l10nignore b/apps/files_versions/.l10nignore index 8b832897e3..a5844cfefe 100644 --- a/apps/files_versions/.l10nignore +++ b/apps/files_versions/.l10nignore @@ -1,2 +1,3 @@ # compiled vue templates -js/templates.js +js/files_versions.js +src/templates.js diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index 1ac7d40689..f28210553c 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -22,6 +22,4 @@ * */ -\OCP\Util::addStyle('files_versions', 'versions'); - \OCA\Files_Versions\Hooks::connectHooks(); diff --git a/apps/files_versions/js/files_versions.js b/apps/files_versions/js/files_versions.js new file mode 100644 index 0000000000000000000000000000000000000000..4405671a1019d93cedbb031273f26608abf13dfe GIT binary patch literal 18146 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

1epM51!-*!pq2UM20${zvWrKL)8evAPFS+2} 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 ZW{ALX25=WXEHCK7gy)48Ru>k&{6B7O4%h$y literal 0 HcmV?d00001 diff --git a/apps/files_versions/js/merged.json b/apps/files_versions/js/merged.json deleted file mode 100644 index 67ee60b385..0000000000 --- a/apps/files_versions/js/merged.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - "versionmodel.js", - "templates.js", - "versioncollection.js", - "versionstabview.js", - "filesplugin.js" -] diff --git a/apps/files_versions/lib/Hooks.php b/apps/files_versions/lib/Hooks.php index 3c4049e213..4e2dcfa308 100644 --- a/apps/files_versions/lib/Hooks.php +++ b/apps/files_versions/lib/Hooks.php @@ -149,6 +149,6 @@ class Hooks { * Load additional scripts when the files app is visible */ public static function onLoadFilesAppScripts() { - \OCP\Util::addScript('files_versions', 'merged'); + \OCP\Util::addScript('files_versions', 'files_versions'); } } diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/src/css/versions.css similarity index 100% rename from apps/files_versions/css/versions.css rename to apps/files_versions/src/css/versions.css diff --git a/apps/files_versions/src/files_versions.js b/apps/files_versions/src/files_versions.js new file mode 100644 index 0000000000..e9504e03ed --- /dev/null +++ b/apps/files_versions/src/files_versions.js @@ -0,0 +1,8 @@ +import './versionmodel' +import './templates' +import './versioncollection' +import './versionstabview' +import './filesplugin' +import './css/versions.css' + +window.OCA.Versions = OCA.Versions diff --git a/apps/files_versions/js/filesplugin.js b/apps/files_versions/src/filesplugin.js similarity index 100% rename from apps/files_versions/js/filesplugin.js rename to apps/files_versions/src/filesplugin.js diff --git a/apps/files_versions/js/templates.js b/apps/files_versions/src/templates.js similarity index 100% rename from apps/files_versions/js/templates.js rename to apps/files_versions/src/templates.js diff --git a/apps/files_versions/js/templates/item.handlebars b/apps/files_versions/src/templates/item.handlebars similarity index 100% rename from apps/files_versions/js/templates/item.handlebars rename to apps/files_versions/src/templates/item.handlebars diff --git a/apps/files_versions/js/templates/template.handlebars b/apps/files_versions/src/templates/template.handlebars similarity index 100% rename from apps/files_versions/js/templates/template.handlebars rename to apps/files_versions/src/templates/template.handlebars diff --git a/apps/files_versions/js/versioncollection.js b/apps/files_versions/src/versioncollection.js similarity index 100% rename from apps/files_versions/js/versioncollection.js rename to apps/files_versions/src/versioncollection.js diff --git a/apps/files_versions/js/versionmodel.js b/apps/files_versions/src/versionmodel.js similarity index 100% rename from apps/files_versions/js/versionmodel.js rename to apps/files_versions/src/versionmodel.js diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/src/versionstabview.js similarity index 100% rename from apps/files_versions/js/versionstabview.js rename to apps/files_versions/src/versionstabview.js diff --git a/apps/files_versions/webpack.js b/apps/files_versions/webpack.js new file mode 100644 index 0000000000..4b0f1e4f6b --- /dev/null +++ b/apps/files_versions/webpack.js @@ -0,0 +1,37 @@ +const path = require('path'); + +module.exports = { + entry: path.join(__dirname, 'src', 'files_versions.js'), + output: { + path: path.resolve(__dirname, 'js'), + publicPath: '/js/', + filename: 'files_versions.js' + }, + module: { + rules: [ + { + test: /\.css$/, + use: ['style-loader', 'css-loader'] + }, + { + test: /\.scss$/, + use: ['style-loader', 'css-loader', 'sass-loader'] + }, + { + test: /\.js$/, + loader: 'babel-loader', + exclude: /node_modules/ + }, + { + test: /\.(png|jpg|gif|svg)$/, + loader: 'file-loader', + options: { + name: '[name].[ext]?[hash]' + } + } + ] + }, + resolve: { + extensions: ['*', '.js'] + } +}; diff --git a/core/js/core.json b/core/js/core.json index 77aeffff10..5bf6512d6a 100644 --- a/core/js/core.json +++ b/core/js/core.json @@ -13,9 +13,7 @@ "sharedialoglinkshareview.js", "sharedialogresharerinfoview.js", "sharedialogshareelistview.js", - "contactsmenu_templates.js", "public/publicpage.js", - "multiselect.js", "oc-requesttoken.js", "setupchecks.js", "../search/js/search.js", diff --git a/tests/karma.config.js b/tests/karma.config.js index fe60de3bdb..7ffd5ad4e6 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -45,6 +45,7 @@ module.exports = function(config) { return [ 'files', 'files_trashbin', + 'files_versions', { name: 'files_sharing', srcFiles: [ @@ -74,17 +75,6 @@ module.exports = function(config) { ], testFiles: ['apps/files_external/tests/js/*.js'] }, - { - name: 'files_versions', - srcFiles: [ - // need to enforce loading order... - 'apps/files_versions/js/versionmodel.js', - 'apps/files_versions/js/templates.js', - 'apps/files_versions/js/versioncollection.js', - 'apps/files_versions/js/versionstabview.js' - ], - testFiles: ['apps/files_versions/tests/js/**/*.js'] - }, { name: 'comments', srcFiles: [ @@ -117,8 +107,7 @@ module.exports = function(config) { { name: 'settings', srcFiles: [ - 'settings/js/apps.js', - 'core/vendor/marked/marked.min.js' + 'settings/js/apps.js' ] } ]; diff --git a/webpack.common.js b/webpack.common.js index 9a117ba4b3..f6a0d0213a 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -1,5 +1,10 @@ const core = require('./core/webpack'); const files_trashbin = require('./apps/files_trashbin/webpack') +const files_versions = require('./apps/files_versions/webpack'); const oauth2 = require('./apps/oauth2/webpack') -module.exports = [].concat(core, files_trashbin, oauth2); +module.exports = [].concat( + core, + files_trashbin, + files_versions, + oauth2);