remove legacy code

Matthelonianxl · Aug 2, 2017 · 8ca88b5 · 8ca88b5
1 parent 3e21265
commit 8ca88b5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ If you'd like to make modifications to the codebase, run the dev server with: `n
 If you'd like to rebuild the `/dist` folder with your codebase changes, run `npm run build`.
 
 
-##### Integrate Tests
+##### Integration Tests
 
 You will need JDK of version 7 or higher as instructed here
 http://nightwatchjs.org/gettingstarted#selenium-server-setup

diff --git a/dev-helpers/template.ejs → dev-helpers/index.html b/dev-helpers/template.ejs → dev-helpers/index.html
@@ -5,20 +5,21 @@
   <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="./favicon-32x32.png" sizes="32x32" />
   <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
   <style>
     html
     {
-        box-sizing: border-box;
-        overflow: -moz-scrollbars-vertical;
-        overflow-y: scroll;
+      box-sizing: border-box;
+      overflow: -moz-scrollbars-vertical;
+      overflow-y: scroll;
     }
     *,
     *:before,
     *:after
     {
-        box-sizing: inherit;
+      box-sizing: inherit;
     }
 
     body {
@@ -33,7 +34,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
   <defs>
     <symbol viewBox="0 0 20 20" id="unlocked">
-          <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
+      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
     </symbol>
 
     <symbol viewBox="0 0 20 20" id="locked">
@@ -66,12 +67,12 @@
 
 <div id="swagger-ui"></div>
 
+<script src="./swagger-ui-bundle.js"> </script>
+<script src="./swagger-ui-standalone-preset.js"> </script>
 <script>
   window.onload = function() {
     window["SwaggerUIBundle"] = window["swagger-ui-bundle"]
     window["SwaggerUIStandalonePreset"] = window["swagger-ui-standalone-preset"]
-
-    var spec = '<%- htmlWebpackPlugin.options.spec %>'
     // Build a system
     const ui = SwaggerUIBundle({
       url: "http://petstore.swagger.io/v2/swagger.json",

diff --git a/make-webpack-config.js b/make-webpack-config.js
@@ -2,7 +2,6 @@ var path = require('path')
 
 var webpack = require('webpack')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
-var HtmlWebpackPlugin = require('html-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 var deepExtend = require('deep-extend')
 const {gitDescribeSync} = require('git-describe')
@@ -77,11 +76,6 @@ module.exports = function(rules, options) {
     plugins.push( new webpack.NoEmitOnErrorsPlugin())
 
   } else {    // development mode
-    plugins.push(
-      new HtmlWebpackPlugin({
-        template: 'dev-helpers/template.ejs',
-      })
-    )
     plugins.push(new CopyWebpackPlugin([ { from: 'test/e2e/specs', to: 'test-specs' } ]))
   }
 

diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
     "build-bundle": "webpack --config webpack-dist-bundle.config.js --colors",
     "build-core": "webpack --config webpack-dist.config.js --colors",
     "build-standalone": "webpack --config webpack-dist-standalone.config.js --colors",
+    "predev": "npm install",
     "dev": "npm-run-all --parallel hot-server open-localhost",
     "watch": "webpack --config webpack-watch.config.js --watch --progress",
     "open-localhost": "node -e 'require(\"open\")(\"http://localhost:3200\")'",
@@ -103,7 +104,6 @@
     "extract-text-webpack-plugin": "^2.1.2",
     "file-loader": "0.11.2",
     "git-describe": "^4.0.1",
-    "html-webpack-plugin": "^2.29.0",
     "imports-loader": "0.7.1",
     "json-loader": "0.5.4",
     "json-server": "^0.11.0",