From e980ddb9645e3e9a85fc439efe2c1ad6dfb1cd1e Mon Sep 17 00:00:00 2001 From: JounQin Date: Sun, 3 Nov 2019 16:52:06 +0800 Subject: [PATCH] fix: bump @pkgr/utils version, dTs config takes highest priority chore: remove infrequently used composite config --- package.json | 2 +- packages/babel-preset/package.json | 2 +- packages/commitlint-config/package.json | 2 +- packages/eslint-config/_util.js | 48 +++++-------------- packages/eslint-config/overrides.js | 2 +- packages/eslint-config/package.json | 2 +- packages/lib-config/package.json | 2 +- packages/lint-staged/package.json | 4 +- packages/postcss-config/package.json | 2 +- packages/stylelint-config/package.json | 2 +- packages/tsconfig/app.json | 6 +-- packages/tsconfig/composite.json | 7 --- yarn.lock | 63 ++++++++++++++----------- 13 files changed, 59 insertions(+), 85 deletions(-) delete mode 100644 packages/tsconfig/composite.json diff --git a/package.json b/package.json index 4d118357..31acc4d0 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@angular/core": "^8.2.13", "@types/jest": "^24.0.21", - "@types/node": "^12.12.3", + "@types/node": "^12.12.5", "@types/react": "^16.9.11", "@types/unist": "^2.0.3", "lerna": "^3.18.3", diff --git a/packages/babel-preset/package.json b/packages/babel-preset/package.json index 9a38061f..29418d26 100644 --- a/packages/babel-preset/package.json +++ b/packages/babel-preset/package.json @@ -18,7 +18,7 @@ "@babel/preset-env": "^7.6.3", "@babel/preset-react": "^7.6.3", "@babel/preset-typescript": "^7.6.0", - "@pkgr/utils": "^0.2.0", + "@pkgr/utils": "^0.3.0", "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0", "@vue/babel-preset-jsx": "^1.1.1", "babel-plugin-import": "^1.12.2", diff --git a/packages/commitlint-config/package.json b/packages/commitlint-config/package.json index 37012aff..791ae6de 100644 --- a/packages/commitlint-config/package.json +++ b/packages/commitlint-config/package.json @@ -9,7 +9,7 @@ "@commitlint/cli": "^8.2.0", "@commitlint/config-conventional": "^8.2.0", "@commitlint/config-lerna-scopes": "^8.2.0", - "@pkgr/utils": "^0.2.0" + "@pkgr/utils": "^0.3.0" }, "publishConfig": { "access": "public" diff --git a/packages/eslint-config/_util.js b/packages/eslint-config/_util.js index 4db7948d..03a743d9 100644 --- a/packages/eslint-config/_util.js +++ b/packages/eslint-config/_util.js @@ -1,45 +1,19 @@ -const fs = require('fs') const { resolve } = require('path') -const { isPkgAvailable, tryFile } = require('@pkgr/utils') -const isGlob = require('is-glob') -const globSync = require('tiny-glob/sync') +const { + isMonorepo, + isPkgAvailable, + monorepoPkgs, + tryRequirePkg, +} = require('@pkgr/utils') -let pkg = {} - -try { - pkg = require(resolve('package.json')) -} catch (e) {} - -let lernaConfig - -try { - lernaConfig = require(resolve('lerna.json')) -} catch (e) {} - -const pkgsPath = (lernaConfig && lernaConfig.packages) || pkg.workspaces - -exports.isMonorepo = Array.isArray(pkgsPath) - -if (exports.isMonorepo) { - const pkgs = pkgsPath.reduce( - (acc, pkg) => - acc - .concat( - isGlob(pkg) - ? globSync(pkg).map(sub => resolve(sub)) - : tryFile(resolve(pkg)), - ) - .filter(Boolean), - [], - ) - - exports.allowModules = pkgs.reduce((acc, pkg) => { - const pkgJson = resolve(pkg, 'package.json') - if (!fs.existsSync(pkgJson)) { +if (isMonorepo) { + exports.allowModules = monorepoPkgs.reduce((acc, pkg) => { + const pkgJson = tryRequirePkg(resolve(pkg, 'package.json')) + if (!pkgJson) { return acc } - const { name, peerDependencies = {}, dependencies = {} } = require(pkgJson) + const { name, peerDependencies = {}, dependencies = {} } = pkgJson return acc.concat( name, Object.keys(peerDependencies), diff --git a/packages/eslint-config/overrides.js b/packages/eslint-config/overrides.js index 4185a981..bed1b96d 100644 --- a/packages/eslint-config/overrides.js +++ b/packages/eslint-config/overrides.js @@ -405,7 +405,6 @@ exports.config = { exports.overrides = exports.ts .concat( exports.js, - exports.dTs, tslint && lintFile && exports.tslint, isReactAvailable && exports.react, isReactAvailable && exports.reactHooks, @@ -417,5 +416,6 @@ exports.overrides = exports.ts exports.test, exports.stories, exports.config, + exports.dTs, ) .filter(Boolean) diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index a5908235..d12c134c 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -10,7 +10,7 @@ "eslint": ">=6.6.0" }, "dependencies": { - "@pkgr/utils": "^0.2.0", + "@pkgr/utils": "^0.3.0", "@typescript-eslint/eslint-plugin": "^2.6.0", "@typescript-eslint/eslint-plugin-tslint": "^2.6.0", "@typescript-eslint/parser": "^2.6.0", diff --git a/packages/lib-config/package.json b/packages/lib-config/package.json index 61abdb28..dda8f22e 100644 --- a/packages/lib-config/package.json +++ b/packages/lib-config/package.json @@ -19,7 +19,7 @@ "@1stg/remark-config": "^0.2.2", "@1stg/tsconfig": "^0.7.0", "@babel/core": "^7.6.4", - "@pkgr/rollup": "^0.6.5", + "@pkgr/rollup": "^0.8.0", "eslint": "^6.6.0", "husky": "^3.0.9", "jest": "^24.9.0", diff --git a/packages/lint-staged/package.json b/packages/lint-staged/package.json index 565f5024..2d6fc688 100644 --- a/packages/lint-staged/package.json +++ b/packages/lint-staged/package.json @@ -9,11 +9,11 @@ "lint-staged": ">=9.0.0" }, "dependencies": { - "@pkgr/utils": "^0.2.0", + "@pkgr/utils": "^0.3.0", "@prettier/plugin-pug": "^1.0.5", "cross-env": "^6.0.3", "prettier": "^1.18.2", - "prettier-plugin-sh": "^0.2.1", + "prettier-plugin-sh": "^0.2.2", "prettier-plugin-toml": "^0.3.1" }, "publishConfig": { diff --git a/packages/postcss-config/package.json b/packages/postcss-config/package.json index ab8d97bc..997cc1f4 100644 --- a/packages/postcss-config/package.json +++ b/packages/postcss-config/package.json @@ -12,7 +12,7 @@ "postcss": ">=7.0.0" }, "dependencies": { - "autoprefixer": "^9.7.0", + "autoprefixer": "^9.7.1", "cssnano": "^4.1.10", "cssnano-preset-advanced": "^4.0.7", "postcss-import": "^12.0.1", diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json index dedb35f9..421953e5 100644 --- a/packages/stylelint-config/package.json +++ b/packages/stylelint-config/package.json @@ -9,7 +9,7 @@ "stylelint": ">=11.0.0" }, "dependencies": { - "@pkgr/utils": "^0.2.0", + "@pkgr/utils": "^0.3.0", "stylelint-config-prettier": "^6.0.0", "stylelint-config-standard": "^19.0.0", "stylelint-high-performance-animation": "^1.3.0", diff --git a/packages/tsconfig/app.json b/packages/tsconfig/app.json index 9d847b09..83248d46 100644 --- a/packages/tsconfig/app.json +++ b/packages/tsconfig/app.json @@ -1,6 +1,6 @@ { "$schema": "http://json.schemastore.org/tsconfig", - "extends": "./tsconfig.json", + "extends": "./loose.json", "compilerOptions": { "declaration": false, "declarationMap": false, @@ -9,8 +9,6 @@ "src/*" ] }, - "outDir": "dist", - "strictFunctionTypes": false, - "strictNullChecks": false + "outDir": "dist" } } diff --git a/packages/tsconfig/composite.json b/packages/tsconfig/composite.json deleted file mode 100644 index 3579671e..00000000 --- a/packages/tsconfig/composite.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/tsconfig", - "extends": "./lib.json", - "compilerOptions": { - "composite": true - } -} diff --git a/yarn.lock b/yarn.lock index 060c0fb8..9f92995b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2218,29 +2218,31 @@ tiny-glob "^0.2.6" tslib "^1.10.0" -"@pkgr/named-exports@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@pkgr/named-exports/-/named-exports-0.3.0.tgz#fffb72c50eb359f71d22066f5ae9eefa9a8c15e2" - integrity sha512-oNStMLh73dEmn443mmqPtdzAqY7FzudJDQXsgBI0lk0m/DI8SqH50IwHVX4NQaaAeIQ+5mx52qEaO34khHIUuA== +"@pkgr/named-exports@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@pkgr/named-exports/-/named-exports-0.4.0.tgz#2ee994cfea1e50d888adb0df1e7c4625651dcec8" + integrity sha512-DXWo3ZQWp1XBE7q9M3n/M+8GTuz8Ob0/qAeJMOH5qWDTRv6eU/UAkfHNo340/53+gX5MdiHRqByexNrB6db25g== -"@pkgr/rollup@^0.6.5": - version "0.6.5" - resolved "https://registry.yarnpkg.com/@pkgr/rollup/-/rollup-0.6.5.tgz#b86f07cf458dff25c5e4c433f0131af119e7b6a9" - integrity sha512-Gys6/jiG8cAkvypLQYunJC1LUK+7AYOCGlo60fNlgQQxjp119KrqnVG2/d3NrT+rk0rUq9VUhYirrFhy2mbmaw== +"@pkgr/rollup@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@pkgr/rollup/-/rollup-0.8.0.tgz#1831e212f1ec50364aa7bfd5b8a1b03225b47538" + integrity sha512-xSccCwSlS2B9y03A7CrmUr35Gex5WSiFGnf4FM7YITYdoLvXjZoCjiuPxyO0wqolYW8kKI058cD7RPE+gpb0Jw== dependencies: "@babel/preset-env" "^7.6.3" "@pkgr/es-modules" "^0.2.1" - "@pkgr/named-exports" "^0.3.0" + "@pkgr/named-exports" "^0.4.0" "@pkgr/umd-globals" "^0.3.0" - "@pkgr/utils" "^0.2.0" + "@pkgr/utils" "^0.3.0" "@rollup/plugin-replace" "^2.2.0" "@rxts/rollup-plugin-alias" "^0.1.1" builtin-modules "^3.1.0" - commander "^3.0.2" + commander "^4.0.0" debug "^4.1.1" + is-glob "^4.0.1" jsox "^1.1.115" lodash "^4.17.15" - rollup "^1.26.0" + micromatch "^4.0.2" + rollup "^1.26.3" rollup-plugin-babel "^4.3.3" rollup-plugin-commonjs "^10.1.0" rollup-plugin-copy "^3.1.0" @@ -2257,14 +2259,16 @@ resolved "https://registry.yarnpkg.com/@pkgr/umd-globals/-/umd-globals-0.3.0.tgz#ba82ddc4b6c2f864b4635fa8a6257f65f57b40b3" integrity sha512-tnSeL23iFiqgmN6ISWG5cTJ/Cv7Kol81MolfPowYj63rAtEXyr0p1uHBXxFWUyM7WNUGJSUw98xdOdTzh1+BaQ== -"@pkgr/utils@^0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-0.2.0.tgz#5e4b4d3b727a1ad5af937e6ca610a4ec262f8e7b" - integrity sha512-mJOrIYSjKbdiHyzEnPL8ryucweTGaJMj+rTfovoF0qaIYFfJ/rZYFcS/t1sZ67GXXA7zmSSXXXwSnBIfabNEKA== +"@pkgr/utils@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-0.3.0.tgz#f04d5ecf3b8db7652f6a031d96923a5dcb39fd1f" + integrity sha512-ouLVujG7AHr9KI2Ops/u++c/p777UEYIzqOtrO0u8UQQHYmcdgmWWZ1UoFduA0IHRAfoSW0O4ti6jhpoAK2ulQ== dependencies: chalk "^2.4.2" cross-spawn "^7.0.1" + is-glob "^4.0.1" open "^7.0.0" + tiny-glob "^0.2.6" tslib "^1.10.0" "@prettier/plugin-pug@^1.0.5": @@ -2529,11 +2533,16 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node@*", "@types/node@^12.0.2", "@types/node@^12.11.1", "@types/node@^12.12.3": +"@types/node@*", "@types/node@^12.0.2", "@types/node@^12.11.1": version "12.12.3" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.3.tgz#ebfe83507ac506bc3486314a8aa395be66af8d23" integrity sha512-opgSsy+cEF9N8MgaVPnWVtdJ3o4mV2aMHvDq7thkQUFt0EuOHJon4rQpJfhjmNHB+ikl0Cd6WhWIErOyQ+f7tw== +"@types/node@^12.12.5": + version "12.12.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.5.tgz#66103d2eddc543d44a04394abb7be52506d7f290" + integrity sha512-KEjODidV4XYUlJBF3XdjSH5FWoMCtO0utnhtdLf1AgeuZLOrRbvmU/gaRCVg7ZaQDjVf3l84egiY0mRNe5xE4A== + "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" @@ -3077,7 +3086,7 @@ atob@^2.1.1: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@^9.4.7, autoprefixer@^9.5.1, autoprefixer@^9.6.1, autoprefixer@^9.7.0: +autoprefixer@^9.4.7, autoprefixer@^9.5.1, autoprefixer@^9.6.1, autoprefixer@^9.7.1: version "9.7.1" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.1.tgz#9ffc44c55f5ca89253d9bb7186cefb01ef57747f" integrity sha512-w3b5y1PXWlhYulevrTJ0lizkQ5CyqfeU6BIRDbuhsMupstHQOeb1Ur80tcB1zxSu7AwyY/qCQ7Vvqklh31ZBFw== @@ -3913,10 +3922,10 @@ commander@^2.11.0, commander@^2.12.1, commander@^2.20.0, commander@~2.20.3: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" - integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== +commander@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.0.tgz#e782b6afe6a0f1b1408be59429919e1305160e3f" + integrity sha512-SEa2abMBTZuEjLVYpNrAFoRgxPwG4rXP3+SGY6CM/HZGeDzIA7Pzp+7H3AHDukKEpyy2SoSGGPShKqqfH9T9AQ== commander@~2.8.1: version "2.8.1" @@ -10431,7 +10440,7 @@ prettier-plugin-pkg@^0.4.4: resolved "https://registry.yarnpkg.com/prettier-plugin-pkg/-/prettier-plugin-pkg-0.4.4.tgz#e7b20cba16995d04fe22b0aa2fe3974d9dc8a757" integrity sha512-3rIuIjGLoe8tNdG6I1ybAybNxy3O5SgpZsqypxTzPN4hkBtYbGAhBey1ROclKsFpH6SBYny9Y2djXq9y1b+adQ== -prettier-plugin-sh@^0.2.1, prettier-plugin-sh@^0.2.2: +prettier-plugin-sh@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/prettier-plugin-sh/-/prettier-plugin-sh-0.2.2.tgz#26714b34324f17884a7d74fee043ff25b462cc1c" integrity sha512-yL7Mdm+GZ7I7OwISZM2Y4NiaZsg1vKMd2JF5ixfa8BwdQCWUltr8gHW5buiaG9KXEvrBhIvoyFm4MsbtzpWtHQ== @@ -11979,10 +11988,10 @@ rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, dependencies: estree-walker "^0.6.1" -rollup@^1.26.0: - version "1.26.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.26.2.tgz#33d1ad23ee94aff1057448bae267be51dab4bdc1" - integrity sha512-TLM8hlYP85TFFptYlXmr2VnhCLA8GaYXG4LBdWsHu9oBH/Wm5MMPAE9wsAnohfV21Dqq0ZvRHdmsKXomshaDSg== +rollup@^1.26.3: + version "1.26.3" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.26.3.tgz#3e71b8120a4ccc745a856e926cab0efbe0eead90" + integrity sha512-8MhY/M8gnv3Q/pQQSWYWzbeJ5J1C5anCNY5BK1kV8Yzw9RFS0FF4lbLt+uyPO3wLKWXSXrhAL5pWL85TZAh+Sw== dependencies: "@types/estree" "*" "@types/node" "*"