From 02d5a17e1f7a78a095db49b59c1d8efb828e842f Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 12:21:29 +1300 Subject: [PATCH 1/6] MNT Update development dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 61e7d97..f52fa81 100644 --- a/composer.json +++ b/composer.json @@ -15,9 +15,9 @@ ], "require": { "silverstripe/vendor-plugin": "^1.0", - "silverstripe/framework": "^4.10", - "silverstripe/cms": "^4.0", - "silverstripe/versioned": "^1.0" + "silverstripe/framework": "4.13.x-dev", + "silverstripe/cms": "4.13.x-dev", + "silverstripe/versioned": "1.13.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5", @@ -38,4 +38,4 @@ "license": "BSD-3-Clause", "minimum-stability": "dev", "prefer-stable": true -} +} \ No newline at end of file From 8ad05374731acd9b4cb80b57a4686c6005bb04dc Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:32:44 +1300 Subject: [PATCH 2/6] MNT Update release dependencies --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index f52fa81..d9f3841 100644 --- a/composer.json +++ b/composer.json @@ -15,9 +15,9 @@ ], "require": { "silverstripe/vendor-plugin": "^1.0", - "silverstripe/framework": "4.13.x-dev", - "silverstripe/cms": "4.13.x-dev", - "silverstripe/versioned": "1.13.x-dev" + "silverstripe/framework": "4.13.0-beta1", + "silverstripe/cms": "4.13.0-beta1", + "silverstripe/versioned": "1.13.0-beta1" }, "require-dev": { "phpunit/phpunit": "^9.5", From a9a20ab1c0e3fd78c2745911a73b0ce35f333d23 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:32:47 +1300 Subject: [PATCH 3/6] MNT Update development dependencies --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index d9f3841..f52fa81 100644 --- a/composer.json +++ b/composer.json @@ -15,9 +15,9 @@ ], "require": { "silverstripe/vendor-plugin": "^1.0", - "silverstripe/framework": "4.13.0-beta1", - "silverstripe/cms": "4.13.0-beta1", - "silverstripe/versioned": "1.13.0-beta1" + "silverstripe/framework": "4.13.x-dev", + "silverstripe/cms": "4.13.x-dev", + "silverstripe/versioned": "1.13.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5", From 2b53f5095c4162690a13b2b2294831d4dceda4ae Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Tue, 28 Mar 2023 17:02:24 +1300 Subject: [PATCH 4/6] MNT Revert erroneous dependency changes (#198) --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index f52fa81..faa3e52 100644 --- a/composer.json +++ b/composer.json @@ -15,9 +15,9 @@ ], "require": { "silverstripe/vendor-plugin": "^1.0", - "silverstripe/framework": "4.13.x-dev", - "silverstripe/cms": "4.13.x-dev", - "silverstripe/versioned": "1.13.x-dev" + "silverstripe/framework": "^4.10", + "silverstripe/cms": "^4.0", + "silverstripe/versioned": "^1.0" }, "require-dev": { "phpunit/phpunit": "^9.5", From 60d0c23587e31897905c52e212ccf1285e91c8b8 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Mon, 3 Apr 2023 14:40:59 +1200 Subject: [PATCH 5/6] MNT Update dev JS --- package.json | 7 +++---- yarn.lock | 16 ++++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 888542a..2868f8b 100644 --- a/package.json +++ b/package.json @@ -20,11 +20,10 @@ "lint": "eslint client/src && sass-lint client/src", "lint-fix": "eslint client/src --fix && sass-lint client/src --fix" }, - "dependencies": { - }, + "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 b0b5b77..43d227f 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" From 7e6ee59822bd689b3123e242fd49136821e8963e Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 19 Apr 2023 17:01:32 +1200 Subject: [PATCH 6/6] DOC Update README.md for CMS 5 --- README.md | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index e9ada92..8d08f16 100644 --- a/README.md +++ b/README.md @@ -8,19 +8,13 @@ Widgets are small pieces of functionality such as showing the latest comments or Flickr photos. They normally display on the sidebar of your website. -## Requirements - -* Silverstripe 4.0 - -**Note:** this version is compatible with Silverstripe 4. For Silverstripe 3, please see [the 1.x release line](https://github.com/silverstripe/silverstripe-widgets/tree/1.3). - -### Installation - -Install the module through [composer](http://getcomposer.org): +## Installation +```sh +composer require silverstripe/widgets ``` -$ composer require silverstripe/widgets -``` + +## Setup Widgets are essentially database relations to other models, mostly page types. By default, they're not added to any of your own models. The easiest and most common @@ -204,7 +198,7 @@ class FlickrWidget extends Widget ## Releasing a widget -Follow the [standard procedures defined for releasing a Silverstripe module](https://docs.silverstripe.org/en/4/developer_guides/extending/how_tos/publish_a_module). +Follow the [standard procedures defined for releasing a Silverstripe module](https://docs.silverstripe.org/en/developer_guides/extending/how_tos/publish_a_module). Here is a composer template you can use. @@ -215,17 +209,18 @@ You need to finish off / change: * keywords * license * author - * installer-name (eg: `widgets_carousel`) ```json { "name": "", "description": "", "type": "silverstripe-module", - "keywords" : ["widget"], + "keywords" : [ + "widget" + ], "require": { - "silverstripe/framework": "^4.0", - "silverstripe/cms": "^4.0" + "silverstripe/framework": "^5.0", + "silverstripe/cms": "^5.0" }, "license": "BSD-2-Clause", "authors": [ @@ -234,9 +229,6 @@ You need to finish off / change: "email": "" } ], - "extra" : { - "installer-name": "widgets_" - }, "autoload": { "psr-4": { "Yourname\\MyWidget\\": "src/" @@ -423,4 +415,4 @@ and any new translations will be merged back to the project source code. Please use [https://www.transifex.com/projects/p/silverstripe-widgets/](https://www.transifex.com/projects/p/silverstripe-widgets/) to contribute translations, rather than sending pull requests with YAML files. -See the ["i18n" topic](https://docs.silverstripe.org/en/4/developer_guides/i18n/) on doc.silverstripe.org for more details. +See the ["i18n" topic](https://docs.silverstripe.org/en/developer_guides/i18n/) on docs.silverstripe.org for more details.