Skip to content

Commit

Permalink
Run babel on 'npm install' and remove .npminstall (mattermost#635)
Browse files Browse the repository at this point in the history
  • Loading branch information
hmhealey authored Sep 18, 2018
1 parent 9d47dbf commit a10b6c7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
11 changes: 4 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: check-style clean pre-run test install flow

.npminstall: package.json
node_modules: package.json
@if ! [ $(shell which npm) ]; then \
echo "npm is not installed"; \
exit 1; \
Expand All @@ -10,9 +10,7 @@

npm install --ignore-scripts

touch $@

check-style: | pre-run .npminstall
check-style: | pre-run node_modules
@echo Checking for style guide compliance

npm run check
Expand All @@ -21,7 +19,6 @@ clean:
@echo Cleaning app

rm -rf node_modules
rm -f .npminstall

pre-run:
@echo Make sure no previous build are in the folder
Expand All @@ -44,14 +41,14 @@ flow: .flowinstall

npm run flow

.flowinstall: .npminstall
.flowinstall: node_modules
@echo Getting flow-typed packages

npm run flow-typed install

touch $@

install: .npminstall
install: node_modules

bundle:
npm run build
Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"name": "mattermost-redux",
"version": "1.2.0",
"description": "Common code (API client, Redux stores, logic, utility functions) for building a Mattermost client",
"homepage": "https://github.com/mattermost/mattermost-redux",
"license": " Apache-2.0",
"repository": "mattermost/mattermost-redux",
"dependencies": {
"deep-equal": "1.0.1",
"eslint-plugin-header": "1.2.0",
Expand Down Expand Up @@ -67,6 +71,6 @@
"flow": "flow",
"flow-typed": "flow-typed",
"test": "NODE_ENV=test mocha --opts test/mocha.opts",
"prepublishOnly": "npm run build"
"prepare": "npm run build"
}
}

0 comments on commit a10b6c7

Please sign in to comment.