Merge branch 'release/1.38.3'

.github/workflows/build.yml

@@ -0,0 +1,24 @@
+name: dpc-sdp/ripple/build
+on:
+  workflow_call:
+env:
+  CONTENT_API_SERVER: ${{ vars.CONTENT_API_SERVER }}
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+      - uses: actions/[email protected]
+        with:
+          node-version: '14'
+      - name: Restore cache
+        uses: actions/[email protected]
+        with:
+          key: v10-deps-${{ hashFiles('yarn.lock') }}
+          path: | 
+            ./.cache
+            **/node_modules
+      - name: Install Dependencies
+        run:  yarn install --frozen-lockfile --cache-folder .cache/yarn
+      - name: Build reference nuxt app
+        run:  yarn reference:build

.github/workflows/canary-npm-release.yml

@@ -0,0 +1,26 @@
+name: dpc-sdp/ripple/canary-npm-release
+on:
+  push:
+    branches:
+      # Uncomment below once testing has been completed and we are ready to publish using this workflow
+      #- uat
+      - 'github-action/disable-workflow'
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+  test:
+    needs:
+      - build
+    uses: ./.github/workflows/test.yml
+  create-prerelease:
+    needs:
+      - test
+    uses: ./.github/workflows/create-release.yml
+    with:
+      canary-prerelease: true
+  tag-release:
+    needs:
+    - create-prerelease
+    permissions:
+      contents: write
+    uses: ./.github/workflows/tag-release.yml

.github/workflows/commit.yml

@@ -0,0 +1,35 @@
+name: dpc-sdp/ripple/commit
+on:
+  workflow_call:
+  push:
+    branches-ignore:
+      - master
+env:
+  CHROMATIC_APP_CODE: ${{ secrets.CHROMATIC_APP_CODE }}
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+  test:
+    needs:
+      - build
+    uses: ./.github/workflows/test.yml
+  storybook:
+    runs-on: ubuntu-latest
+    needs:
+    - build
+    steps:
+    - uses: actions/[email protected]
+      with:
+        fetch-depth: 0 # 👈 Required to retrieve git history
+    - uses: actions/[email protected]
+      with:
+        node-version: '14'
+    - name: Restore cache
+      uses: actions/[email protected]
+      with:
+        key: v10-deps-${{ hashFiles('yarn.lock') }}
+        path: | 
+          ./.cache
+          **/node_modules
+    - name: Run UI test
+      run: cd src && yarn chromatic --project-token $CHROMATIC_APP_CODE --exit-zero-on-changes  

.github/workflows/create-release.yml

@@ -0,0 +1,29 @@
+name: dpc-sdp/ripple/create-release
+on:
+  workflow_call:
+    inputs:
+      canary-prerelease:
+        type: boolean
+        default: false
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+      - name: Restore cache
+        uses: actions/[email protected]
+        with:
+          key: v10-deps-${{ hashFiles('yarn.lock') }}
+          path: | 
+            ./.cache
+            **/node_modules
+      - name: Authenticate with registry
+        run: |-
+          echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > .npmrc
+          git update-index --assume-unchanged .npmrc
+      - name: Publish pre-release packages to NPM
+        if: inputs.canary-prerelease == true
+        run: npx lerna publish from-package --canary --force-publish --no-push --dist-tag dev --yes --no-verify-access
+      - name: Publish packages to NPM
+        if: inputs.canary-prerelease == false
+        run: npx lerna publish from-package --force-publish --yes --no-verify-access

.github/workflows/nightwatch.yml

