Skip to content

Commit a8d6d90

Browse files
committed
Merge branch 'typescript'
# Conflicts: # .travis.yml # docs/api-overview.md # docs/common-patterns.md # docs/mixins.md # docs/model-classes.md # docs/service-plugin.md # package-lock.json # package.json # src/service-module/getters.js # src/service-module/mutations.js # src/service-module/state.js # test/service-module/getters.test.js # yarn.lock
2 parents 37dc0a9 + 82ce214 commit a8d6d90

File tree

102 files changed

+18489
-32920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+18489
-32920
lines changed

.babelrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
{
22
"plugins": [ "add-module-exports" ],
3-
"presets": [ "es2015", "stage-2"]
3+
"presets": [
4+
[ "env", { "modules": false } ],
5+
"es2015",
6+
"stage-2"
7+
]
48
}

.eslintrc.json

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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ lib/
3939
*.ntvs*
4040
*.njsproj
4141
*.sln
42+
/dist

.travis.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
language: node_js
2-
node_js: '12'
2+
node_js: '8'
33
cache: yarn
44
addons:
55
code_climate:
66
repo_token: 'your repo token'
7-
firefox: "69.0"
7+
firefox: "51.0"
88
services:
99
- xvfb
1010
notifications:
11-
email: false
12-
before_script:
13-
- npm install codeclimate-test-reporter
14-
- alias codeclimate="./node_modules/codeclimate-test-reporter/bin/codeclimate.js"
15-
after_script:
16-
- codeclimate-test-reporter < coverage/lcov.info
11+
email: false

.vscode/launch.json

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,23 @@
77
{
88
"type": "node",
99
"request": "launch",
10-
"name": "Mocha Tests",
11-
"cwd": "${workspaceRoot}",
12-
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/mocha",
13-
"windows": {
14-
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/mocha.cmd"
15-
},
16-
"runtimeArgs": [
17-
"--opts",
18-
"mocha.opts",
10+
"name": "TS - Mocha Tests",
11+
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
12+
"args": [
13+
"--require",
14+
"ts-node/register",
1915
"-u",
2016
"tdd",
2117
"--timeout",
2218
"999999",
23-
"--colors"
19+
"--colors",
20+
"--recursive",
21+
"${workspaceFolder}/test/**/*.ts"
2422
],
25-
"internalConsoleOptions":"openOnFirstSessionStart"
23+
"env": {
24+
"TS_NODE_PROJECT": "tsconfig.esnext.json"
25+
},
26+
"internalConsoleOptions": "openOnSessionStart"
2627
},
2728
{
2829
"type": "node",
@@ -36,6 +37,7 @@
3637
"request": "attach",
3738
"name": "Attach to Process",
3839
"port": 5858
39-
}
40+
},
41+
4042
]
4143
}

.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,10 @@
88
"lib/**": true,
99
"**/node_modules": true,
1010
"**/bower_components": true
11+
},
12+
"workbench.colorCustomizations": {
13+
"activityBar.background": "#2B3011",
14+
"titleBar.activeBackground": "#3C4418",
15+
"titleBar.activeForeground": "#FAFBF4"
1116
}
1217
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ See [https://feathers-vuex.feathers-plus.com/index.html](https://feathers-vuex.f
4646

4747
## Installation
4848

49-
```console
49+
```bash
5050
npm install feathers-vuex --save
5151
```
5252

docs/.vuepress/config.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
module.exports = {
22
title: 'FeathersVuex',
33
description: 'Integration of FeathersJS, Vue, and Nuxt for the artisan developer',
4+
theme: 'default-prefers-color-scheme',
45
themeConfig: {
56
repo: 'feathers-plus/feathers-vuex',
67
docsDir: 'docs',
78
editLinks: true,
89
sidebar: [
910
'/api-overview.md',
1011
'/vue-plugin.md',
11-
'/service-module.md',
12-
'/auth-module.md',
12+
'/service-plugin.md',
13+
'/auth-plugin.md',
1314
'/model-classes.md',
1415
'/common-patterns.md',
1516
'/mixins.md',
16-
'/components.md',
17-
'/nuxt.md'
17+
'/data-components.md',
18+
'/feathers-vuex-form-wrapper.md',
19+
'/nuxt.md',
20+
'/2.0-major-release.md'
1821
],
1922
serviceWorker: {
2023
updatePopup: true

0 commit comments

Comments
 (0)