Skip to content

Commit

Permalink
Merge branch 'master' into production
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
#	apps/image-editor/index.d.ts
  • Loading branch information
lja1018 committed Mar 5, 2021
2 parents 38ed8a3 + 3cbd059 commit d2679a0
Show file tree
Hide file tree
Showing 378 changed files with 97,435 additions and 11,999 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[*]
charset = utf-8
indent_style = space
indent_size = 4
end_of_line = lf
indent_size = 2
end_of_line = lf
59 changes: 32 additions & 27 deletions .github/workflows/detectRuntimeError.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,36 @@
name: detect runtime error

on:
schedule:
- cron: "0 22 * * *"
schedule:
- cron: '0 22 * * *'
jobs:
detectError:
runs-on: ubuntu-latest
steps:
- name: checkout repository
uses: actions/checkout@v2
- name: create config variable
run: |
node createConfigVariable.js
- name: set global error variable
run: |
errorVariable=`cat ./errorVariable.txt`
echo "ERROR_VARIABLE=$errorVariable" >> $GITHUB_ENV
- name: set url
shell: bash
run: |
url=`cat ./url.txt`
echo "URLS=$url" >> $GITHUB_ENV
- name: detect runtime error
uses: nhn/toast-ui.detect-runtime-error-actions@v1.0.1
with:
global-error-log-variable: ${{ env.ERROR_VARIABLE }}
urls: ${{ env.URLS }}
env:
BROWSERSTACK_USERNAME: ${{secrets.BROWSERSTACK_USERNAME}}
BROWSERSTACK_ACCESS_KEY: ${{secrets.BROWSERSTACK_ACCESS_KEY}}
detectError:
runs-on: ubuntu-latest
env:
WORKING_DIRECTORY: ./apps/image-editor
steps:
- name: checkout repository
uses: actions/checkout@v2
- name: create config variable
working-directory: ${{ env.WORKING_DIRECTORY }}
run: |
node createConfigVariable.js
- name: set global error variable
working-directory: ${{ env.WORKING_DIRECTORY }}
run: |
errorVariable=`cat ./errorVariable.txt`
echo "ERROR_VARIABLE=$errorVariable" >> $GITHUB_ENV
- name: set url
working-directory: ${{ env.WORKING_DIRECTORY }}
shell: bash
run: |
url=`cat ./url.txt`
echo "URLS=$url" >> $GITHUB_ENV
- name: detect runtime error
uses: nhn/toast-ui.detect-runtime-error-actions@v1.0.1
with:
global-error-log-variable: ${{ env.ERROR_VARIABLE }}
urls: ${{ env.URLS }}
env:
BROWSERSTACK_USERNAME: ${{secrets.BROWSERSTACK_USERNAME}}
BROWSERSTACK_ACCESS_KEY: ${{secrets.BROWSERSTACK_ACCESS_KEY}}
27 changes: 23 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ node_modules
bower_components
lib

#JSDOC
doc

# IDEA
.idea
*.iml
Expand All @@ -46,11 +49,27 @@ Desktop.ini
.project
.metadata

# build
build

#report / screenshots
report
screenshots

# Atom
tags
.ctags
.tern-project

# etc
.agignore
*.swp
etc
temp
doc
demo
report
api
.tern-port
*.vim
test.html
.\#*
.vscode

dist
7 changes: 6 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@
"useTabs": false,
"semi": true,
"quoteProps": "as-needed",
"jsxSingleQuote": false,
"trailingComma": "es5",
"arrowParens": "always",
"endOfLine": "lf",
"bracketSpacing": true,
"proseWrap": "preserve"
"jsxBracketSameLine": false,
"requirePragma": false,
"insertPragma": false,
"proseWrap": "preserve",
"vueIndentScriptAndStyle": false
}

0 comments on commit d2679a0

Please sign in to comment.