chore(): merge feature-7.0 into main

chore(): merge feature-7.0 into main

Author: liamdebeasi

.github/workflows/actions/publish-npm/action.yml

@@ -7,6 +7,8 @@ inputs:
     description: 'The type of version to release.'
   tag:
     description: 'The tag to publish to on NPM.'
+  preid:
+    description: 'The prerelease identifier used when doing a prerelease.'
   working-directory:
     description: 'The directory of the package.'
   folder:
@@ -25,7 +27,7 @@ runs:
       shell: bash
       working-directory: ${{ inputs.working-directory }}
     - name: Update Version
-      run: lerna version ${{ inputs.version }} --yes --exact --no-changelog --no-push --no-git-tag-version
+      run: lerna version ${{ inputs.version }} --yes --exact --no-changelog --no-push --no-git-tag-version --preid=${{ inputs.preid }}
       shell: bash
       working-directory: ${{ inputs.working-directory }}
     - name: Run Build

.github/workflows/build.yml

@@ -135,7 +135,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        apps: [ng12, ng13, ng14, ng15]
+        apps: [ng14, ng15]
     needs: [build-angular, build-angular-server]
     runs-on: ubuntu-latest
     steps:

.github/workflows/release-ionic.yml

@@ -11,6 +11,9 @@ on:
         description: 'The tag to publish to NPM.'
         type: string
         required: true
+      preid:
+        description: 'The prerelease identifier used when doing a prerelease.'
+        type: string
     secrets:
       NPM_TOKEN:
         required: true
@@ -25,6 +28,7 @@ jobs:
         scope: '@ionic/core'
         tag: ${{ inputs.tag }}
         version: ${{ inputs.version }}
+        preid: ${{ inputs.preid }}
         working-directory: 'core'
         token: ${{ secrets.NPM_TOKEN }}
     - name: Cache Built @ionic/core
@@ -56,6 +60,7 @@ jobs:
         scope: '@ionic/docs'
         tag: ${{ inputs.tag }}
         version: ${{ inputs.version }}
+        preid: ${{ inputs.preid }}
         working-directory: 'docs'
         token: ${{ secrets.NPM_TOKEN }}
 
@@ -75,6 +80,7 @@ jobs:
         scope: '@ionic/angular'
         tag: ${{ inputs.tag }}
         version: ${{ inputs.version }}
+        preid: ${{ inputs.preid }}
         working-directory: 'angular'
         folder: './dist'
         token: ${{ secrets.NPM_TOKEN }}
@@ -101,6 +107,7 @@ jobs:
         scope: '@ionic/react'
         tag: ${{ inputs.tag }}
         version: ${{ inputs.version }}
+        preid: ${{ inputs.preid }}
         working-directory: 'packages/react'
         token: ${{ secrets.NPM_TOKEN }}
     - name: Cache Built @ionic/react
@@ -126,6 +133,7 @@ jobs:
         scope: '@ionic/vue'
         tag: ${{ inputs.tag }}
         version: ${{ inputs.version }}
+        preid: ${{ inputs.preid }}
         working-directory: 'packages/vue'
         token: ${{ secrets.NPM_TOKEN }}
     - name: Cache Built @ionic/vue
@@ -157,6 +165,7 @@ jobs:
         scope: '@ionic/angular-server'
         tag: ${{ inputs.tag }}
         version: ${{ inputs.version }}
+        preid: ${{ inputs.preid }}
         working-directory: 'packages/angular-server'
         folder: './dist'
         token: ${{ secrets.NPM_TOKEN }}
@@ -183,6 +192,7 @@ jobs:
         scope: '@ionic/react-router'
         tag: ${{ inputs.tag }}
         version: ${{ inputs.version }}
+        preid: ${{ inputs.preid }}
         working-directory: 'packages/react-router'
         token: ${{ secrets.NPM_TOKEN }}
 
@@ -208,5 +218,6 @@ jobs:
         scope: '@ionic/vue-router'
         tag: ${{ inputs.tag }}
         version: ${{ inputs.version }}
+        preid: ${{ inputs.preid }}
         working-directory: 'packages/vue-router'
         token: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

@@ -11,21 +11,36 @@ on:
           - patch
           - minor
           - major
+          - prepatch
+          - preminor
+          - premajor
+          - prerelease
       tag:
         required: true
         type: choice
         description: Which npm tag should this be published to?
         options:
           - latest
+          - next
           - v5-lts
           - v4-lts
+      preid:
+        type: choice
+        description: Which prerelease identifier should be used? This is only needed when version is "prepatch", "preminor", "premajor", or "prerelease".
+        options:
+          - ''
+          - alpha
+          - beta
+          - rc
+          - next
 
 jobs:
   release-ionic:
     uses: ./.github/workflows/release-ionic.yml
     with:
       tag: ${{ inputs.tag }}
       version: ${{ inputs.version }}
+      preid: ${{ inputs.preid }}
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
@@ -48,7 +63,7 @@ jobs:
         git config user.email [email protected]
       shell: bash
     - name: Create GitHub Release
-      run: lerna version ${{ inputs.version }} --yes --force-publish='*' --conventional-commits --create-release github
+      run: lerna version ${{ inputs.version }} --yes --force-publish='*' --conventional-commits --create-release github --preid=${{ inputs.preid }}
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       shell: bash