Skip to content

Commit 633fa10

Browse files
committed
# Conflicts: # dist/swagger-ui-bundle.js # dist/swagger-ui-bundle.js.map # dist/swagger-ui-standalone-preset.js # dist/swagger-ui.js # dist/swagger-ui.js.map
2 parents a6a3aff + 2fd371b commit 633fa10

Some content is hidden

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

70 files changed

+346
-549
lines changed

.eslintrc

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"parser": "babel-eslint",
3+
4+
"env": {
5+
"browser": true,
6+
"node": true,
7+
"es6": true
8+
},
9+
10+
"parserOptions": {
11+
"ecmaFeatures": {
12+
"jsx": true
13+
}
14+
},
15+
16+
"extends": ["eslint:recommended", "plugin:react/recommended"],
17+
18+
"plugins": [
19+
"react"
20+
],
21+
22+
"rules": {
23+
"semi": [2, "never"],
24+
"strict": 0,
25+
"quotes": 2,
26+
"no-unused-vars": 2,
27+
"no-multi-spaces": 1,
28+
"camelcase": 1,
29+
"no-use-before-define": [2,"nofunc"],
30+
"no-underscore-dangle": 0,
31+
"no-unused-expressions": 1,
32+
"comma-dangle": 0,
33+
"no-console": ["error", { allow: ["warn", "error"] }],
34+
"react/jsx-no-bind": 1,
35+
"react/display-name": 0
36+
}
37+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ node_modules
33
.deps_check
44
.DS_Store
55
npm-debug.log
6+
.eslintcache

README.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
**This is the new version of swagger-ui, 3.x. Want to learn more? Check out our [FAQ](http://swagger.io/new-ui-faq/).**
88

9+
As a brand new version, written from the ground up, there are some known issues and unimplemented features. Check out the [Known Issues](#known-issues) section for more details.
10+
911
For the older version of swagger-ui, refer to the [*2.x branch*](https://github.com/swagger-api/swagger-ui/tree/2.x).
1012

1113
## Compatibility
@@ -41,10 +43,21 @@ If you just want to see your specs, open `public/index.html` in your browser dir
4143

4244
If you'd like to make modifications to the codebase, run the dev server with: `npm run dev`.
4345

44-
4546
##### Browser support
4647
Swagger UI works in the latest versions of Chrome, Safari, Firefox, Edge and IE11.
4748

49+
### Known Issues
50+
51+
To help with the migration, here are the currently known issues with 3.X. This list will update regularly, and will not include features that were not implemented in previous versions.
52+
53+
- Currently, the only configuration options available are the `url` and `spec`.
54+
- The JSON Form Editor is not implemented.
55+
- Shebang URL support for operations is missing.
56+
- Support for `collectionFormat` is partial.
57+
- l10n (translations) is not implemented.
58+
- Relative path support for external files is not implemented.
59+
60+
4861
## CORS Support
4962

5063
CORS is a technique to prevent websites from doing bad things with your personal data. Most browsers + JavaScript toolkits not only support CORS but enforce it, which has implications for your API server which supports Swagger.

dist/swagger-ui-bundle.js

Lines changed: 38 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-ui-bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-ui-standalone-preset.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-ui-standalone-preset.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-ui.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-ui.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,16 @@
2626
"deps-license": "license-checker --production --csv --out $npm_package_config_deps_check_dir/licenses.csv && license-checker --development --csv --out $npm_package_config_deps_check_dir/licenses-dev.csv",
2727
"deps-size": "webpack -p --config webpack.check.js --json | webpack-bundle-size-analyzer >| $npm_package_config_deps_check_dir/sizes.txt",
2828
"deps-check": "npm run deps-license && npm run deps-size",
29-
"just-test-in-node": "mocha --recursive --compilers js:babel-core/register test/core"
29+
"lint": "eslint --cache --ext '.js,.jsx' src test",
30+
"lint-errors": "eslint --cache --quiet --ext '.js,.jsx' src test",
31+
"lint-fix": "eslint --cache --ext '.js,.jsx' src test --fix",
32+
"test": "npm run lint-errors && npm run just-test-in-node",
33+
"test-in-node": "npm run lint-errors && npm run just-test-in-node",
34+
"just-test": "karma start --config karma.conf.js",
35+
"just-test-in-node": "mocha --recursive --compilers js:babel-core/register test/core test/components"
3036
},
3137
"dependencies": {
38+
"babel-polyfill": "^6.23.0",
3239
"brace": "0.7.0",
3340
"btoa": "^1.1.2",
3441
"debounce": "1.0.0",
@@ -46,7 +53,7 @@
4653
"react": "^15.4.0",
4754
"react-addons-perf": "0.14.8",
4855
"react-addons-shallow-compare": "0.14.8",
49-
"react-addons-test-utils": "0.14.8",
56+
"react-addons-test-utils": "^15.4.0",
5057
"react-collapse": "2.3.1",
5158
"react-dom": "^15.4.0",
5259
"react-height": "^2.0.0",
@@ -84,11 +91,19 @@
8491
"css-loader": "0.22.0",
8592
"deep-extend": "^0.4.1",
8693
"deepmerge": "^1.3.2",
94+
"enzyme": "^2.7.1",
95+
"eslint": "^2.13.1",
96+
"eslint-plugin-react": "^6.10.3",
8797
"extract-text-webpack-plugin": "0.8.2",
8898
"file-loader": "0.8.4",
8999
"html-webpack-plugin": "^2.28.0",
90100
"imports-loader": "0.6.5",
91101
"json-loader": "0.5.3",
102+
"karma": "^0.13.22",
103+
"karma-chrome-launcher": "^0.2.3",
104+
"karma-mocha": "^0.2.2",
105+
"karma-sourcemap-loader": "^0.3.7",
106+
"karma-webpack": "1.8.0",
92107
"less": "2.5.3",
93108
"less-loader": "2.2.1",
94109
"license-checker": "^8.0.4",

0 commit comments

Comments
 (0)