Merge pull request #628 from vue-styleguidist/next

release 4.0.0

.circleci/config.yml

@@ -48,8 +48,9 @@ jobs:
  - attach_workspace:
  at: ~/
 
+ - run: cd packages/vue-cli-plugin-styleguidist && yarn link && cd ../..
+
  # remake the yarn link to vue-cli-plugin
- - run: yarn install
  - run: yarn build vuecli3
  - run: yarn build vuecli-noplugin
  - run: yarn build vuecli3-vuetify-ie
@@ -81,6 +82,8 @@ jobs:
  - attach_workspace:
  at: ~/
 
+ - run: cd packages/vue-cli-plugin-styleguidist && yarn link && cd ../..
+
  # run cypress tests
  - run: yarn cross-env CY_EXAMPLE_FOLDER=basic yarn cy
  - store_artifacts:

.eslintrc

@@ -9,7 +9,8 @@
  "settings": {
  "import/resolver": {
  "node": {
- "moduleDirectory": ["packages/vue-styleguidist/src", "node_modules"]
+ "moduleDirectory": ["packages/vue-styleguidist/src", "node_modules"],
+ "extensions": [".ts", ".tsx", ".js", ".d.ts"]
  }
  }
  },
@@ -44,7 +45,7 @@
  },
  "overrides": [
  {
- "files": ["**/*.ts"],
+ "files": ["**/*.ts", "**/*.tsx"],
  "parser": "@typescript-eslint/parser",
  "parserOptions": {
  "ecmaVersion": 2018,
@@ -54,14 +55,23 @@
  "settings": {
  "import/resolver": {
  "node": {
- "extensions": [".ts", ".js"]
+ "extensions": [".ts", ".tsx", ".js", ".d.ts"]
  }
  }
  },
  "rules": {
  "no-unused-vars": "off",
  "typescript/no-unused-vars": "off"
  }
+ },
+ {
+ "files": ["**/vue-docgen-api/**"],
+ "env": {
+ "es6": true
+ },
+ "rules": {
+ "compat/compat": "off"
+ }
  }
  ],
  "globals": {

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 
 # never build when commited by the bot
 # + prevent double build on dev -> master Pull Request
-if: sender != "vue-styleguidist-bot" AND sender != "Vue Styleguidist Bot" AND (type = pull_request OR branch = master)
+if: sender != "vue-styleguidist-bot" AND sender != "Vue Styleguidist Bot" AND (type = pull_request OR branch = master OR branch = next)
 
 cache: yarn
 
@@ -18,12 +18,15 @@ install:
 branches:
  only:
  - master
+ - next
  - dev
 
 stages:
  - test
  - name: documentation
  if: type != pull_request AND branch = master
+ - name: release-beta
+ if: type != pull_request AND branch = next
  - name: release
  if: type != pull_request AND branch = master
  - name: merge-back
@@ -42,7 +45,6 @@ jobs:
  - stage: documentation
  script:
  - yarn docs:build
- - yarn compile
 
  # Build all examples
  - cd examples
@@ -64,7 +66,6 @@ jobs:
 
  - stage: release
  script:
- - yarn compile
  - git config --global user.name "Vue Styleguidist Bot"
  - git config --global user.email "${BOT_EMAIL}"
  - git remote set-url origin "https://${GH_TOKEN}@github.com/vue-styleguidist/vue-styleguidist.git" > /dev/null 2>&1
@@ -74,6 +75,17 @@ jobs:
  - yarn lerna version --yes --github-release
  - yarn lerna publish from-git --yes
 
+ - stage: release-beta
+ script:
+ - git config --global user.name "Vue Styleguidist Bot"
+ - git config --global user.email "${BOT_EMAIL}"
+ - git remote set-url origin "https://${GH_TOKEN}@github.com/vue-styleguidist/vue-styleguidist.git" > /dev/null 2>&1
+ - git checkout next
+ - git reset --hard
+ - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" >> $HOME/.npmrc 2> /dev/null
+ - yarn lerna version --yes --github-release --conventional-prerelease --preid beta
+ - yarn lerna publish from-git --yes --dist-tag next
+
  # then merge the whole thing back to dev
  - stage: merge-back
  install: skip # bundle install is not required