Skip to content

Commit d604ac3

Browse files
committed
Upgrade omegaedit to see if it resolves problems
1 parent 7de6c11 commit d604ac3

3 files changed

Lines changed: 27 additions & 22 deletions

File tree

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"watch:svelte": "yarn webpack --env development=true -w -c ./src/svelte/webpack.config.js",
3939
"watch:svelte-tests": "mocha -r ts-node/register -w ./src/svelte/tests/**/*.test.ts",
4040
"watch:tdmlEditorJS": "esbuild src/tdmlEditor/webview/webview.js --outfile=dist/views/tdmlEditor/webview/webview.js --bundle --platform=node --format=cjs --watch",
41-
"webpack": "webpack --mode production --config ./webpack/ext-dev.webpack.config.js",
42-
"webpack:pkg": "webpack --mode production --config ./webpack/ext-package.webpack.config.js",
41+
"webpack": "webpack --mode development --config ./webpack/ext-dev.webpack.config.js",
42+
"webpack:pkg": "webpack --mode development --config ./webpack/ext-package.webpack.config.js",
4343
"webpack:svelte": "webpack -c ./src/svelte/webpack.config.js",
4444
"compile:tdmlEditorJS": "esbuild src/tdmlEditor/webview/webview.js --outfile=dist/views/tdmlEditor/webview/webview.js --bundle --platform=node --format=cjs",
4545
"prepackage": "yarn install && yarn compile && yarn webpack:pkg",
@@ -52,7 +52,7 @@
5252
"update-version": "run-func build/yarn-scripts.ts updateVersion"
5353
},
5454
"dependencies": {
55-
"@omega-edit/client": "0.9.87",
55+
"@omega-edit/client": "0.9.88",
5656
"@viperproject/locate-java-home": "1.1.15",
5757
"@vscode/debugadapter": "1.67.0",
5858
"@vscode/webview-ui-toolkit": "^1.2.2",

src/dataEditor/dataEditorClient.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,6 +1211,11 @@ async function serverStart() {
12111211
throw new Error(`Log config file '${logConfigFile}' not found`)
12121212
}
12131213

1214+
const x = OMEGA_EDIT_HOST
1215+
const y = getPidFile(omegaEditPort)
1216+
const z = logConfigFile
1217+
1218+
console.log(x, y, z)
12141219
// Start the server and wait up to 10 seconds for it to start
12151220
const serverPid = (await Promise.race([
12161221
startServer(

yarn.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -427,23 +427,23 @@
427427
"@nodelib/fs.scandir" "2.1.5"
428428
fastq "^1.6.0"
429429

430-
"@omega-edit/client@0.9.87":
431-
version "0.9.87"
432-
resolved "https://registry.yarnpkg.com/@omega-edit/client/-/client-0.9.87.tgz#d6ebd101f061873e33e3b584c8e7dd74680574c5"
433-
integrity sha512-LYLdOIRjUX8tKjXqridMKdABJ3wxlG32UKX1NVcPI6prTC2kTeGGsPT/4L0rblc/wUl/obu/BRLf97fN/r1BZg==
430+
"@omega-edit/client@0.9.88":
431+
version "0.9.88"
432+
resolved "https://registry.yarnpkg.com/@omega-edit/client/-/client-0.9.88.tgz#bf68e813aa75bcf60bad9af20780a18ed319b9cc"
433+
integrity sha512-yf1bQtH2zkdF9M/yXxUKeKtQwMKZUK78lylHLVz3Gja4YE/Fi2yKdm1TOtFn0qxFwpJlA53b9aTPqxK08cu7Yw==
434434
dependencies:
435435
"@grpc/grpc-js" "1.12.2"
436-
"@omega-edit/server" "0.9.87"
436+
"@omega-edit/server" "0.9.88"
437437
"@types/google-protobuf" "3.15.12"
438438
google-protobuf "3.21.4"
439439
pid-port "1.0.2"
440-
pino "9.6.0"
440+
pino "9.7.0"
441441
wait-port "1.1.0"
442442

443-
"@omega-edit/server@0.9.87":
444-
version "0.9.87"
445-
resolved "https://registry.yarnpkg.com/@omega-edit/server/-/server-0.9.87.tgz#0106352494db75b6d709f9a41784f99fc30fbc0c"
446-
integrity sha512-vF1QF4HmE0I2qrH5nWz4QMKDTgd9Z/NbQ3mQ96vSATdx3x/zM3D5mOibieWHUoX2nS4jQ7zNRsBvGuXXuZCDKw==
443+
"@omega-edit/server@0.9.88":
444+
version "0.9.88"
445+
resolved "https://registry.yarnpkg.com/@omega-edit/server/-/server-0.9.88.tgz#346d99439772ed8be1c7a00a5196677cc2872def"
446+
integrity sha512-O+lV7l1P28CcjMflvPzcqRhhbl/xas03q0f6jwd4NF+E+PFjd27K+PAwPLLKvyHBHrrRqrATMRYFyAxlqsmiHw==
447447

448448
"@parcel/watcher-android-arm64@2.5.1":
449449
version "2.5.1"
@@ -3906,17 +3906,17 @@ pino-std-serializers@^7.0.0:
39063906
resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz#7c625038b13718dbbd84ab446bd673dc52259e3b"
39073907
integrity sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==
39083908

3909-
pino@9.6.0:
3910-
version "9.6.0"
3911-
resolved "https://registry.yarnpkg.com/pino/-/pino-9.6.0.tgz#6bc628159ba0cc81806d286718903b7fc6b13169"
3912-
integrity sha512-i85pKRCt4qMjZ1+L7sy2Ag4t1atFcdbEt76+7iRJn1g2BvsnRMGu9p8pivl9fs63M2kF/A0OacFZhTub+m/qMg==
3909+
pino@9.7.0:
3910+
version "9.7.0"
3911+
resolved "https://registry.yarnpkg.com/pino/-/pino-9.7.0.tgz#ff7cd86eb3103ee620204dbd5ca6ffda8b53f645"
3912+
integrity sha512-vnMCM6xZTb1WDmLvtG2lE/2p+t9hDEIvTWJsu6FejkE62vB7gDhvzrpFR4Cw2to+9JNQxVnkAKVPA1KPB98vWg==
39133913
dependencies:
39143914
atomic-sleep "^1.0.0"
39153915
fast-redact "^3.1.1"
39163916
on-exit-leak-free "^2.1.0"
39173917
pino-abstract-transport "^2.0.0"
39183918
pino-std-serializers "^7.0.0"
3919-
process-warning "^4.0.0"
3919+
process-warning "^5.0.0"
39203920
quick-format-unescaped "^4.0.3"
39213921
real-require "^0.2.0"
39223922
safe-stable-stringify "^2.3.1"
@@ -4222,10 +4222,10 @@ process-nextick-args@~2.0.0:
42224222
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
42234223
integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
42244224

4225-
process-warning@^4.0.0:
4226-
version "4.0.1"
4227-
resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-4.0.1.tgz#5c1db66007c67c756e4e09eb170cdece15da32fb"
4228-
integrity sha512-3c2LzQ3rY9d0hc1emcsHhfT9Jwz0cChib/QN89oME2R451w5fy3f0afAhERFZAwrbDU43wk12d0ORBpDVME50Q==
4225+
process-warning@^5.0.0:
4226+
version "5.0.0"
4227+
resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-5.0.0.tgz#566e0bf79d1dff30a72d8bbbe9e8ecefe8d378d7"
4228+
integrity sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==
42294229

42304230
protobufjs@^7.2.5:
42314231
version "7.5.3"

0 commit comments

Comments
 (0)