From 4ed2b3902cb84445edd9e662aeb18af3ae534da6 Mon Sep 17 00:00:00 2001 From: McMatts Date: Thu, 3 Mar 2022 18:21:16 -0500 Subject: [PATCH] JS build tweaks --- gui/.watchmanconfig | 2 +- gui/app/pods/customize/template.hbs | 2 +- gui/app/router.js | 48 ++----------------- .../components/customize/auth-settings.hbs | 2 +- gui/config/targets.js | 4 +- gui/ember-cli-build.js | 6 +-- gui/package.json | 2 +- 7 files changed, 13 insertions(+), 53 deletions(-) diff --git a/gui/.watchmanconfig b/gui/.watchmanconfig index e23b9c2d..18194658 100644 --- a/gui/.watchmanconfig +++ b/gui/.watchmanconfig @@ -1,3 +1,3 @@ { - "ignore_dirs": ["tmp", "dist", "dist-prod", "tests", "node_modules"] + "ignore_dirs": ["tmp", "dist", "dist-prod", "tests", "node_modules", "public"] } diff --git a/gui/app/pods/customize/template.hbs b/gui/app/pods/customize/template.hbs index f7fe24ac..15d1dbae 100644 --- a/gui/app/pods/customize/template.hbs +++ b/gui/app/pods/customize/template.hbs @@ -3,7 +3,7 @@
- Documize {{appMeta.edition}} {{appMeta.version}} (build {{appMeta.revision}}) + Documize {{appMeta.edition}} {{appMeta.version}} ({{appMeta.revision}})
diff --git a/gui/app/router.js b/gui/app/router.js index e0b8c142..2ba1db05 100644 --- a/gui/app/router.js +++ b/gui/app/router.js @@ -23,15 +23,12 @@ export default Router.map(function () { }); this.route('action', { - path: 'action' }); this.route('analytics', { - path: 'analytics' }); this.route('activity', { - path: 'activity' }); this.route( @@ -41,7 +38,6 @@ export default Router.map(function () { }, function () { this.route('settings', { - path: 'settings' }); this.route('block', { path: 'block/:block_id' @@ -59,13 +55,10 @@ export default Router.map(function () { path: 'section/:page_id' }); this.route('settings', { - path: 'settings' }); this.route('revisions', { - path: 'revisions' }); this.route('activity', { - path: 'activity' }); } ); @@ -77,52 +70,37 @@ export default Router.map(function () { }, function () { this.route('general', { - path: 'general' }); this.route('labels', { - path: 'labels' }); this.route('groups', { - path: 'groups' }); this.route('users', { - path: 'users' }); this.route('folders', { - path: 'folders' }); this.route('smtp', { - path: 'smtp' }); this.route('product', { - path: 'product' }); this.route('notice', { - path: 'notice' }); this.route('auth', { - path: 'auth' }); this.route('audit', { - path: 'audit' }); this.route('search', { - path: 'search' }); this.route('integrations', { - path: 'integrations' }); this.route('backup', { - path: 'backup' }); this.route('billing', { - path: 'billing' }); } ); this.route('setup', { - path: 'setup' }); this.route('secure', { @@ -136,55 +114,39 @@ export default Router.map(function () { this.route( 'auth', { - path: 'auth' }, function () { this.route('sso', { path: 'sso/:token' }); this.route('keycloak', { - path: 'keycloak' }); this.route('login', { - path: 'login' }); this.route('forgot', { - path: 'forgot' }); this.route('reset', { path: 'reset/:token' }); this.route('logout', { - path: 'logout' }); this.route('share', { path: 'share/:id/:slug/:serial' }); this.route('cas', { - path: 'cas' }); } ); - this.route('profile', { - path: 'profile' - }); + this.route('profile', {}); - this.route('search', { - path: 'search' - }); + this.route('search', {}); - this.route('accounts', { - path: 'accounts' - }); + this.route('accounts', {}); - this.route('theming', { - path: 'theming' - }); + this.route('theming', {}); - this.route('updates', { - path: 'updates' - }); + this.route('updates', {}); this.route('auth/login', { path: '/*wildcard' diff --git a/gui/app/templates/components/customize/auth-settings.hbs b/gui/app/templates/components/customize/auth-settings.hbs index b28b0241..04f45943 100644 --- a/gui/app/templates/components/customize/auth-settings.hbs +++ b/gui/app/templates/components/customize/auth-settings.hbs @@ -49,7 +49,7 @@
{{textarea id="keycloak-publicKey" type="text" value=keycloakConfig.publicKey rows=7 class=(if KeycloakPublicKeyError "form-control is-invalid" "form-control")}} - {{localize 'auth_keylcloak_pk_explain'}} + {{localize 'auth_keycloak_pk_explain'}}
diff --git a/gui/config/targets.js b/gui/config/targets.js index a3dffee3..3f67060b 100644 --- a/gui/config/targets.js +++ b/gui/config/targets.js @@ -1,10 +1,10 @@ 'use strict'; const browsers = [ - 'last 2 Edge versions', + 'last 1 Edge versions', 'last 1 Chrome versions', 'last 1 Firefox versions', - 'last 1 Safari versions' + 'last 1 Safari versions' ]; // const isCI = !!process.env.CI; diff --git a/gui/ember-cli-build.js b/gui/ember-cli-build.js index c992159a..99af8c80 100644 --- a/gui/ember-cli-build.js +++ b/gui/ember-cli-build.js @@ -13,7 +13,7 @@ module.exports = function(defaults) { fingerprintAssetMap: false, prepend: '/', extensions: ['js', 'css'], - exclude: ['tinymce/**', 'codemirror/**', 'prism/**', 'pdfjs/**'] + exclude: ['tinymce/**', 'codemirror/**', 'prism/**', 'pdfjs/**', 'i18n/**'] }, minifyCSS: { @@ -40,11 +40,9 @@ module.exports = function(defaults) { 'ember-cli-terser': { enabled: !isDevelopment, exclude: ['tinymce/**', 'codemirror/**', 'prism/**', 'pdfjs/**'], - - hiddenSourceMap: true, - terser: { }, + hiddenSourceMap: true, // minifyJS: { // enabled: !isDevelopment, diff --git a/gui/package.json b/gui/package.json index 2c653699..e4e36755 100644 --- a/gui/package.json +++ b/gui/package.json @@ -1,5 +1,5 @@ { - "name": "community", + "name": "documize", "version": "5.0.0", "private": true, "description": "Documize Community",