Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Node build break on typescript-eslint #771

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Fix Node build break on typescript-eslint #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build: build-node build-java
.PHONY: build-node
build-node:
cd '$(node_dir)' && \
npm install && \
npm ci && \
npm run build && \
rm -f fabric-gateway-dev.tgz && \
mv $$(npm pack) fabric-gateway-dev.tgz
Expand Down Expand Up @@ -117,15 +117,15 @@ scan-node: scan-node-npm-audit scan-node-osv-scanner
.PHONY: scan-node-npm-audit
scan-node-npm-audit:
cd '$(node_dir)' && \
npm install --package-lock-only && \
npm install --omit=dev --package-lock-only --no-audit && \
npm audit --omit=dev

.PHONY: scan-node-osv-scanner
scan-node-osv-scanner:
go install github.com/google/osv-scanner/cmd/osv-scanner@latest
cd '$(node_dir)' && \
npm install --package-lock-only && \
npm sbom --omit dev --package-lock-only --sbom-format cyclonedx > sbom.json && \
npm install --omit=dev --package-lock-only --no-audit && \
npm sbom --omit=dev --package-lock-only --sbom-format cyclonedx > sbom.json && \
osv-scanner scan --sbom=sbom.json

.PHONY: scan-java
Expand Down Expand Up @@ -174,15 +174,15 @@ scenario-test-go-no-hsm: vendor-chaincode
.PHONY: scenario-test-node
scenario-test-node: vendor-chaincode build-node fabric-ca-client setup-softhsm
cd '$(scenario_dir)/node' && \
rm -rf package-lock.json node_modules && \
npm install && \
npm ci && \
npm install @hyperledger/fabric-gateway@file:../../node/fabric-gateway-dev.tgz && \
npm test

.PHONY: scenario-test-node-no-hsm
scenario-test-node-no-hsm: vendor-chaincode build-node fabric-ca-client
cd '$(scenario_dir)/node' && \
rm -rf package-lock.json node_modules && \
npm install && \
npm ci && \
npm install @hyperledger/fabric-gateway@file:../../node/fabric-gateway-dev.tgz && \
npm run test:no-hsm

.PHONY: scenario-test-java
Expand Down Expand Up @@ -222,7 +222,7 @@ generate-docs:
.PHONY: generate-docs-node
generate-docs-node:
cd '$(node_dir)' && \
npm install && \
npm ci && \
npm run generate-apidoc

.PHONY: generate-docs-java
Expand All @@ -241,7 +241,7 @@ clean: clean-generated clean-node clean-java clean-docs

.PHONY: clean-node
clean-node:
cd '$(node_dir)' && rm -rf package-lock.json node_modules
cd '$(node_dir)' && rm -rf node_modules

.PHONY: clean-java
clean-java:
Expand Down
1 change: 0 additions & 1 deletion node/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ coverage/
*.tgz
src/protos/
apidocs/
package-lock.json
sbom.json
Loading