Release v1.35.0 Fix merge conflict

dpc-sdp · Mar 22, 2023 · 7936362 · 7936362
2 parents 1008a6c + a6ac15e
commit 7936362
Show file tree

Hide file tree

Showing 75 changed files with 1,168 additions and 591 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -88,82 +88,6 @@ jobs:
       - store_artifacts:
           path: examples/reference/test/integration/screenshots
 
-
-
-  reference-integration:
-    # Integration tests confirm FE components are working correctly without testing BE
-    <<: *defaults
-    executor: cypress
-    parallelism: 2
-    steps:
-      - attach_workspace:
-          at: ~/app
-      - restore_cache:
-          keys:
-            - v10-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
-      - run:
-          name: run full integration test
-          command: yarn reference:integration
-      - store_artifacts:
-          path: test-results
-      - store_test_results:
-          path: test-results
-      - store_artifacts:
-          path: examples/reference/test/integration/videos
-      - store_artifacts:
-          path: examples/reference/test/integration/screenshots
-
-
-  integration-example:
-    # This runs the full suite of integration tests on example nuxt tide app
-    <<: *defaults
-    executor: cypress
-    steps:
-      - attach_workspace:
-          at: ~/app
-      - restore_cache:
-          keys:
-            - v10-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
-      - run:
-          name: build example nuxt app
-          command: cd examples/basic-examples && yarn build:default
-      - run:
-          name: run full integration test
-          command: yarn test:integration-example
-      - store_test_results:
-          path: test-results
-      - store_artifacts:
-          path: test-results
-      - store_artifacts:
-          path: examples/basic-examples/test/integration/videos
-      - store_artifacts:
-          path: examples/basic-examples/test/integration/screenshots
-
-  integration-vue-example-app:
-  # This runs the full suite of integration tests on example vue example app
-    <<: *defaults
-    executor: cypress
-    steps:
-      - attach_workspace:
-          at: ~/app
-      - restore_cache:
-          keys:
-            - v10-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
-      - run:
-          name: build example nuxt app
-          command: cd examples/vue-example-app && yarn build
-      - run:
-          name: run smoke test
-          command: cd examples/vue-example-app && yarn test:smoke
-      - store_test_results:
-          path: test-results
-      - store_artifacts:
-          path: test-results
-      - store_artifacts:
-          path: examples/vue-example-app/test/integration/videos
-      - store_artifacts:
-          path: examples/vue-example-app/test/integration/screenshots
-
   storybook:
     <<: *defaults
     executor: default
@@ -266,21 +190,6 @@ workflows:
           context: Ripple
           requires:
             - build
-      # Run regression tests on release branches
-      - reference-integration:
-          requires:
-            - build
-          filters:
-            branches:
-              only:
-                - /^release\/.*/
-      # - integration-vue-example-app:
-      #     requires:
-      #       - build
-      #     filters:
-      #       branches:
-      #         only:
-      #           - /^release\/.*/
 
   # Builds modules, verifies code with the linter, runs unit tests, and
   # publishes the built packages to NPM.

diff --git a/examples/basic-examples/package.json b/examples/basic-examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "basic-examples",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "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.34.0",
+    "@dpc-sdp/ripple-nuxt-tide": "1.35.0",
     "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.34.0",
+    "@dpc-sdp/ripple-test-tools": "1.35.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^24.8.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",

diff --git a/examples/reference/package.json b/examples/reference/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reference",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "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.34.0",
-    "@dpc-sdp/ripple-nuxt-tide": "1.34.0",
+    "@dpc-sdp/ripple-data-vic-api": "1.35.0",
+    "@dpc-sdp/ripple-nuxt-tide": "1.35.0",
     "@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.34.0",
+    "@dpc-sdp/ripple-test-tools": "1.35.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^7.0.3",
     "eslint": "^7.19.0",

diff --git a/examples/vue-example-app/package.json b/examples/vue-example-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ripple-app",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "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.34.0",
-    "@dpc-sdp/ripple-button": "1.34.0",
-    "@dpc-sdp/ripple-card": "1.34.0",
-    "@dpc-sdp/ripple-markup": "1.34.0",
+    "@dpc-sdp/ripple-accordion": "1.35.0",
+    "@dpc-sdp/ripple-button": "1.35.0",
+    "@dpc-sdp/ripple-card": "1.35.0",
+    "@dpc-sdp/ripple-markup": "1.35.0",
     "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.34.0",
+    "@dpc-sdp/ripple-test-tools": "1.35.0",
     "@vue/babel-preset-app": "^4.5.11",
     "@vue/cli-plugin-babel": "^4.5.11",
     "@vue/cli-plugin-eslint": "^4.5.11",

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.34.0",
+  "version": "1.35.0",
   "exact": true,
   "npmClient": "yarn",
   "useWorkspaces": true,

diff --git a/packages/components/Atoms/Button/package.json b/packages/components/Atoms/Button/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-button",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "A button themed element. Will be a `<button>` by default, or a an `<a>` if a `href` is provided.",
   "license": "Apache-2.0",
   "main": "index.vue",
