Skip to content

Commit

Permalink
Merge branch 'dev' into fix/3197-restore-v-edit-dialog-events
Browse files Browse the repository at this point in the history
  • Loading branch information
jacekkarczmarczyk authored Jun 11, 2018
2 parents 059d64d + 2773c94 commit 3982b5e
Show file tree
Hide file tree
Showing 506 changed files with 24,565 additions and 15,609 deletions.
42 changes: 24 additions & 18 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
{
"presets": [
["env", {
"targets": {
"browsers": [">0.5%", "last 2 versions", "not dead", "not op_mini all"],
"node": 8
},
"modules": false
}]
],
"plugins": [
["transform-define", "./build/babel-transform-define.js"],
"transform-object-rest-spread"
],
"env": {
"test": {
"presets": [
["es2015"],
["stage-2"]
["env", {
"targets": { "node": true }
}]
],
"plugins": [
"transform-runtime",
["module-resolver", {
"root": ["./src"],
"alias": {
Expand All @@ -21,22 +34,15 @@
},
"es5": {
"presets": [
["es2015"],
["stage-2"]
],
"plugins": ["./build/babel-transform-stylus-paths.js"]
},
"development": {
"presets": [
["es2015", { "modules": false }],
["stage-2"]
["env", {
"targets": {
"browsers": [">0.5%", "last 2 versions", "not dead", "not op_mini all"],
"node": 8
}
}]
],
"plugins": ["add-filehash"]
},
"production": {
"presets": [
["es2015", { "modules": false }],
["stage-2"]
"plugins": [
"./build/babel-transform-stylus-paths.js"
]
}
}
Expand Down
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ src/stylus/*.styl
src/util/testing.js
src/util/to-have-been-warned.js
*.spec.js
/dist
/es5
/es5-temp
/types/test
82 changes: 74 additions & 8 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,97 @@
module.exports = {
root: true,
parser: 'typescript-eslint-parser',
parserOptions: {
parser: 'babel-eslint',
ecmaVersion: 2017,
sourceType: 'module'
},
extends: [
'standard'
],
env: {
browser: true
browser: true,
es6: true
},
globals: {
'expect': true,
'describe': true,
'it': true,
'jest': true
'jest': true,
'process': true,
'__REQUIRED_VUE__': true
},
'rules': {
plugins: [
'typescript',
'eslint-plugin-local-rules'
],
rules: {
// allow paren-less arrow functions
'arrow-parens': [2, 'as-needed'],
'local-rules/no-render-string-reference': 2,
// set maximum line characters
'max-len': [2, 140, 4, {'ignoreUrls': true, 'ignoreTemplateLiterals': true, 'ignoreStrings': true}],
'max-len': [2, 140, 4, {
'ignoreUrls': true,
'ignoreTemplateLiterals': true,
'ignoreStrings': true
}],
'max-statements': [2, 24],
'no-console': 'off',
// allow debugger during development
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
'no-return-assign': 0,
'max-statements': [2, 24],
'prefer-promise-reject-errors': 0
}
'prefer-promise-reject-errors': 0,
'no-unused-vars': ['error', {
vars: 'all',
args: 'none', // This needs to be off so we can specify mixin interfaces
ignoreRestSiblings: false
}],
'no-empty': 'error',
'object-curly-spacing': ['error', 'always'],
'space-before-function-paren': [
'error',
{
anonymous: 'always',
named: 'always',
asyncArrow: 'always'
}
],
'no-return-await': 'warn',
'object-shorthand': ['error', 'always'],
'no-extra-semi': 'error'
},
overrides: [
{
files: '**/*.ts',
rules: {
// https://github.com/eslint/typescript-eslint-parser#known-issues
'no-undef': 'off',

// https://github.com/eslint/typescript-eslint-parser/issues/445
// 'typescript/no-unused-vars': 'error'

// https://github.com/eslint/eslint/issues/10260
'space-infix-ops': false,

// https://github.com/nzakas/eslint-plugin-typescript/issues/127
// 'typescript/prefer-namespace-keyword': 'error',

// Can't overload function exports with this enabled
'import/export': false,

// https://github.com/eslint/typescript-eslint-parser/issues/457
'no-unused-vars': false,
// 'typescript/no-unused-vars': 'error',

// https://github.com/eslint/typescript-eslint-parser/issues/443
// 'no-redeclare': false,

'typescript/adjacent-overload-signatures': 'error',
'typescript/member-delimiter-style': ['error', {
delimiter: 'none'
}],
'typescript/member-ordering': 'error',
'typescript/type-annotation-spacing': 'error'
}
}
]
}
12 changes: 10 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ MAKE SURE TO READ THE CONTRIBUTING GUIDE BEFORE CREATING A PR
https://github.com/vuetifyjs/vuetify/blob/master/.github/CONTRIBUTING.md
-->

<!--- Provide a general summary of your changes in the Title above -->
<!-- Provide a general summary of your changes in the Title above -->
<!-- Keep the title short and descriptive, as it will be used as a commit message -->

## Description
<!--- Describe your changes in detail -->
Expand All @@ -15,9 +16,16 @@ https://github.com/vuetifyjs/vuetify/blob/master/.github/CONTRIBUTING.md
## How Has This Been Tested?
<!--- Please describe how you tested your changes. -->
<!--- Have you created new tests or updated existing ones? -->
<!--- e.g. unit | visually | e2e | none -->

## Markup:
<!--- Paste markup that showcases your contribution --->
<!--- Paste markup for testing your change --->
<details>

```vue
// Paste your FULL Playground.vue here
```
</details>

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ dev/*css
!dev/lint-commit-message.js
!dev/warn-npm-install.js
/es5
/es5-temp
/dist
/release
.env
yarn-error.log
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ dev/
build/
release/
**/*.spec.js
/es5-temp
/.babelrc
/.editorconfig
/.eslintignore
/.eslintrc.js
/eslint-local-rules.js
eslint-rules/
/.travis.yml
/package-lock.json
/postcss.config.js
Expand Down
80 changes: 50 additions & 30 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,57 @@
language: node_js
node_js:
- "8"
node_js: '8'

before_script:
- npm i codecov -g
cache:
yarn: true

script:
install:
- yarn --frozen-lockfile --non-interactive
- yarn run lint
- yarn run test:coverage && codecov
- yarn run build

cache:
yarn: true
stages:
- name: test
if: (tag IS blank) OR (type != push) OR (repo != vuetifyjs/vuetify)
- name: deploy
if: (tag IS present) AND (type = push) AND (repo = vuetifyjs/vuetify)

jobs:
include:
- stage: test
before_script:
- npm i codecov -g
script:
- yarn run lint
- yarn run test:types
- yarn run test:coverage -i
after_script:
- codecov

before_deploy:
- rm -rf release
- mkdir -p release
- for file in ./dist/*; do cp "$file" "${file/dist\/vuetify/release/vuetify-${TRAVIS_TAG}}"; done
- zip -jr "release/vuetify-${TRAVIS_TAG}.zip" release/*
- stage: test
script: yarn run build

deploy:
- provider: npm
email: "[email protected]"
api_key: $NPM_API_KEY
tag: $(node ./build/parse-npm-tag.js ${TRAVIS_TAG})
skip_cleanup: true
on:
repo: vuetifyjs/vuetify
tags: true
- provider: releases
api_key: $GITHUB_API_KEY
file: "release/vuetify-${TRAVIS_TAG}.zip"
skip_cleanup: true
on:
tags: true
- stage: deploy
before_script:
- npm i codecov -g
script:
- yarn run lint
- yarn run test:coverage -i && codecov
- yarn run build
- rm -rf release
- mkdir -p release
- for file in ./dist/*; do cp "$file" "${file/dist\/vuetify/release/vuetify-${TRAVIS_TAG}}"; done
- zip -jr "release/vuetify-${TRAVIS_TAG}.zip" release/*
deploy:
- provider: npm
email: "[email protected]"
api_key: $NPM_API_KEY
tag: $(node ./build/parse-npm-tag.js ${TRAVIS_TAG})
skip_cleanup: true
on:
repo: vuetifyjs/vuetify
tags: true
- provider: releases
api_key: $GITHUB_API_KEY
file: "release/vuetify-${TRAVIS_TAG}.zip"
skip_cleanup: true
on:
repo: vuetifyjs/vuetify
tags: true
Loading

0 comments on commit 3982b5e

Please sign in to comment.