Merge pull request #20 from jcdcdev/dev/v14

feature: v14 support (WIP)

Author: jcdcdev

.github/README.md

@@ -1,8 +1,8 @@
 # jcdcdev.Umbraco.ReadingTime
 
-[![Umbraco Version](https://img.shields.io/badge/Umbraco-10.4+-%233544B1?style=flat&logo=umbraco)](https://marketplace.umbraco.com/package/jcdcdev.umbraco.readingtime)
-[![GitHub license](https://img.shields.io/github/license/jcdcdev/jcdcdev.Umbraco.ReadingTime?color=8AB803&label=License)](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/blob/main/LICENSE)
-[![NuGet Downloads](https://img.shields.io/nuget/dt/jcdcdev.Umbraco.ReadingTime?color=cc9900&label=NuGet)](https://www.nuget.org/packages/jcdcdev.Umbraco.ReadingTime/)
+[![Umbraco Marketplace](https://img.shields.io/badge/Umbraco-Marketplace-%233544B1?style=flat&logo=umbraco)](https://marketplace.umbraco.com/package/jcdcdev.umbraco.readingtime)
+[![GitHub License](https://img.shields.io/github/license/jcdcdev/jcdcdev.Umbraco.ReadingTime?color=8AB803&label=License&logo=github)](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/blob/main/LICENSE)
+[![NuGet Downloads](https://img.shields.io/nuget/dt/jcdcdev.Umbraco.ReadingTime?color=cc9900&label=Downloads&logo=nuget)](https://www.nuget.org/packages/jcdcdev.Umbraco.ReadingTime/)
 
 Custom Data Type for calculating reading time. With full variant support! 
 
@@ -51,27 +51,17 @@ Min and max `TimeUnit` values are derived from the Data Type settings. The below
  Model.ReadingTime.DisplayTime(minUnit: TimeUnit.Second, maxUnit: TimeUnit.Second)
 ```
 
-
-
 ## Configuration
 
 You can change the average words per minute in the data type settings.
 
-When creating a new data type, the default will be 200 words per minute. To change this default, adjust your `appsettings.json` file:
-
-```json
-{
-  "ReadingTime": {
-    "WordsPerMinute": 200
-  }
-}
-```
+When creating a new data type, the default will be 200 words per minute.
 
 ## Limitations
 
 **Values are derived from published content only.** 
 
-Draft content is _not_ included in the calculation.
+Unpublished (saved) content is _not_ included in the calculation.
 
 **Words per minute applies to all variants.**
 
@@ -116,7 +106,7 @@ public class Composer : IComposer
 
 ## Contributing
 
-Contributions to this package are most welcome! Please read the [Contributing Guidelines](CONTRIBUTING.md).
+Contributions to this package are most welcome! Please read the [Contributing Guidelines](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/blob/main/.github/CONTRIBUTING.md).
 
 ## Acknowledgments (thanks!)
 

.github/workflows/build.yml

@@ -7,9 +7,15 @@ jobs:
   metadata:
     uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@main
   build:
-    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/build-template.yml@main
+    runs-on: ubuntu-latest
     needs:
       - metadata
-    with:
-      project-name: ${{ needs.metadata.outputs.project-name }}
-      project-path: ${{ needs.metadata.outputs.project-path }}
+    steps:
+      - name: Build
+        uses: jcdcdev/jcdcdev.Umbraco.Github.Build@main
+        with:
+          project-name: ${{ needs.metadata.outputs.project-name}}
+          project-path: ${{ needs.metadata.outputs.project-path }}
+          npm-working-dir: ${{ needs.metadata.outputs.npm-working-dir }}
+          npm-enabled: true
+          umbraco-version: 14

.github/workflows/release.yml

@@ -1,24 +1,31 @@
 name: 🚀 Release
 on:
   workflow_dispatch:
+  pull_request:
+    types: [ closed ]
 jobs:
   metadata:
-    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@main
-  build:
-    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/build-template.yml@main    
-    needs: 
-      - metadata
-    with:
-      project-name: ${{ needs.metadata.outputs.project-name}}
-      project-path: ${{ needs.metadata.outputs.project-path }}
+    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@dev
   release:
-    needs: 
-      - build
+    runs-on: ubuntu-latest
     permissions:
       contents: write
-    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/release-template.yml@main
-    with:
-      artifact-name: ${{ needs.build.outputs.artifact-name }}
-      version: ${{ needs.build.outputs.version }}
-    secrets:
-      nuget-api-key: ${{ secrets.NUGET_API_KEY }}
+    needs:
+      - metadata
+    steps:
+      - name: Build
+        id: build
+        uses: jcdcdev/jcdcdev.Umbraco.GitHub.Build@main
+        with:
+          project-name: ${{ needs.metadata.outputs.project-name}}
+          project-path: ${{ needs.metadata.outputs.project-path }}
+          npm-working-dir: ${{ needs.metadata.outputs.npm-working-dir }}
+          npm-enabled: true
+          umbraco-version: 14
+      - name: Release
+        uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@main
+        with:
+          artifact-name: ${{ steps.build.outputs.artifact-name }}
+          version: ${{ steps.build.outputs.version }}
+          nuget-api-key: ${{ secrets.NUGET_API_KEY }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sync-branches.yml

@@ -0,0 +1,63 @@
+name: 🔃 Sync branches
+
+on:
+  push:
+    branches:
+      - 'v*'
+  workflow_dispatch:
+
+jobs:
+  check-branch:
+    runs-on: ubuntu-latest
+    outputs:
+      is-valid-branch: ${{ steps.branch_check.outputs.is-valid-branch }}
+    steps:
+      - name: Check if branch name starts with 'v'
+        id: branch_check
+        run: |
+          BRANCH_NAME=${{ github.ref }}
+          if [[ $BRANCH_NAME =~ refs/heads/v.* ]]; then
+            VALID=true
+          else
+            VALID=false
+          fi
+
+          echo "is-valid-branch=$VALID" >> $GITHUB_OUTPUT
+  merge-branches:
+    needs: check-branch
+    permissions:
+      contents: write
+    if: needs.check-branch.outputs.is-valid-branch == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Merge into dev/v**
+        run: |
+          # Extract the version number from the branch name
+          VERSION=$(echo "${GITHUB_REF}" | sed -n 's#refs/heads/v\([0-9]\+\)#\1#p')
+          SOURCE_BRANCH="v${VERSION}"
+          TARGET_BRANCH="dev/v${VERSION}"
+          # Set git config
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
+
+
+          echo "Merging $SOURCE_BRANCH into $TARGET_BRANCH"
+
+          # Checkout the source branch
+          git checkout $SOURCE_BRANCH
+          git pull origin $SOURCE_BRANCH
+          echo "Pulled latest for $SOURCE_BRANCH"
+
+          # Merge into the target branch
+          git checkout $TARGET_BRANCH
+          git merge --no-ff $SOURCE_BRANCH -m "Merge v$VERSION into dev/v$VERSION"
+          echo "Merged $SOURCE_BRANCH into $TARGET_BRANCH"
+
+          # Push changes
+          git push origin $TARGET_BRANCH
+          echo "Pushed changes to $TARGET_BRANCH"
+

.gitignore

@@ -358,3 +358,4 @@ src/.idea
 .idea/
 *.csproj.DotSettings
 **/umbraco/Data/TEMP/
+/src/jcdcdev.Umbraco.ReadingTime/wwwroot/App_Plugins/jcdcdev.Umbraco.ReadingTime/dist/

docs/README_nuget.md

@@ -0,0 +1,26 @@
+# jcdcdev.Umbraco.ReadingTime
+
+[![Documentation](https://img.shields.io/badge/Docs-Quickstart-394933?style=flat&logo=github)](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/tree/main?tab=readme-ov-file#quick-start)
+[![Umbraco Marketplace](https://img.shields.io/badge/Umbraco-Marketplace-%233544B1?style=flat&logo=umbraco)](https://marketplace.umbraco.com/package/jcdcdev.umbraco.readingtime)
+[![GitHub License](https://img.shields.io/github/license/jcdcdev/jcdcdev.Umbraco.ReadingTime?color=8AB803&label=License&logo=github)](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/blob/main/LICENSE)
+[![NuGet Downloads](https://img.shields.io/nuget/dt/jcdcdev.Umbraco.ReadingTime?color=cc9900&label=Downloads&logo=nuget)](https://www.nuget.org/packages/jcdcdev.Umbraco.ReadingTime/)
+
+Custom Data Type for calculating reading time. With full variant support!
+
+The following editors are currently supported:
+
+- Rich Text
+- Markdown
+- Block Grid
+- Block List
+- Nested Content
+- Textstring
+- Textarea
+
+## Contributing
+
+Contributions to this package are most welcome! Please read the [Contributing Guidelines](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/blob/main/.github/CONTRIBUTING.md).
+
+## Acknowledgments (thanks!)
+
+- LottePitcher - [opinionated-package-starter](https://github.com/LottePitcher/opinionated-package-starter)