Skip to content
This repository was archived by the owner on Jun 14, 2018. It is now read-only.

Commit 81115bc

Browse files
authored
Merge pull request #1 from ryutamaki/feature/typescript
typescript integrations
2 parents ff9c817 + 43f9315 commit 81115bc

28 files changed

+199
-306
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# vue-webpack-boilerplate
22

3-
> A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.
3+
> A full-featured Webpack setup with hot-reload, unit testing & css extraction.
44
55
> This template is Vue 2.0 compatible. For Vue 1.x use this command: `vue init webpack#1.0 my-project`
66
@@ -27,7 +27,6 @@ $ npm run dev
2727
- Webpack + `vue-loader` for single file Vue components.
2828
- State preserving hot-reload
2929
- State preserving compilation error overlay
30-
- Lint-on-save with ESLint
3130
- Source maps
3231

3332
- `npm run build`: Production ready build.

docs/SUMMARY.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
- [Project Structure](structure.md)
44
- [Build Commands](commands.md)
5-
- [Linter Configuration](linter.md)
65
- [Pre-Processors](pre-processors.md)
76
- [Handling Static Assets](static.md)
87
- [Environment Variables](env.md)

docs/commands.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ All build commands are executed via [NPM Scripts](https://docs.npmjs.com/misc/sc
99
- Webpack + `vue-loader` for single file Vue components.
1010
- State preserving hot-reload
1111
- State preserving compilation error overlay
12-
- Lint-on-save with ESLint
1312
- Source maps
1413

1514
### `npm run build`

docs/linter.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

docs/structure.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@
2121
│ │   ├── index.js # test build entry file
2222
│ │   └── karma.conf.js # test runner config file
2323
│ └── e2e/ # e2e tests
24-
│ │   ├── specs/ # test spec files
25-
│ │   ├── custom-assertions/ # custom assertions for e2e tests
26-
│ │   ├── runner.js # test runner script
27-
│ │   └── nightwatch.conf.js # test runner config file
28-
├── .babelrc # babel config
24+
│    ├── specs/ # test spec files
25+
│    ├── custom-assertions/ # custom assertions for e2e tests
26+
│    ├── runner.js # test runner script
27+
│    └── nightwatch.conf.js # test runner config file
2928
├── .editorconfig.js # editor config
30-
├── .eslintrc.js # eslint config
3129
├── index.html # index.html template
3230
└── package.json # build scripts and dependencies
3331
```

meta.js

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,6 @@ module.exports = {
4040
}
4141
]
4242
},
43-
"lint": {
44-
"type": "confirm",
45-
"message": "Use ESLint to lint your code?"
46-
},
47-
"lintConfig": {
48-
"when": "lint",
49-
"type": "list",
50-
"message": "Pick an ESLint preset",
51-
"choices": [
52-
{
53-
"name": "Standard (https://github.com/feross/standard)",
54-
"value": "standard",
55-
"short": "Standard"
56-
},
57-
{
58-
"name": "AirBNB (https://github.com/airbnb/javascript)",
59-
"value": "airbnb",
60-
"short": "AirBNB"
61-
},
62-
{
63-
"name": "none (configure it yourself)",
64-
"value": "none",
65-
"short": "none"
66-
}
67-
]
68-
},
6943
"unit": {
7044
"type": "confirm",
7145
"message": "Setup unit tests with Karma + Mocha?"
@@ -76,8 +50,6 @@ module.exports = {
7650
}
7751
},
7852
"filters": {
79-
".eslintrc.js": "lint",
80-
".eslintignore": "lint",
8153
"config/test.env.js": "unit || e2e",
8254
"test/unit/**/*": "unit",
8355
"test/e2e/**/*": "e2e"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vue-cli-template-webpack",
33
"version": "2.0.0",
44
"license": "MIT",
5-
"description": "A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.",
5+
"description": "A full-featured Webpack setup with hot-reload, unit testing & css extraction.",
66
"scripts": {
77
"docs": "cd docs && gitbook serve",
88
"deploy-docs": "bash ./deploy-docs.sh"

template/.eslintignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

template/.eslintrc.js

Lines changed: 0 additions & 46 deletions
This file was deleted.

template/build/dev-client.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable */
21
require('eventsource-polyfill')
32
var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
43

0 commit comments

Comments
 (0)