diff --git a/app/404.html b/404.html similarity index 100% rename from app/404.html rename to 404.html diff --git a/app/CNAME b/CNAME similarity index 100% rename from app/CNAME rename to CNAME diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index 5d005c1cad8..00000000000 --- a/Gruntfile.js +++ /dev/null @@ -1,76 +0,0 @@ -'use strict'; - -module.exports = function (grunt) { - - require('load-grunt-config')(grunt); - require('time-grunt')(grunt); - - grunt.registerTask('serve', function (target) { - if (target === 'dist') { - return grunt.task.run(['build', 'connect:dist:keepalive']); - } - - grunt.task.run([ - 'clean:server', - 'wiredep', - 'less:server', - 'autoprefixer', - 'connect:livereload', - 'watch' - ]); - }); - - grunt.registerTask('test', [ - 'clean:server', - 'less', - 'autoprefixer', - 'connect:test', - 'jshint', - 'jscs', - 'karma:unit', - 'protr' - ]); - - grunt.registerTask('protr', 'Runs end-to-end tests.', [ - 'http-server', - 'protractor' - ]); - - grunt.registerTask('test-dev', - 'Develop unit tests. Continuously runs tests and watches for changes', - [ - 'jshint:test', - 'jscs:test', - 'karma:main', - 'watch:jsTest' - ] - ); - - grunt.registerTask('build', [ - 'clean:dist', - 'wiredep', - 'useminPrepare', - 'less', - 'concurrent:dist', - 'autoprefixer', - 'concat', - 'ngAnnotate', - 'copy:dist', - 'cssmin', - 'uglify', - 'usemin', - 'htmlmin' - ]); - - grunt.registerTask('default', [ - 'newer:jshint', - 'test', - 'build' - ]); - - grunt.registerTask('ship', [ - 'build', - 'gh-pages', - 'shell:publish' - ]); -}; diff --git a/app/index.html b/app/index.html deleted file mode 100644 index 39c2623e23c..00000000000 --- a/app/index.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - Swagger Editor - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/server.js b/app/server.js new file mode 100644 index 00000000000..de5c1e9011e --- /dev/null +++ b/app/server.js @@ -0,0 +1,13 @@ +'use strict'; + +var PORT = 8080; // TODO use env port + +var webpackDevServer = require('webpack-dev-server'); +var config = require("./webpack.config.js"); +config.entry.app.unshift("webpack-dev-server/client?http://localhost:8080/"); +var compiler = webpack(config); +var server = new webpackDevServer(compiler, { + publicPath: config.output.publicPath +}); + +server.listen(8080); diff --git a/app/config/defaults.json b/config/defaults.json similarity index 100% rename from app/config/defaults.json rename to config/defaults.json diff --git a/app/config/defaults.json.guide.js b/config/defaults.json.guide.js similarity index 100% rename from app/config/defaults.json.guide.js rename to config/defaults.json.guide.js diff --git a/app/fonts/Droid_Sans_400.eot b/fonts/Droid_Sans_400.eot similarity index 100% rename from app/fonts/Droid_Sans_400.eot rename to fonts/Droid_Sans_400.eot diff --git a/app/fonts/Droid_Sans_400.svg b/fonts/Droid_Sans_400.svg similarity index 100% rename from app/fonts/Droid_Sans_400.svg rename to fonts/Droid_Sans_400.svg diff --git a/app/fonts/Droid_Sans_400.ttf b/fonts/Droid_Sans_400.ttf similarity index 100% rename from app/fonts/Droid_Sans_400.ttf rename to fonts/Droid_Sans_400.ttf diff --git a/app/fonts/Droid_Sans_400.woff b/fonts/Droid_Sans_400.woff similarity index 100% rename from app/fonts/Droid_Sans_400.woff rename to fonts/Droid_Sans_400.woff diff --git a/app/fonts/Droid_Sans_700.eot b/fonts/Droid_Sans_700.eot similarity index 100% rename from app/fonts/Droid_Sans_700.eot rename to fonts/Droid_Sans_700.eot diff --git a/app/fonts/Droid_Sans_700.svg b/fonts/Droid_Sans_700.svg similarity index 100% rename from app/fonts/Droid_Sans_700.svg rename to fonts/Droid_Sans_700.svg diff --git a/app/fonts/Droid_Sans_700.ttf b/fonts/Droid_Sans_700.ttf similarity index 100% rename from app/fonts/Droid_Sans_700.ttf rename to fonts/Droid_Sans_700.ttf diff --git a/app/fonts/Droid_Sans_700.woff b/fonts/Droid_Sans_700.woff similarity index 100% rename from app/fonts/Droid_Sans_700.woff rename to fonts/Droid_Sans_700.woff diff --git a/app/fonts/FontAwesome.otf b/fonts/FontAwesome.otf similarity index 100% rename from app/fonts/FontAwesome.otf rename to fonts/FontAwesome.otf diff --git a/app/fonts/Open_Sans_300.eot b/fonts/Open_Sans_300.eot similarity index 100% rename from app/fonts/Open_Sans_300.eot rename to fonts/Open_Sans_300.eot diff --git a/app/fonts/Open_Sans_300.svg b/fonts/Open_Sans_300.svg similarity index 100% rename from app/fonts/Open_Sans_300.svg rename to fonts/Open_Sans_300.svg diff --git a/app/fonts/Open_Sans_300.ttf b/fonts/Open_Sans_300.ttf similarity index 100% rename from app/fonts/Open_Sans_300.ttf rename to fonts/Open_Sans_300.ttf diff --git a/app/fonts/Open_Sans_300.woff b/fonts/Open_Sans_300.woff similarity index 100% rename from app/fonts/Open_Sans_300.woff rename to fonts/Open_Sans_300.woff diff --git a/app/fonts/Open_Sans_400.eot b/fonts/Open_Sans_400.eot similarity index 100% rename from app/fonts/Open_Sans_400.eot rename to fonts/Open_Sans_400.eot diff --git a/app/fonts/Open_Sans_400.svg b/fonts/Open_Sans_400.svg similarity index 100% rename from app/fonts/Open_Sans_400.svg rename to fonts/Open_Sans_400.svg diff --git a/app/fonts/Open_Sans_400.ttf b/fonts/Open_Sans_400.ttf similarity index 100% rename from app/fonts/Open_Sans_400.ttf rename to fonts/Open_Sans_400.ttf diff --git a/app/fonts/Open_Sans_400.woff b/fonts/Open_Sans_400.woff similarity index 100% rename from app/fonts/Open_Sans_400.woff rename to fonts/Open_Sans_400.woff diff --git a/app/fonts/Open_Sans_600.eot b/fonts/Open_Sans_600.eot similarity index 100% rename from app/fonts/Open_Sans_600.eot rename to fonts/Open_Sans_600.eot diff --git a/app/fonts/Open_Sans_600.svg b/fonts/Open_Sans_600.svg similarity index 100% rename from app/fonts/Open_Sans_600.svg rename to fonts/Open_Sans_600.svg diff --git a/app/fonts/Open_Sans_600.ttf b/fonts/Open_Sans_600.ttf similarity index 100% rename from app/fonts/Open_Sans_600.ttf rename to fonts/Open_Sans_600.ttf diff --git a/app/fonts/Open_Sans_600.woff b/fonts/Open_Sans_600.woff similarity index 100% rename from app/fonts/Open_Sans_600.woff rename to fonts/Open_Sans_600.woff diff --git a/app/fonts/Open_Sans_700.eot b/fonts/Open_Sans_700.eot similarity index 100% rename from app/fonts/Open_Sans_700.eot rename to fonts/Open_Sans_700.eot diff --git a/app/fonts/Open_Sans_700.svg b/fonts/Open_Sans_700.svg similarity index 100% rename from app/fonts/Open_Sans_700.svg rename to fonts/Open_Sans_700.svg diff --git a/app/fonts/Open_Sans_700.ttf b/fonts/Open_Sans_700.ttf similarity index 100% rename from app/fonts/Open_Sans_700.ttf rename to fonts/Open_Sans_700.ttf diff --git a/app/fonts/Open_Sans_700.woff b/fonts/Open_Sans_700.woff similarity index 100% rename from app/fonts/Open_Sans_700.woff rename to fonts/Open_Sans_700.woff diff --git a/app/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot similarity index 100% rename from app/fonts/fontawesome-webfont.eot rename to fonts/fontawesome-webfont.eot diff --git a/app/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg similarity index 100% rename from app/fonts/fontawesome-webfont.svg rename to fonts/fontawesome-webfont.svg diff --git a/app/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf similarity index 100% rename from app/fonts/fontawesome-webfont.ttf rename to fonts/fontawesome-webfont.ttf diff --git a/app/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff similarity index 100% rename from app/fonts/fontawesome-webfont.woff rename to fonts/fontawesome-webfont.woff diff --git a/app/fonts/fontawesome-webfont.woff2 b/fonts/fontawesome-webfont.woff2 similarity index 100% rename from app/fonts/fontawesome-webfont.woff2 rename to fonts/fontawesome-webfont.woff2 diff --git a/app/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from app/fonts/glyphicons-halflings-regular.eot rename to fonts/glyphicons-halflings-regular.eot diff --git a/app/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from app/fonts/glyphicons-halflings-regular.svg rename to fonts/glyphicons-halflings-regular.svg diff --git a/app/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from app/fonts/glyphicons-halflings-regular.ttf rename to fonts/glyphicons-halflings-regular.ttf diff --git a/app/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from app/fonts/glyphicons-halflings-regular.woff rename to fonts/glyphicons-halflings-regular.woff diff --git a/grunt/autoprefixer.js b/grunt/autoprefixer.js deleted file mode 100644 index 390927d69ca..00000000000 --- a/grunt/autoprefixer.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -module.exports = { - options: { - browsers: ['last 1 version'] - }, - dist: { - files: [{ - expand: true, - cwd: '.tmp/styles/', - src: '{,*/}*.css', - dest: '.tmp/styles/' - }] - } -}; diff --git a/grunt/clean.js b/grunt/clean.js deleted file mode 100644 index d38b6135cef..00000000000 --- a/grunt/clean.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -module.exports = { - dist: { - files: [{ - dot: true, - src: [ - '.tmp', - 'dist/*', - 'app/app/embedded-docs.html' - ] - }] - }, - server: '.tmp' -}; diff --git a/grunt/concat.js b/grunt/concat.js deleted file mode 100644 index 8b46fbbaadf..00000000000 --- a/grunt/concat.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict'; - -module.exports = {}; diff --git a/grunt/concurrent.js b/grunt/concurrent.js deleted file mode 100644 index b99b5750bfc..00000000000 --- a/grunt/concurrent.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -module.exports = { - server: [ - 'copy:styles' - ], - test: [ - 'copy:styles', - ], - dist: [ - 'copy:ace', - 'copy:sourceCodePro', - 'copy:styles' - ] -}; diff --git a/grunt/connect.js b/grunt/connect.js deleted file mode 100644 index f167cf59215..00000000000 --- a/grunt/connect.js +++ /dev/null @@ -1,42 +0,0 @@ -'use strict'; - -var developmentPort = process.env.PORT || 9000; -var productionPort = process.env.PORT || 8080; - -module.exports = { - options: { - port: developmentPort, - hostname: 'localhost', - livereload: 35729 - }, - livereload: { - options: { - open: 'http://localhost:' + developmentPort, - port: developmentPort, - base: [ - '.tmp', - 'app' - ] - } - }, - test: { - options: { - port: 9001, - base: [ - '.tmp', - 'test', - 'app' - ] - } - }, - dist: { - options: { - keepalive: true, - base: 'dist', - port: productionPort, - open: true, - hostname: /^win/.test(process.platform) ? 'localhost' : '0.0.0.0', - livereload: false - } - } -}; diff --git a/grunt/copy.js b/grunt/copy.js deleted file mode 100644 index b8b9de777cd..00000000000 --- a/grunt/copy.js +++ /dev/null @@ -1,81 +0,0 @@ -'use strict'; - -module.exports = { - dist: { - files: [ - { - expand: true, - cwd: 'app/images', - src: '{,*/}*.{png,jpg,jpeg,gif}', - dest: 'dist/images' - }, - { - expand: true, - dot: true, - cwd: 'app', - dest: 'dist', - src: [ - '*.{ico,png,txt}', - '.htaccess', - '*.html', - 'config/defaults.json', - 'images/{,*/}*.{webp,svg,png}', - 'views/{,*/}*.html', - 'templates/{,*/}*.html', - 'fonts/*', - 'spec-files/*', - 'CNAME', - 'styles/branding.css', - 'scripts/branding.js' - ] - }, - { - expand: true, - cwd: '.tmp/images', - dest: 'dist/images', - src: ['generated/*'] - }, - { - expand: true, - cwd: 'bower_components/bootstrap/dist', - src: 'fonts/*', - dest: 'dist' - }] - }, - styles: { - expand: true, - cwd: 'app/styles', - dest: '.tmp/styles/', - src: '{,*/}*.css' - }, - ace: { - expand: true, - cwd: 'app/bower_components/ace-builds/src-min-noconflict/', - dest: 'dist/bower_components/ace-builds/src-noconflict/', - src: [ - 'theme-*.js', - 'snippets/yaml.js', - 'ext-settings_menu.js', - 'ext-language_tools.js', - 'ext-searchbox.js', - 'mode-yaml.js', - 'mode-json.js', - 'keybinding-*.js' - ], - }, - sourceCodePro: { - expand: true, - cwd: 'app/bower_components/source-code-pro/', - // Upstream source-code-pro.css loads fonts by relative path - // from it's location, and since source-code-pro.css is bundled - // in dist/styles/main.css, we need to copy fonts there too. - dest: 'dist/styles/', - src: [ - '**/*.eot', - '**/*.otf', - '**/*.ttf', - '**/*.woff', - '**/*.woff2' - ] - } -}; diff --git a/grunt/cssmin.js b/grunt/cssmin.js deleted file mode 100644 index 32a40a6db11..00000000000 --- a/grunt/cssmin.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -module.exports = { - options: { - - } -}; diff --git a/grunt/gh-pages.js b/grunt/gh-pages.js deleted file mode 100644 index 4c5ac3fbce6..00000000000 --- a/grunt/gh-pages.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -module.exports = { - main: { - options: { - base: 'dist' - }, - src: ['**'] - } -}; diff --git a/grunt/htmlmin.js b/grunt/htmlmin.js deleted file mode 100644 index fe03373f2a4..00000000000 --- a/grunt/htmlmin.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - dist: { - options: { - collapseWhitespace: true, - collapseBooleanAttributes: true, - removeCommentsFromCDATA: true, - removeOptionalTags: true - }, - files: [{ - expand: true, - cwd: 'dist', - src: ['*.html', 'views/{,*/}*.html', 'templates/{,*/}*.html'], - dest: 'dist' - }] - } -}; diff --git a/grunt/http-server.js b/grunt/http-server.js deleted file mode 100644 index 6ee9faf0ece..00000000000 --- a/grunt/http-server.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -module.exports = { - test: { - root: 'dist', - port: 8282, - host: '127.0.0.1', - cache: 0, - showDir : true, - autoIndex: true, - defaultExt: 'html', - runInBackground: true, - logFn: function noop() {} - } -}; diff --git a/grunt/jscs.js b/grunt/jscs.js deleted file mode 100644 index 24a858ff1c9..00000000000 --- a/grunt/jscs.js +++ /dev/null @@ -1,19 +0,0 @@ -'use strict'; - -module.exports = { - main: { - src: 'app/scripts/**/*.js', - options: { - config: '.jscsrc', - requireCurlyBraces: [ 'if' ] - } - }, - - test: { - src: 'test/**/*.js', - options: { - config: 'test/.jscsrc', - requireCurlyBraces: [ 'if' ] - } - } -}; diff --git a/grunt/jshint.js b/grunt/jshint.js deleted file mode 100644 index e1083ee21ad..00000000000 --- a/grunt/jshint.js +++ /dev/null @@ -1,19 +0,0 @@ -'use strict'; - -module.exports = { - options: { - jshintrc: '.jshintrc', - reporter: require('jshint-stylish') - }, - all: [ - 'Gruntfile.js', - 'app/scripts/{,*/}*.js', - 'grunt/*.js' - ], - test: { - options: { - jshintrc: 'test/.jshintrc' - }, - src: ['test/spec/{,*/}*.js'] - } -}; diff --git a/grunt/karma.js b/grunt/karma.js deleted file mode 100644 index 7a0bb237d00..00000000000 --- a/grunt/karma.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict'; - -module.exports = { - unit: { - configFile: 'test/unit/karma.conf.js', - singleRun: true - }, - main: { - configFile: 'test/unit/karma.conf.js', - singleRun: false, - autoWatch: true - } -}; diff --git a/grunt/less.js b/grunt/less.js deleted file mode 100644 index 802e4de5dd1..00000000000 --- a/grunt/less.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict'; - -module.exports = { - options: { - paths: 'app/styles' - }, - server: { - files: { - '.tmp/styles/main.css': 'app/styles/main.less' - } - } -}; diff --git a/grunt/ngAnnotate.js b/grunt/ngAnnotate.js deleted file mode 100644 index 25f7f303f06..00000000000 --- a/grunt/ngAnnotate.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -module.exports = { - options: { - singleQuotes: true - }, - dist: { - files: [{ - expand: true, - cwd: '.tmp/concat/scripts', - src: ['*.js', '!oldieshim.js'], - dest: '.tmp/concat/scripts' - }] - } -}; diff --git a/grunt/protractor.js b/grunt/protractor.js deleted file mode 100644 index 2cafc68f986..00000000000 --- a/grunt/protractor.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -module.exports = { - main: { - options: { - configFile: './test/e2e/protractor.config.js' - } - } -}; diff --git a/grunt/shell.js b/grunt/shell.js deleted file mode 100644 index 72dbeb427a5..00000000000 --- a/grunt/shell.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -module.exports = { - 'publish': { - command: [ - 'npm publish', - 'node scripts/copy-dist-package-json.js', - 'cd dist', - 'npm publish' - ].join(';\n') - }, - 'serve-dist': { - command: './node_modules/http-server/bin/http-server -p 8090 &' - } -}; diff --git a/grunt/uglify.js b/grunt/uglify.js deleted file mode 100644 index d375c3fadba..00000000000 --- a/grunt/uglify.js +++ /dev/null @@ -1,21 +0,0 @@ -'use strict'; - - -module.exports = { - options: { - screwIE8: true - }, - sway: { - files: { - 'dist/bower_components/sway-worker/index.js': - 'app/bower_components/sway-worker/index.js' - } - }, - yamlWorker: { - files: { - 'dist/bower_components/yaml-worker/worker.js': 'app/bower_components/yaml-worker/worker.js', - 'dist/bower_components/yaml-worker/bower_components/yaml-js/yaml.js': 'app/bower_components/yaml-js/yaml.js', - 'dist/bower_components/yaml-worker/bower_components/js-yaml/dist/js-yaml.js': 'app/bower_components/js-yaml/dist/js-yaml.js' - } - } -}; diff --git a/grunt/usemin.js b/grunt/usemin.js deleted file mode 100644 index ee4d360edd4..00000000000 --- a/grunt/usemin.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -module.exports = { - html: ['dist/{,*/}*.html'], - css: ['dist/styles/{,*/}*.css'], - options: { - assetsDirs: ['dist', 'dist/images'] - } -}; diff --git a/grunt/useminPrepare.js b/grunt/useminPrepare.js deleted file mode 100644 index e00870b4cbd..00000000000 --- a/grunt/useminPrepare.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -module.exports = { - html: 'app/index.html', - options: { - dest: 'dist', - flow: { - html: { - steps: { - js: ['concat', 'uglifyjs'], - css: ['cssmin'] - }, - post: {} - } - } - } -}; diff --git a/grunt/watch.js b/grunt/watch.js deleted file mode 100644 index b45520d3e37..00000000000 --- a/grunt/watch.js +++ /dev/null @@ -1,47 +0,0 @@ -'use strict'; - -module.exports = { - bower: { - files: ['bower.json'], - tasks: ['wiredep'] - }, - js: { - files: ['app/scripts/{,*/}*.js', 'app/libs/{,*/}*.js', 'grunt/*.js'], - tasks: ['jshint:all', 'jscs'], - options: { - livereload: true - } - }, - html: { - files: ['app/**/*.html'], - options: { - livereload: true - } - }, - jsTest: { - files: ['test/spec/{,*/}*.js'], - tasks: ['jshint:test', 'jscs:test', 'karma:main'] - }, - less: { - files: ['app/styles/{,*/}*.less'], - tasks: ['less:server', 'autoprefixer'] - }, - gruntfile: { - files: ['Gruntfile.js'] - }, - handlebars: { - files: ['app/{,*/}*.handlebars', 'app/swagger-ui/main/template/*.handlebars'], - tasks: ['handlebars:compile'] - }, - livereload: { - options: { - livereload: '<%= connect.options.livereload %>' - }, - files: [ - 'app/{,*/}*.html', - 'app/{,*/}*.handlebars', - '.tmp/styles/{,*/}*.css', - 'app/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}' - ] - } -}; diff --git a/grunt/wiredep.js b/grunt/wiredep.js deleted file mode 100644 index f2288df9562..00000000000 --- a/grunt/wiredep.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict'; - -module.exports = { - app: { - src: [ - 'app/index.html', - 'app/styles/main.less' - ], - fileTypes: { - html: { - replace: { - js: '' - } - }, - less: { - replace: { - css: '@import (less) "{{filePath}}";' - } - } - } - } -}; diff --git a/app/images/close.svg b/images/close.svg similarity index 100% rename from app/images/close.svg rename to images/close.svg diff --git a/app/images/edit-pencil.svg b/images/edit-pencil.svg similarity index 100% rename from app/images/edit-pencil.svg rename to images/edit-pencil.svg diff --git a/app/images/favicon-16x16.png b/images/favicon-16x16.png similarity index 100% rename from app/images/favicon-16x16.png rename to images/favicon-16x16.png diff --git a/app/images/favicon-32x32.png b/images/favicon-32x32.png similarity index 100% rename from app/images/favicon-32x32.png rename to images/favicon-32x32.png diff --git a/app/images/favicon.ico b/images/favicon.ico similarity index 100% rename from app/images/favicon.ico rename to images/favicon.ico diff --git a/app/images/jump-icon.svg b/images/jump-icon.svg similarity index 100% rename from app/images/jump-icon.svg rename to images/jump-icon.svg diff --git a/app/images/overlay-arrow.svg b/images/overlay-arrow.svg similarity index 100% rename from app/images/overlay-arrow.svg rename to images/overlay-arrow.svg diff --git a/app/images/swagger-logo.png b/images/swagger-logo.png similarity index 100% rename from app/images/swagger-logo.png rename to images/swagger-logo.png diff --git a/index.html b/index.html index dd01093e234..abb64be5f88 100644 --- a/index.html +++ b/index.html @@ -1 +1,16 @@ - + + + + Swagger Editor + + + + + + + +
+ + + + diff --git a/index.js b/index.js new file mode 100644 index 00000000000..45a997b9f29 --- /dev/null +++ b/index.js @@ -0,0 +1,5 @@ +'use strict'; + +window.console.log('hi?!!'); + +1233333 diff --git a/package.json b/package.json index b42ec9fcdbe..5dd72a00092 100644 --- a/package.json +++ b/package.json @@ -9,35 +9,8 @@ ], "repository": "git@github.com:swagger-api/swagger-editor.git", "devDependencies": { - "bower": "^1.7.7", "chai": "^3.5.0", - "grunt": "^0.4.5", - "grunt-autoprefixer": "^3.0.3", - "grunt-cli": "^0.1.13", - "grunt-concurrent": "^2.0.0", - "grunt-contrib-clean": "^0.7.0", - "grunt-contrib-concat": "^0.5.1", - "grunt-contrib-connect": "^0.11.2", - "grunt-contrib-copy": "^0.8.0", - "grunt-contrib-cssmin": "^0.14.0", - "grunt-contrib-htmlmin": "^0.6.0", - "grunt-contrib-jshint": "^0.12.0", - "grunt-contrib-less": "^1.2.0", - "grunt-contrib-uglify": "^0.11.1", - "grunt-contrib-watch": "^0.6.1", - "grunt-exec": "^0.4.6", - "grunt-gh-pages": "^1.0.0", - "grunt-google-cdn": "^0.4.3", - "grunt-http-server": "^1.14.0", - "grunt-inline": "^0.3.5", - "grunt-jscs": "^2.7.0", - "grunt-karma": "^0.12.1", - "grunt-newer": "^1.1.1", - "grunt-ng-annotate": "^1.0.1", - "grunt-protractor-runner": "^3.0.0", - "grunt-shell": "^1.1.2", - "grunt-usemin": "3.1.1", - "grunt-wiredep": "^2.0.0", + "css-loader": "^0.23.1", "http-server": "^0.8.0", "jasmine-core": "^2.3.4", "jshint-stylish": "^2.0.1", @@ -51,6 +24,7 @@ "karma-mocha-reporter": "^1.0.2", "karma-ng-html2js-preprocessor": "^0.2.0", "karma-ng-scenario": "^0.1.0", + "less-loader": "^2.2.2", "load-grunt-config": "^0.19.1", "main-bower-files": "^2.9.0", "mocha": "^2.4.5", @@ -58,20 +32,15 @@ "protractor": "^3.1.1", "sinon": "^1.17.3", "sinon-chai": "^2.8.0", - "time-grunt": "^1.2.1" + "style-loader": "^0.13.0", + "time-grunt": "^1.2.1", + "webpack": "^1.12.14", + "webpack-dev-server": "^1.14.1" }, "engines": { "node": ">=0.10.0" }, "scripts": { - "test": "webdriver-manager update; grunt build; grunt test", - "prebower-install": "npm install", - "bower-install": "bower install", - "prebuild": "npm run bower-install", - "prestart": "npm run build", - "predevelop": "npm run build", - "start": "grunt serve:dist", - "build": "grunt build", - "develop": "grunt serve" + "test": "webdriver-manager update; grunt build; grunt test" } } diff --git a/app/robots.txt b/robots.txt similarity index 100% rename from app/robots.txt rename to robots.txt diff --git a/app/scripts/ace/snippets/swagger.snippet.js b/scripts/ace/snippets/swagger.snippet.js similarity index 100% rename from app/scripts/ace/snippets/swagger.snippet.js rename to scripts/ace/snippets/swagger.snippet.js diff --git a/app/scripts/ace/themes/theme-atom_dark.js b/scripts/ace/themes/theme-atom_dark.js similarity index 100% rename from app/scripts/ace/themes/theme-atom_dark.js rename to scripts/ace/themes/theme-atom_dark.js diff --git a/app/scripts/analytics/google.js b/scripts/analytics/google.js similarity index 100% rename from app/scripts/analytics/google.js rename to scripts/analytics/google.js diff --git a/app/scripts/app.js b/scripts/app.js similarity index 100% rename from app/scripts/app.js rename to scripts/app.js diff --git a/app/scripts/bootstrap.js b/scripts/bootstrap.js similarity index 100% rename from app/scripts/bootstrap.js rename to scripts/bootstrap.js diff --git a/app/scripts/branding.js b/scripts/branding.js similarity index 100% rename from app/scripts/branding.js rename to scripts/branding.js diff --git a/app/scripts/config/app.config.js b/scripts/config/app.config.js similarity index 100% rename from app/scripts/config/app.config.js rename to scripts/config/app.config.js diff --git a/app/scripts/controllers/editor.js b/scripts/controllers/editor.js similarity index 100% rename from app/scripts/controllers/editor.js rename to scripts/controllers/editor.js diff --git a/app/scripts/controllers/errorpresenter.js b/scripts/controllers/errorpresenter.js similarity index 100% rename from app/scripts/controllers/errorpresenter.js rename to scripts/controllers/errorpresenter.js diff --git a/app/scripts/controllers/general-modal.js b/scripts/controllers/general-modal.js similarity index 100% rename from app/scripts/controllers/general-modal.js rename to scripts/controllers/general-modal.js diff --git a/app/scripts/controllers/header.js b/scripts/controllers/header.js similarity index 100% rename from app/scripts/controllers/header.js rename to scripts/controllers/header.js diff --git a/app/scripts/controllers/import-file.js b/scripts/controllers/import-file.js similarity index 100% rename from app/scripts/controllers/import-file.js rename to scripts/controllers/import-file.js diff --git a/app/scripts/controllers/importurl.js b/scripts/controllers/importurl.js similarity index 100% rename from app/scripts/controllers/importurl.js rename to scripts/controllers/importurl.js diff --git a/app/scripts/controllers/main.js b/scripts/controllers/main.js similarity index 100% rename from app/scripts/controllers/main.js rename to scripts/controllers/main.js diff --git a/app/scripts/controllers/modal.js b/scripts/controllers/modal.js similarity index 100% rename from app/scripts/controllers/modal.js rename to scripts/controllers/modal.js diff --git a/app/scripts/controllers/openexamples.js b/scripts/controllers/openexamples.js similarity index 100% rename from app/scripts/controllers/openexamples.js rename to scripts/controllers/openexamples.js diff --git a/app/scripts/controllers/paste-json.js b/scripts/controllers/paste-json.js similarity index 100% rename from app/scripts/controllers/paste-json.js rename to scripts/controllers/paste-json.js diff --git a/app/scripts/controllers/preferences.js b/scripts/controllers/preferences.js similarity index 100% rename from app/scripts/controllers/preferences.js rename to scripts/controllers/preferences.js diff --git a/app/scripts/controllers/preview.js b/scripts/controllers/preview.js similarity index 100% rename from app/scripts/controllers/preview.js rename to scripts/controllers/preview.js diff --git a/app/scripts/controllers/security.js b/scripts/controllers/security.js similarity index 100% rename from app/scripts/controllers/security.js rename to scripts/controllers/security.js diff --git a/scripts/copy-dist-package-json.js b/scripts/copy-dist-package-json.js deleted file mode 100644 index a8fdd7d68e4..00000000000 --- a/scripts/copy-dist-package-json.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -var fs = require('fs'); - -var distPackage = require('./npm.json'); -var sourcePackage = require('../package.json'); - -distPackage.version = sourcePackage.version; - -fs.writeFileSync('./dist/package.json', JSON.stringify(distPackage), null, 4); diff --git a/app/scripts/directives/auto-focus.js b/scripts/directives/auto-focus.js similarity index 100% rename from app/scripts/directives/auto-focus.js rename to scripts/directives/auto-focus.js diff --git a/app/scripts/directives/collapsewhen.js b/scripts/directives/collapsewhen.js similarity index 100% rename from app/scripts/directives/collapsewhen.js rename to scripts/directives/collapsewhen.js diff --git a/app/scripts/directives/on-file-change.js b/scripts/directives/on-file-change.js similarity index 100% rename from app/scripts/directives/on-file-change.js rename to scripts/directives/on-file-change.js diff --git a/app/scripts/directives/operation.js b/scripts/directives/operation.js similarity index 100% rename from app/scripts/directives/operation.js rename to scripts/directives/operation.js diff --git a/app/scripts/directives/schemamodel.js b/scripts/directives/schemamodel.js similarity index 100% rename from app/scripts/directives/schemamodel.js rename to scripts/directives/schemamodel.js diff --git a/app/scripts/directives/scroll-into-view-when.js b/scripts/directives/scroll-into-view-when.js similarity index 100% rename from app/scripts/directives/scroll-into-view-when.js rename to scripts/directives/scroll-into-view-when.js diff --git a/app/scripts/directives/stop-event.js b/scripts/directives/stop-event.js similarity index 100% rename from app/scripts/directives/stop-event.js rename to scripts/directives/stop-event.js diff --git a/app/scripts/directives/track-event.js b/scripts/directives/track-event.js similarity index 100% rename from app/scripts/directives/track-event.js rename to scripts/directives/track-event.js diff --git a/app/scripts/directives/tryoperation.js b/scripts/directives/tryoperation.js similarity index 100% rename from app/scripts/directives/tryoperation.js rename to scripts/directives/tryoperation.js diff --git a/app/scripts/enums/defaults.js b/scripts/enums/defaults.js similarity index 100% rename from app/scripts/enums/defaults.js rename to scripts/enums/defaults.js diff --git a/app/scripts/enums/strings.js b/scripts/enums/strings.js similarity index 100% rename from app/scripts/enums/strings.js rename to scripts/enums/strings.js diff --git a/app/scripts/filters/formdata.js b/scripts/filters/formdata.js similarity index 100% rename from app/scripts/filters/formdata.js rename to scripts/filters/formdata.js diff --git a/scripts/npm.json b/scripts/npm.json deleted file mode 100755 index 7905dcc080a..00000000000 --- a/scripts/npm.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "swagger-editor", - "description": "Swagger Editor Web App", - "version": "2.9.9", - "repository": "https://github.com/swagger-api/swagger-editor.git", - "dependencies": {}, - "devDependencies": {}, - "main": "index.html", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "keywords": [ - "Swagger" - ], - "author": "Mohsen Azimi", - "license": "MIT" -} diff --git a/app/scripts/plugins/jquery.scroll-into-view.js b/scripts/plugins/jquery.scroll-into-view.js similarity index 100% rename from app/scripts/plugins/jquery.scroll-into-view.js rename to scripts/plugins/jquery.scroll-into-view.js diff --git a/app/scripts/router.js b/scripts/router.js similarity index 100% rename from app/scripts/router.js rename to scripts/router.js diff --git a/app/scripts/services/analytics.js b/scripts/services/analytics.js similarity index 100% rename from app/scripts/services/analytics.js rename to scripts/services/analytics.js diff --git a/app/scripts/services/ast-manager.js b/scripts/services/ast-manager.js similarity index 100% rename from app/scripts/services/ast-manager.js rename to scripts/services/ast-manager.js diff --git a/app/scripts/services/auth-manager.js b/scripts/services/auth-manager.js similarity index 100% rename from app/scripts/services/auth-manager.js rename to scripts/services/auth-manager.js diff --git a/app/scripts/services/autocomplete.js b/scripts/services/autocomplete.js similarity index 100% rename from app/scripts/services/autocomplete.js rename to scripts/services/autocomplete.js diff --git a/app/scripts/services/backend.js b/scripts/services/backend.js similarity index 100% rename from app/scripts/services/backend.js rename to scripts/services/backend.js diff --git a/app/scripts/services/builder.js b/scripts/services/builder.js similarity index 100% rename from app/scripts/services/builder.js rename to scripts/services/builder.js diff --git a/app/scripts/services/codegen.js b/scripts/services/codegen.js similarity index 100% rename from app/scripts/services/codegen.js rename to scripts/services/codegen.js diff --git a/app/scripts/services/editor.js b/scripts/services/editor.js similarity index 100% rename from app/scripts/services/editor.js rename to scripts/services/editor.js diff --git a/app/scripts/services/external-hooks.js b/scripts/services/external-hooks.js similarity index 100% rename from app/scripts/services/external-hooks.js rename to scripts/services/external-hooks.js diff --git a/app/scripts/services/fileloader.js b/scripts/services/fileloader.js similarity index 100% rename from app/scripts/services/fileloader.js rename to scripts/services/fileloader.js diff --git a/app/scripts/services/focused-path.js b/scripts/services/focused-path.js similarity index 100% rename from app/scripts/services/focused-path.js rename to scripts/services/focused-path.js diff --git a/app/scripts/services/fold-state-manager.js b/scripts/services/fold-state-manager.js similarity index 100% rename from app/scripts/services/fold-state-manager.js rename to scripts/services/fold-state-manager.js diff --git a/app/scripts/services/keyword-map.js b/scripts/services/keyword-map.js similarity index 100% rename from app/scripts/services/keyword-map.js rename to scripts/services/keyword-map.js diff --git a/app/scripts/services/local-storage.js b/scripts/services/local-storage.js similarity index 100% rename from app/scripts/services/local-storage.js rename to scripts/services/local-storage.js diff --git a/app/scripts/services/preferences.js b/scripts/services/preferences.js similarity index 100% rename from app/scripts/services/preferences.js rename to scripts/services/preferences.js diff --git a/app/scripts/services/storage.js b/scripts/services/storage.js similarity index 100% rename from app/scripts/services/storage.js rename to scripts/services/storage.js diff --git a/app/scripts/services/sway-worker.js b/scripts/services/sway-worker.js similarity index 100% rename from app/scripts/services/sway-worker.js rename to scripts/services/sway-worker.js diff --git a/app/scripts/services/tag-manager.js b/scripts/services/tag-manager.js similarity index 100% rename from app/scripts/services/tag-manager.js rename to scripts/services/tag-manager.js diff --git a/app/scripts/services/yaml.js b/scripts/services/yaml.js similarity index 100% rename from app/scripts/services/yaml.js rename to scripts/services/yaml.js diff --git a/server.js b/server.js new file mode 100644 index 00000000000..58f06c65628 --- /dev/null +++ b/server.js @@ -0,0 +1,20 @@ +'use strict'; + +var webpack = require('webpack'); +var WebpackDevServer = require('webpack-dev-server'); +var config = require('./webpack.config'); + + +var PORT = process.env.PORT || 8080; + +new WebpackDevServer(webpack(config), { + publicPath: config.output.publicPath, + hot: true, + quiet: true +}).listen(PORT, 'localhost', function (err, result) { + if (err) { + console.log(err); + } + + console.log('Development server started at http://localhost:' + PORT); +}); diff --git a/app/spec-files/basic-auth.yaml b/spec-files/basic-auth.yaml similarity index 100% rename from app/spec-files/basic-auth.yaml rename to spec-files/basic-auth.yaml diff --git a/app/spec-files/default.yaml b/spec-files/default.yaml similarity index 100% rename from app/spec-files/default.yaml rename to spec-files/default.yaml diff --git a/app/spec-files/echo.yaml b/spec-files/echo.yaml similarity index 100% rename from app/spec-files/echo.yaml rename to spec-files/echo.yaml diff --git a/app/spec-files/guide.yaml b/spec-files/guide.yaml similarity index 100% rename from app/spec-files/guide.yaml rename to spec-files/guide.yaml diff --git a/app/spec-files/heroku-pets.yaml b/spec-files/heroku-pets.yaml similarity index 100% rename from app/spec-files/heroku-pets.yaml rename to spec-files/heroku-pets.yaml diff --git a/app/spec-files/instagram.yaml b/spec-files/instagram.yaml similarity index 100% rename from app/spec-files/instagram.yaml rename to spec-files/instagram.yaml diff --git a/app/spec-files/minimal.yaml b/spec-files/minimal.yaml similarity index 100% rename from app/spec-files/minimal.yaml rename to spec-files/minimal.yaml diff --git a/app/spec-files/petstore_full.yaml b/spec-files/petstore_full.yaml similarity index 100% rename from app/spec-files/petstore_full.yaml rename to spec-files/petstore_full.yaml diff --git a/app/spec-files/petstore_simple.yaml b/spec-files/petstore_simple.yaml similarity index 100% rename from app/spec-files/petstore_simple.yaml rename to spec-files/petstore_simple.yaml diff --git a/app/spec-files/security.yaml b/spec-files/security.yaml similarity index 100% rename from app/spec-files/security.yaml rename to spec-files/security.yaml diff --git a/app/spec-files/twitter.yaml b/spec-files/twitter.yaml similarity index 100% rename from app/spec-files/twitter.yaml rename to spec-files/twitter.yaml diff --git a/app/styles/branding.css b/styles/branding.css similarity index 100% rename from app/styles/branding.css rename to styles/branding.css diff --git a/app/styles/buttons.less b/styles/buttons.less similarity index 100% rename from app/styles/buttons.less rename to styles/buttons.less diff --git a/app/styles/colors.less b/styles/colors.less similarity index 100% rename from app/styles/colors.less rename to styles/colors.less diff --git a/app/styles/components.less b/styles/components.less similarity index 100% rename from app/styles/components.less rename to styles/components.less diff --git a/app/styles/components/collapse-when.less b/styles/components/collapse-when.less similarity index 100% rename from app/styles/components/collapse-when.less rename to styles/components/collapse-when.less diff --git a/app/styles/components/editor.less b/styles/components/editor.less similarity index 100% rename from app/styles/components/editor.less rename to styles/components/editor.less diff --git a/app/styles/components/error-presenter.less b/styles/components/error-presenter.less similarity index 100% rename from app/styles/components/error-presenter.less rename to styles/components/error-presenter.less diff --git a/app/styles/components/header.less b/styles/components/header.less similarity index 100% rename from app/styles/components/header.less rename to styles/components/header.less diff --git a/app/styles/components/intro.less b/styles/components/intro.less similarity index 100% rename from app/styles/components/intro.less rename to styles/components/intro.less diff --git a/app/styles/components/menu-bar.less b/styles/components/menu-bar.less similarity index 100% rename from app/styles/components/menu-bar.less rename to styles/components/menu-bar.less diff --git a/app/styles/components/modal.less b/styles/components/modal.less similarity index 100% rename from app/styles/components/modal.less rename to styles/components/modal.less diff --git a/app/styles/components/operation.less b/styles/components/operation.less similarity index 100% rename from app/styles/components/operation.less rename to styles/components/operation.less diff --git a/app/styles/components/path-headers.less b/styles/components/path-headers.less similarity index 100% rename from app/styles/components/path-headers.less rename to styles/components/path-headers.less diff --git a/app/styles/components/path.less b/styles/components/path.less similarity index 100% rename from app/styles/components/path.less rename to styles/components/path.less diff --git a/app/styles/components/preferences-modal.less b/styles/components/preferences-modal.less similarity index 100% rename from app/styles/components/preferences-modal.less rename to styles/components/preferences-modal.less diff --git a/app/styles/components/preview.less b/styles/components/preview.less similarity index 100% rename from app/styles/components/preview.less rename to styles/components/preview.less diff --git a/app/styles/components/schema-model.less b/styles/components/schema-model.less similarity index 100% rename from app/styles/components/schema-model.less rename to styles/components/schema-model.less diff --git a/app/styles/components/security-definitions.less b/styles/components/security-definitions.less similarity index 100% rename from app/styles/components/security-definitions.less rename to styles/components/security-definitions.less diff --git a/app/styles/components/tags.less b/styles/components/tags.less similarity index 100% rename from app/styles/components/tags.less rename to styles/components/tags.less diff --git a/app/styles/components/tooltip.less b/styles/components/tooltip.less similarity index 100% rename from app/styles/components/tooltip.less rename to styles/components/tooltip.less diff --git a/app/styles/components/try-operation.less b/styles/components/try-operation.less similarity index 100% rename from app/styles/components/try-operation.less rename to styles/components/try-operation.less diff --git a/app/styles/fonts.less b/styles/fonts.less similarity index 100% rename from app/styles/fonts.less rename to styles/fonts.less diff --git a/app/styles/main.less b/styles/main.less similarity index 100% rename from app/styles/main.less rename to styles/main.less diff --git a/app/styles/markdown.less b/styles/markdown.less similarity index 100% rename from app/styles/markdown.less rename to styles/markdown.less diff --git a/app/styles/print.less b/styles/print.less similarity index 100% rename from app/styles/print.less rename to styles/print.less diff --git a/app/templates/about.html b/templates/about.html similarity index 100% rename from app/templates/about.html rename to templates/about.html diff --git a/app/templates/auth/api-key.html b/templates/auth/api-key.html similarity index 100% rename from app/templates/auth/api-key.html rename to templates/auth/api-key.html diff --git a/app/templates/auth/basic.html b/templates/auth/basic.html similarity index 100% rename from app/templates/auth/basic.html rename to templates/auth/basic.html diff --git a/app/templates/auth/oauth2.html b/templates/auth/oauth2.html similarity index 100% rename from app/templates/auth/oauth2.html rename to templates/auth/oauth2.html diff --git a/app/templates/code-gen-error-modal.html b/templates/code-gen-error-modal.html similarity index 100% rename from app/templates/code-gen-error-modal.html rename to templates/code-gen-error-modal.html diff --git a/app/templates/error-presenter.html b/templates/error-presenter.html similarity index 100% rename from app/templates/error-presenter.html rename to templates/error-presenter.html diff --git a/app/templates/file-import.html b/templates/file-import.html similarity index 100% rename from app/templates/file-import.html rename to templates/file-import.html diff --git a/app/templates/import.html b/templates/import.html similarity index 100% rename from app/templates/import.html rename to templates/import.html diff --git a/app/templates/intro.html b/templates/intro.html similarity index 100% rename from app/templates/intro.html rename to templates/intro.html diff --git a/app/templates/open-examples.html b/templates/open-examples.html similarity index 100% rename from app/templates/open-examples.html rename to templates/open-examples.html diff --git a/app/templates/operation.html b/templates/operation.html similarity index 100% rename from app/templates/operation.html rename to templates/operation.html diff --git a/app/templates/paste-json.html b/templates/paste-json.html similarity index 100% rename from app/templates/paste-json.html rename to templates/paste-json.html diff --git a/app/templates/path.html b/templates/path.html similarity index 100% rename from app/templates/path.html rename to templates/path.html diff --git a/app/templates/preferences.html b/templates/preferences.html similarity index 100% rename from app/templates/preferences.html rename to templates/preferences.html diff --git a/app/templates/schema-model.html b/templates/schema-model.html similarity index 100% rename from app/templates/schema-model.html rename to templates/schema-model.html diff --git a/app/templates/security.html b/templates/security.html similarity index 100% rename from app/templates/security.html rename to templates/security.html diff --git a/app/templates/specs-info.html b/templates/specs-info.html similarity index 100% rename from app/templates/specs-info.html rename to templates/specs-info.html diff --git a/app/templates/tags.html b/templates/tags.html similarity index 100% rename from app/templates/tags.html rename to templates/tags.html diff --git a/app/templates/try-operation.html b/templates/try-operation.html similarity index 100% rename from app/templates/try-operation.html rename to templates/try-operation.html diff --git a/app/templates/url-import.html b/templates/url-import.html similarity index 100% rename from app/templates/url-import.html rename to templates/url-import.html diff --git a/app/views/editor/editor.html b/views/editor/editor.html similarity index 100% rename from app/views/editor/editor.html rename to views/editor/editor.html diff --git a/app/views/header/header.html b/views/header/header.html similarity index 100% rename from app/views/header/header.html rename to views/header/header.html diff --git a/app/views/main.html b/views/main.html similarity index 100% rename from app/views/main.html rename to views/main.html diff --git a/app/views/preview/preview.html b/views/preview/preview.html similarity index 100% rename from app/views/preview/preview.html rename to views/preview/preview.html diff --git a/webpack.config.js b/webpack.config.js new file mode 100644 index 00000000000..8b77231895f --- /dev/null +++ b/webpack.config.js @@ -0,0 +1,36 @@ +'use strict'; + +var path = require('path'); +var webpack = require('webpack'); + +module.exports = { + devtool: 'eval', + + entry: [ + './index.js' + ], + + output: { + path: path.join(__dirname, 'dist'), + filename: 'bundle.js', + publicPath: '/' + }, + + plugins: [ + new webpack.HotModuleReplacementPlugin(), + new webpack.NoErrorsPlugin() + ], + + module: { + loaders: [ + { + test: /\.css$/, + loader: "style!css" + }, + // { + // test: /\.json$/, + // loaders: ['json-loader'] + // } + ] + } +};