Merge pull request #1008 from swagger-api/add-missing-templates

Add missing templates

Author: saharj

scripts/bootstrap.js

@@ -32,6 +32,72 @@ $(function() {
   function bootstrap(defaults) {
     window.SwaggerEditor.$defaults = defaults;
 
+    SwaggerEditor.run(function($templateCache) {
+      // require all templates
+      $templateCache.put('templates/about.html',
+        require('templates/about.html'));
+
+      $templateCache.put('templates/code-gen-error-modal.html',
+        require('templates/code-gen-error-modal.html'));
+
+      $templateCache.put('templates/error-presenter.html',
+        require('templates/error-presenter.html'));
+
+      $templateCache.put('templates/file-import.html',
+        require('templates/file-import.html'));
+
+      $templateCache.put('templates/import.html',
+        require('templates/import.html'));
+
+      $templateCache.put('templates/intro.html',
+        require('templates/intro.html'));
+
+      $templateCache.put('templates/open-examples.html',
+        require('templates/open-examples.html'));
+
+      $templateCache.put('templates/operation.html',
+        require('templates/operation.html'));
+
+      $templateCache.put('templates/paste-json.html',
+        require('templates/paste-json.html'));
+
+      $templateCache.put('templates/path.html',
+        require('templates/path.html'));
+
+      $templateCache.put('templates/preferences.html',
+        require('templates/preferences.html'));
+
+      $templateCache.put('templates/reset-editor.html',
+        require('templates/reset-editor.html'));
+
+      $templateCache.put('templates/schema-model.html',
+        require('templates/schema-model.html'));
+
+      $templateCache.put('templates/security.html',
+        require('templates/security.html'));
+
+      $templateCache.put('templates/specs-info.html',
+        require('templates/specs-info.html'));
+
+      $templateCache.put('templates/tags.html',
+        require('templates/tags.html'));
+
+      $templateCache.put('templates/try-operation.html',
+        require('templates/try-operation.html'));
+
+      $templateCache.put('templates/url-import.html',
+        require('templates/url-import.html'));
+
+      $templateCache.put('templates/auth/api-key.html',
+        require('templates/auth/api-key.html'));
+
+      $templateCache.put('templates/auth/basic.html',
+        require('templates/auth/basic.html'));
+
+      $templateCache.put('templates/auth/oauth2.html',
+        require('templates/auth/oauth2.html'));
+    });
+
     angular.bootstrap(window.document, ['SwaggerEditor']);
   }
 });

webpack.config.js

@@ -5,6 +5,7 @@ var webpack = require('webpack');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var NgAnnotatePlugin = require('ng-annotate-webpack-plugin');
 var argv = require('minimist')(process.argv.slice(2));
+var FONT_REGEX = /\.(ttf|eot|svg|woff|woff2|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/;
 
 var config = {
   devtool: 'source-map',
@@ -26,50 +27,62 @@ var config = {
   },
 
   plugins: [
-    new webpack.NoErrorsPlugin(),
     new ExtractTextPlugin('styles.css')
   ],
 
+  eslint: {
+    configFile: './.eslintrc.js'
+  },
+
   module: {
     loaders: [
-      {
-        test: '/.js$/',
-        loader: 'eslint-loader',
-        exclude: 'node_modules/'
-      },
       {
         test: /\.json$/,
-        loader: 'json-loader'
+        loader: 'json'
       },
       {
         test: /\.worker.js$/,
-        loader: 'worker-loader'
+        loader: 'worker'
       },
       {
         test: /\.png$/,
-        loader: "url-loader",
+        loader: "url",
         query: {mimetype: "image/png"}
       },
       {
         test: /\.less$/,
         loader: ExtractTextPlugin.extract(
-
-                    // activate source maps via loader query
-                    'css?sourceMap!' +
-                    'less?sourceMap'
-                )
+                    'css?sourceMap' +
+                    // minimize CSS in producion
+                    (argv.production ? '&minimize' : '') +
+                    '!less?sourceMap'
+        )
       },
       {
         test: /images\/*\.svg$/,
         loader: 'svg-inline'
       },
       {
-        test: /\.(ttf|eot|svg|woff|woff2|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: 'url-loader'
+        test: FONT_REGEX,
+        loader: 'url',
+        query: {
+          // limit: 1000 // 10kb
+        }
       },
+      // {
+      //   test: FONT_REGEX,
+      //   loader: 'file'
+      // },
       {
         test: /\.html$/,
-        loader: 'html-loader'
+        loader: 'html'
+      }
+    ],
+
+    preLoaders: [
+      {
+        test: /\.js$/,
+        loader: 'eslint'
       }
     ]
   }
@@ -80,8 +93,8 @@ if (argv.production) {
   console.info('This might take a while...');
 
   config.plugins.unshift(new webpack.optimize.UglifyJsPlugin({mangle: true}));
-
   config.plugins.unshift(new NgAnnotatePlugin({add: true}));
+  config.plugins.unshift(new webpack.NoErrorsPlugin());
 }
 
 module.exports = config;