Merge commit '5978c8dc5be7c918c8ded8b3169a1cb8edca8afc' into releases

CHANGELOG.md

@@ -1,4 +1,43 @@
-# 1.3.0 (2014-08-31)
+# 1.4.0 (2016-10-14)
+### Bug fixes
+* Fix destroy/reinit
+* Fix minimum/maximum zero not rendered (#123)
+
+### Features/Improvements
+* Do spec load after bootstrap
+* Build and publish angular2 module (#126)
+
+# 1.3.3 (2016-09-28)
+### Features/Improvements
+* implemented x-extendedDiscriminator to workaround name clashes in big specs
+* Add engines to package.json (#83)
+* Fix npm start on windows (#119, #118)
+* Update webpack to latest beta
+* Update angular to 2.0.1
+* Update local dev steps
+* Update openapi-sampler lib (#111)
+
+# 1.3.2 (2016-09-13)
+### Bug fixes
+* Fix broken tabs styling for response samples
+* fix v1.x.x deployment
+
+# 1.3.1 (2016-09-13)
+### Bug fixes
+* makes basePath optional (by @LeFnord)
+* fixed little typo (by @adamd)
+* Typo s/IGNORRED/IGNORED (by @MikeRalphson)
+* Fixed indentation (by @bennyn)
+* Fix default hostname (#108)
+* Fix default value for falsy values is not displayed (#109)
+* Fix schema collapse after change discriminator
+
+### Features/Improvements
+* Update to latest Angular RC.6
+* Smaller bundle size by removing esprima dep from bundle
+* Updated dependencies
+
+# 1.3.0 (2016-08-31)
 ### Bug fixes
 * Fix code samples are not shown for operations without body param (#93)
 * Fixed side menu overlapped site footer (#75)

build/webpack.dev.js

@@ -18,7 +18,7 @@ module.exports = {
     }
   },
   externals: {
-    "jquery": "jQuery",
+    'jquery': 'jquery',
     'esprima': 'esprima' // optional dep of ys-yaml not needed for redoc
   },
   node: {

build/webpack.prod.js

@@ -12,6 +12,18 @@ const BANNER =
 
 const IS_MODULE = process.env.IS_MODULE != null;
 
+const TS_RULE = {
+  test: /\.ts$/,
+  loader: 'awesome-typescript-loader',
+  exclude: /(node_modules)/,
+};
+//
+// if (IS_MODULE) {
+//   TS_RULE.query = {
+//     noEmitHelpers: false
+//   }
+// }
+
 const config = {
   context: root(),
   devtool: 'source-map',
@@ -24,7 +36,7 @@ const config = {
     }
   },
   externals: {
-    'jquery': 'jQuery',
+    'jquery': 'jquery',
     'esprima': 'esprima' // optional dep of ys-yaml not needed for redoc
   },
   node: {
@@ -58,11 +70,7 @@ const config = {
       exclude: [
         /node_modules/
       ]
-    },{
+    }, TS_RULE, {
-      test: /\.ts$/,
-      loader: 'awesome-typescript-loader',
-      exclude: /(node_modules)/
-    }, {
       test: /lib[\\\/].*\.css$/,
       loaders: ['raw-loader'],
       exclude: [/redoc-initial-styles\.css$/]
@@ -100,7 +108,7 @@ const config = {
 
 if (IS_MODULE) {
   config.externals = {
-    'jquery': 'jQuery',
+    'jquery': 'jquery',
     'esprima': 'esprima', // optional dep of ys-yaml not needed for redoc
     '@angular/platform-browser-dynamic': '@angular/platform-browser-dynamic',
     '@angular/platform-browser': '@angular/platform-browser',

build/webpack.test.js

@@ -15,7 +15,7 @@ module.exports = {
     }
   },
   externals: {
-    "jquery": "jQuery",
+    'jquery': 'jquery',
     'esprima': 'esprima' // optional dep of ys-yaml not needed for redoc
   },
   node: {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "redoc",
   "description": "Swagger-generated API Reference Documentation",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/Rebilly/ReDoc"
@@ -105,7 +105,7 @@
     "hint.css": "^2.3.2",
     "json-pointer": "^0.5.0",
     "json-schema-ref-parser": "^3.1.2",
-    "openapi-sampler": "^0.3.1",
+    "openapi-sampler": "^0.3.2",
     "prismjs": "^1.5.1",
     "remarkable": "^1.6.2",
     "scrollparent": "^1.0.0",

tsconfig.json

@@ -15,7 +15,7 @@
       "should",
       "requirejs"
     ],
-    "noEmitHelpers": true
+    "noEmitHelpers": false
   },
   "compileOnSave": false,
   "exclude": [