Skip to content

Commit

Permalink
update npm deps, remove a bunch
Browse files Browse the repository at this point in the history
  • Loading branch information
coilysiren committed Nov 24, 2023
1 parent d52fc99 commit efe4f22
Show file tree
Hide file tree
Showing 11 changed files with 2,596 additions and 6,758 deletions.
18 changes: 0 additions & 18 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,10 @@ install:
cargo build
npm install

dev: ## dev (primary entrypoint)
npx concurrently \
-k -n rust,rust::test,js,js::test \
-c red,red,green,green \
"make build-rust-dev" \
"make test-rust-dev" \
"make build-js-dev" \
"make test-js-dev"

test-rust:
cargo check
cargo test -- --color always

test-rust-dev:
cargo watch -s "make test-rust"

test-js:
npx karma start src/js/tests/karma.conf.js --singleRun=true

test-js-dev:
npx karma start src/js/tests/karma.conf.js

build-rust:
cargo build
make build-wasm
Expand Down
9,222 changes: 2,586 additions & 6,636 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 0 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,19 @@
{
"name": "galaxy_gen_client",
"version": "0.0.1",
"engines": {
"node": "10.4.0",
"npm": "6.0.1"
},
"scripts": {
"start": "node src/js/express.js",
"test": "make test-js"
},
"devDependencies": {
"@angular/common": "^6.1.7",
"@angular/compiler": "^6.1.7",
"@angular/core": "^6.1.7",
"@angular/http": "^6.1.7",
"@angular/platform-browser": "^6.1.7",
"@angular/platform-browser-dynamic": "^6.1.7",
"@types/mocha": "^5.2.5",
"@types/node": "^10.9.4",
"@types/webassembly-js-api": "0.0.1",
"ajv": "^6.5.3",
"concurrently": "^3.6.1",
"galaxy_gen_backend": "file:pkg",
"html-webpack-plugin": "^3.2.0",
"karma": "^2.0.5",
"karma-chrome-launcher": "^2.2.0",
"karma-mocha": "^1.3.0",
"karma-spec-reporter": "0.0.32",
"karma-typescript": "^3.0.13",
"karma-webpack": "^3.0.4",
"mocha": "^5.2.0",
"rxjs": "^6.3.2",
"ts-loader": "^4.5.0",
"tslint": "^5.11.0",
Expand All @@ -38,8 +22,5 @@
"webpack-cli": "^3.1.0",
"webpack-serve": "^1.0.4",
"zone.js": "^0.8.26"
},
"dependencies": {
"express": "^4.16.3"
}
}
Binary file removed src/js/assets/favicon.png
Binary file not shown.
2 changes: 1 addition & 1 deletion src/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ setupMainScript();

platformBrowserDynamic()
.bootstrapModule(AppModule)
.catch(err => console.log(err));
.catch((err) => console.log(err));
16 changes: 0 additions & 16 deletions src/js/express.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/js/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>GalaxyGen</title>
<title>galaxy-gen</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
Expand Down
26 changes: 0 additions & 26 deletions src/js/tests/galaxygen.spec.js

This file was deleted.

29 changes: 0 additions & 29 deletions src/js/tests/karma.conf.js

This file was deleted.

4 changes: 0 additions & 4 deletions src/js/tests/tsconfig.json

This file was deleted.

16 changes: 8 additions & 8 deletions src/js/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
module.exports = {
entry: path.resolve(__dirname, "bootstrap.js"),
output: {
path: path.resolve(__dirname, "..", "..", "dist")
path: path.resolve(__dirname, "..", "..", "dist"),
},
resolve: {
extensions: [".ts", ".js", ".wasm", ".png"]
extensions: [".ts", ".js", ".wasm", ".png"],
},
module: {
rules: [{ test: /\.ts$/, loader: "ts-loader" }]
rules: [{ test: /\.ts$/, loader: "ts-loader" }],
},
plugins: [
new HtmlWebpackPlugin({
template: path.resolve(__dirname, "index.html"),
favicon: path.resolve(__dirname, "assets/favicon.png")
})
favicon: path.resolve(__dirname, "assets/favicon.png"),
}),
],
optimization: {
splitChunks: {
chunks: "all"
}
chunks: "all",
},
},
mode: "development"
mode: "development",
};

0 comments on commit efe4f22

Please sign in to comment.