Skip to content

Commit d2679a0

Browse files
committed
Merge branch 'master' into production
# Conflicts: # .gitignore # apps/image-editor/index.d.ts
2 parents 38ed8a3 + 3cbd059 commit d2679a0

File tree

378 files changed

+97435
-11999
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

378 files changed

+97435
-11999
lines changed

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[*]
22
charset = utf-8
33
indent_style = space
4-
indent_size = 4
5-
end_of_line = lf
4+
indent_size = 2
5+
end_of_line = lf
Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,36 @@
11
name: detect runtime error
22

33
on:
4-
schedule:
5-
- cron: "0 22 * * *"
4+
schedule:
5+
- cron: '0 22 * * *'
66
jobs:
7-
detectError:
8-
runs-on: ubuntu-latest
9-
steps:
10-
- name: checkout repository
11-
uses: actions/checkout@v2
12-
- name: create config variable
13-
run: |
14-
node createConfigVariable.js
15-
- name: set global error variable
16-
run: |
17-
errorVariable=`cat ./errorVariable.txt`
18-
echo "ERROR_VARIABLE=$errorVariable" >> $GITHUB_ENV
19-
- name: set url
20-
shell: bash
21-
run: |
22-
url=`cat ./url.txt`
23-
echo "URLS=$url" >> $GITHUB_ENV
24-
- name: detect runtime error
25-
26-
with:
27-
global-error-log-variable: ${{ env.ERROR_VARIABLE }}
28-
urls: ${{ env.URLS }}
29-
env:
30-
BROWSERSTACK_USERNAME: ${{secrets.BROWSERSTACK_USERNAME}}
31-
BROWSERSTACK_ACCESS_KEY: ${{secrets.BROWSERSTACK_ACCESS_KEY}}
7+
detectError:
8+
runs-on: ubuntu-latest
9+
env:
10+
WORKING_DIRECTORY: ./apps/image-editor
11+
steps:
12+
- name: checkout repository
13+
uses: actions/checkout@v2
14+
- name: create config variable
15+
working-directory: ${{ env.WORKING_DIRECTORY }}
16+
run: |
17+
node createConfigVariable.js
18+
- name: set global error variable
19+
working-directory: ${{ env.WORKING_DIRECTORY }}
20+
run: |
21+
errorVariable=`cat ./errorVariable.txt`
22+
echo "ERROR_VARIABLE=$errorVariable" >> $GITHUB_ENV
23+
- name: set url
24+
working-directory: ${{ env.WORKING_DIRECTORY }}
25+
shell: bash
26+
run: |
27+
url=`cat ./url.txt`
28+
echo "URLS=$url" >> $GITHUB_ENV
29+
- name: detect runtime error
30+
31+
with:
32+
global-error-log-variable: ${{ env.ERROR_VARIABLE }}
33+
urls: ${{ env.URLS }}
34+
env:
35+
BROWSERSTACK_USERNAME: ${{secrets.BROWSERSTACK_USERNAME}}
36+
BROWSERSTACK_ACCESS_KEY: ${{secrets.BROWSERSTACK_ACCESS_KEY}}

.gitignore

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ node_modules
2828
bower_components
2929
lib
3030

31+
#JSDOC
32+
doc
33+
3134
# IDEA
3235
.idea
3336
*.iml
@@ -46,11 +49,27 @@ Desktop.ini
4649
.project
4750
.metadata
4851

52+
# build
53+
build
54+
55+
#report / screenshots
56+
report
57+
screenshots
58+
59+
# Atom
60+
tags
61+
.ctags
62+
.tern-project
63+
4964
# etc
65+
.agignore
66+
*.swp
67+
etc
5068
temp
51-
doc
52-
demo
53-
report
69+
api
70+
.tern-port
5471
*.vim
55-
test.html
72+
.\#*
73+
.vscode
5674

75+
dist

.prettierrc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@
55
"useTabs": false,
66
"semi": true,
77
"quoteProps": "as-needed",
8+
"jsxSingleQuote": false,
89
"trailingComma": "es5",
910
"arrowParens": "always",
1011
"endOfLine": "lf",
1112
"bracketSpacing": true,
12-
"proseWrap": "preserve"
13+
"jsxBracketSameLine": false,
14+
"requirePragma": false,
15+
"insertPragma": false,
16+
"proseWrap": "preserve",
17+
"vueIndentScriptAndStyle": false
1318
}

0 commit comments

Comments
 (0)