From fe15226f6f1f6a15ee4f962a529e7bfaa3dba650 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 27 Oct 2021 15:53:12 +0200 Subject: [PATCH] Withdrew protobuf from package, ignores, etc. --- .github/workflows/test.yml | 2 -- .gitmodules | 3 --- backend/.eslintignore | 4 +--- backend/package.json | 4 ---- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d7c4f6b40..b6fd6c31d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,8 +42,6 @@ jobs: ########################################################################## - name: Checkout code uses: actions/checkout@v2 - with: - submodules: true ########################################################################## # BACKEND ################################################################ ########################################################################## diff --git a/.gitmodules b/.gitmodules index 5026a5b8a..22790ccc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,6 +34,3 @@ [submodule "login_server/dependencies/protobuf"] path = login_server/dependencies/protobuf url = https://github.com/protocolbuffers/protobuf.git -[submodule "backend/src/proto"] - path = backend/src/proto - url = git@github.com:gradido/gradido_protocol.git diff --git a/backend/.eslintignore b/backend/.eslintignore index 43e3327c1..2ae13b30e 100644 --- a/backend/.eslintignore +++ b/backend/.eslintignore @@ -1,4 +1,2 @@ node_modules -**/*.min.js -build -src/proto/bundle.d.ts \ No newline at end of file +**/*.min.js \ No newline at end of file diff --git a/backend/package.json b/backend/package.json index a445c955b..d63450fbd 100644 --- a/backend/package.json +++ b/backend/package.json @@ -8,17 +8,14 @@ "license": "MIT", "private": false, "scripts": { - "prebuild": "mkdir -p build/proto && pbjs -t static-module -w commonjs -o build/proto/bundle.js src/proto/gradido/*.proto && pbts -o src/proto/bundle.d.ts build/proto/bundle.js", "build": "tsc --build", "clean": "tsc --build --clean", "start": "node build/index.js", - "predev": "pbjs -t static-module -w commonjs -o src/proto/bundle.js src/proto/gradido/*.proto && pbts -o src/proto/bundle.d.ts src/proto/bundle.js", "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts", "lint": "eslint . --ext .js,.ts", "test": "jest --coverage" }, "dependencies": { - "@apollo/protobufjs": "^1.2.2", "@types/jest": "^27.0.2", "apollo-server-express": "^2.25.2", "axios": "^0.21.1", @@ -56,7 +53,6 @@ "eslint-plugin-promise": "^5.1.0", "nodemon": "^2.0.7", "prettier": "^2.3.1", - "protobufjs": "^6.11.2", "ts-node": "^10.0.0", "typescript": "^4.3.4" },