diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-08-27 11:04:31 +0200 |
|---|---|---|
| committer | Carl Schwan <carl@carlschwan.eu> | 2022-08-27 11:04:52 +0200 |
| commit | 07ab1eacd09a7ade4934724872e15a50a781613e (patch) | |
| tree | 6a45726ba296784ddafc2d18afdb0c821d419fed | |
| parent | 3211da93ea9c2f3bf145aae69010c1828857d33b (diff) | |
Move output to build dirport/vue-settings
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | templates/admin.php | 2 | ||||
| -rw-r--r-- | webpack.config.js | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -173,7 +173,7 @@ appstore: # on macOS there is no option "--parents" for the "cp" command mkdir -p $(appstore_sign_dir)/$(app_name)/js/build $(appstore_sign_dir)/$(app_name)/js/admin cp js/build/app.min.js $(appstore_sign_dir)/$(app_name)/js/build - cp js/admin/Admin.js $(appstore_sign_dir)/$(app_name)/js/admin + cp js/build/news-admin-settings.js* $(appstore_sign_dir)/$(app_name)/js/build # export the key and cert to a file mkdir -p $(cert_dir) diff --git a/templates/admin.php b/templates/admin.php index 5a3cba711..56c6498a6 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -2,7 +2,7 @@ declare(strict_types=1); // SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu> // SPDX-Licence-Identifier: AGPL-3.0-or-later -\OCP\Util::addScript('news', 'news-admin-settings'); +\OCP\Util::addScript('news', 'build/news-admin-settings'); ?> <div id="vue-admin-news"></div> diff --git a/webpack.config.js b/webpack.config.js index 136a214c5..c329f79d1 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -7,5 +7,7 @@ const webpackConfig = require('@nextcloud/webpack-vue-config') webpackConfig.entry = { 'admin-settings': path.join(__dirname, 'src', 'main-admin.js'), } +webpackConfig.output.path = path.resolve('./js/build/') +webpackConfig.output.publicPath = path.join('/apps/', process.env.npm_package_name, '/js/build/') module.exports = webpackConfig |