From d5e5a752a4063111727b7c030f3d139c3c0dcbd9 Mon Sep 17 00:00:00 2001 From: Arlen22 Date: Sun, 21 Nov 2021 00:26:41 -0500 Subject: [PATCH] Upgrade tiddlywiki version --- package-lock.json | 18 +++++++++--------- package.json | 10 ++++++---- webpack.config.js | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 532d8f5..a80cc42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4230,14 +4230,14 @@ } }, "tiddlywiki-production-client": { - "version": "5.1.23", - "resolved": "https://registry.npmjs.org/tiddlywiki-production-client/-/tiddlywiki-production-client-5.1.23.tgz", - "integrity": "sha512-Yv9PdVL6Jf8VnF/dizPQw01x9d/f7SK+yjIZHHYiSDbYd4wmMjnV9Hs/53/6zBtcNTnrAb12MF3TL0hg+mAA0A==" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/tiddlywiki-production-client/-/tiddlywiki-production-client-5.2.0.tgz", + "integrity": "sha512-ictv7IK3b+fmp19seyGLvgMIwxbzlQ7Wvl6GLVs0fVX94lsn36dHkArPLySFV7bnYLrdtFFfkAZkVKSr0Wlu5g==" }, "tiddlywiki-production-server": { - "version": "5.1.23", - "resolved": "https://registry.npmjs.org/tiddlywiki-production-server/-/tiddlywiki-production-server-5.1.23.tgz", - "integrity": "sha512-O2n8wT1O0apKsTpZh+SCSThVUiId7Ul3FLaLSHaAMNtS15WvCXPhOaM35bdeYTEPAwnbXhwxep3jwC68wUC2KA==" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/tiddlywiki-production-server/-/tiddlywiki-production-server-5.2.0.tgz", + "integrity": "sha512-C5fuHmS2myWlD+tP7uFg+IsrIr3VpiKKfFdmD4uEln19VW6k7TMBUIseomd9ygs2Po2itqqdYPUw/aGLJry3Kg==" }, "timers-browserify": { "version": "2.0.11", @@ -4373,9 +4373,9 @@ "dev": true }, "typescript": { - "version": "3.9.7", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz", - "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==", + "version": "3.9.10", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", + "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", "dev": true }, "union-value": { diff --git a/package.json b/package.json index 032d625..b06958a 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "homepage": "https://arlen22.github.io/tiddlyserver/", "repository": "github:Arlen22/TiddlyServer", "dependencies": { - "tiddlywiki-production-client": "5.1.23", - "tiddlywiki-production-server": "5.1.23" + "tiddlywiki-production-client": "5.2.0", + "tiddlywiki-production-server": "5.2.0" }, "devDependencies": { "@types/copy-webpack-plugin": "^5.0.0", @@ -33,7 +33,7 @@ "ts-json-schema-generator": "^0.61.1", "ts-node": "^8.10.1", "tslib": "^1.11.1", - "typescript": "^3.9.7", + "typescript": "^3.9.10", "webpack": "^4.43.0", "webpack-cli": "^3.3.11", "ws": "^7.2.1", @@ -42,10 +42,12 @@ "scripts": { "test": "tsc && node dist/server --config settings.json --dry-run", "start": "tsc && node dist/server --config settings.json", + "serve": "node dist/server --config settings.json", + "debug": "node --inspect-brk dist/server --config settings.json", "server": "node dist/server", "index": "node dist/index", "schema": "tsc && node dist/server --gen-schema", - "build": "rm -rf dist && tsc && webpack", + "build": "tsc && webpack", "upload": "npm run build && (cd dist && npm publish)", "build-docs": "(cd ../tiddlyserver-website && npm run build && npm run push)", "install-build-tools": "npm install webpack webpack-cli typescript tslib ts-node source-map-support clean-webpack-plugin copy-webpack-plugin" diff --git a/webpack.config.js b/webpack.config.js index de3cae4..432cbe7 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -62,7 +62,7 @@ const options = { }, resolve: { alias: { - "../package.json": "../../package.json" + "../package.json": path.resolve(__dirname, "package.json") } }, output: {