Skip to content

Commit

Permalink
Merge f98d1ba into e1a67bd
Browse files Browse the repository at this point in the history
  • Loading branch information
e-cloud committed Dec 9, 2016
2 parents e1a67bd + f98d1ba commit 68b73c5
Show file tree
Hide file tree
Showing 13 changed files with 932 additions and 7 deletions.
26 changes: 26 additions & 0 deletions .editorconfig
@@ -0,0 +1,26 @@
root = true

[*]
indent_style = space
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
max_line_length = 233

[*.json]
indent_style = space
indent_size = 2

[*.ejs]
insert_final_newline = false

[*.yml]
indent_style = space
indent_size = 2

[test/cases/parsing/bom/bomfile.{css,js}]
charset = utf-8-bom

[*.md]
trim_trailing_whitespace = false
21 changes: 20 additions & 1 deletion .gitattributes
@@ -1,3 +1,22 @@
# Automatically normalize line endings for all text-based files
# http://git-scm.com/docs/gitattributes#_end_of_line_conversion
* text=auto

# For the following file types, normalize line endings to LF on
# checkin and prevent conversion to CRLF when they are checked out
# (this is required in order to prevent newline related issues like,
# for example, after the build script is run)
.* text eol=lf
*.css text eol=lf
*.html text eol=lf
*.js text eol=lf
*.ts text eol=lf
*.json text eol=lf
*.md text eol=lf
*.sh text eol=lf
*.txt text eol=lf
*.xml text eol=lf

test/statsCases/* eol=lf
examples/* eol=lf
bin/* eol=lf
bin/* eol=lf
59 changes: 55 additions & 4 deletions .gitignore
@@ -1,5 +1,56 @@
/node_modules
/test/fixtures
/playground/folder
# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
/coverage
.DS_Store

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
/node_modules
jspm_packages

# Optional npm cache directory
.npm

# Optional REPL history
.node_repl_history

# tests
/test/js
/test/browsertest/js

# benchmark
/benchmark/js
/benchmark/fixtures

# custom
/examples/*/js
lib/**/*.map

# IDE
.DS_Store
.idea
.vscode

yarn.lock

0 comments on commit 68b73c5

Please sign in to comment.