Skip to content

Commit

Permalink
fix: upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
dword-design committed Aug 26, 2020
1 parent 3cd6450 commit 6db4b64
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 78 deletions.
99 changes: 51 additions & 48 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,14 @@
name: build
on:
push:
branches:
- "**"
jobs:
cancel-existing:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
runs-on: ubuntu-latest
steps:
- uses: rokroskar/workflow-run-cleanup-action@v0.2.2
env:
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
test:
needs: cancel-existing
strategy:
matrix:
os:
- macos-latest
- windows-latest
- ubuntu-latest
node:
- 10
- 12
exclude:
- os: macos-latest
node: 10
- os: windows-latest
node: 10
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}
- run: git config --global user.email "actions@github.com"
- run: git config --global user.name "GitHub Actions"
- run: yarn --frozen-lockfile
- run: yarn test
- name: Coveralls
if: matrix.os == 'ubuntu-latest' && matrix.node == 12
run: yarn dw-ci coveralls
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_SERVICE_NAME: github
COVERALLS_GIT_COMMIT: ${{ github.sha }}
COVERALLS_GIT_BRANCH: ${{ github.ref }}
uses: rokroskar/workflow-run-cleanup-action@v0.2.2
release:
needs: test
if: github.ref == 'refs/heads/master'
needs: test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -56,14 +18,55 @@ jobs:
- run: git config --global user.email "actions@github.com"
- run: git config --global user.name "GitHub Actions"
- run: yarn --frozen-lockfile
- run: yarn clean
- run: yarn lint
- name: Push changed files
run: yarn dw-ci push-changed-files
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- env:
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
name: Push changed files
run: yarn dw-ci push-changed-files
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
name: Release
run: yarn semantic-release
test:
needs: cancel-existing
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}
- run: git config --global user.email "actions@github.com"
- run: git config --global user.name "GitHub Actions"
- run: yarn --frozen-lockfile
- run: yarn clean
- run: yarn test
- env:
COVERALLS_GIT_BRANCH: ${{ github.ref }}
COVERALLS_GIT_COMMIT: ${{ github.sha }}
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_SERVICE_NAME: github
if: matrix.os == 'ubuntu-latest' && matrix.node == 12
name: Coveralls
run: yarn dw-ci coveralls
strategy:
matrix:
exclude:
- node: 10
os: macos-latest
- node: 10
os: windows-latest
node:
- 10
- 12
os:
- macos-latest
- windows-latest
- ubuntu-latest
name: build
on:
push:
branches:
- "**"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
.DS_Store
/.babelrc.json
/.commitlintrc.json
/.cz.json
/.editorconfig
/.env.json
/.eslintrc.json
/.huskyrc.json
/.nyc_output
/.releaserc.json
/.test.env.json
Expand Down
8 changes: 5 additions & 3 deletions .renovaterc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"extends": [
":semanticCommits"
],
"labels": [
"maintenance"
],
"packageRules": [
{
"packagePatterns": [
Expand All @@ -20,7 +23,6 @@
}
],
"lockFileMaintenance": {
"enabled": true,
"schedule": "at any time"
"enabled": true
}
}
}
17 changes: 16 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,22 @@
[![Dependency status](https://img.shields.io/david/dword-design/depcheck-parser-sass)](https://david-dm.org/dword-design/depcheck-parser-sass)
![Renovate enabled](https://img.shields.io/badge/renovate-enabled-brightgreen)

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/dword-design/depcheck-parser-sass)
<a href="https://www.buymeacoffee.com/dword">
<img
src="https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg"
alt="Buy Me a Coffee"
height="32"
>
</a><a href="https://gitpod.io/#https://github.com/dword-design/depcheck-parser-sass">
<img src="https://gitpod.io/button/open-in-gitpod.svg" alt="Open in Gitpod">
</a>
<a href="https://paypal.me/SebastianLandwehr">
<img
src="https://upload.wikimedia.org/wikipedia/commons/b/b5/PayPal.svg"
alt="PayPal"
height="30"
>
</a>
<!-- /BADGES -->
<!-- DESCRIPTION/ -->
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"dist"
],
"scripts": {
"clean": "base clean",
"commit": "base commit",
"dev": "base dev",
"lint": "base lint",
Expand Down
36 changes: 10 additions & 26 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@
pirates "^4.0.0"
source-map-support "^0.5.16"

"@babel/runtime@^7.10.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.6":
"@babel/runtime@^7.11.0", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.6":
version "7.11.2"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
Expand Down Expand Up @@ -1034,7 +1034,7 @@
"@babel/plugin-proposal-pipeline-operator" "^7.5.0"
"@babel/preset-env" "^7.6.3"
"@dword-design/functions" "^2.2.2"
"@vue/babel-preset-jsx" "github:dword-design/jsx#fork-babel-preset-jsx"
"@vue/babel-preset-jsx" dword-design/jsx#fork-babel-preset-jsx
babel-plugin-add-module-exports "^1.0.2"
babel-plugin-module-resolver "^4.0.0"
babel-plugin-transform-imports "^2.0.0"
Expand Down Expand Up @@ -1079,7 +1079,7 @@
commitizen "^4.0.3"
constant-case "^3.0.3"
cz-conventional-changelog "^3.1.0"
depcheck "github:dword-design/depcheck#fork"
depcheck dword-design/depcheck#fork
depcheck-detector-execa "^1.2.1"
depcheck-parser-babel "^1.2.0"
execa "^4.0.0"
Expand Down Expand Up @@ -1141,7 +1141,7 @@
eslint-config-airbnb-base "^14.1.0"
eslint-config-prettier "^6.11.0"
eslint-import-resolver-babel-module "^5.1.2"
eslint-plugin-import "github:dword-design/eslint-plugin-import#fork"
eslint-plugin-import dword-design/eslint-plugin-import#fork
eslint-plugin-json-format "^2.0.1"
eslint-plugin-prefer-arrow "^1.1.6"
eslint-plugin-prettier "^3.1.3"
Expand All @@ -1152,7 +1152,7 @@
eslint-plugin-vue "^7.0.0-alpha.6"
get-package-name "^1.0.0"
load-pkg "^4.0.0"
prettier "github:prettier/prettier#c4e9dd9c3672ded96f52a2c271a9658d0b2fe446"
prettier prettier/prettier#c4e9dd9c3672ded96f52a2c271a9658d0b2fe446
vue-eslint-parser "^7.0.0"

"@dword-design/eslint-plugin-import-alias@^1.1.1":
Expand All @@ -1169,7 +1169,7 @@
resolved "https://registry.yarnpkg.com/@dword-design/functions/-/functions-1.1.4.tgz#8b5be6c15e5ac9d017b9009c821d755e05299dc0"
integrity sha512-uJoO5tyJ0Wtfc3yfQpd5BEyG7G5TBfcCVyZZIZaCJUS+AcQ/Xt5xb15YYDwYI2n7zIi+wUEEL6+hJBNT+tqd3A==
dependencies:
endent "github:dword-design/endent#fork"
endent dword-design/endent#fork
lodash "^4.17.15"
tinycolor2 "^1.4.1"

Expand Down Expand Up @@ -1622,7 +1622,6 @@

"@vue/babel-preset-jsx@github:dword-design/jsx#fork-babel-preset-jsx":
version "1.1.2"
uid a73cb9961541a60a66b1b99a69a32e00bc66d336
resolved "https://codeload.github.com/dword-design/jsx/tar.gz/a73cb9961541a60a66b1b99a69a32e00bc66d336"
dependencies:
"@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
Expand All @@ -1641,7 +1640,6 @@

"@vue/babel-sugar-inject-h@dword-design/jsx#fork-babel-sugar-inject-h":
version "1.1.2"
uid cc36a2200c059120f37944615fb2ec0e22f8f3cc
resolved "https://codeload.github.com/dword-design/jsx/tar.gz/cc36a2200c059120f37944615fb2ec0e22f8f3cc"
dependencies:
"@babel/plugin-syntax-jsx" "^7.2.0"
Expand Down Expand Up @@ -2532,7 +2530,6 @@ ci-info@^2.0.0:

ci-info@watson/ci-info#f43f6a1cefff47fb361c88cf4b943fdbcaafe540:
version "2.0.0"
uid f43f6a1cefff47fb361c88cf4b943fdbcaafe540
resolved "https://codeload.github.com/watson/ci-info/tar.gz/f43f6a1cefff47fb361c88cf4b943fdbcaafe540"

cidr-regex@^2.0.10:
Expand Down Expand Up @@ -3185,7 +3182,6 @@ decode-uri-component@^0.2.0:

dedent@0.7.0, dedent@dword-design/dedent#fork:
version "0.7.0"
uid c8d46e5017d60504657c2d01b59082c0329a12a7
resolved "https://codeload.github.com/dword-design/dedent/tar.gz/c8d46e5017d60504657c2d01b59082c0329a12a7"
dependencies:
babel-plugin-add-module-exports "^1.0.2"
Expand Down Expand Up @@ -3506,7 +3502,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:

endent@dword-design/endent#fork, "endent@github:dword-design/endent#fork":
version "1.4.0"
uid be5433db67eaec07c6c9d00ba3bed2ed946dc664
resolved "https://codeload.github.com/dword-design/endent/tar.gz/be5433db67eaec07c6c9d00ba3bed2ed946dc664"
dependencies:
dedent dword-design/dedent#fork
Expand Down Expand Up @@ -3675,7 +3670,6 @@ eslint-module-utils@^2.4.1:

"eslint-plugin-import@github:dword-design/eslint-plugin-import#fork":
version "2.20.1"
uid "092878bcc1f9b7ef80ca755bfd77e13b15aa9ef3"
resolved "https://codeload.github.com/dword-design/eslint-plugin-import/tar.gz/092878bcc1f9b7ef80ca755bfd77e13b15aa9ef3"
dependencies:
array-includes "^3.0.3"
Expand Down Expand Up @@ -5749,11 +5743,11 @@ jsesc@~0.5.0:
integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=

json-fixer@^1.3.2:
version "1.6.1"
resolved "https://registry.yarnpkg.com/json-fixer/-/json-fixer-1.6.1.tgz#0539edbad065321bab0272ce1a7579e6390bf717"
integrity sha512-kYGgtgg/cQqLkxeqcxkT54aJUkylbFFviGC1Zjd1RaETII0m0/Fb85R1hwLK1qXaEZxvyBQnfGDOeRNnK5E5LA==
version "1.6.3"
resolved "https://registry.yarnpkg.com/json-fixer/-/json-fixer-1.6.3.tgz#1beaf69b137ed3588b8fdb5a5a507f4b3f276fe4"
integrity sha512-JSjfJJaKCQpSNEh+Tw1lX2L8MnDjIxfBpPTWUO/XN0JUY87nHJiFBy5i0Tm8o7/841LWfMDbqhn7UjhkjrZKkw==
dependencies:
"@babel/runtime" "^7.10.5"
"@babel/runtime" "^7.11.0"
chalk "^4.1.0"
pegjs "^0.10.0"

Expand Down Expand Up @@ -7154,7 +7148,6 @@ npm@^6.10.3:
cmd-shim "^3.0.3"
columnify "~1.5.4"
config-chain "^1.1.12"
debuglog "*"
detect-indent "~5.0.0"
detect-newline "^2.1.0"
dezalgo "~1.0.3"
Expand All @@ -7169,7 +7162,6 @@ npm@^6.10.3:
has-unicode "~2.0.1"
hosted-git-info "^2.8.8"
iferr "^1.0.2"
imurmurhash "*"
infer-owner "^1.0.4"
inflight "~1.0.6"
inherits "^2.0.4"
Expand All @@ -7188,14 +7180,8 @@ npm@^6.10.3:
libnpx "^10.2.4"
lock-verify "^2.1.0"
lockfile "^1.0.4"
lodash._baseindexof "*"
lodash._baseuniq "~4.6.0"
lodash._bindcallback "*"
lodash._cacheindexof "*"
lodash._createcache "*"
lodash._getnative "*"
lodash.clonedeep "~4.5.0"
lodash.restparam "*"
lodash.union "~4.6.0"
lodash.uniq "~4.5.0"
lodash.without "~4.4.0"
Expand Down Expand Up @@ -7754,7 +7740,6 @@ parse-passwd@^1.0.0:

parse-srcset@ikatyang/parse-srcset#54eb9c1cb21db5c62b4d0e275d7249516df6f0ee:
version "1.0.2"
uid "54eb9c1cb21db5c62b4d0e275d7249516df6f0ee"
resolved "https://codeload.github.com/ikatyang/parse-srcset/tar.gz/54eb9c1cb21db5c62b4d0e275d7249516df6f0ee"

pascal-case@^2.0.0:
Expand Down Expand Up @@ -8028,7 +8013,6 @@ prettier-linter-helpers@^1.0.0:

"prettier@github:prettier/prettier#c4e9dd9c3672ded96f52a2c271a9658d0b2fe446":
version "2.1.0-dev"
uid c4e9dd9c3672ded96f52a2c271a9658d0b2fe446
resolved "https://codeload.github.com/prettier/prettier/tar.gz/c4e9dd9c3672ded96f52a2c271a9658d0b2fe446"
dependencies:
"@angular/compiler" "10.0.11"
Expand Down

0 comments on commit 6db4b64

Please sign in to comment.