@dreamworld/dw-ripple 2.2.2-fix-console-error.1 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.circleci/config.yml +51 -7
- package/demo/dw-ripple-demo.js +2 -2
- package/package.json +5 -5
package/.circleci/config.yml
CHANGED
|
@@ -1,12 +1,48 @@
|
|
|
1
1
|
version: 2
|
|
2
2
|
jobs:
|
|
3
|
+
merge-to-development:
|
|
4
|
+
machine: true
|
|
5
|
+
steps:
|
|
6
|
+
- run:
|
|
7
|
+
name: Clone Repository
|
|
8
|
+
working_directory: ~/workdir
|
|
9
|
+
command: |
|
|
10
|
+
echo "PR IS::"
|
|
11
|
+
echo $CIRCLE_PULL_REQUEST
|
|
12
|
+
if [[ -n ${CIRCLE_PULL_REQUEST} ]]
|
|
13
|
+
then
|
|
14
|
+
git clone https://${GH_TOKEN}@github.com/DreamworldSolutions/$CIRCLE_PROJECT_REPONAME.git my-repo
|
|
15
|
+
else
|
|
16
|
+
echo "No PR Attached, so not doing anything"
|
|
17
|
+
fi
|
|
18
|
+
- run:
|
|
19
|
+
name: Merge PR branch to development
|
|
20
|
+
working_directory: ~/workdir/my-repo
|
|
21
|
+
command: |
|
|
22
|
+
if [[ -n ${CIRCLE_PULL_REQUEST} ]]
|
|
23
|
+
then
|
|
24
|
+
# circleci has 2.14.x as of now!
|
|
25
|
+
git --version
|
|
26
|
+
git config credential.helper 'cache --timeout=120'
|
|
27
|
+
git config user.email "dw-devops@dreamworld.solutions"
|
|
28
|
+
git config user.name "DW Devops"
|
|
29
|
+
git remote set-url --push origin https://${GH_TOKEN}@github.com/DreamworldSolutions/$CIRCLE_PROJECT_REPONAME.git
|
|
30
|
+
(git checkout -b feature/development origin/master || true)
|
|
31
|
+
(git pull origin feature/development || true)
|
|
32
|
+
git merge origin/$CIRCLE_BRANCH --no-ff --no-edit
|
|
33
|
+
git push origin feature/development
|
|
34
|
+
# Push quietly to prevent showing the token in log
|
|
35
|
+
git push -q origin feature/development
|
|
36
|
+
else
|
|
37
|
+
echo "No PR Attached, so not doing anything."
|
|
38
|
+
fi
|
|
39
|
+
|
|
3
40
|
release-snapshot:
|
|
4
41
|
docker:
|
|
5
|
-
- image: circleci/node:
|
|
42
|
+
- image: circleci/node:14
|
|
6
43
|
steps:
|
|
7
44
|
- checkout
|
|
8
|
-
- run: yarn install --
|
|
9
|
-
- run: yarn install --production=false --non-interactive
|
|
45
|
+
- run: yarn install --frozen-lockfile --non-interactive
|
|
10
46
|
- run:
|
|
11
47
|
name: Deploy
|
|
12
48
|
command: |
|
|
@@ -15,11 +51,10 @@ jobs:
|
|
|
15
51
|
npx semantic-release
|
|
16
52
|
release:
|
|
17
53
|
docker:
|
|
18
|
-
- image: circleci/node:
|
|
54
|
+
- image: circleci/node:14
|
|
19
55
|
steps:
|
|
20
56
|
- checkout
|
|
21
|
-
- run: yarn install --
|
|
22
|
-
- run: yarn install --production=false --non-interactive
|
|
57
|
+
- run: yarn install --frozen-lockfile --non-interactive
|
|
23
58
|
- run: echo "Running release job"
|
|
24
59
|
- run:
|
|
25
60
|
name: Deploy
|
|
@@ -28,6 +63,15 @@ jobs:
|
|
|
28
63
|
|
|
29
64
|
workflows:
|
|
30
65
|
version: 2
|
|
66
|
+
merge-to-development:
|
|
67
|
+
jobs:
|
|
68
|
+
- merge-to-development:
|
|
69
|
+
context: Dreamworld
|
|
70
|
+
filters:
|
|
71
|
+
branches:
|
|
72
|
+
ignore:
|
|
73
|
+
- master
|
|
74
|
+
- feature/development
|
|
31
75
|
release:
|
|
32
76
|
jobs:
|
|
33
77
|
- release-snapshot:
|
|
@@ -35,7 +79,7 @@ workflows:
|
|
|
35
79
|
filters:
|
|
36
80
|
branches:
|
|
37
81
|
only:
|
|
38
|
-
-
|
|
82
|
+
- feature/development
|
|
39
83
|
- release:
|
|
40
84
|
context: Dreamworld
|
|
41
85
|
filters:
|
package/demo/dw-ripple-demo.js
CHANGED
|
@@ -57,8 +57,8 @@ export class DwRippleDemo extends LitElement {
|
|
|
57
57
|
return html`
|
|
58
58
|
<section class="main">
|
|
59
59
|
<mwc-formfield label="Enable dark theme">
|
|
60
|
-
<mwc-switch @
|
|
61
|
-
if (e.target.
|
|
60
|
+
<mwc-switch @click="${(e) => {
|
|
61
|
+
if (e.target.selected) {
|
|
62
62
|
this.setAttribute('dark-theme', e.detail);
|
|
63
63
|
return;
|
|
64
64
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dreamworld/dw-ripple",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"description": "Ripple element created as child-class of [`mwc-ripple`] (https://github.com/material-components/material-components-web-components/tree/master/packages/ripple)",
|
|
5
5
|
"main": "dw-ripple.js",
|
|
6
6
|
"scripts": {
|
|
@@ -18,16 +18,16 @@
|
|
|
18
18
|
},
|
|
19
19
|
"homepage": "https://github.com/DreamworldSolutions/dw-ripple#readme",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@material/mwc-ripple": "0.
|
|
21
|
+
"@material/mwc-ripple": "^0.26.1",
|
|
22
22
|
"lit-element": "^2.2.0"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@dreamworld/material-styles": "^1.1.0",
|
|
26
26
|
"@dreamworld/pwa-helpers": "^1.10.0",
|
|
27
|
-
"@material/mwc-formfield": "0.
|
|
28
|
-
"@material/mwc-switch": "0.
|
|
27
|
+
"@material/mwc-formfield": "^0.26.1",
|
|
28
|
+
"@material/mwc-switch": "^0.26.1",
|
|
29
29
|
"@webcomponents/webcomponentsjs": "^2.2.10",
|
|
30
|
-
"semantic-release": "17.
|
|
30
|
+
"semantic-release": "17.4.2"
|
|
31
31
|
},
|
|
32
32
|
"resolutions": {
|
|
33
33
|
"tslib": "2.1.0"
|