@dreamworld/dw-ripple 2.2.1 → 2.2.3-development.1

package/.circleci/config.yml

@@ -1,12 +1,48 @@
 version: 2
 jobs:
+  merge-to-development:
+    machine: true
+    steps:
+      - run:
+          name: Clone Repository
+          working_directory: ~/workdir
+          command: |
+            echo "PR IS::"
+            echo $CIRCLE_PULL_REQUEST
+            if [[ -n ${CIRCLE_PULL_REQUEST} ]]
+            then
+              git clone https://${GH_TOKEN}@github.com/DreamworldSolutions/$CIRCLE_PROJECT_REPONAME.git  my-repo
+            else
+              echo "No PR Attached, so not doing anything"
+            fi
+      - run:
+          name: Merge PR branch to development
+          working_directory: ~/workdir/my-repo
+          command: |
+            if [[ -n ${CIRCLE_PULL_REQUEST} ]]
+            then
+              # circleci has 2.14.x as of now!
+              git --version
+              git config credential.helper 'cache --timeout=120'
+              git config user.email "dw-devops@dreamworld.solutions"
+              git config user.name "DW Devops"
+              git remote set-url --push origin https://${GH_TOKEN}@github.com/DreamworldSolutions/$CIRCLE_PROJECT_REPONAME.git
+              (git checkout -b feature/development origin/master || true)
+              (git pull origin feature/development || true)
+              git merge origin/$CIRCLE_BRANCH --no-ff --no-edit
+              git push origin feature/development
+              # Push quietly to prevent showing the token in log
+              git push -q origin feature/development
+            else
+              echo "No PR Attached, so not doing anything."
+            fi
+            
   release-snapshot:
     docker:
-      - image: circleci/node:lts
+      - image: circleci/node:14
     steps:
       - checkout
-      - run: yarn install --production=true --flat --non-ineractive
-      - run: yarn install --production=false --non-interactive
+      - run: yarn install --frozen-lockfile --non-interactive
       - run:
           name: Deploy
           command: |
@@ -15,11 +51,10 @@ jobs:
             npx semantic-release
   release:
     docker:
-      - image: circleci/node:lts
+      - image: circleci/node:14
     steps:
       - checkout
-      - run: yarn install --production=true --flat --non-ineractive
-      - run: yarn install --production=false --non-interactive
+      - run: yarn install --frozen-lockfile --non-interactive
       - run: echo "Running release job"
       - run:
           name: Deploy
@@ -28,6 +63,15 @@ jobs:
 
 workflows:
   version: 2
+  merge-to-development:
+    jobs:
+      - merge-to-development:
+          context: Dreamworld
+          filters:
+            branches:
+              ignore:
+                - master
+                - feature/development
   release:
     jobs:
       - release-snapshot:
@@ -35,7 +79,7 @@ workflows:
           filters:
             branches:
               only:
-                - /^feature\/.+$/
+                - feature/development
       - release:
           context: Dreamworld
           filters:

package/demo/dw-ripple-demo.js

@@ -57,8 +57,8 @@ export class DwRippleDemo extends LitElement {
     return html`
       <section class="main">
         <mwc-formfield label="Enable dark theme">
-          <mwc-switch @change="${(e) => {
-              if (e.target.checked) {
+          <mwc-switch @click="${(e) => {
+              if (e.target.selected) {
                 this.setAttribute('dark-theme', e.detail);
                 return;
               }

package/dw-ripple.js

@@ -107,13 +107,15 @@ export class DwRipple extends Ripple {
 
   disconnectedCallback() {
     const parent = this.__getParentNode();
-    parent.removeEventListener('mouseenter', this._rippleHander.startHover);
-    parent.removeEventListener('mouseleave', this._rippleHander.endHover);
-    
-    parent.removeEventListener('mousedown', this.__onMouseDown);
-    parent.removeEventListener('touchstart', this.__onTouchStart);
-    parent.removeEventListener('focus', this._rippleHander.startFocus);
-    parent.removeEventListener('blur', this._rippleHander.endFocus);
+    if (parent) {
+      parent.removeEventListener('mouseenter', this._rippleHander.startHover);
+      parent.removeEventListener('mouseleave', this._rippleHander.endHover);
+
+      parent.removeEventListener('mousedown', this.__onMouseDown);
+      parent.removeEventListener('touchstart', this.__onTouchStart);
+      parent.removeEventListener('focus', this._rippleHander.startFocus);
+      parent.removeEventListener('blur', this._rippleHander.endFocus);
+    }
 
     window.removeEventListener('touchend', this.__onTouchEnd);
     window.removeEventListener('mouseup', this.__onMouseUp);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamworld/dw-ripple",
-  "version": "2.2.1",
+  "version": "2.2.3-development.1",
   "description": "Ripple element created as child-class of [`mwc-ripple`] (https://github.com/material-components/material-components-web-components/tree/master/packages/ripple)",
   "main": "dw-ripple.js",
   "scripts": {
@@ -18,16 +18,16 @@
   },
   "homepage": "https://github.com/DreamworldSolutions/dw-ripple#readme",
   "dependencies": {
-    "@material/mwc-ripple": "0.20.0",
+    "@material/mwc-ripple": "^0.26.1",
     "lit-element": "^2.2.0"
   },
   "devDependencies": {
     "@dreamworld/material-styles": "^1.1.0",
     "@dreamworld/pwa-helpers": "^1.10.0",
-    "@material/mwc-formfield": "0.20.0",
-    "@material/mwc-switch": "0.20.0",
+    "@material/mwc-formfield": "^0.26.1",
+    "@material/mwc-switch": "^0.26.1",
     "@webcomponents/webcomponentsjs": "^2.2.10",
-    "semantic-release": "17.0.8"
+    "semantic-release": "17.4.2"
   },
   "resolutions": {
     "tslib": "2.1.0"