Skip to content

Commit

Permalink
fix: rollback the lock file changes and remove the lock file during i…
Browse files Browse the repository at this point in the history
…nstall (twilio#144)
  • Loading branch information
childish-sambino committed Dec 13, 2019
1 parent bdb9c82 commit 5653efa
Show file tree
Hide file tree
Showing 5 changed files with 5,574 additions and 11 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ twilio.env
*.env
.env
.history
package-lock.json
npm-shrinkwrap.json

### Backup package.json files created during release ###
*.bak
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Twilio
Copyright (c) 2019 Twilio

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
11 changes: 6 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
.PHONY: githooks install test clean docker-build docker-push
.PHONY: githooks clean install test docker-build docker-push

githooks:
ln -sf ../../githooks/pre-commit .git/hooks/pre-commit

install: githooks
clean:
rm -rf node_modules

install: githooks clean
rm -f package-lock.json
npm install --no-optional

test:
npm test

clean:
rm -rf node_modules

API_DEFINITIONS_SHA=$(shell git log --oneline | grep Regenerated | head -n1 | cut -d ' ' -f 5)
docker-build:
docker build -t twilio/twilio-cli .
Expand Down
Loading

0 comments on commit 5653efa

Please sign in to comment.