Skip to content

Commit

Permalink
Merge pull request #5376 from camptocamp/no_lock
Browse files Browse the repository at this point in the history
Prevent npm from creating package-lock.json
  • Loading branch information
fredj committed Dec 20, 2019
2 parents ab3253f + 17cab50 commit 2cc043e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
/apidoc/
/api/dist/api.*
/.transifexrc
/package-lock.json
/npm-debug.log
/.build/
/node_modules/
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ spell: .build/python-venv.timestamp
-or -name '__pycache__' -prune -or -name 'build' -prune \
-or \( -type f -and -not -name '*.png' -and -not -name '*.mo' -and -not -name '*.po*' -and -not -name '*_translation' \
-and -not -name 'themescapabilities.js' -and -not -name 'themes.js' -and -not -name 'prettify.js' \
-and -not -name 'package-lock.json' -and -not -name 'asitvd.capabilities.xml' \) -print)
-and -not -name 'asitvd.capabilities.xml' \) -print)

.PHONY: eslint
eslint: .build/eslint.timestamp
Expand Down

0 comments on commit 2cc043e

Please sign in to comment.