Skip to content

Commit

Permalink
Merge branch 'release/1.0.23' into v1
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Apr 1, 2021
2 parents b6a248e + dbc0cba commit b5efd17
Show file tree
Hide file tree
Showing 40 changed files with 1,021 additions and 929 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
# Webperf Changelog

## 1.1.22 - 2021.03.03
## 1.0.23 - 2021.04.01
### Changed
* More consistent `makefile` build commands
* Use Tailwind 2.x & `@tailwindcss/jit`
* Move settings from the `composer.json` “extra” to the plugin main class
* Move the manifest service registration to the constructor
* Fix the broken Vue data tables

## 1.0.22 - 2021.03.03
### Changed
* Dockerized the buildchain, using `craft-plugin-manifest` for the webpack HMR bridge

## 1.1.21 - 2021.02.24
## 1.0.21 - 2021.02.24
### Added
* Added support for both 8.x and 9.x versions of `league/csv` for peer compatibility

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG TAG=12-alpine
ARG TAG=14-alpine
FROM nystudio107/node-dev-base:$TAG

WORKDIR /app/buildchain/
Expand Down
63 changes: 26 additions & 37 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,50 +1,39 @@
TAG?=12-alpine
CONTAINER?=webperf-buildchain
DEST?=../../sites/nystudio107/web/docs/webperf
TAG?=14-alpine
CONTAINER?=$(shell basename $(CURDIR))-buildchain
DOCKERRUN=docker container run \
--name ${CONTAINER} \
--rm \
-t \
--network plugindev_default \
-p 8080:8080 \
-v `pwd`:/app \
${CONTAINER}:${TAG}
DOCSDEST?=../../sites/nystudio107/web/docs/webperf

.PHONY: dist docker docs install npm
.PHONY: build dev docker docs install npm

dist: docker docs install
docker container run \
--name ${CONTAINER} \
--rm \
-t \
-v `pwd`:/app \
nystudio107/${CONTAINER}:${TAG} \
build: docker install
${DOCKERRUN} \
run build
dev: docker install
${DOCKERRUN} \
run dev
docker:
docker build \
. \
-t nystudio107/${CONTAINER}:${TAG} \
-t ${CONTAINER}:${TAG} \
--build-arg TAG=${TAG} \
--no-cache
docs:
docker container run \
--name ${CONTAINER} \
--rm \
-t \
-v `pwd`:/app \
nystudio107/${CONTAINER}:${TAG} \
docs: docker
${DOCKERRUN} \
run docs
rm -rf ${DEST}
mv ./docs/docs/.vuepress/dist ${DEST}
install:
docker container run \
--name ${CONTAINER} \
--rm \
-t \
-v `pwd`:/app \
nystudio107/${CONTAINER}:${TAG} \
rm -rf ${DOCSDEST}
mv ./docs/docs/.vuepress/dist ${DOCSDEST}
install: docker
${DOCKERRUN} \
install
npm:
docker container run \
--name ${CONTAINER} \
--network plugindev_default \
--rm \
-t \
-p 8080:8080 \
-v `pwd`:/app \
nystudio107/${CONTAINER}:${TAG} \
npm: docker
${DOCKERRUN} \
$(filter-out $@,$(MAKECMDGOALS))
%:
@:
Expand Down
Loading

0 comments on commit b5efd17

Please sign in to comment.