Skip to content

Commit

Permalink
fix: fixes after upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
dword-design committed Jul 4, 2020
1 parent 9c1aac8 commit 6434c51
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 39 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ jobs:
- run: git config --global user.name "GitHub Actions"
- run: yarn --frozen-lockfile
- run: yarn test
- name: Push changed files
if: matrix.os == 'ubuntu-latest' && matrix.node == 12
run: yarn dw-ci push-changed-files
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
- name: Coveralls
if: matrix.os == 'ubuntu-latest' && matrix.node == 12
run: yarn dw-ci coveralls
Expand All @@ -56,12 +50,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v1
with:
node-version: 12
- run: git config --global user.email "actions@github.com"
- run: git config --global user.name "GitHub Actions"
- run: yarn --frozen-lockfile
- run: yarn lint
- name: Push changed files
run: yarn dw-ci push-changed-files
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"scripts": {
"commit": "base commit",
"dev": "base dev",
"lint": "base lint",
"prepare": "base prepare",
"prepublishOnly": "base prepublishOnly",
"test": "base test"
Expand Down
16 changes: 8 additions & 8 deletions src/index.spec.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
import withLocalTmpDir from 'with-local-tmp-dir'
import outputFiles from 'output-files'
import { endent } from '@dword-design/functions'
import execa from 'execa'
import getPackageName from 'get-package-name'
import outputFiles from 'output-files'
import withLocalTmpDir from 'with-local-tmp-dir'

export default {
valid: () =>
withLocalTmpDir(async () => {
await outputFiles({
'.babelrc.json': JSON.stringify({
presets: [
[
getPackageName(require.resolve('@babel/preset-env')),
{ targets: { node: 10 } },
],
],
plugins: [
[
getPackageName(
Expand All @@ -23,6 +17,12 @@ export default {
{ proposal: 'fsharp' },
],
],
presets: [
[
getPackageName(require.resolve('@babel/preset-env')),
{ targets: { node: 10 } },
],
],
}),
'depcheck.config.js': endent`
const parser = require('../src/')
Expand Down
29 changes: 6 additions & 23 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,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 All @@ -973,7 +973,7 @@
parse-git-config "^3.0.0"
plugin-name-to-package-name "^0.1.1"
safe-readfile "^1.0.2"
safe-require "github:dword-design/node-safe-require#fork"
safe-require dword-design/node-safe-require#fork
semantic-release "^17.0.3"
sort-package-json "^1.39.1"
spdx-expression-parse "^3.0.0"
Expand Down Expand Up @@ -1003,7 +1003,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 @@ -1014,7 +1014,7 @@
eslint-plugin-vue "^7.0.0-alpha.6"
get-package-name "^1.0.0"
load-pkg "^4.0.0"
prettier "github:prettier/prettier#19545e049ea424273fb6d647eefd1787d998b333"
prettier prettier/prettier#19545e049ea424273fb6d647eefd1787d998b333
vue-eslint-parser "^7.0.0"

"@dword-design/eslint-plugin-import-alias@^1.1.1":
Expand All @@ -1031,7 +1031,7 @@
resolved "https://registry.yarnpkg.com/@dword-design/functions/-/functions-1.1.3.tgz#7a8fc3e4b0ba98aaf24804ea3cb8eb25c4b09a32"
integrity sha512-CzDaAHhF56vLo/A9dFMJQil+2t88RufZbQzsG1aGM4lvEm0iwPAqXPYhnGeS4+vucbuqDIV3QJ3FiQXlOmtEoA==
dependencies:
endent "github:dword-design/endent#fork"
endent dword-design/endent#fork
lodash "^4.17.15"
p-is-promise "^3.0.0"
tinycolor2 "^1.4.1"
Expand Down Expand Up @@ -1479,7 +1479,6 @@

"@vue/babel-preset-jsx@https://gitpkg.now.sh/dword-design/jsx/packages/babel-preset-jsx?fork":
version "1.1.2"
uid "3e09ecc8d5a0852b667f203969982bae39beb8c6"
resolved "https://gitpkg.now.sh/dword-design/jsx/packages/babel-preset-jsx?fork#3e09ecc8d5a0852b667f203969982bae39beb8c6"
dependencies:
"@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
Expand All @@ -1498,7 +1497,6 @@

"@vue/babel-sugar-inject-h@https://gitpkg.now.sh/dword-design/jsx/packages/babel-sugar-inject-h?fork":
version "1.1.2"
uid "43f4810009b4fdaa860aa1c44cb0aa43b1353ec3"
resolved "https://gitpkg.now.sh/dword-design/jsx/packages/babel-sugar-inject-h?fork#43f4810009b4fdaa860aa1c44cb0aa43b1353ec3"
dependencies:
"@babel/plugin-syntax-jsx" "^7.2.0"
Expand Down Expand Up @@ -2253,7 +2251,6 @@ chardet@^0.7.0:

"chdir@github:dword-design/node-chdir#fork":
version "0.0.0"
uid "7eaa8592e576b0f9d6d3ce699b02b04dcd8a2c16"
resolved "https://codeload.github.com/dword-design/node-chdir/tar.gz/7eaa8592e576b0f9d6d3ce699b02b04dcd8a2c16"

chokidar@3.3.0:
Expand Down Expand Up @@ -2322,7 +2319,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 @@ -2902,7 +2898,6 @@ 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 @@ -3209,7 +3204,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 @@ -3348,7 +3342,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 @@ -6576,7 +6569,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 @@ -6591,7 +6583,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 @@ -6610,14 +6601,8 @@ npm@^6.10.3:
libnpx "^10.2.2"
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 @@ -7371,7 +7356,6 @@ prettier-linter-helpers@^1.0.0:

"prettier@github:prettier/prettier#19545e049ea424273fb6d647eefd1787d998b333":
version "2.1.0-dev"
uid "19545e049ea424273fb6d647eefd1787d998b333"
resolved "https://codeload.github.com/prettier/prettier/tar.gz/19545e049ea424273fb6d647eefd1787d998b333"
dependencies:
"@angular/compiler" "9.0.5"
Expand Down Expand Up @@ -8118,7 +8102,6 @@ safe-regex@^1.1.0:

"safe-require@github:dword-design/node-safe-require#fork":
version "1.0.3"
uid "53682cf7aa25d784c6278f8ccbc9986ad0dd5f38"
resolved "https://codeload.github.com/dword-design/node-safe-require/tar.gz/53682cf7aa25d784c6278f8ccbc9986ad0dd5f38"

"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
Expand Down Expand Up @@ -9464,7 +9447,7 @@ with-local-tmp-dir@^2.2.4:
resolved "https://registry.yarnpkg.com/with-local-tmp-dir/-/with-local-tmp-dir-2.2.10.tgz#f840d54ada8f7714866e5d638b021ebbc8c2b9b0"
integrity sha512-QjUhQh7HN/OzaAkrXG+4eWyREOjWXLDD97tD2WKq68RTs2AiGPaxwlBIF15dul/vF05KG1RGvLR59a51O7xpyg==
dependencies:
chdir "github:dword-design/node-chdir#fork"
chdir dword-design/node-chdir#fork
tmp-promise "^3.0.0"

word-wrap@^1.0.3, word-wrap@^1.2.3:
Expand Down

0 comments on commit 6434c51

Please sign in to comment.