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: w3tecch/vue-example-app
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: w3tecch/vue-example-app
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: feature/add-nps
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 7 commits
  • 8 files changed
  • 1 contributor

Commits on Apr 25, 2018

  1. ✨ add nps and icon

    Robert Kleger committed Apr 25, 2018
    Copy the full SHA
    e81d538 View commit details
  2. ✨ add nps and repository icon

    Robert Kleger committed Apr 25, 2018
    Copy the full SHA
    34acbb8 View commit details

Commits on May 2, 2018

  1. 💚 fix ci build

    Robert Kleger committed May 2, 2018
    Copy the full SHA
    1e30686 View commit details
  2. 💚 fix ci build on appveyor

    Robert Kleger committed May 2, 2018
    Copy the full SHA
    c1f278b View commit details
  3. 💚 fix appveyor build

    Robert Kleger committed May 2, 2018
    Copy the full SHA
    a2b56b1 View commit details
  4. 💚 add windows check to package-scripts

    Robert Kleger committed May 2, 2018
    Copy the full SHA
    ec0ae7f View commit details

Commits on May 9, 2018

  1. 👌 implement review feedback

    Robert Kleger committed May 9, 2018
    Copy the full SHA
    0a5eb9e View commit details
Showing with 324 additions and 20 deletions.
  1. +1 −1 .travis.yml
  2. +1 −1 README.md
  3. +1 −1 appveyor.yml
  4. BIN icon.png
  5. +16 −0 package-scripts.js
  6. +4 −5 package.json
  7. +1 −1 src/types/vue.types.d.ts
  8. +300 −11 yarn.lock
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -4,4 +4,4 @@ node_js:
install:
- yarn install
script:
- yarn build
- yarn start build
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ Then copy the `.env.example` file and rename it to `.env`.
Go to the project dir and start your app with this npm script.

```bash
yarn serve
yarn start serve
```

![divider](./w3tec-divider.png)
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -6,4 +6,4 @@ install:
- yarn install

build_script:
- yarn build
- yarn start build
Binary file added icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions package-scripts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

const { ifWindows } = require('nps-utils');

/**
* Windows: Please do not use trailing comma as windows will fail with token error
*/
module.exports = {
scripts: {
default: 'build',
serve: 'vue-cli-service serve --open',
build: 'vue-cli-service build',
test: 'vue-cli-service test',
e2e: 'vue-cli-service e2e',
lint: 'vue-cli-service lint'
}
};
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -2,11 +2,8 @@
"name": "vue-example-app",
"version": "0.3.0",
"scripts": {
"serve": "vue-cli-service serve --open",
"build": "vue-cli-service build",
"test": "vue-cli-service test",
"e2e": "vue-cli-service e2e",
"lint": "vue-cli-service lint"
"start": "nps",
"test": "nps test"
},
"homepage": "https://github.com/w3tecch/vue-example-app#readme",
"author": "w3tec.ch <info@w3tec.ch>",
@@ -57,6 +54,8 @@
"@vue/cli-service": "^3.0.0-beta.6",
"@vue/test-utils": "^1.0.0-beta.10",
"node-sass": "^4.7.2",
"nps": "^5.9.0",
"nps-utils": "^1.5.0",
"sass-loader": "^6.0.6",
"ts-jest": "^22.0.1",
"vue-template-compiler": "^2.5.13"
2 changes: 1 addition & 1 deletion src/types/vue.types.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Vue from 'vue';

import Noty from 'noty';
import { AxiosInstance } from "axios";
import { AxiosInstance } from 'axios';


declare module 'vue/types/vue' {
311 changes: 300 additions & 11 deletions yarn.lock

Large diffs are not rendered by default.