Merge branch 'master' of github.com:swagger-api/swagger-ui

shockey · shockey · commit be887043edce · 2017-03-25T00:39:54.000-07:00
diff --git a/Dockerfile b/Dockerfile
@@ -8,11 +8,8 @@ RUN mkdir -p /run/nginx
 COPY nginx.conf /etc/nginx/
 
 # copy swagger files to the `/js` folder
-ADD ./dist/ /usr/share/nginx/html/js
 ADD ./public/* /usr/share/nginx/html/
-
-# change the folder structure
-RUN sed -i 's/\.\.\/dist/js/g' /usr/share/nginx/html/index.html
+ADD ./dist/* /usr/share/nginx/html/
 
 EXPOSE 8080
 
diff --git a/dist/index.html b/dist/index.html
@@ -1,10 +1,13 @@
+<!-- HTML for static distribution bundle build -->
 <!DOCTYPE html>
-<!-- this is for the dev server -->
 <html lang="en">
 <head>
   <meta charset="UTF-8">
   <title>Swagger UI</title>
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
+  <link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
+  <link rel="icon" type="image/png" href="../public/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="../public/favicon-16x16.png" sizes="16x16" />
   <style>
     html
     {
@@ -64,9 +67,8 @@
 
 <div id="swagger-ui"></div>
 
-<!-- don't be alarmed, these don't match what's in dist, because webpack-dev-server serves them in memory. -->
-<script src="/dist/SwaggerUIBundle.js"> </script>
-<script src="/dist/SwaggerUIStandalonePreset.js"> </script>
+<script src="./swagger-ui-bundle.js"> </script>
+<script src="./swagger-ui-standalone-preset.js"> </script>
 <script>
 window.onload = function() {
   // Build a system
diff --git a/public/index.html b/public/index.html
diff --git a/webpack-dist-standalone.config.js b/webpack-dist-standalone.config.js
@@ -13,7 +13,6 @@ module.exports = require('./make-webpack-config.js')({
 
   entry: {
     'swagger-ui-standalone-preset': [
-      'babel-polyfill',
       './src/standalone/index.js'
     ]
   },

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ module.exports = require('./make-webpack-config.js')({`
`13`	`13`
`14`	`14`	`entry: {`
`15`	`15`	`'swagger-ui-standalone-preset': [`
`16`		`- 'babel-polyfill',`
`17`	`16`	`'./src/standalone/index.js'`
`18`	`17`	`]`
`19`	`18`	`},`