Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vuejs-templates/webpack
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: vuejs-templates/webpack
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 7 commits
  • 8 files changed
  • 6 contributors

Commits on Feb 5, 2018

  1. 1
    Copy the full SHA
    073b021 View commit details
  2. Fixed typo in linter.md (#1263)

    salvadornico authored and LinusBorg committed Feb 5, 2018
    Copy the full SHA
    50d01f9 View commit details
  3. Fix two documentation typos (#1248)

    fossil12 authored and LinusBorg committed Feb 5, 2018
    Copy the full SHA
    b1c0f98 View commit details
  4. Docs: formatting/typo fixes (#1254)

    cristianl authored and LinusBorg committed Feb 5, 2018
    1
    Copy the full SHA
    b654847 View commit details

Commits on Mar 1, 2018

  1. Fix typos (#1312)

    diogosalazar authored and LinusBorg committed Mar 1, 2018
    1
    Copy the full SHA
    4ffcccb View commit details

Commits on Sep 19, 2018

  1. Update README.md

    LinusBorg authored Sep 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3473bb1 View commit details
  2. Update README.md

    LinusBorg authored Sep 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2985030 View commit details
Showing with 28 additions and 16 deletions.
  1. +11 −0 README.md
  2. +1 −1 docs/backend.md
  3. +4 −4 docs/env.md
  4. +2 −1 docs/linter.md
  5. +4 −4 docs/pre-processors.md
  6. +2 −2 docs/structure.md
  7. +3 −3 scenarios/README.md
  8. +1 −1 template/package.json
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -4,6 +4,17 @@
> This template is Vue 2.0 compatible. For Vue 1.x use this command: `vue init webpack#1.0 my-project`

# Vue-cli 3 is here, so this template is now considered deprecated.

This template was the main template for vue-cli verison 2.*.

Now that we have released a [stable version of vue-cli 3](https://cli.vuejs.org), which incorporates all features that this template offers (and much more), we think that this template doesn't have any significant use for the future, so we won't put much resource in developing it further.

We will try and fix major issues should they arise, but not much more.

Feel free to fork this template if you want to keep it alive.

## Documentation

- [For this template](http://vuejs-templates.github.io/webpack): common questions specific to this template are answered and each part is described in greater detail
2 changes: 1 addition & 1 deletion docs/backend.md
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ const path = require('path')

module.exports = {
dev: {
/ Paths
// Paths
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {},
8 changes: 4 additions & 4 deletions docs/env.md
Original file line number Diff line number Diff line change
@@ -42,10 +42,10 @@ So, the environment variables are:

As we can see, `test.env` inherits the `dev.env` and the `dev.env` inherits the `prod.env`.

### Usage
### Usage

It is simple to use the environment variables in your code. For example:
It is simple to use the environment variables in your code. For example:

```js
Vue.config.productionTip = process.env.NODE_ENV === 'production'
```js
Vue.config.productionTip = process.env.NODE_ENV === 'production'
```
3 changes: 2 additions & 1 deletion docs/linter.md
Original file line number Diff line number Diff line change
@@ -31,5 +31,6 @@ You can run the following command to let eslint fix any errors it finds (if it c
npm run lint -- --fix
```

*(The `--` in the middle is necessary to ensure the `--fix` option is passdd to `eslint`, not to `npm`. It can be omitted whne using yarn)*
*(The `--` in the middle is necessary to ensure the `--fix` option is passed to `eslint`, not to `npm`. It can be omitted when using yarn)*


8 changes: 4 additions & 4 deletions docs/pre-processors.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Pre-Processors

This boilerplate has pre-configured CSS extraction for most popular CSS pre-processors including LESS, SASS, Stylus, and PostCSS. To use a pre-processor, all you need to do is install the appropriate webpack loader for it. For example, to use SASS:
This boilerplate has pre-configured CSS extraction for most popular CSS pre-processors including LESS, Sass, Stylus, and PostCSS. To use a pre-processor, all you need to do is install the appropriate webpack loader for it. For example, to use Sass:

``` bash
npm install sass-loader node-sass --save-dev
@@ -14,11 +14,11 @@ Once installed, you can use the pre-processors inside your `*.vue` components us

``` html
<style lang="scss">
/* write SASS! */
/* write Sass! */
</style>
```

### A note on SASS syntax
### A note on Sass syntax

- `lang="scss"` corresponds to the CSS-superset syntax (with curly braces and semicolons).
- `lang="sass"` corresponds to the indentation-based syntax.
@@ -27,7 +27,7 @@ Once installed, you can use the pre-processors inside your `*.vue` components us

Styles in `*.vue` files and style files (`*.css`, `*.scss` etc) are piped through PostCSS by default, so you don't need to use a specific loader for it.

You can simply add PostCSS plugins you want to use to the `.postcssrc.js`file in your project's root directory:
You can simply add PostCSS plugins you want to use to the `.postcssrc.js` file in your project's root directory:

``` js
// https://github.com/michael-ciniawsky/postcss-load-config
4 changes: 2 additions & 2 deletions docs/structure.md
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@
│ │ ├── eslintrc # config file for eslint with extra settings only for unit tests
│ │ ├── index.js # test build entry file
│ │ ├── jest.conf.js # Config file when using Jest for unit tests
│ │ ── karma.conf.js # test runner config file when using Karma for unit tests
│ │ ── setup.js # file that runs before Jest runs your unit tests
│ │ ── karma.conf.js # test runner config file when using Karma for unit tests
│ │ ── setup.js # file that runs before Jest runs your unit tests
│ └── e2e/ # e2e tests
│ │   ├── specs/ # test spec files
│ │   ├── custom-assertions/ # custom assertions for e2e tests
6 changes: 3 additions & 3 deletions scenarios/README.md
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ With the code from `index.js`, we insert those answers into the metalsmith metad

## The scenarios

We currently have 3 scenrios set up:
We currently have 3 scenarios set up:

1. 'minimal': it basically answers "no" to ever choice, so no router, no elint, no tests
1. 'minimal': it basically answers "no" to ever choice, so no router, no eslint, no tests
2. 'full': It answers "yes" to every choice. With router, with linting (standard), with full tests (jest & e2e)
3. 'full-airbnb-karma': like 'full', but using airbnb eslint config instead od standard and karma instead of jest for unnit tests.
3. 'full-airbnb-karma': like 'full', but using airbnb eslint config instead of standard and karma instead of jest for unit tests.

Other permutations might be worth testing to secure against edge cases, but this gives us a decent level of security over common combinations.

2 changes: 1 addition & 1 deletion template/package.json
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
},
"devDependencies": {
{{#lint}}
"babel-eslint": "^8.2.1",
"babel-eslint": "^7.2.3",
"eslint": "^4.15.0",
"eslint-friendly-formatter": "^3.0.0",
"eslint-loader": "^1.7.1",