From 8fa5444c38f52f7dfa9b71c561468bcbedfcfdb0 Mon Sep 17 00:00:00 2001 From: Marcus Longmuir Date: Wed, 16 Aug 2023 17:33:52 +0100 Subject: [PATCH] Upgrade to MML v0.5 --- example/server/package.json | 2 +- package-lock.json | 214 +++++++++++++---------- packages/3d-web-client-core/package.json | 2 +- 3 files changed, 122 insertions(+), 96 deletions(-) diff --git a/example/server/package.json b/example/server/package.json index b63077d4..7ff74808 100644 --- a/example/server/package.json +++ b/example/server/package.json @@ -23,7 +23,7 @@ "express": "4.18.2", "express-ws": "5.0.2", "http-proxy": "^1.18.1", - "networked-dom-server": "0.4.0", + "networked-dom-server": "0.5.0", "ws": "8.13.0" }, "devDependencies": { diff --git a/package-lock.json b/package-lock.json index a2694c0f..0708d35a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,7 @@ "express": "4.18.2", "express-ws": "5.0.2", "http-proxy": "^1.18.1", - "networked-dom-server": "0.4.0", + "networked-dom-server": "0.5.0", "ws": "8.13.0" }, "devDependencies": { @@ -2347,50 +2347,47 @@ "link": true }, "node_modules/@mml-io/networked-dom-document": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-document/-/networked-dom-document-0.4.0.tgz", - "integrity": "sha512-6nwyxxPCaBoXMx0PMnySxBbmCchxVyuLQdPTU45GBFJyy9JhSBV7pugNM4Q1D00WePIpV2WkB/93TC1O2UFlxQ==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-document/-/networked-dom-document-0.5.0.tgz", + "integrity": "sha512-VQKD9/hfDjIfGSOdk8gFECXYWSwI4zJHFrkB546x6uXMlXuejIQPt1a3590y7T5TUvKDEc1A7iQSz4nmVdm4qQ==", "dependencies": { - "@mml-io/networked-dom-protocol": "^0.4.0", - "@mml-io/observable-dom-common": "^0.4.0", + "@mml-io/networked-dom-protocol": "^0.5.0", + "@mml-io/observable-dom-common": "^0.5.0", "rfc6902": "git+https://github.com/marcuslongmuir/rfc6902.git#7b81b044d7c2cd36f34f9f30d106e7f5db8a0589" } }, - "node_modules/@mml-io/networked-dom-protocol": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-protocol/-/networked-dom-protocol-0.4.0.tgz", - "integrity": "sha512-fcAeG6mWBwew2wyOqUaH7kCRz1wktSW9sEC92Q5P6ckX3sBVPNU+5HR98thmiY7q3PdMT03nbD4qQ2puwut59w==" - }, - "node_modules/@mml-io/networked-dom-web": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-web/-/networked-dom-web-0.4.0.tgz", - "integrity": "sha512-+gMxVr6EutA1Os28KZoSCL7MEWBkwIpuy+ddD8dw/fE/imPdnJDe8EAD8M2beys+K30l5SDU0NoNhZ+ReEKtJQ==", - "dependencies": { - "@mml-io/networked-dom-protocol": "^0.4.0" - } + "node_modules/@mml-io/networked-dom-document/node_modules/@mml-io/networked-dom-protocol": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-protocol/-/networked-dom-protocol-0.5.0.tgz", + "integrity": "sha512-zxx8lynrtqULIZ/FZxGosByjCiGu4K+iVNjj4+ID8Z1aHAj95h9qDli32bdTD8hx67run5Nc/a6sGUO54D1P3g==" }, "node_modules/@mml-io/observable-dom": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mml-io/observable-dom/-/observable-dom-0.4.0.tgz", - "integrity": "sha512-tH+4TL72qpTmtmU1yNmVWCYNtLCGohh4QpMJeznachAj+jdrDQaGhNc7NNN8MnqUJTWLANoBsxkXiuLntllSug==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/observable-dom/-/observable-dom-0.5.0.tgz", + "integrity": "sha512-0erQwquqlyeG3lzlvXgm02BB6Y5Vn44Zi0IbXZJ00eZFxqgDt+khbFlBdL7unbvvnx3i0qbYIMvS6l4ibvVkcQ==", "dependencies": { - "@mml-io/observable-dom-common": "^0.4.0", + "@mml-io/observable-dom-common": "^0.5.0", "jsdom": "22.1.0", - "node-fetch": "2.6.11" + "node-fetch": "2.6.12" } }, "node_modules/@mml-io/observable-dom-common": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mml-io/observable-dom-common/-/observable-dom-common-0.4.0.tgz", - "integrity": "sha512-MCWEVr3KdaL86dMKbsu0ZH2yMtE5ulJQSRk5xyJAE5mYwhahRt1Li8xSgqDKWRsDGsahmjq1ZrVaMvi1INsM2Q==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/observable-dom-common/-/observable-dom-common-0.5.0.tgz", + "integrity": "sha512-6JbZzNZtTbEnSIcS3+EPG6gl1OLp7neq3OAviMi3qRWmmu3M8KbbI5sV7hFrr9WoRYC/QQnPizfJJDwePEogmA==", "dependencies": { - "@mml-io/networked-dom-protocol": "^0.4.0" + "@mml-io/networked-dom-protocol": "^0.5.0" } }, + "node_modules/@mml-io/observable-dom-common/node_modules/@mml-io/networked-dom-protocol": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-protocol/-/networked-dom-protocol-0.5.0.tgz", + "integrity": "sha512-zxx8lynrtqULIZ/FZxGosByjCiGu4K+iVNjj4+ID8Z1aHAj95h9qDli32bdTD8hx67run5Nc/a6sGUO54D1P3g==" + }, "node_modules/@mml-io/observable-dom/node_modules/node-fetch": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz", - "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==", + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz", + "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -13044,17 +13041,6 @@ "node": ">=10" } }, - "node_modules/mml-web": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/mml-web/-/mml-web-0.4.0.tgz", - "integrity": "sha512-iR+DHjUQhH7gspI8blBSt4dra6+55qLMt6puYaHw0JlLwjR83OecrxyBNQAC9jIGsZfjvXf+HLiDmuFxK8swig==", - "dependencies": { - "@mml-io/networked-dom-web": "^0.4.0" - }, - "peerDependencies": { - "three": "*" - } - }, "node_modules/modify-values": { "version": "1.0.1", "dev": true, @@ -13153,13 +13139,13 @@ "license": "MIT" }, "node_modules/networked-dom-server": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/networked-dom-server/-/networked-dom-server-0.4.0.tgz", - "integrity": "sha512-L94wbypG+iucDGgTvdFoAqZFBDFGNdXet0/ZhhoNXlNsiYYz9+iTX7ME/AmjzBlYJRCwSnhnIsdpo6ip7eSZww==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/networked-dom-server/-/networked-dom-server-0.5.0.tgz", + "integrity": "sha512-EkGYBTlgThCh2gS+N+xAVisVmnyMiO0NpimnksNaolxUXl4+6SPiRVeSdS9DEHya9QT+UfQFSimGPx9SrK++mA==", "dependencies": { - "@mml-io/networked-dom-document": "^0.4.0", - "@mml-io/observable-dom": "^0.4.0", - "@mml-io/observable-dom-common": "^0.4.0" + "@mml-io/networked-dom-document": "^0.5.0", + "@mml-io/observable-dom": "^0.5.0", + "@mml-io/observable-dom-common": "^0.5.0" } }, "node_modules/nice-try": { @@ -18255,7 +18241,7 @@ "name": "@mml-io/3d-web-client-core", "version": "0.4.0", "dependencies": { - "mml-web": "0.4.0", + "mml-web": "0.5.0", "postprocessing": "6.32.1", "three": "^0.153.0", "three-mesh-bvh": "0.6.0", @@ -18266,6 +18252,30 @@ "@types/three": "^0.152.1" } }, + "packages/3d-web-client-core/node_modules/@mml-io/networked-dom-protocol": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-protocol/-/networked-dom-protocol-0.5.0.tgz", + "integrity": "sha512-zxx8lynrtqULIZ/FZxGosByjCiGu4K+iVNjj4+ID8Z1aHAj95h9qDli32bdTD8hx67run5Nc/a6sGUO54D1P3g==" + }, + "packages/3d-web-client-core/node_modules/@mml-io/networked-dom-web": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-web/-/networked-dom-web-0.5.0.tgz", + "integrity": "sha512-QhUAUohQEcra90lx/lc+gyhG/6ON3+WO5D6fv8X8QfFrUyvyX2/i016UyfL+beWwEJBSfrgV4zBd6TEGAhURQA==", + "dependencies": { + "@mml-io/networked-dom-protocol": "^0.5.0" + } + }, + "packages/3d-web-client-core/node_modules/mml-web": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/mml-web/-/mml-web-0.5.0.tgz", + "integrity": "sha512-Len5qDbKdiCz8Jbtb2yuO43zgO9TqPn+Hs0TnfNJqT+/xeu/1v/uZT0eoqPGJGqzjtRAckn6L2wZbgYYHDk5FQ==", + "dependencies": { + "@mml-io/networked-dom-web": "^0.5.0" + }, + "peerDependencies": { + "three": "*" + } + }, "packages/3d-web-user-networking": { "name": "@mml-io/3d-web-user-networking", "version": "0.4.0", @@ -18846,7 +18856,7 @@ "express": "4.18.2", "express-ws": "5.0.2", "http-proxy": "^1.18.1", - "networked-dom-server": "0.4.0", + "networked-dom-server": "0.5.0", "nodemon": "^2.0.22", "ws": "8.13.0" } @@ -20024,11 +20034,34 @@ "requires": { "@tweakpane/core": "1.1.9", "@types/three": "^0.152.1", - "mml-web": "0.4.0", + "mml-web": "0.5.0", "postprocessing": "6.32.1", "three": "^0.153.0", "three-mesh-bvh": "0.6.0", "tweakpane": "3.1.10" + }, + "dependencies": { + "@mml-io/networked-dom-protocol": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-protocol/-/networked-dom-protocol-0.5.0.tgz", + "integrity": "sha512-zxx8lynrtqULIZ/FZxGosByjCiGu4K+iVNjj4+ID8Z1aHAj95h9qDli32bdTD8hx67run5Nc/a6sGUO54D1P3g==" + }, + "@mml-io/networked-dom-web": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-web/-/networked-dom-web-0.5.0.tgz", + "integrity": "sha512-QhUAUohQEcra90lx/lc+gyhG/6ON3+WO5D6fv8X8QfFrUyvyX2/i016UyfL+beWwEJBSfrgV4zBd6TEGAhURQA==", + "requires": { + "@mml-io/networked-dom-protocol": "^0.5.0" + } + }, + "mml-web": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/mml-web/-/mml-web-0.5.0.tgz", + "integrity": "sha512-Len5qDbKdiCz8Jbtb2yuO43zgO9TqPn+Hs0TnfNJqT+/xeu/1v/uZT0eoqPGJGqzjtRAckn6L2wZbgYYHDk5FQ==", + "requires": { + "@mml-io/networked-dom-web": "^0.5.0" + } + } } }, "@mml-io/3d-web-user-networking": { @@ -20044,42 +20077,36 @@ } }, "@mml-io/networked-dom-document": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-document/-/networked-dom-document-0.4.0.tgz", - "integrity": "sha512-6nwyxxPCaBoXMx0PMnySxBbmCchxVyuLQdPTU45GBFJyy9JhSBV7pugNM4Q1D00WePIpV2WkB/93TC1O2UFlxQ==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-document/-/networked-dom-document-0.5.0.tgz", + "integrity": "sha512-VQKD9/hfDjIfGSOdk8gFECXYWSwI4zJHFrkB546x6uXMlXuejIQPt1a3590y7T5TUvKDEc1A7iQSz4nmVdm4qQ==", "requires": { - "@mml-io/networked-dom-protocol": "^0.4.0", - "@mml-io/observable-dom-common": "^0.4.0", + "@mml-io/networked-dom-protocol": "^0.5.0", + "@mml-io/observable-dom-common": "^0.5.0", "rfc6902": "git+https://github.com/marcuslongmuir/rfc6902.git#7b81b044d7c2cd36f34f9f30d106e7f5db8a0589" - } - }, - "@mml-io/networked-dom-protocol": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-protocol/-/networked-dom-protocol-0.4.0.tgz", - "integrity": "sha512-fcAeG6mWBwew2wyOqUaH7kCRz1wktSW9sEC92Q5P6ckX3sBVPNU+5HR98thmiY7q3PdMT03nbD4qQ2puwut59w==" - }, - "@mml-io/networked-dom-web": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-web/-/networked-dom-web-0.4.0.tgz", - "integrity": "sha512-+gMxVr6EutA1Os28KZoSCL7MEWBkwIpuy+ddD8dw/fE/imPdnJDe8EAD8M2beys+K30l5SDU0NoNhZ+ReEKtJQ==", - "requires": { - "@mml-io/networked-dom-protocol": "^0.4.0" + }, + "dependencies": { + "@mml-io/networked-dom-protocol": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-protocol/-/networked-dom-protocol-0.5.0.tgz", + "integrity": "sha512-zxx8lynrtqULIZ/FZxGosByjCiGu4K+iVNjj4+ID8Z1aHAj95h9qDli32bdTD8hx67run5Nc/a6sGUO54D1P3g==" + } } }, "@mml-io/observable-dom": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mml-io/observable-dom/-/observable-dom-0.4.0.tgz", - "integrity": "sha512-tH+4TL72qpTmtmU1yNmVWCYNtLCGohh4QpMJeznachAj+jdrDQaGhNc7NNN8MnqUJTWLANoBsxkXiuLntllSug==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/observable-dom/-/observable-dom-0.5.0.tgz", + "integrity": "sha512-0erQwquqlyeG3lzlvXgm02BB6Y5Vn44Zi0IbXZJ00eZFxqgDt+khbFlBdL7unbvvnx3i0qbYIMvS6l4ibvVkcQ==", "requires": { - "@mml-io/observable-dom-common": "^0.4.0", + "@mml-io/observable-dom-common": "^0.5.0", "jsdom": "22.1.0", - "node-fetch": "2.6.11" + "node-fetch": "2.6.12" }, "dependencies": { "node-fetch": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz", - "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==", + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz", + "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==", "requires": { "whatwg-url": "^5.0.0" } @@ -20087,11 +20114,18 @@ } }, "@mml-io/observable-dom-common": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mml-io/observable-dom-common/-/observable-dom-common-0.4.0.tgz", - "integrity": "sha512-MCWEVr3KdaL86dMKbsu0ZH2yMtE5ulJQSRk5xyJAE5mYwhahRt1Li8xSgqDKWRsDGsahmjq1ZrVaMvi1INsM2Q==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/observable-dom-common/-/observable-dom-common-0.5.0.tgz", + "integrity": "sha512-6JbZzNZtTbEnSIcS3+EPG6gl1OLp7neq3OAviMi3qRWmmu3M8KbbI5sV7hFrr9WoRYC/QQnPizfJJDwePEogmA==", "requires": { - "@mml-io/networked-dom-protocol": "^0.4.0" + "@mml-io/networked-dom-protocol": "^0.5.0" + }, + "dependencies": { + "@mml-io/networked-dom-protocol": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@mml-io/networked-dom-protocol/-/networked-dom-protocol-0.5.0.tgz", + "integrity": "sha512-zxx8lynrtqULIZ/FZxGosByjCiGu4K+iVNjj4+ID8Z1aHAj95h9qDli32bdTD8hx67run5Nc/a6sGUO54D1P3g==" + } } }, "@nodelib/fs.scandir": { @@ -27484,14 +27518,6 @@ "mkdirp": "^1.0.3" } }, - "mml-web": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/mml-web/-/mml-web-0.4.0.tgz", - "integrity": "sha512-iR+DHjUQhH7gspI8blBSt4dra6+55qLMt6puYaHw0JlLwjR83OecrxyBNQAC9jIGsZfjvXf+HLiDmuFxK8swig==", - "requires": { - "@mml-io/networked-dom-web": "^0.4.0" - } - }, "modify-values": { "version": "1.0.1", "dev": true @@ -27564,13 +27590,13 @@ "dev": true }, "networked-dom-server": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/networked-dom-server/-/networked-dom-server-0.4.0.tgz", - "integrity": "sha512-L94wbypG+iucDGgTvdFoAqZFBDFGNdXet0/ZhhoNXlNsiYYz9+iTX7ME/AmjzBlYJRCwSnhnIsdpo6ip7eSZww==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/networked-dom-server/-/networked-dom-server-0.5.0.tgz", + "integrity": "sha512-EkGYBTlgThCh2gS+N+xAVisVmnyMiO0NpimnksNaolxUXl4+6SPiRVeSdS9DEHya9QT+UfQFSimGPx9SrK++mA==", "requires": { - "@mml-io/networked-dom-document": "^0.4.0", - "@mml-io/observable-dom": "^0.4.0", - "@mml-io/observable-dom-common": "^0.4.0" + "@mml-io/networked-dom-document": "^0.5.0", + "@mml-io/observable-dom": "^0.5.0", + "@mml-io/observable-dom-common": "^0.5.0" } }, "nice-try": { diff --git a/packages/3d-web-client-core/package.json b/packages/3d-web-client-core/package.json index 0a87e348..9bbdaf66 100644 --- a/packages/3d-web-client-core/package.json +++ b/packages/3d-web-client-core/package.json @@ -15,7 +15,7 @@ "lint:fix": "eslint \"./src/**/*.{ts,}\" --fix" }, "dependencies": { - "mml-web": "0.4.0", + "mml-web": "0.5.0", "postprocessing": "6.32.1", "three": "^0.153.0", "three-mesh-bvh": "0.6.0",