@@ -10,7 +10,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.34.0",
-    "@dpc-sdp/ripple-link": "1.34.0"
+    "@dpc-sdp/ripple-global": "1.35.0",
+    "@dpc-sdp/ripple-link": "1.35.0"
   }
 }
diff --git a/packages/components/Atoms/Global/package.json b/packages/components/Atoms/Global/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-global",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "The core styles and utilities used by all ripple components. Includes sets of colours, fonts, breakpoints.",
   "license": "Apache-2.0",
   "main": "./index.js",

diff --git a/packages/components/Atoms/Grid/package.json b/packages/components/Atoms/Grid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-grid",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "A grid system for page layout.",
   "license": "Apache-2.0",
   "main": "index.js",

diff --git a/packages/components/Atoms/Icon/package.json b/packages/components/Atoms/Icon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-icon",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "A configurable SVG, sprite-based icon set for use with ripple components.",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -10,6 +10,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.34.0"
+    "@dpc-sdp/ripple-global": "1.35.0"
   }
 }
diff --git a/packages/components/Atoms/Link/package.json b/packages/components/Atoms/Link/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-link",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "Components for creating page links in plain text, and with accompanying icon. External links open in a new window by default.",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -10,7 +10,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.34.0",
-    "@dpc-sdp/ripple-icon": "1.34.0"
+    "@dpc-sdp/ripple-global": "1.35.0",
+    "@dpc-sdp/ripple-icon": "1.35.0"
   }
 }
diff --git a/packages/components/Atoms/MetaTag/package.json b/packages/components/Atoms/MetaTag/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-meta-tag",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "A link component to represent tags.",
   "license": "Apache-2.0",
   "main": "index.vue",
@@ -10,7 +10,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.34.0",
-    "@dpc-sdp/ripple-link": "1.34.0"
+    "@dpc-sdp/ripple-global": "1.35.0",
+    "@dpc-sdp/ripple-link": "1.35.0"
   }
 }
diff --git a/packages/components/Atoms/ResponsiveImg/package.json b/packages/components/Atoms/ResponsiveImg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-responsive-img",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "A component which renders an image with optimised sources for each breakpoint using kraken.io querystrings",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -10,6 +10,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.34.0"
+    "@dpc-sdp/ripple-global": "1.35.0"
   }
 }
diff --git a/packages/components/Molecules/Alert/package.json b/packages/components/Molecules/Alert/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-alert",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "A set of components to display alert notifications.",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -10,8 +10,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.34.0",
-    "@dpc-sdp/ripple-icon": "1.34.0",
-    "@dpc-sdp/ripple-link": "1.34.0"
+    "@dpc-sdp/ripple-global": "1.35.0",
+    "@dpc-sdp/ripple-icon": "1.35.0",
+    "@dpc-sdp/ripple-link": "1.35.0"
   }
 }
diff --git a/packages/components/Molecules/AnchorLinks/package.json b/packages/components/Molecules/AnchorLinks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-anchor-links",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "A table of contents for use on article pages.",
   "license": "Apache-2.0",
   "main": "index.vue",
@@ -10,7 +10,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.34.0",
-    "@dpc-sdp/ripple-link": "1.34.0"
+    "@dpc-sdp/ripple-global": "1.35.0",
+    "@dpc-sdp/ripple-link": "1.35.0"
   }
 }
diff --git a/packages/components/Molecules/Breadcrumbs/package.json b/packages/components/Molecules/Breadcrumbs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-breadcrumbs",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "A compoennt to display the active path, with links. Does not display on small screens.",
   "license": "Apache-2.0",
   "main": "index.vue",
@@ -10,7 +10,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.34.0",
-    "@dpc-sdp/ripple-link": "1.34.0"
+    "@dpc-sdp/ripple-global": "1.35.0",
+    "@dpc-sdp/ripple-link": "1.35.0"
   }
 }
diff --git a/packages/components/Molecules/Card/package.json b/packages/components/Molecules/Card/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-card",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "Card-themed containers for content such as events and dates, navigation, featured, promotional. Recommended implementation using the grid component.",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -10,9 +10,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.34.0",
-    "@dpc-sdp/ripple-icon": "1.34.0",
-    "@dpc-sdp/ripple-link": "1.34.0",
+    "@dpc-sdp/ripple-global": "1.35.0",
+    "@dpc-sdp/ripple-icon": "1.35.0",
+    "@dpc-sdp/ripple-link": "1.35.0",
     "fontfaceobserver": "^2.0.13",
     "vue-carousel": "^0.18.0"
   }

diff --git a/packages/components/Molecules/Contact/package.json b/packages/components/Molecules/Contact/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-contact",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "Contact information panel for displaying address, phone, social media. Recommended for use in sidebars.",
   "license": "Apache-2.0",
   "main": "index.vue",
@@ -10,7 +10,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.34.0",
-    "@dpc-sdp/ripple-list": "1.34.0"
+    "@dpc-sdp/ripple-global": "1.35.0",
+    "@dpc-sdp/ripple-list": "1.35.0"
   }
 }