@@ -0,0 +1,72 @@
+name: dpc-sdp/ripple/nightwatch
+on:
+  workflow_dispatch:
+    inputs:
+      e2e:
+        type: boolean
+        required: true
+      e2e_project:
+        type: string
+        required: true
+      e2e_be_url:
+        type: string
+      e2e_fe_url:
+        type: string
+jobs:
+  e2e_be:
+    if: inputs.e2e
+    uses: dpc-sdp/github-actions/.github/workflows/run_e2e_be.yml@main
+    secrets: inherit
+    with:
+      tags: "(@core or @${{ inputs.e2e_project }}) and @regression"
+      be_url: ${{ inputs.e2e_be_url }}
+      project: ${{ inputs.e2e_project }}
+      browser: 'chrome'
+      test_id: 'fixture'
+      test_type: ':nightwatch:'
+      runner: 'ubuntu-latest'
+  e2e_fe_smoke:
+    if: inputs.e2e
+    uses: dpc-sdp/github-actions/.github/workflows/run_e2e_fe.yml@main
+    secrets: inherit
+    with:
+      tags: "(@smoke and @core) or (@smoke and @${{ inputs.e2e_project }})"
+      be_url: ${{ inputs.e2e_be_url }}
+      fe_url: ${{ inputs.e2e_fe_url }}
+      project: ${{ inputs.e2e_project }}
+      browser: 'chrome'
+      test_id: 'fixture'
+      test_type: ':nightwatch:'
+      runner: 'ubuntu-latest'
+  e2e_fe_chrome:
+    needs:
+      - e2e_be
+      - e2e_fe_smoke
+    if: inputs.e2e
+    uses: dpc-sdp/github-actions/.github/workflows/run_e2e_fe.yml@main
+    secrets: inherit
+    with:
+      tags: "(@core or @${{ inputs.e2e_project }}) and @regression and not @mobile"
+      be_url: ${{ inputs.e2e_be_url }}
+      fe_url: ${{ inputs.e2e_fe_url }}
+      project: ${{ inputs.e2e_project }}
+      browser: 'chrome'
+      test_id: 'fixture'
+      test_type: ':nightwatch:'
+      runner: 'ubuntu-latest'
+  e2e_fe_android:
+    needs:
+      - e2e_be
+      - e2e_fe_smoke
+    if: inputs.e2e
+    uses: dpc-sdp/github-actions/.github/workflows/run_e2e_fe.yml@main
+    secrets: inherit
+    with:
+      tags: "(@core or @${{ inputs.e2e_project }}) and @regression and not @desktop"
+      be_url: ${{ inputs.e2e_be_url }}
+      fe_url: ${{ inputs.e2e_fe_url }}
+      project: ${{ inputs.e2e_project }}
+      browser: 'androidChrome'
+      test_id: 'fixture'
+      test_type: ':nightwatch:'
+      runner: 'ubuntu-latest'

.github/workflows/publish-to-npm.yml

@@ -0,0 +1,53 @@
+name: dpc-sdp/ripple/publish-to-npm
+on:
+  push:
+    branches:
+      # Uncomment below once testing has been completed and we are ready to publish using this workflow
+      #- master
+      - 'github-action/disable-workflow'
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+  test:
+    needs:
+      - build
+    uses: ./.github/workflows/test.yml
+  confirm-release:
+    environment:
+      name: approval
+    runs-on: ubuntu-latest
+    needs:
+    - test
+    steps:
+    - run: echo 'approved'
+  create-release:
+    needs:
+    - confirm-release
+    uses: ./.github/workflows/create-release.yml
+  tag-release:
+    needs:
+    - create-release
+    permissions:
+      contents: write
+    uses: ./.github/workflows/tag-release.yml
+  create-release-notes:
+    runs-on: ubuntu-latest
+    needs:
+    - tag-release
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/[email protected]
+    - name: Restore cache
+      uses: actions/[email protected]
+      with:
+        key: v10-deps-${{ hashFiles('yarn.lock') }}
+        path: | 
+          ./.cache
+          **/node_modules
+    - name: Install github-release-notes package
+      run: yarn add -D -W github-release-notes
+    - name: Generate release notes and publish to GitHub
+      run: |-
+        PACKAGE_VERSION=$(node -pe "require('./lerna.json')['version']")
+        npx gren release --data-source=commits --tags=v$PACKAGE_VERSION --override --token ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tag-release.yml

@@ -0,0 +1,19 @@
+name: dpc-sdp/ripple/tag-release
+on:
+  workflow_call:
+jobs:
+  tag-release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/[email protected]
+    - name: Git tag the release with the `lerna.json` version number
+      run: |-
+        PACKAGE_VERSION=$(node -pe "require('./lerna.json')['version']")
+        git tag v$PACKAGE_VERSION
+    - name: Push git tag to the remote repository
+      run: |-
+        PACKAGE_VERSION=$(node -pe "require('./lerna.json')['version']")
+        echo $PACKAGE_VERSION
+        git push -q https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git v$PACKAGE_VERSION

.github/workflows/test.yml

