From 40831ef86ef7ec7eaf0efd3a42ed10820cf367a7 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Mon, 29 Jun 2020 15:22:36 -0300 Subject: [PATCH] Fixed pbjs not working on Windows because package.json runs by cmd.exe which does not support pipe | and ; semicolons https://github.com/ankitects/anki/commit/6fd444b9587918834bf5f641bd7a44cd064ff495#r40232987 --- ts/Makefile | 3 ++- ts/package.json | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/Makefile b/ts/Makefile index af288bf55..61438ac9a 100644 --- a/ts/Makefile +++ b/ts/Makefile @@ -24,7 +24,8 @@ PROTODEPS := ../proto/backend.proto ../proto/fluent.proto BUILDDEPS := .build/npm webpack.config.js .build/proto: $(BUILDDEPS) $(PROTODEPS) - npm run proto + npx pbjs -t json-module -w es6 ../proto/backend.proto -o src/backend/proto.js + npx pbjs -t static-module ../proto/backend.proto | npx pbts -o src/backend/proto.d.ts - @touch $@ PHONY: dev diff --git a/ts/package.json b/ts/package.json index 86927acdf..703f14c63 100644 --- a/ts/package.json +++ b/ts/package.json @@ -42,7 +42,6 @@ "webpack-dev-server": "^3.11.0" }, "scripts": { - "proto": "pbjs -t json-module -w es6 ../proto/backend.proto -o src/backend/proto.js; pbjs -t static-module ../proto/backend.proto | pbts -o src/backend/proto.d.ts -", "fix": "prettier --write src/*/*.ts", "check": "prettier --check src/*/*.ts && eslint --max-warnings=0 --ext .ts src", "build": "cross-env NODE_ENV=production webpack",