Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust karma to use Webpack 3 config #1339

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@ node_modules/
typings/
sandbox/
test/
bower.json
CODE_OF_CONDUCT.md
COLLABORATOR_GUIDE.md
CONTRIBUTING.md
COOKBOOK.md
ECOSYSTEM.md
Gruntfile.js
karma.conf.js
webpack.*.js
sauce_connect.log
8 changes: 3 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@ Please update the docs accordingly so that there are no discrepencies between th

### Developing

- `grunt test` run the jasmine and nodeunit tests
- `grunt build` run webpack and bundle the source
- `grunt version` prepare the code for release
- `grunt watch:test` watch for changes and run `test`
- `grunt watch:build` watch for changes and run `build`
- `npm run test` run the Karma / Jasmine tests (browser & unit)
- `npm run build` run webpack and bundle the source
- `npm run version` prepare the code for release

Please don't include changes to `dist/` in your pull request. This should only be updated when releasing a new version.

Expand Down
98 changes: 0 additions & 98 deletions Gruntfile.js

This file was deleted.

6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@ Using npm:
$ npm install axios
```

Using bower:

```bash
$ bower install axios
```

Using cdn:

```html
Expand Down
38 changes: 0 additions & 38 deletions bower.json

This file was deleted.

2 changes: 1 addition & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ To run the examples:
1. `git clone https://github.com/axios/axios.git`
2. `cd axios`
3. `npm install`
4. `grunt build`
4. `npm run build`
5. `npm run examples`
6. [http://localhost:3000](http://localhost:3000)
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('./dist/commonjs/axios');
module.exports = require('./lib/axios')