Merge branch 'release/2.1.0' into develop

dpc-sdp · Aug 9, 2023 · 2e5c491 · 2e5c491
2 parents 8fdeb16 + da7a3db
commit 2e5c491
Show file tree

Hide file tree

Showing 23 changed files with 321 additions and 42 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,22 +6,11 @@ on:
       - main
       - test-release
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - run: npm ci
-      - run: npm run build
-      - run: npm test
   publish:
-    needs: build
     runs-on: ubuntu-latest
     permissions:
       packages: write
-      contents: read
+      contents: write
     steps:
       - uses: actions/checkout@v3
       - name: Install pnpm
@@ -41,13 +30,12 @@ jobs:
           CYPRESS_INSTALL_BINARY: 0
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
         run: pnpm install --frozen-lockfile
-      - name: Create changelog and GitHub release
+      - name: Publish release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: pnpm run release:changelog
-      - name: Publish semantic release
-        env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          git config --global user.email "sdp.devs@dpc.vic.gov.au"
+          git config --global user.name "SDP Deploy"
           pnpm config set access public
           pnpm run release:publish --yes
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0",
+  "version": "2.1.0",
   "npmClient": "pnpm",
   "exact": true,
   "command": {

diff --git a/package.json b/package.json
@@ -17,12 +17,12 @@
     "build:storybook": "pnpm -F ripple-storybook static:build",
     "postinstall": "husky install && pnpm build",
     "preinstall": "npx only-allow pnpm",
-    "release": "pnpm release:version && pnpm release:changelog",
+    "release:prepare": "pnpm release:version && pnpm release:changelog",
     "release:version": "lerna version --force-publish --no-changelog --no-git-tag-version --no-push",
-    "release:changelog": "changelogen --bump --release --push && changelogen gh release",
+    "release:changelog": "changelogen --output --no-commit -r $(cat lerna.json | jq -r '.version')",
     "release:publish-alpha": "lerna publish --canary minor --preid alpha --dist-tag alpha --force-publish",
     "release:publish-next": "lerna publish --canary minor --preid next --dist-tag next --force-publish",
-    "release:publish": "lerna publish from-package",
+    "release:publish": "changelogen gh release && lerna publish from-package",
     "lint": "eslint . --ext .ts,.vue && stylelint 'packages/ripple-ui-core/**/*.css'",
     "test:unit": "jest --colors --runInBand",
     "test:components-core": "pnpm -F @dpc-sdp/ripple-ui-core test:components",

diff --git a/packages/eslint-config-ripple/package.json b/packages/eslint-config-ripple/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/eslint-config-ripple",
   "description": "ESLint config for Ripple projects",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",

diff --git a/packages/nuxt-ripple-analytics/package.json b/packages/nuxt-ripple-analytics/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/nuxt-ripple-analytics",
   "description": "Nuxt module for handling event tracking.",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
@@ -18,13 +18,13 @@
     "@dpc-sdp/nuxt-ripple": "workspace:*",
     "@dpc-sdp/ripple-tide-api": "workspace:*",
     "@dpc-sdp/ripple-tide-event": "workspace:*",
-    "@dpc-sdp/ripple-tide-topic": "workspace:*",
     "@dpc-sdp/ripple-tide-grant": "workspace:*",
     "@dpc-sdp/ripple-tide-landing-page": "workspace:*",
     "@dpc-sdp/ripple-tide-media": "workspace:*",
     "@dpc-sdp/ripple-tide-news": "workspace:*",
     "@dpc-sdp/ripple-tide-publication": "workspace:*",
     "@dpc-sdp/ripple-tide-search": "workspace:*",
+    "@dpc-sdp/ripple-tide-topic": "workspace:*",
     "@dpc-sdp/ripple-ui-core": "workspace:*",
     "@dpc-sdp/ripple-ui-forms": "workspace:*",
     "@nuxt/eslint-config": "^0.1.1"

diff --git a/packages/nuxt-ripple-cli/package.json b/packages/nuxt-ripple-cli/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/nuxt-ripple-cli",
   "description": "A CLI for simplifying common setup and scaffolding tasks",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",

diff --git a/packages/nuxt-ripple-preview/package.json b/packages/nuxt-ripple-preview/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/nuxt-ripple-preview",
   "description": "Adds support for drupal preview links in Ripple frontend sites",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/nuxt-ripple/package.json b/packages/nuxt-ripple/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/nuxt-ripple",
   "description": "Nuxt module for integrating Ripple and Tide",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/ripple-storybook/package.json b/packages/ripple-storybook/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "ripple-storybook",
   "description": "Ripple Storybook instance",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "private": true,
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/ripple-test-utils/package.json b/packages/ripple-test-utils/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.0.0",
   "name": "@dpc-sdp/ripple-test-utils",
   "description": "Test utils for Ripple sites",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/config/index.js",

diff --git a/packages/ripple-tide-api/package.json b/packages/ripple-tide-api/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-api",
   "description": "Ripple API endpoints for Tide Drupal backend",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",

diff --git a/packages/ripple-tide-event/package.json b/packages/ripple-tide-event/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-event",
   "description": "Ripple mappings and components for Tide Event Content type",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/ripple-tide-grant/package.json b/packages/ripple-tide-grant/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-grant",
   "description": "Ripple mappings and components for Tide Grant Content type",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-landing-page/package.json b/packages/ripple-tide-landing-page/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-landing-page",
   "description": "Ripple mappings and components for Tide landing-page Content type",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-media/package.json b/packages/ripple-tide-media/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-media",
   "description": "Ripple mappings and components for Tide media",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-news/package.json b/packages/ripple-tide-news/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-news",
   "description": "Ripple mappings and components for Tide News content type",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-publication/package.json b/packages/ripple-tide-publication/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-publication",
   "description": "Ripple mappings and components for Tide Publication Content type",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-search/package.json b/packages/ripple-tide-search/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-search",
   "description": "Ripple search UI and services for connecting to Tide search",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-topic/package.json b/packages/ripple-tide-topic/package.json
@@ -9,11 +9,11 @@
     "./mapping": "./mapping/index.ts",
     "./types": "./types.ts"
   },
-  "version": "2.1.0-alpha.188",
+  "version": "2.1.0",
   "dependencies": {
     "@dpc-sdp/nuxt-ripple": "workspace:*",
     "@dpc-sdp/ripple-tide-api": "workspace:*",
-    "@dpc-sdp/ripple-ui-core": "workspace:*",
-    "@dpc-sdp/ripple-tide-search": "workspace:*"
+    "@dpc-sdp/ripple-tide-search": "workspace:*",
+    "@dpc-sdp/ripple-ui-core": "workspace:*"
   }
 }
diff --git a/packages/ripple-ui-core/package.json b/packages/ripple-ui-core/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-ui-core",
   "description": "Ripple UI Core component library",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "files": [

diff --git a/packages/ripple-ui-forms/package.json b/packages/ripple-ui-forms/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-ui-forms",
   "description": "A form component library built with Formkit",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/rpl-forms.umd.js",

diff --git a/packages/stylelint-config-ripple/package.json b/packages/stylelint-config-ripple/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/stylelint-config-ripple",
   "description": "ESLint config for Ripple projects",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",