Skip to content

Commit

Permalink
added editorconfig, fixed style expections (#582)
Browse files Browse the repository at this point in the history
  • Loading branch information
generalhenry authored and subfuzion committed Dec 16, 2016
1 parent cdb8c47 commit 3485cf4
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 4 deletions.
33 changes: 33 additions & 0 deletions .editorconfig
@@ -0,0 +1,33 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,css,html}]
charset = utf-8

# 2 space indentation
[*.{js,json,yml,yaml,proto,sh,html,css}]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true

# Tab indentation (no size specified)
[Makefile]
indent_style = tab

# Tailing whitespace
[{Dockerfile*,Makefile}]
trim_trailing_whitespace = true

# Matches the exact files either package.json or .travis.yml
[{package.json,.travis.yml}]
indent_style = space
indent_size = 2
2 changes: 1 addition & 1 deletion examples/ui/Dockerfile
Expand Up @@ -10,4 +10,4 @@ RUN yarn run build

EXPOSE 3000

CMD ["node", "server.js"]
CMD ["node", "server.js"]
2 changes: 1 addition & 1 deletion examples/ui/deploy.sh
Expand Up @@ -2,4 +2,4 @@
amp stack rm -f gw-ui || true
docker build -t examples/gw-ui .
amp registry push examples/gw-ui
amp stack up -f stack.yml gw-ui
amp stack up -f stack.yml gw-ui
2 changes: 1 addition & 1 deletion examples/ui/server.js
Expand Up @@ -8,4 +8,4 @@ app.use('/topics', express.static('public'))
app.use('/stackEdit', express.static('public'))
app.use('/dist', express.static('dist'))

app.listen(3000)
app.listen(3000)
2 changes: 1 addition & 1 deletion examples/websocket/stack.yml
Expand Up @@ -8,4 +8,4 @@ services:
image: 'registry.local.appcelerator.io/ws-bash-web'
public:
- name: web
internal_port: 80
internal_port: 80
1 change: 1 addition & 0 deletions project/CONTRIBUTORS.md
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions project/RELEASE-PROCESS.md
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions project/VENDORING.md
@@ -0,0 +1 @@

0 comments on commit 3485cf4

Please sign in to comment.