Skip to content

Commit

Permalink
Merge branch 'release/1.1.16' into v1
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Welch committed Sep 16, 2022
2 parents 655e91c + 503fe6e commit 98fc99f
Show file tree
Hide file tree
Showing 42 changed files with 3,986 additions and 2,607 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,11 @@
# Instant Analytics Changelog

## 1.1.16 - 2022.09.16
### Changed
* Updated how the Instant Analytics components are registered, to allow for overriding via plugin config ([#1989](https://github.com/craftcms/cms/issues/1989))
* Update the buildchain to use Vite `^3.1.0` for building frontend assets
* Move to using `ServicesTrait` and add getter methods for services

## 1.1.15 - 2022.01.27

### Fixed
Expand Down
6 changes: 6 additions & 0 deletions buildchain/Makefile
Expand Up @@ -11,24 +11,30 @@ DOCKERRUN=docker container run \

.PHONY: build dev docker install clean npm

# Build the production assets
build: docker install
${DOCKERRUN} \
run build
# Start up the dev server
dev: docker install
${DOCKERRUN} \
run dev
# Start the Docker container
docker:
docker build \
. \
-t ${CONTAINER}:${TAG} \
--build-arg TAG=${TAG} \
--no-cache
# Run an npm install
install: docker
${DOCKERRUN} \
install
# Remove node_modules/* & package-lock.json
clean:
rm -rf node_modules/
rm -f package-lock.json
# Run the passed in npm command
npm: docker
${DOCKERRUN} \
$(filter-out $@,$(MAKECMDGOALS))
Expand Down

0 comments on commit 98fc99f

Please sign in to comment.