forgot to commit this for 7 months...

This commit is contained in:
Robin Appelman 2023-11-24 22:07:44 +01:00
commit 6d568799a7
11 changed files with 77 additions and 31 deletions

8
.gitignore vendored
View file

@ -1,7 +1,7 @@
node_modules
/dist
/target
/pkg
/wasm-pack.log
dist
target
pkg
wasm-pack.log
result
.direnv

View file

@ -29,6 +29,7 @@
buildInputs = with pkgs; [openssl];
OPENSSL_NO_VENDOR = 1;
NODE_OPTIONS = "--openssl-legacy-provider";
};
});
}

View file

@ -1,7 +1,7 @@
import {FlatState, XY} from '../pkg/index';
import {FlatState, XY} from '@demostf/tf-demos-viewer';
export async function parseDemo(bytes: Uint8Array, progressCallback : (progress: number) => void): Promise<ParsedDemo> {
let m = await import("../pkg/index.js");
let m = await import("@demostf/tf-demos-viewer");
const state = m.parse_demo(bytes, progressCallback);
let playerCount = state.player_count;

65
package-lock.json generated
View file

@ -1,13 +1,14 @@
{
"name": "@demostf/parser-worker",
"version": "0.1.1",
"version": "0.2.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@demostf/parser-worker",
"version": "0.1.1",
"version": "0.2.0",
"devDependencies": {
"@demostf/tf-demos-viewer": "0.1.0",
"@wasm-tool/wasm-pack-plugin": "^1.3.1",
"copy-webpack-plugin": "^6.2.0",
"rimraf": "^3.0.2",
@ -18,6 +19,12 @@
"webpack-dev-server": "^3.11.0"
}
},
"node_modules/@demostf/tf-demos-viewer": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/@demostf/tf-demos-viewer/-/tf-demos-viewer-0.1.0.tgz",
"integrity": "sha512-43p9bpO7jDB2Up7zvve0MNGrDRNNoBYHS5HzCZQSath8vx7DIaCYAbsd7N0zx9j9W3pWrpUVkhSBORrR4KIVWw==",
"dev": true
},
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
@ -675,6 +682,16 @@
"node": ">=8"
}
},
"node_modules/bindings": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
"dev": true,
"optional": true,
"dependencies": {
"file-uri-to-path": "1.0.0"
}
},
"node_modules/bluebird": {
"version": "3.7.2",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@ -2264,6 +2281,13 @@
"integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
"dev": true
},
"node_modules/file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
"dev": true,
"optional": true
},
"node_modules/fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@ -3980,6 +4004,13 @@
"integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
"dev": true
},
"node_modules/nan": {
"version": "2.17.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
"integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
"dev": true,
"optional": true
},
"node_modules/nanomatch": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@ -7593,6 +7624,12 @@
}
},
"dependencies": {
"@demostf/tf-demos-viewer": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/@demostf/tf-demos-viewer/-/tf-demos-viewer-0.1.0.tgz",
"integrity": "sha512-43p9bpO7jDB2Up7zvve0MNGrDRNNoBYHS5HzCZQSath8vx7DIaCYAbsd7N0zx9j9W3pWrpUVkhSBORrR4KIVWw==",
"dev": true
},
"@nodelib/fs.scandir": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
@ -8158,6 +8195,16 @@
"dev": true,
"optional": true
},
"bindings": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
"dev": true,
"optional": true,
"requires": {
"file-uri-to-path": "1.0.0"
}
},
"bluebird": {
"version": "3.7.2",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@ -9513,6 +9560,13 @@
"integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
"dev": true
},
"file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
"dev": true,
"optional": true
},
"fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@ -10838,6 +10892,13 @@
"integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
"dev": true
},
"nan": {
"version": "2.17.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
"integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
"dev": true,
"optional": true
},
"nanomatch": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",

View file

@ -1,15 +1,13 @@
{
"author": "Robin Appelman <robin@icewind.nl>",
"name": "@demostf/parser-worker",
"version": "0.1.1",
"version": "0.1.2",
"scripts": {
"build": "rimraf dist pkg && webpack",
"start": "rimraf dist pkg && webpack-dev-server --open -d",
"test": "cargo test && wasm-pack test --headless"
"build": "./node_modules/.bin/rimraf dist pkg && webpack",
"start": "./node_modules/.bin/rimraf dist pkg && webpack-dev-server --open -d",
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "^1.3.1",
"copy-webpack-plugin": "^6.2.0",
"@demostf/tf-demos-viewer": "0.1.0",
"rimraf": "^3.0.2",
"ts-loader": "^8.0.4",
"typescript": "^4.0.3",
@ -17,5 +15,5 @@
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0"
},
"main": "dist/index.js"
"main": "../dist/index.js"
}

View file

View file

@ -1,7 +1,7 @@
[package]
name = "tf-demos-viewer"
description = "JS bindings for demo parser"
version = "0.1.0"
version = "0.1.1"
authors = ["Robin Appelman <robin@icewind.nl>"]
categories = ["wasm"]
readme = "README.md"

View file

@ -1,11 +1,8 @@
const path = require("path");
const CopyPlugin = require("copy-webpack-plugin");
const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
const dist = path.resolve(__dirname, "dist");
module.exports = {
target: 'webworker',
mode: "production",
entry: {
index: "./js/index.ts"
@ -13,7 +10,7 @@ module.exports = {
output: {
path: dist,
filename: "[name].js",
libraryTarget: 'commonjs'
libraryTarget: 'commonjs-module'
},
devServer: {
contentBase: dist,
@ -30,15 +27,4 @@ module.exports = {
},
],
},
plugins: [
new CopyPlugin({
patterns: [
path.resolve(__dirname, "static")
]
}),
new WasmPackPlugin({
crateDirectory: __dirname,
}),
]
};