fix: packaged app can't open and can't find wiki folder

This commit is contained in:
tiddlygit-test 2021-05-03 02:43:03 +08:00
parent c2d4fad4e1
commit b6eab47aa0
3 changed files with 19 additions and 6 deletions

20
package-lock.json generated
View file

@ -14351,12 +14351,13 @@
}
},
"node-loader": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/node-loader/-/node-loader-2.0.0.tgz",
"integrity": "sha512-I5VN34NO4/5UYJaUBtkrODPWxbobrE4hgDqPrjB25yPkonFhCmZ146vTH+Zg417E9Iwoh1l/MbRs1apc5J295Q==",
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/node-loader/-/node-loader-1.0.3.tgz",
"integrity": "sha512-8c9ef5q24F0AjrPxUjdX7qdTlsU1zZCPeqYvSBCH1TJko3QW4qu1uA1C9KbOPdaRQwREDdbSYZgltBAlbV7l5g==",
"dev": true,
"requires": {
"loader-utils": "^2.0.0"
"loader-utils": "^2.0.0",
"schema-utils": "^3.0.0"
},
"dependencies": {
"json5": {
@ -14378,6 +14379,17 @@
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"schema-utils": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
"integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.6",
"ajv": "^6.12.5",
"ajv-keywords": "^3.5.2"
}
}
}
},

View file

@ -25,6 +25,7 @@
"asar": true,
"extraResource": [
"localization",
"template/wiki",
".webpack/main/wiki-worker.js"
],
"mac": {
@ -200,7 +201,7 @@
"graphql-hooks": "5.1.1",
"if-env": "1.0.4",
"image-webpack-loader": "7.0.1",
"node-loader": "2.0.0",
"node-loader": "1.0.3",
"prettier": "2.2.1",
"react": "17.0.2",
"react-ace": "9.4.0",

View file

@ -14,7 +14,7 @@ export const REACT_PATH = MAIN_WINDOW_WEBPACK_ENTRY;
// .app/Contents/Resources/wiki/
export const TIDDLYWIKI_TEMPLATE_FOLDER_PATH = isDevelopmentOrTest
? path.resolve(sourcePath, '..', 'template', 'wiki')
: path.resolve(process.resourcesPath, '..', 'wiki');
: path.resolve(process.resourcesPath, 'wiki');
export const TIDDLERS_PATH = 'tiddlers';
export const ICON_PATH = isDevelopmentOrTest ? path.resolve(buildResourcePath, 'icon.png') : `file://${path.resolve(__dirname, '..', 'icon.png')}`;
export const CHROME_ERROR_PATH = 'chrome-error://chromewebdata/';