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

Removed skrinkwrap File #124

Merged
merged 2 commits into from
Oct 27, 2017
Merged

Removed skrinkwrap File #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0a7d6f
Removed shrinkwrap file
hiranya911 Oct 26, 2017
fc6e76a
Updated version in package lock
hiranya911 Oct 26, 2017
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
1 change: 1 addition & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ Here are some highlights of the directory structure and notable source files
* `verifyReleaseTarball.sh` - Installs and validates the release tarballs created by
`createReleaseTarball.sh`.
* `gulpfile.js` - Defines the `gulp` tasks necessary for building release artifacts.
* `package-lock.json` - A snapshot of the dependency tree for development and CI purposes.
* `tslint.json` - TypeScript linting rules.
* `tsconfig.json` - TypeScript configuration options.
* `tsconfig-lint.json` - TypeScript configuration options for the linter. This simply widens
Expand Down
22 changes: 7 additions & 15 deletions createReleaseTarball.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ sed -i '' -e s/"\"version\": \".*\""/"\"version\": \"${VERSION_WITHOUT_RC}\""/ p
echo


####################################
# REGENERATE npm-shrinkwrap.json #
####################################
echo "[INFO] Removing lib/, node_modules/, and npm-shrinkwrap..."
rm -rf lib/ node_modules/ npm-shrinkwrap.json
############################
# REINSTALL DEPENDENCIES #
############################
echo "[INFO] Removing lib/, and node_modules/..."
rm -rf lib/ node_modules/
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it make sense to, since you're trying to clean install here, just do:

git clean -xdf

And just prune everything that doesn't exist by default in the git tree?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good suggestion. But I think we need to add a few more entries to .gitignore before we do this. Will do as a separate PR.

if [[ $? -ne 0 ]]; then
echo "Error: Failed to remove lib/, node_modules/, and npm-shrinkwrap."
echo "Error: Failed to remove lib/, and node_modules/."
exit 1
fi
echo
Expand All @@ -108,14 +108,6 @@ if [[ $? -ne 0 ]]; then
fi
echo

echo "[INFO] Regenerating npm-shrinkwrap.json file..."
npm shrinkwrap
if [[ $? -ne 0 ]]; then
echo "Error: Failed to regenerate npm-shrinkwrap.json file."
exit 1
fi
echo


############################
# CREATE RELEASE TARBALL #
Expand Down Expand Up @@ -190,5 +182,5 @@ echo
##############

echo "[INFO] firebase-admin-${VERSION}.tgz successfully created!"
echo "[INFO] Create a CL for the updated package.json and npm-shrinkwrap.json if this is an actual release."
echo "[INFO] Create a CL for the updated package.json if this is an actual release."
echo
111 changes: 59 additions & 52 deletions npm-shrinkwrap.json → package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
"lib/",
"LICENSE",
"README.md",
"package.json",
"npm-shrinkwrap.json"
"package.json"
],
"types": "./lib/index.d.ts",
"dependencies": {
Expand Down