Merge branch 'release/4.0.0' into v4

nystudio107 · May 17, 2022 · 4d2ac65 · 4d2ac65
2 parents e7fd547 + 800d25d
commit 4d2ac65
Show file tree

Hide file tree

Showing 6 changed files with 267 additions and 240 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Units Changelog
 
+## 4.0.0 - 2022.05.17
+### Added
+* Initial Craft CMS 4 release
+
+### Fixed
+* Fixed an issue that would cause the field type to be unusable if you were running PHP 8 or later, due to additions in the token parser in PHP 8 ([#40](https://github.com/nystudio107/craft-units/issues/40))
+
 ## 4.0.0-beta.1 - 2022.03.17
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-units",
   "description": "Units is a plugin that can convert between any units of measure, and comes with a Field for content authors to use",
   "type": "craft-plugin",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0",
   "keywords": [
     "craft",
     "cms",
@@ -26,7 +26,7 @@
     }
   ],
   "require": {
-    "craftcms/cms": "^4.0.0-beta.1",
+    "craftcms/cms": "^4.0.0",
     "php-units-of-measure/php-units-of-measure": "^2.1.0"
   },
   "autoload": {

diff --git a/docs/Makefile b/docs/Makefile
@@ -9,15 +9,15 @@ DOCKERRUN=docker container run \
 	${CONTAINER}:${TAG}
 DOCSDEST?=../../../sites/nystudio107/web/docs/units
 
-.PHONY: docker build dev fix install lint update npm
+.PHONY: docker build dev fix install lint clean npm
 
 docker:
 	docker build \
 		. \
 		-t ${CONTAINER}:${TAG} \
 		--build-arg TAG=${TAG} \
 		--no-cache
-build: docker install update
+build: clean docker install
 	${DOCKERRUN} \
 		run docs:build
 	rm -rf ${DOCSDEST}
@@ -34,9 +34,9 @@ install: docker
 lint: docker install
 	${DOCKERRUN} \
 		run docs:lint
-update: docker
-	${DOCKERRUN} \
-		update
+clean:
+	rm -rf node_modules/
+	rm -f package-lock.json
 npm: docker
 	${DOCKERRUN} \
 		$(filter-out $@,$(MAKECMDGOALS))

diff --git a/docs/docs/.vitepress/config.js b/docs/docs/.vitepress/config.js
@@ -13,9 +13,9 @@ module.exports = {
     docsDir: 'docs/docs',
     docsBranch: 'develop',
     algolia: {
-      appId: '',
-      apiKey: '',
-      indexName: ''
+      appId: 'TVGT09IBL5',
+      apiKey: 'd2d2de61619265d05d80bf26ad24f9b4',
+      indexName: 'nystudio107-units'
     },
     editLinks: true,
     editLinkText: 'Edit this page on GitHub',