Commit 65246d00 authored by JC Brand's avatar JC Brand

Update Makefile

- Don't unnecessarily build dist files
parent ac3e8796
......@@ -34,7 +34,7 @@ help:
@echo "Please use \`make <target>' where <target> is one of the following:"
@echo ""
@echo " all Set up dev environment and create all builds"
@echo " build Create minified builds of converse.js and all its dependencies."
@echo " dist Create minified builds of converse.js and all its dependencies."
@echo " clean Remove all NPM packages."
@echo " check Run all tests."
@echo " dev Set up the development environment and build unminified resources. To force a fresh start, run 'make clean' first."
......@@ -99,7 +99,7 @@ release:
$(SED) -ri 's,cdn.conversejs.org/$(VERSION_FORMAT),cdn.conversejs.org/$(VERSION),' demo/*.html
make pot
make po
make build
make dist
npm pack
.PHONY: postrelease
......@@ -135,9 +135,9 @@ devserver: node_modules
########################################################################
## Builds
dist/converse.js:: node_modules dev
dist/converse.js:: node_modules
dist/converse.css:: node_modules dev
dist/converse.css:: node_modules
dist/website.css:: node_modules sass
$(SASS) --source-map true --include-path $(BOOTSTRAP) sass/website.scss $@
......@@ -174,15 +174,11 @@ logo/conversejs-filled%.png:: logo/conversejs-filled.svg
src/headless/dist/converse-headless.min.js: src webpack.common.js node_modules @converse/headless
npm run headless
.PHONY: dist
dist:: build
.PHONY: build
build:: node_modules
dist:: node_modules src/*
npm run dev && npm run build && make dist/website.css && make dist/website.min.css
.PHONY: install
install:: build
install:: dist
.PHONY: cdn
cdn:: node_modules
......
......@@ -3603,12 +3603,12 @@
}
},
"@octokit/endpoint": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.0.tgz",
"integrity": "sha512-3nx+MEYoZeD0uJ+7F/gvELLvQJzLXhep2Az0bBSXagbApDvDW0LWwpnAIY/hb0Jwe17A0fJdz0O12dPh05cj7A==",
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.1.tgz",
"integrity": "sha512-pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A==",
"dev": true,
"requires": {
"@octokit/types": "^2.0.0",
"@octokit/types": "^2.11.1",
"is-plain-object": "^3.0.0",
"universal-user-agent": "^5.0.0"
},
......@@ -3671,14 +3671,14 @@
}
},
"@octokit/request": {
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.0.tgz",
"integrity": "sha512-uAJO6GI8z8VHBqtY7VTL9iFy1Y+UTp5ShpI97tY5z0qBfYKE9rZCRsCm23VmF00x+IoNJ7a0nuVITs/+wS9/mg==",
"version": "5.4.2",
"resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.2.tgz",
"integrity": "sha512-zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw==",
"dev": true,
"requires": {
"@octokit/endpoint": "^6.0.0",
"@octokit/endpoint": "^6.0.1",
"@octokit/request-error": "^2.0.0",
"@octokit/types": "^2.8.2",
"@octokit/types": "^2.11.1",
"deprecation": "^2.0.0",
"is-plain-object": "^3.0.0",
"node-fetch": "^2.3.0",
......@@ -3759,9 +3759,9 @@
}
},
"@octokit/types": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.10.0.tgz",
"integrity": "sha512-0/NN22MgQvNNgMjTwzWUzcIfFfks3faqiP1D1oQQz49KYeOWc+KkRG9ASbAPurrAnOaDiqnnuDYzhNT9cq4e8Q==",
"version": "2.11.1",
"resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.11.1.tgz",
"integrity": "sha512-QaLoLkmFdfoNbk3eOzPv7vKrUY0nRJIYmZDoz/pTer4ICpqu80aSQTVHnnUxEFuURCiidig76CcxUOYC/bY3RQ==",
"dev": true,
"requires": {
"@types/node": ">= 8"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment