Merge pull request #995 from nextcloud/chore/noid/build-fix

Move build to build-js
nextcloud · Jul 9, 2024 · 85a5ca8 · 85a5ca8
2 parents 41b21a6 + 9fa0489
commit 85a5ca8
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,4 +62,5 @@ nbproject
 .php_cs.cache
 node_modules
 /vendor
+/build
 composer.phar
diff --git a/build/WebpackSPDXPlugin.js → build-js/WebpackSPDXPlugin.js b/build/WebpackSPDXPlugin.js → build-js/WebpackSPDXPlugin.js
diff --git a/build/npm-post-build.sh → build-js/npm-post-build.sh b/build/npm-post-build.sh → build-js/npm-post-build.sh
diff --git a/js/files_pdfviewer-main.js b/js/files_pdfviewer-main.js
diff --git a/js/files_pdfviewer-main.js.map b/js/files_pdfviewer-main.js.map
diff --git a/...s_pdfviewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-C62Gh8th_mjs.js b/...s_pdfviewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-C62Gh8th_mjs.js
diff --git a/...fviewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-C62Gh8th_mjs.js.map b/...fviewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-C62Gh8th_mjs.js.map
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
   "private": true,
   "scripts": {
     "prebuild": "rm -rf js && npm run pdfjs:get",
-    "postbuild": "build/npm-post-build.sh",
+    "postbuild": "build-js/npm-post-build.sh",
     "build": "webpack --node-env production --progress",
     "dev": "webpack --node-env development --progress",
     "watch": "webpack --node-env development --progress --watch",

diff --git a/webpack.config.js b/webpack.config.js
@@ -3,7 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 const webpackConfig = require('@nextcloud/webpack-vue-config')
-const WebpackSPDXPlugin = require('./build/WebpackSPDXPlugin.js')
+// eslint-disable-next-line n/no-extraneous-require
+const TerserPlugin = require('terser-webpack-plugin')
+const WebpackSPDXPlugin = require('./build-js/WebpackSPDXPlugin.js')
 const path = require('path')
 
 webpackConfig.entry.workersrc = path.resolve(path.join('src', 'workersrc.js'))
@@ -12,6 +14,15 @@ webpackConfig.entry.public = path.resolve(path.join('src', 'public.js'))
 // keep pdfjs vendor in the js folder
 webpackConfig.output.clean = false
 
+webpackConfig.optimization.minimizer = [new TerserPlugin({
+	extractComments: false,
+	terserOptions: {
+		format: {
+			comments: false,
+		},
+	},
+})]
+
 webpackConfig.plugins = [
 	...webpackConfig.plugins,
 	// Generate reuse license files