Merge branch 'release/1.0.13'

nystudio107 · Apr 5, 2021 · ae6c7f7 · ae6c7f7
2 parents 9d9d7ea + 62f437c
commit ae6c7f7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # nystudio107/plugindev Change Log
 
+## 1.0.13 - 2021.04.05
+### Added
+* Added `make update` to update Composer & NPM packages
+* Added `make update-clean` to completely remove `vendor/` and `node_modules/`, then update Composer & NPM packages
+
 ## 1.0.12 - 2021.04.01
 ### Changed
 * Better login background pattern

diff --git a/Makefile b/Makefile
@@ -13,6 +13,15 @@ mysql: up
 	cp cms/config/_dbconfigs/mysql.php cms/config/db.php
 postgres: up
 	cp cms/config/_dbconfigs/postgres.php cms/config/db.php
+update:
+	docker-compose down
+	rm cms/composer.lock
+	docker-compose up
+update-clean:
+	docker-compose down
+	rm cms/composer.lock
+	rm -rf cms/vendor/
+	docker-compose up
 up:
 	if [ ! "$$(docker ps -q -f name=${CONTAINER})" ]; then \
         docker-compose up; \

diff --git a/README.md b/README.md
@@ -48,8 +48,12 @@ The default login is:
 
 To update to the latest Composer packages (as constrained by the `cms/composer.json` semvers), do:
 ```
-rm cms/composer.lock
-make dev
+make update
+```
+
+To start from scratch by removing `cms/vendor/`, then update to the latest Composer packages (as constrained by the `cms/composer.json` semvers), do:
+```
+make update-clean
 ```
 
 ### Switching between MySQL & Postgres
@@ -94,6 +98,8 @@ To make using it easier, we're using a Makefile and the built-in `make` utility
 - `make clean` - shuts down the Docker containers, removes any mounted volumes (including the database), and then rebuilds the containers from scratch
 - `make mysql` - switches the project to use the MySQL database container; just reload the browser
 - `make postgres` - switches the project to use the Postgres database container; just reload the browser
+- `make update` - causes the project to update to the latest Composer and NPM dependencies
+- `make update-clean` - completely removes `node_modules/` & `vendor/`, then causes the project to update to the latest Composer and NPM dependencies
 - `make composer xxx` - runs the `composer` command passed in, e.g. `make composer install`
 
 ### XDebug with VScode