Merge pull request #3140 from shockey/v/3.0.12

v3.0.12
Rebuild dist
2017-05-26 19:43:55 -07:00 · 2017-05-26 19:38:03 -07:00 · 2017-05-26 19:36:30 -07:00 · 2017-05-26 00:59:16 -07:00 · 2017-05-25 17:45:01 -07:00 · 2017-05-25 18:30:12 +03:00
14 changed files with 70 additions and 60 deletions
@@ -15,7 +15,7 @@ The OpenAPI Specification has undergone 4 revisions since initial creation in 20

 Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes | Status
 ------------------ | ------------ | -------------------------- | ----- | ------
-3.0.11              | 2017-03-19   | 2.0                        | [tag v3.0.11](https://github.com/swagger-api/swagger-ui/tree/v3.0.11) |
+3.0.12              | 2017-03-19   | 2.0                        | [tag v3.0.12](https://github.com/swagger-api/swagger-ui/tree/v3.0.12) |
 2.2.10             | 2017-01-04   | 1.1, 1.2, 2.0              | [tag v2.2.10](https://github.com/swagger-api/swagger-ui/tree/v2.2.10) |
 2.1.5              | 2016-07-20   | 1.1, 1.2, 2.0              | [tag v2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5) |
 2.0.24             | 2014-09-12   | 1.1, 1.2 | [tag v2.0.24](https://github.com/swagger-api/swagger-ui/tree/v2.0.24) |
@@ -115,6 +115,8 @@ dom_id | The id of a dom element inside which SwaggerUi will put the user interf
 oauth2RedirectUrl | OAuth redirect URL
 operationsSorter | Apply a sort to the operation list of each API. It can be 'alpha' (sort by paths alphanumerically), 'method' (sort by HTTP method) or a function (see Array.prototype.sort() to know how sort function works). Default is the order returned by the server unchanged.
 configUrl | Configs URL
+parameterMacro | MUST be a function. Function to set default value to parameters. Accepts two arguments parameterMacro(operation, parameter). Operation and parameter are objects passed for context, both remain immutable
+modelPropertyMacro | MUST be a function. Function to set default values to each property in model. Accepts one argument modelPropertyMacro(property), property is immutable

 ### Plugins

@@ -94,8 +94,8 @@ window.onload = function() {
    clientSecret: "your-client-secret-if-required",
    realm: "your-realms",
    appName: "your-app-name",
-    scopeSeparator: "-",
-    additionalQueryStringParams: {test: "hello"}
+    scopeSeparator: " ",
+    additionalQueryStringParams: {}
  })
 }
 </script>
@@ -1 +1 @@
-{"version":3,"file":"swagger-ui-bundle.js","sources":["webpack:///swagger-ui-bundle.js"],"mappings":"AAAA;AAu/FA;AA6+FA;;;;;;;;;;;;;;;;;;;;;;;;;;AAyTA;;;;;;AAoIA;AAi7FA;AAmtCA;AAi0IA;AA0oJA;AAgwFA;AAyrGA;AA4lFA;AAioFA;AA09CA;AAwhDA;AAkrCA;AAu4EA;;;;;AAykCA;AAsyJA;;;;;;;;;;;;;;AA64EA;AA4mIA;AAquJA;AA2qHA;AA2mGA;AAiiEA;AAq4DA;AAg3DA;AAwZA;;;;;;AA8wFA;AAw3FA;;;;;AAkgDA;AAgsFA;AAw2CA;AA2kCA;AA88CA;AAkgFA;AAk2FA;;;;;;;;;AA2pDA;AA2zIA;AAk4DA;AA8mDA","sourceRoot":""}
+{"version":3,"file":"swagger-ui-bundle.js","sources":["webpack:///swagger-ui-bundle.js"],"mappings":"AAAA;AAu/FA;AA6+FA;;;;;;;;;;;;;;;;;;;;;;;;;;AAyTA;;;;;;AAoIA;AAi7FA;AAmtCA;AAi0IA;AA0oJA;AAgwFA;AAyrGA;AA0lFA;AA4nFA;AA+9CA;AAmhDA;AAmrCA;AAg1EA;;;;;AAwoCA;AAsyJA;;;;;;;;;;;;;;AA64EA;AA4mIA;AAquJA;AA2qHA;AA2mGA;AAiiEA;AAq4DA;AAg3DA;AAgRA;;;;;;AAs5FA;AAw3FA;;;;;AAkgDA;AAgsFA;AAw2CA;AA6kCA;AA68CA;AAsgFA;AAq2FA;;;;;;;;;AAkpDA;AA2zIA;AAk4DA;AA8mDA","sourceRoot":""}
@@ -1 +1 @@
-{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;;;;;;AA0yCA;AAoyHA;AA8xHA;AA0kGA;AA+9BA;AA+iCA;AAmjCA;AA25BA","sourceRoot":""}
+{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;;;;;;AA0yCA;AAoyHA;AAgyHA;AAwkGA;AA48BA;AAokCA;AA8iCA;AAs6BA","sourceRoot":""}
@@ -1,6 +1,6 @@
 {
  "name": "swagger-ui",
-  "version": "3.0.11",
+  "version": "3.0.12",
  "main": "dist/swagger-ui.js",
  "repository": "git@github.com:swagger-api/swagger-ui.git",
  "contributors": [
@@ -69,7 +69,7 @@
    "reselect": "2.5.3",
    "serialize-error": "2.0.0",
    "shallowequal": "0.2.2",
-    "swagger-client": "~3.0.11",
+    "swagger-client": "~3.0.12",
    "url-parse": "^1.1.8",
    "whatwg-fetch": "0.11.1",
    "worker-loader": "^0.7.1",
@@ -48,11 +48,10 @@ export default class Operations extends React.Component {
              return (
                <div className={showTag ? "opblock-tag-section is-open" : "opblock-tag-section"} key={"operation-" + tag}>

-                  <h4 className={!tagDescription ? "opblock-tag no-desc" : "opblock-tag" }>
-                    <span onClick={() => layoutActions.show(isShownKey, !showTag)}>{tag}</span>
-
+                  <h4 onClick={() => layoutActions.show(isShownKey, !showTag)} className={!tagDescription ? "opblock-tag no-desc" : "opblock-tag" }>
+                    <span>{tag}</span>
                    { !tagDescription ? null :
-                        <small onClick={() => layoutActions.show(isShownKey, !showTag)} >
+                        <small>
                          { tagDescription }
                        </small>
                    }
@@ -7,8 +7,8 @@ import * as AllPlugins from "core/plugins/all"
 import { parseSeach, filterConfigs } from "core/utils"

 const CONFIGS = [ "url", "spec", "validatorUrl", "onComplete", "onFailure", "authorizations", "docExpansion",
-    "apisSorter", "operationsSorter", "supportedSubmitMethods", "highlightSizeThreshold", "dom_id",
-    "defaultModelRendering", "oauth2RedirectUrl", "showRequestHeaders", "custom" ]
+    "apisSorter", "operationsSorter", "supportedSubmitMethods", "dom_id", "defaultModelRendering", "oauth2RedirectUrl",
+    "showRequestHeaders", "custom", "modelPropertyMacro", "parameterMacro" ]

 // eslint-disable-next-line no-undef
 const { GIT_DIRTY, GIT_COMMIT, PACKAGE_VERSION } = buildInfo
@@ -77,7 +77,9 @@ export const parseToJson = (str) => ({specActions, specSelectors, errActions}) =
  return specActions.updateJsonSpec(json)
 }

-export const resolveSpec = (json, url) => ({specActions, specSelectors, errActions, fn: { fetch, resolve, AST }}) => {
+export const resolveSpec = (json, url) => ({specActions, specSelectors, errActions, fn: { fetch, resolve, AST }, getConfigs}) => {
+  const { modelPropertyMacro, parameterMacro } = getConfigs()
+
  if(typeof(json) === "undefined") {
    json = specSelectors.specJson()
  }
@@ -89,7 +91,7 @@ export const resolveSpec = (json, url) => ({specActions, specSelectors, errActio

  let specStr = specSelectors.specStr()

-  return resolve({fetch, spec: json, baseDoc: url})
+  return resolve({fetch, spec: json, baseDoc: url, modelPropertyMacro, parameterMacro })
  .then( ({spec, errors}) => {
    errActions.clear({
      type: "thrown"
@@ -1,3 +1,8 @@
-This module, `swagger-ui-dist`, exposes Swagger-UI's entire dist folder as a dependency-free npm module.
+This module, `swagger-ui-dist`, exposes Swagger-UI's entire dist folder as a dependency-free npm module. Use `swagger-ui` instead, if you'd like to have npm install dependencies for you.

-Use `swagger-ui` instead, if you'd like to have npm install dependencies for you.
+`SwaggerUIBundle` and `SwaggerUIStandalonePreset` can be imported:
+```javascript
+  import { SwaggerUIBundle, SwaggerUIStandalonePreset } from 'swagger-ui-dist'
+```
+
+For anything else, check the [Swagger-UI](https://github.com/swagger-api/swagger-ui) repository.
@@ -18,4 +18,4 @@ else
  npm pack .
 fi

-find . -not -name .npmignore -not -name .npmrc -not -name deploy.sh -not -name package.json -not -name README.md -not -name *.tgz -delete 
+find . -not -name .npmignore -not -name .npmrc -not -name deploy.sh -not -name index.js -not -name package.json -not -name README.md -not -name *.tgz -delete
@@ -0,0 +1,2 @@
+module.exports.SwaggerUIBundle = require('./swagger-ui-bundle.js')
+module.exports.SwaggerUIStandalonePreset = require('./swagger-ui-standalone-preset.js')
@@ -1,7 +1,7 @@
 {
  "name": "swagger-ui-dist",
  "version": "$$VERSION",
-  "main": "dist/swagger-ui.js",
+  "main": "index.js",
  "repository": "git@github.com:swagger-api/swagger-ui.git",
  "contributors": [
    "(in alphabetical order)",
Author	SHA1	Message	Date
shockey	39501c8d82	Merge pull request #3140 from shockey/v/3.0.12 v3.0.12	2017-05-26 19:43:55 -07:00
Kyle Shockey	d68dd5f7d6	Rebuild dist	2017-05-26 19:38:03 -07:00
Kyle Shockey	2567e5168d	v3.0.12	2017-05-26 19:36:30 -07:00
shockey	bf6681c914	Merge pull request #3133 from shockey/ft/dist-npm-packaging packaging: fix swagger-ui-dist entry point	2017-05-26 00:59:16 -07:00
Roman Bolshakov	b23c999d01	packaging: fix swagger-ui-dist entry point Entry point was missing. This change allows importing SwaggerUIBundle and SwaggerUIStandalonePreset directly from package. Correct entry point is also needed for module bundlers like webpack to perform tree-shaking.	2017-05-25 17:45:01 -07:00
Anna	41d8089d0e	Merge pull request #3130 from bodnia/fix-3067 Fix 3067	2017-05-25 18:30:12 +03:00
Anna Bodnia	c5d2faa3a2	build	2017-05-25 18:10:40 +03:00
Anna Bodnia	df4ea9b3d6	Merge remote-tracking branch 'upstream/master' into fix-3067	2017-05-25 18:06:07 +03:00
Anna Bodnia	62cb9ec581	Read me for modelPropertyMacro, changed for parameterMacro	2017-05-25 18:04:21 +03:00
shockey	1db8e498b7	Merge pull request #3116 from Minasokoni/clickfix Updated click area	2017-05-24 09:01:34 -07:00
Anna Bodnia	918e0e46c0	read me for parameterMacro	2017-05-23 15:36:42 +03:00
Robert Barnwell	760d1eba80	Merge branch 'master' into clickfix	2017-05-22 09:57:19 -07:00
Minasokoni	a2a2f76199	updated click area	2017-05-22 09:12:13 -07:00
Anna Bodnia	d5b9552a5a	removed debugger	2017-05-22 17:13:31 +03:00
Anna Bodnia	edfe88d299	modelPropertyMacro, parameterMacro	2017-05-19 18:50:51 +03:00