fix setup of new document, closes zadam#966

Author: zadam

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 node_modules/
 dist/
-src/public/dist/
+src/public/app-dist/
 npm-debug.log
 yarn-error.log
 *.db

bin/copy-trilium.sh

@@ -29,7 +29,7 @@ cp webpack-* $DIR/
 
 find $DIR/libraries -name "*.map" -type f -delete
 
-rm -r $DIR/src/public/javascripts
+rm -r $DIR/src/public/app
 
-sed -i -e 's/javascripts\/desktop.js/dist\/desktop.js/g' $DIR/src/views/desktop.ejs
-sed -i -e 's/javascripts\/mobile.js/dist\/mobile.js/g' $DIR/src/views/mobile.ejs
+sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
+sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs

package-lock.json

@@ -16,9 +16,9 @@
     "start-server": "TRILIUM_ENV=dev node ./src/www",
     "start-electron": "TRILIUM_ENV=dev electron .",
     "build-backend-docs": "./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/entities/*.js src/services/backend_script_api.js",
-    "build-frontend-docs": "./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/javascripts/entities/*.js src/public/javascripts/services/frontend_script_api.js",
+    "build-frontend-docs": "./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js",
     "build-docs": "npm run build-backend-docs && npm run build-frontend-docs",
-    "webpack": "npx webpack -c webpack-desktop.config.js && npx webpack -c webpack-mobile.config.js"
+    "webpack": "npx webpack -c webpack-desktop.config.js && npx webpack -c webpack-mobile.config.js && npx webpack -c webpack-setup.config.js"
   },
   "dependencies": {
     "async-mutex": "0.2.1",
@@ -51,7 +51,7 @@
     "imagemin-pngquant": "8.0.0",
     "ini": "1.3.5",
     "is-svg": "4.2.1",
-    "jimp": "0.10.1",
+    "jimp": "0.10.2",
     "mime-types": "2.1.26",
     "multer": "1.4.2",
     "node-abi": "2.15.0",
@@ -62,11 +62,11 @@
     "rimraf": "3.0.2",
     "sanitize-filename": "1.6.3",
     "sax": "1.2.4",
-    "semver": "7.2.2",
+    "semver": "7.3.2",
     "serve-favicon": "2.5.0",
     "session-file-store": "1.4.0",
     "simple-node-logger": "18.12.24",
-    "sqlite": "4.0.6",
+    "sqlite": "4.0.7",
     "sqlite3": "4.1.1",
     "string-similarity": "4.0.1",
     "tar-stream": "2.1.2",
@@ -78,7 +78,7 @@
     "yazl": "^2.5.1"
   },
   "devDependencies": {
-    "electron": "9.0.0-beta.15",
+    "electron": "9.0.0-beta.16",
     "electron-builder": "22.4.1",
     "electron-packager": "14.2.1",
     "electron-rebuild": "1.10.1",

package.json

@@ -45,7 +45,6 @@ app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 app.use('/libraries', express.static(path.join(__dirname, '..', 'libraries')));
 app.use('/images', express.static(path.join(__dirname, '..', 'images')));
-app.use('/dist', express.static(path.join(__dirname, '..', 'dist')));
 const sessionParser = session({
     secret: sessionSecret,
     resave: false, // true forces the session to be saved back to the session store, even if the session was never modified during the request.

src/app.js

@@ -33,7 +33,7 @@ function error(message) {
     console.trace(message);
 }
 
-const requestBlacklist = [ "/libraries", "/javascripts", "/images", "/stylesheets" ];
+const requestBlacklist = [ "/libraries", "/app", "/images", "/stylesheets" ];
 
 function request(req) {
     for (const bl of requestBlacklist) {

src/public/javascripts/desktop.js src/public/app/desktop.js

@@ -78,7 +78,7 @@
 <link href="stylesheets/style.css" rel="stylesheet">
 <link href="stylesheets/detail.css" rel="stylesheet">
 
-<script src="javascripts/desktop.js" crossorigin type="module"></script>
+<script src="app/desktop.js" crossorigin type="module"></script>
 
 <link rel="stylesheet" type="text/css" href="libraries/boxicons/css/boxicons.min.css">
 

src/public/javascripts/dialogs/about.js src/public/app/dialogs/about.js

@@ -131,7 +131,7 @@
 
 <link href="libraries/ckeditor/ckeditor-content.css" rel="stylesheet">
 
-<script src="javascripts/mobile.js" crossorigin type="module"></script>
+<script src="app/mobile.js" crossorigin type="module"></script>
 
 <link href="stylesheets/themes.css" rel="stylesheet">
 <link href="stylesheets/style.css" rel="stylesheet">

src/public/javascripts/dialogs/add_link.js src/public/app/dialogs/add_link.js

@@ -210,7 +210,7 @@
 
 <script src="libraries/knockout.min.js"></script>
 
-<script src="javascripts/setup.js" crossorigin type="module"></script>
+<script src="app-dist/setup.js" crossorigin type="module"></script>
 <link href="stylesheets/themes.css" rel="stylesheet">
 </body>
 </html>

src/public/javascripts/dialogs/attributes.js src/public/app/dialogs/attributes.js

@@ -3,11 +3,11 @@ const path = require('path');
 module.exports = {
     mode: 'production',
     entry: {
-        mobile: './src/public/javascripts/desktop.js',
+        mobile: './src/public/app/desktop.js',
     },
     output: {
         publicPath: 'dist/',
-        path: path.resolve(__dirname, 'src/public/dist'),
+        path: path.resolve(__dirname, 'src/public/app-dist'),
         filename: 'desktop.js'
     },
     devtool: 'source-map'

src/public/javascripts/dialogs/backend_log.js src/public/app/dialogs/backend_log.js

@@ -3,11 +3,11 @@ const path = require('path');
 module.exports = {
     mode: 'production',
     entry: {
-        mobile: './src/public/javascripts/mobile.js',
+        mobile: './src/public/app/mobile.js',
     },
     output: {
         publicPath: '/dist/',
-        path: path.resolve(__dirname, 'src/public/dist'),
+        path: path.resolve(__dirname, 'src/public/app-dist'),
         filename: 'mobile.js'
     },
     devtool: 'source-map'

src/public/javascripts/dialogs/branch_prefix.js src/public/app/dialogs/branch_prefix.js

@@ -0,0 +1,14 @@
+const path = require('path');
+
+module.exports = {
+    mode: 'production',
+    entry: {
+        mobile: './src/public/app/setup.js',
+    },
+    output: {
+        publicPath: '/dist/',
+        path: path.resolve(__dirname, 'src/public/app-dist'),
+        filename: 'setup.js'
+    },
+    devtool: 'source-map'
+};