From 6edab24e0734ac06cc7f36eb4f71a2f8e8fc89dc Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 12:21:28 +1300 Subject: [PATCH 1/6] MNT Update development dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 82baed3..e5c302c 100755 --- a/composer.json +++ b/composer.json @@ -9,11 +9,11 @@ "type": "silverstripe-vendormodule", "require": { "php": "^7.4 || ^8.0", - "silverstripe/cms": "^4.0", + "silverstripe/cms": "4.13.x-dev", "silverstripe/lumberjack": "^2.0", - "silverstripe/tagfield": "^2.0", - "silverstripe/assets": "^1.0", - "silverstripe/asset-admin": "^1.0" + "silverstripe/tagfield": "2.11.x-dev", + "silverstripe/assets": "1.13.x-dev", + "silverstripe/asset-admin": "1.13.x-dev" }, "require-dev": { "silverstripe/recipe-testing": "^2", @@ -55,4 +55,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} +} \ No newline at end of file From 508c985ebec4b1e89bf8ca9eb236d957b9f176a2 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:32:36 +1300 Subject: [PATCH 2/6] MNT Update release dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index e5c302c..af299c5 100755 --- a/composer.json +++ b/composer.json @@ -9,11 +9,11 @@ "type": "silverstripe-vendormodule", "require": { "php": "^7.4 || ^8.0", - "silverstripe/cms": "4.13.x-dev", + "silverstripe/cms": "4.13.0-beta1", "silverstripe/lumberjack": "^2.0", - "silverstripe/tagfield": "2.11.x-dev", - "silverstripe/assets": "1.13.x-dev", - "silverstripe/asset-admin": "1.13.x-dev" + "silverstripe/tagfield": "2.11.0-beta1", + "silverstripe/assets": "1.13.0-beta1", + "silverstripe/asset-admin": "1.13.0-beta1" }, "require-dev": { "silverstripe/recipe-testing": "^2", From 160cc023bb4fba80778aca25d717f8511ae62de1 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:32:39 +1300 Subject: [PATCH 3/6] MNT Update development dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index af299c5..e5c302c 100755 --- a/composer.json +++ b/composer.json @@ -9,11 +9,11 @@ "type": "silverstripe-vendormodule", "require": { "php": "^7.4 || ^8.0", - "silverstripe/cms": "4.13.0-beta1", + "silverstripe/cms": "4.13.x-dev", "silverstripe/lumberjack": "^2.0", - "silverstripe/tagfield": "2.11.0-beta1", - "silverstripe/assets": "1.13.0-beta1", - "silverstripe/asset-admin": "1.13.0-beta1" + "silverstripe/tagfield": "2.11.x-dev", + "silverstripe/assets": "1.13.x-dev", + "silverstripe/asset-admin": "1.13.x-dev" }, "require-dev": { "silverstripe/recipe-testing": "^2", From f60541f18d65eb58fa4b95aea93c5d82da452f9e Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Tue, 28 Mar 2023 17:01:53 +1300 Subject: [PATCH 4/6] MNT Revert erroneous dependency changes (#704) --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index e5c302c..2ff1447 100755 --- a/composer.json +++ b/composer.json @@ -9,11 +9,11 @@ "type": "silverstripe-vendormodule", "require": { "php": "^7.4 || ^8.0", - "silverstripe/cms": "4.13.x-dev", + "silverstripe/cms": "^4.0", "silverstripe/lumberjack": "^2.0", - "silverstripe/tagfield": "2.11.x-dev", - "silverstripe/assets": "1.13.x-dev", - "silverstripe/asset-admin": "1.13.x-dev" + "silverstripe/tagfield": "^2.0", + "silverstripe/assets": "^1.0", + "silverstripe/asset-admin": "^1.0" }, "require-dev": { "silverstripe/recipe-testing": "^2", From 692c8fc390e689ae3e54bb8578046c9cffeeeda4 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Mon, 3 Apr 2023 14:28:32 +1200 Subject: [PATCH 5/6] MNT Update dev JS --- package.json | 4 ++-- yarn.lock | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 7a1101c..6af38ad 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,8 @@ "homepage": "https://github.com/silverstripe/silverstripe-blog#readme", "dependencies": {}, "devDependencies": { - "@silverstripe/eslint-config": "^1.0.0-alpha6", - "@silverstripe/webpack-config": "^2.0.0-alpha5", + "@silverstripe/eslint-config": "^1.0.0", + "@silverstripe/webpack-config": "^2.0.0", "webpack": "^5.74.0", "webpack-cli": "^5.0.0" }, diff --git a/yarn.lock b/yarn.lock index 0c62ef7..fe89cda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1261,10 +1261,10 @@ resolved "https://registry.yarnpkg.com/@sect/modernizr-loader/-/modernizr-loader-1.0.3.tgz#7fd8cec372426c53f113f3cfd9344cb29e959825" integrity sha512-47zKwv4/1I0CYptZz8s4aSYSe0awmuyqa+HFKxN89/75h2q8hr6V752TZ9VjhGDhQ4gU0EU7Plew7b+7bf2crg== -"@silverstripe/eslint-config@^1.0.0-alpha6": - version "1.0.0-alpha6" - resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.0.0-alpha6.tgz#1f243b003fddf3503a4abea37f35a8a5968cc96e" - integrity sha512-+P7UzhMRSmc7UlRYCiSXwjauLFYU11oBPwHl/bpacJ7xUcFY3Jt3CgcDt6d+XLvAJO8zMRsG9RcOm5MnxsyCsg== +"@silverstripe/eslint-config@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.0.0.tgz#dcf3f9cf2158bb587d8048a7c2860c0513221d40" + integrity sha512-pcHzB+6KWd8BPStBhHM8achdNY/Yj1p3WSTEs/CSw61VRcfBfg5GZECtvEerTSX/0ZeawAM1ABvstIAYihcfAg== dependencies: eslint "^8.26.0" eslint-config-airbnb "^19.0.4" @@ -1274,10 +1274,10 @@ eslint-plugin-react "^7.31.10" eslint-webpack-plugin "^3.2.0" -"@silverstripe/webpack-config@^2.0.0-alpha5": - version "2.0.0-alpha6" - resolved "https://registry.yarnpkg.com/@silverstripe/webpack-config/-/webpack-config-2.0.0-alpha6.tgz#4a781f600344c3604169de08244ca11cacbd46f7" - integrity sha512-cPux01Z6EGwnSg5EezaJZ1S2x4ThfA3TbpTWTsqmW2jvr1VM/7Xu8B3j2HFH+2fNP0dvdmu+fScCD6VPNVQNWw== +"@silverstripe/webpack-config@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@silverstripe/webpack-config/-/webpack-config-2.0.0.tgz#278a72a1adbc6fa2362497d60424c78fba58e8e1" + integrity sha512-m1qGRxlsdhWL567cWe7IZNBUCzeyg3T1Y9yY9Y6XClwAqlg1oIO9uLfvfauA4dbtECrzU5n1AkaaU6kMRtN6Aw== dependencies: "@babel/core" "^7.19.6" "@babel/preset-env" "^7.19.4" @@ -2140,6 +2140,11 @@ colorette@^2.0.14: resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== +colors@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + columnify@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3" From 05ed7e3be7bac9f3f30c5991fcf1c3b04045b37e Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 19 Apr 2023 16:00:33 +1200 Subject: [PATCH 6/6] DOC Update README.md for CMS 5 --- README.md | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/README.md b/README.md index 233719f..e407d10 100755 --- a/README.md +++ b/README.md @@ -8,16 +8,6 @@ * [User guide](docs/en/userguide/index.md) * [Developer documentation](docs/en/index.md) -## Requirements - -* Silverstripe CMS 4.0+ -* Silverstripe Lumberjack Module 2.0+ -* Silverstripe Tag Field Module 2.0+ -* Silverstripe Assets 1.0+ -* Silverstripe Asset Admin Module 1.0+ - -Note: this version is compatible with Silverstripe 4. For Silverstripe 3, please see [the 2.x release line](https://github.com/silverstripe/silverstripe-blog/tree/2). - ### Suggested Modules * Silverstripe Widgets Module @@ -28,13 +18,3 @@ Note: this version is compatible with Silverstripe 4. For Silverstripe 3, please ``` composer require silverstripe/blog ``` - -## Upgrading - -### Upgrading from 2.x to 3.x - -Aside from the framework and CMS upgrades required the blog module should not require anything extra to be completed. - -### Upgrading legacy blog to 2.x - -If you're upgrading from blog version 1.0 to 2.x you will need to run the `BlogMigrationTask`. Run the task using `dev/tasks/BlogMigrationTask` either via the browser or sake CLI to migrate your legacy blog to the new version data structure.