@@ -0,0 +1,34 @@
+name: dpc-sdp/ripple/test
+on:
+  workflow_call:
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/[email protected]
+    - uses: actions/[email protected]
+      with:
+        node-version: '14'
+    - name: Restore cache
+      uses: actions/[email protected]
+      with:
+        key: v10-deps-${{ hashFiles('yarn.lock') }}
+        path: | 
+          ./.cache
+          **/node_modules
+    - name: Lint code.
+      run: yarn lint --format ./node_modules/eslint-junit/index.js
+      env:
+        ESLINT_JUNIT_OUTPUT: "./test-results/lint/eslint.xml"
+    - name: Unit tests
+      run: yarn test:unit --ci --runInBand --reporters=default --reporters=jest-junit
+      env:
+        JEST_JUNIT_OUTPUT_DIR: test-results/unit/
+    - name: Upload test results
+      uses: actions/[email protected]
+      with:
+        name: Test results
+        path: |
+          test-results
+          examples/reference/test/integration/videos
+          examples/reference/test/integration/screenshots    

examples/basic-examples/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basic-examples",
-  "version": "1.38.2",
+  "version": "1.38.3",
   "description": "Example site for showing how to add custom work",
   "private": true,
   "scripts": {
@@ -21,7 +21,7 @@
     "start:build": "nuxt build --modern=client && nuxt start --modern=client"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-nuxt-tide": "1.38.2",
+    "@dpc-sdp/ripple-nuxt-tide": "1.38.3",
     "dotenv": "^5.0.1",
     "nuxt": "2.15.2",
     "run-script-os": "^1.1.3"
@@ -34,7 +34,7 @@
     "@babel/plugin-transform-runtime": "^7.12.13",
     "@babel/preset-env": "^7.12.13",
     "@babel/runtime": "^7.12.13",
-    "@dpc-sdp/ripple-test-tools": "1.38.2",
+    "@dpc-sdp/ripple-test-tools": "1.38.3",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^24.8.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",

examples/reference/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reference",
-  "version": "1.38.2",
+  "version": "1.38.3",
   "description": "Reference nuxt site using Ripple front end and connecting to Tide backend",
   "private": true,
   "scripts": {
@@ -20,8 +20,8 @@
     "start:build": "nuxt build --modern=client && nuxt start --modern=client"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-data-vic-api": "1.38.2",
-    "@dpc-sdp/ripple-nuxt-tide": "1.38.2",
+    "@dpc-sdp/ripple-data-vic-api": "1.38.3",
+    "@dpc-sdp/ripple-nuxt-tide": "1.38.3",
     "@nuxtjs/gtm": "^2.4.0",
     "@nuxtjs/robots": "^2.0.0",
     "dotenv": "^5.0.1",
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.12.13",
     "@babel/eslint-plugin": "^7.12.13",
-    "@dpc-sdp/ripple-test-tools": "1.38.2",
+    "@dpc-sdp/ripple-test-tools": "1.38.3",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^7.0.3",
     "eslint": "^7.19.0",

examples/vue-example-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ripple-app",
-  "version": "1.38.2",
+  "version": "1.38.3",
   "description": "Example Vue.js app(Not Nuxt.js) for showing how to use Ripple",
   "private": true,
   "scripts": {
@@ -14,17 +14,17 @@
     "test:dev": "cross-env NODE_ENV=test start-server-and-test serve http://localhost:3000 cy:open"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-accordion": "1.38.2",
-    "@dpc-sdp/ripple-button": "1.38.2",
-    "@dpc-sdp/ripple-card": "1.38.2",
-    "@dpc-sdp/ripple-markup": "1.38.2",
+    "@dpc-sdp/ripple-accordion": "1.38.3",
+    "@dpc-sdp/ripple-button": "1.38.3",
+    "@dpc-sdp/ripple-card": "1.38.3",
+    "@dpc-sdp/ripple-markup": "1.38.3",
     "core-js": "^3.8.1",
     "vue": "^2.6.12"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.12.13",
     "@babel/eslint-plugin": "^7.12.13",
-    "@dpc-sdp/ripple-test-tools": "1.38.2",
+    "@dpc-sdp/ripple-test-tools": "1.38.3",
     "@vue/babel-preset-app": "^4.5.11",
     "@vue/cli-plugin-babel": "^4.5.11",
     "@vue/cli-plugin-eslint": "^4.5.11",

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.38.2",
+  "version": "1.38.3",
   "exact": true,
   "npmClient": "yarn",
   "useWorkspaces": true,