Skip to content

Commit

Permalink
Merge pull request #1 from Tencent/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
yuukinan authored Jun 20, 2018
2 parents d831cae + cbb1b93 commit d4be10b
Show file tree
Hide file tree
Showing 196 changed files with 9,960 additions and 8,846 deletions.
2 changes: 2 additions & 0 deletions .commitlintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
extends:
- "@commitlint/config-conventional"
7 changes: 4 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
bin/wwwroot/**/highlight-tsw.js
bin/wwwroot/**/zepto.min.js
bin/lib/api/L5/L5.api.js
bin/wwwroot
bin/deps
node_modules

118 changes: 114 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"commonjs": true,
"es6": true
},
"extends": "eslint:recommended",
"extends": "eslint-config-alloy",
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 2017
Expand All @@ -24,6 +24,23 @@
"error",
"unix"
],
"eol-last": [
"error",
"always"
],
"no-multiple-empty-lines": [
"error",
{
"max": 2,
"maxEOF": 1
}
],
"no-multi-spaces": [
"error",
{
"ignoreEOLComments": true
}
],
"quotes": [
"error",
"single"
Expand All @@ -33,10 +50,103 @@
"always"
],
"no-unused-vars": [
"error",
"error",
{
"args": "none"
}
],
"no-mixed-requires": [
"error",
true
],
"block-spacing": [
"error",
"always"
],
"brace-style": [
"error",
"1tbs"
],
"comma-spacing": [
"error"
],
"space-before-blocks": [
"error",
"always"
],
"no-var": [
"error"
],
"prefer-const": [
"warn"
],
"no-param-reassign": [
"off"
],
"no-template-curly-in-string": [
"off"
],
"one-var": [
"off"
],
"guard-for-in": [
"off"
],
"no-undefined": [
"off"
],
"complexity": [
"off"
],
"max-nested-callbacks": [
"off"
],
"no-path-concat": [
"off"
],
"eqeqeq": [
"off"
],
"max-depth": [
"off"
],
"strict": [
"off"
]
}
}
},
"overrides": [
{
"files": ["bin/tsw/wwwroot/*.js"],
"env": {
"browser": true
},
"globals": {
"define": true
}
}, {
"files": ["bin/tsw/util/auto-report/tmpl.js"],
"rules": {
"no-inner-declarations": [
"off"
]
}
}, {
"files": ["bin/lib/util/mail/tmpl.js", "bin/tsw/util/**/tmpl.js"],
"rules": {
"no-unused-vars": [
"error",
{
"varsIgnorePattern": "out",
"args": "none"
}
],
"no-var": [
"off"
],
"prefer-const": [
"off"
]
}
}
]
}
46 changes: 46 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at tsw@tencent.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
5 changes: 5 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
**Checklist:**

- [ ] test cases has added or updated
- [ ] documentation has added or updated
- [ ] commit message follows the [convention commit guidelines](https://conventionalcommits.org/)
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
node_modules
/node_modules
.vscode
.idea
.DS_Store
.nyc_output
/conf
/coverage
/log
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
19 changes: 10 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
sudo: false
language: node_js
node_js:
- "8"
- "9"

script:
- npm run lint
- npm test && npm run coverage
sudo: false
language: node_js
node_js:
- "8"
- "9"

script:
- commitlint-travis
- npm run lint
- npm test && npm run coverage
20 changes: 0 additions & 20 deletions CHANGELOG.md

This file was deleted.

10 changes: 10 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM alpine
RUN apk --update --no-cache add procps git nodejs bash gawk
RUN git clone https://github.com/Tencent/TSW.git /TSW
WORKDIR /TSW
VOLUME /data/release/node_modules/
RUN npm install --no-optional
EXPOSE 80
ENV IS_DOCKER=1
CMD ["/TSW/bin/proxy/startup.sh"]

8 changes: 4 additions & 4 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Tencent is pleased to support the open source community by making Tencent Server Web available.
Tencent is pleased to support the open source community by making Tencent Server Web available.
Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
If you have downloaded a copy of the Tencent Server Web binary from Tencent, please note that the Tencent Server Web binary is licensed under the MIT License.
If you have downloaded a copy of the Tencent Server Web source code from Tencent, please note that Tencent Server Web source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms. Your integration of Tencent Server Web into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within Tencent Server Web.
A copy of the MIT License is included in this file.

Other dependencies and licenses:

Open Source Software Licensed Under the BSD 3-Clause License:
Open Source Software Licensed Under the BSD 3-Clause License:
----------------------------------------------------------------------------------------
1. qs 6.5.0
Copyright (c) 2014 Nathan LaFreniere and other contributors.
Expand All @@ -29,7 +29,7 @@ Redistribution and use in source and binary forms, with or without modification,
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


Open Source Software Licensed Under the MIT License:
Open Source Software Licensed Under the MIT License:
----------------------------------------------------------------------------------------
1. node-archiver 0.16.0
Copyright (c) 2012-2014 Chris Talkington, contributors.
Expand All @@ -48,7 +48,7 @@ Copyright (c) 2010 Arnout Kazemier,3rd-Eden
5. seajs 1.3.0
Copyright (c) 2012 Frank Wang, http://seajs.org/

6. Semantic-UI 2.1.5
6. Semantic-UI 2.1.5
Copyright 2014 Contributors

7. ws 2.2.1
Expand Down
Loading

0 comments on commit d4be10b

Please sign in to comment.