Skip to content

Commit

Permalink
Remove Bower references and some clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
saharj committed Mar 22, 2016
1 parent d38a86f commit 7bbb041
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 150 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.git
node_modules
app/bower_components
.*.swp
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
"extends": "google"
extends: 'google'
};
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ node_modules/grunt-newer/.cache
npm-debug.log
dist/
node_modules
app/bower_components
*.sublime-workspace
.*.swp
buttons.diff
Expand Down
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ services:
script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm install -g bower
- npm cache clean
- npm install
- npm run-script build
- bower install

- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_IMAGE_NAME . && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$TRAVIS_TAG; fi && docker push $DOCKER_IMAGE_NAME; fi

env:
env:
- DOCKER_IMAGE_NAME=swaggerapi/swagger-editor
8 changes: 4 additions & 4 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ PORT=81 npm start


### Installing dependencies
This app have npm and Bower dependencies. To install all dependencies in one line, run
This app have npm dependencies. To install all dependencies in one line, run
```shell
npm i; bower i
npm install;
```

### Running in development mode
Expand All @@ -34,7 +34,7 @@ or
PORT=3000 npm run develop
```

For development it's preferred to have `grunt` installed globally on your machine.
For development it's preferred to have `grunt` installed globally on your machine.

### Building
To build the project just run:
Expand All @@ -48,7 +48,7 @@ This will build a new version of the web app, ready for production in `/dist` fo
Swagger Editor will make an XHR GET call to `/config/defaults.json` to get it's settings before launch. If you are using Swagger Editor as a dependency or serving it statically, you can provide your own `defaults.json` at this endpoint to override default settings.

Swagger Editor is configured with a file, [`defaults.json`](../app/config/defaults.json).
Read the [configuration guide](./config.md) and additional details
Read the [configuration guide](./config.md) and additional details
in [`defaults.json.guide.js`](../app/config/defaults.json.guide.js)
to learn how to configure Swagger Editor.

Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
"karma-ng-scenario": "^0.1.0",
"less-loader": "^2.2.2",
"lodash": "^4.6.1",
"main-bower-files": "^2.9.0",
"mocha": "^2.4.5",
"mversion": "^1.10.0",
"ng-file-upload": "^12.0.4",
Expand Down
8 changes: 8 additions & 0 deletions test/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
'use strict';

module.exports = {
extends: "../.eslintrc.js",
env: {
jasmine: true
}
};
72 changes: 0 additions & 72 deletions test/.jscsrc

This file was deleted.

36 changes: 0 additions & 36 deletions test/.jshintrc

This file was deleted.

32 changes: 1 addition & 31 deletions test/unit/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,6 @@
// Karma configuration
// http://karma-runner.github.io/0.10/config/configuration-file.html

var path = require('path');

var files = require('main-bower-files')({
filter: /\.js$/,
includeDev: true
})
.map(function (filePath) {

// make paths relative
return path.relative(path.join(__dirname, '../../app'), filePath);
})
.filter(function (filePath) {

// angular-scenario is added in runner.html file already
return !/angular\-scenario/.test(filePath);
})
.concat([

// Worker files
{pattern: 'bower_components/sway-worker/index.js', served: true},

// App source Code
'scripts/*.js',
'scripts/**/*.js',

// Test files
'../test/unit/defaults.js',
'../test/unit/bootstrap.js',
'../test/unit/spec/**/*.js'
]);

module.exports = function (config) {
config.set({
Expand All @@ -41,7 +11,7 @@ module.exports = function (config) {
},

// base path, that will be used to resolve files and exclude
basePath: '../../app',
basePath: '../..',

// testing framework to use (jasmine/mocha/qunit/...)
frameworks: ['mocha', 'sinon-chai', 'chai', 'chai-as-promised'],
Expand Down

0 comments on commit 7bbb041

Please sign in to comment.