Skip to content

Commit

Permalink
fix(libdef): migrate to libdefkit, fix pkg scope
Browse files Browse the repository at this point in the history
  • Loading branch information
@antongolub
antongolub committed Jun 28, 2020
1 parent 5f3ef1d commit dc5ae42
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 76 deletions.
13 changes: 4 additions & 9 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"name": "@qiwi/license",
"version": "1.1.2",
"description": "QIWI OSS License",
"source": "src/main/ts/index.ts",
"bin": {
"qiwilicense": "target/es5/cli.js"
},
"main": "target/bundle/license.js",
"module": "target/bundle/license.mjs",
"unpkg": "target/bundle/license.umd.js",
"source": "src/main/ts/index.ts",
"types": "typings/index.d.ts",
"typescript": {
"definition": "typings/index.d.ts"
Expand All @@ -26,16 +26,13 @@
"lint:fix": "yarn lint --fix",
"test": "yarn lint && yarn jest",
"clean": "rimraf target typings",
"build": "yarn clean && yarn build:tpl && yarn build:es5 && yarn build:es6 && yarn build:ts && yarn libdef && yarn docs && yarn uglify && yarn build:bundle",
"build": "yarn clean && yarn build:tpl && yarn build:es5 && yarn build:es6 && yarn build:ts && yarn build:libdef && yarn docs && yarn uglify && yarn build:bundle",
"build:tpl": "mkdir -p target/tpl && cp src/main/tpl/* target/tpl",
"build:es5": "mkdir -p target/es5 && tsc -p tsconfig.es5.json",
"build:es6": "mkdir -p target/es6 && tsc -p tsconfig.es6.json",
"build:ts": "cp -r src/main/ts/ target/ts/",
"build:bundle": "microbundle build src/main/ts/index.ts -o target/bundle",
"dtsgen": "dts-generator --project ./ --out typings/index.d.ts --prefix license/target/es5 --name license --main license/target/es5/index --moduleResolution node",
"flowgen": "flowgen typings/index.d.ts --output-file flow-typed/index.flow.js",
"libdef": "yarn dtsgen && yarn libdeffix && yarn flowgen",
"libdeffix": "node -r esm ./src/gen/js/libdef-fix.js --dts=./typings/index.d.ts",
"build:libdef": "dts-generator --project ./ --out typings/index.d.ts --prefix @qiwi/license/target/es5 --name @qiwi/license --main @qiwi/license/target/es5/index --moduleResolution node && libdeffix --dts=./typings/index.d.ts --prefix=@qiwi/license/target/es5 && flowgen typings/index.d.ts --output-file flow-typed/index.flow.js",
"test:report": "yarn test && yarn push:report",
"push:report": "yarn coveralls:push",
"coveralls:push": "cat ./coverage/lcov.info | coveralls",
Expand Down Expand Up @@ -68,6 +65,7 @@
"tslib": "^2.0.0"
},
"devDependencies": {
"@qiwi/libdefkit": "^1.0.2",
"@qiwi/semantic-release-gh-pages-plugin": "^3.0.0",
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/git": "^9.0.0",
Expand All @@ -76,15 +74,12 @@
"@types/jest": "^26.0.3",
"@types/jest-json-schema": "^2.1.2",
"coveralls": "^3.1.0",
"dts-generator": "^3.0.0",
"eslint-plugin-typescript": "^0.14.0",
"esm": "^3.2.25",
"execa": "^4.0.2",
"flowgen": "1.11.0",
"jest": "^26.1.0",
"lodash": "^4.17.15",
"microbundle": "^0.12.2",
"replace-in-file": "^6.1.0",
"rimraf": "^3.0.2",
"semantic-release": "^17.1.1",
"terser": "^4.8.0",
Expand Down
41 changes: 0 additions & 41 deletions src/gen/js/libdef-fix.js
View file

This file was deleted.

68 changes: 42 additions & 26 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# yarn lockfile v1


"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.3", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.3", "@babel/code-frame@^7.5.5":
version "7.10.3"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.3.tgz#324bcfd8d35cd3d47dae18cde63d752086435e9a"
integrity sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==
Expand Down Expand Up @@ -260,7 +260,7 @@
"@babel/traverse" "^7.10.1"
"@babel/types" "^7.10.1"

"@babel/highlight@^7.10.3", "@babel/highlight@^7.9.0":
"@babel/highlight@^7.0.0", "@babel/highlight@^7.10.3":
version "7.10.3"
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.3.tgz#c633bb34adf07c5c13156692f5922c81ec53f28d"
integrity sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==
Expand Down Expand Up @@ -1214,6 +1214,21 @@
dependencies:
"@types/node" ">= 8"

"@qiwi/libdefkit@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@qiwi/libdefkit/-/libdefkit-1.0.2.tgz#d63700ae07d991cacab91d15afbf5363a4138084"
integrity sha512-W0oG8vmTAcJQz+6mR5YQxM3HCQEJzCkgCcKsbHUtYLVXePTViXGPGrQxnEQUKzjubxMbBKBiP9DrZ7qKpxVt3g==
dependencies:
"@qiwi/substrate" "^1.18.28"
"@types/lodash" "^4.14.151"
"@types/meow" "^5.0.0"
"@types/read-pkg" "^5.1.0"
dts-generator "^3.0.0"
flowgen "1.10.0"
meow "^7.0.1"
replace-in-file "^6.0.0"
tslib "^2.0.0"

"@qiwi/semantic-release-gh-pages-plugin@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@qiwi/semantic-release-gh-pages-plugin/-/semantic-release-gh-pages-plugin-3.0.0.tgz#3d18908f07084f732672343b023a7fbf076f2b05"
Expand Down Expand Up @@ -1250,7 +1265,7 @@
resolved "https://registry.yarnpkg.com/@qiwi/substrate-types/-/substrate-types-1.41.0.tgz#58961c7cad11375f2a33cd10617a0265cf2f1ef8"
integrity sha512-2fVQP/20zMBaSc8onxRy3te2Ep3yJjVgCoYjqFlCAzNl3nvX4uuAEK3VbwBG0iobUe8LL5zzgr0bySYXkkfucw==

"@qiwi/substrate@^1.18.33":
"@qiwi/substrate@^1.18.28", "@qiwi/substrate@^1.18.33":
version "1.18.33"
resolved "https://registry.yarnpkg.com/@qiwi/substrate/-/substrate-1.18.33.tgz#fba9adbad6f42f8014b996dee6fca5c7bd310b50"
integrity sha512-cZ9lKTiF0KdrnfLpj4s1G3IY8m+Ff1AoZwGkjscxc+F0m9iHupc38SxmiCfJfGI/i6wvbxa7HVvqoeNryp/koQ==
Expand Down Expand Up @@ -1542,7 +1557,7 @@
jest-diff "^25.2.1"
pretty-format "^25.2.1"

"@types/lodash@^4.14.157":
"@types/lodash@^4.14.151", "@types/lodash@^4.14.157":
version "4.14.157"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.157.tgz#fdac1c52448861dfde1a2e1515dbc46e54926dc8"
integrity sha512-Ft5BNFmv2pHDgxV5JDsndOWTRJ+56zte0ZpYLowp03tW+K+t8u8YMOzAnpuqPgzX6WO1XpDIUm7u04M8vdDiVQ==
Expand Down Expand Up @@ -2602,16 +2617,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
dependencies:
delayed-stream "~1.0.0"

commander@^2.12.1, commander@^2.18.0, commander@^2.20.0:
commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.20.0:
version "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@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==

commondir@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
Expand Down Expand Up @@ -3815,17 +3825,18 @@ find-versions@^3.0.0:
dependencies:
semver-regex "^2.0.0"

flowgen@1.11.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/flowgen/-/flowgen-1.11.0.tgz#3d9e36bb1dcbc9ffd849e7b375295e6bb29a0465"
integrity sha512-WpoBjzcZadnAw5FatlUbvFWUWXkI2/LjrwTl5fl3MVDh+KdvYgFzgRXDDKH/O2uUlwjfpveiJJJx8TwL7Se84A==
flowgen@1.10.0:
version "1.10.0"
resolved "https://registry.yarnpkg.com/flowgen/-/flowgen-1.10.0.tgz#a041ae31d543d22166e7ba7c296b8445deb3c2e4"
integrity sha512-3lsoaa1vxGXhnkHuoE4mLPJi/klvpR3ID8R9CFJ/GBNi+cxJXecWQaUPrWMdNI5tGs8Y+7wrIZaCVFKFLQiGOg==
dependencies:
"@babel/code-frame" "^7.8.3"
"@babel/highlight" "^7.9.0"
commander "^5.1.0"
lodash "^4.17.15"
prettier "^2.0.5"
shelljs "^0.8.4"
"@babel/code-frame" "^7.0.0"
"@babel/highlight" "^7.0.0"
commander "^2.11.0"
lodash "^4.17.4"
paralleljs "^0.2.1"
prettier "^1.16.4"
shelljs "^0.8.3"
typescript "^3.4"
typescript-compiler "^1.4.1-2"

Expand Down Expand Up @@ -7132,6 +7143,11 @@ parallel-transform@^1.1.0:
inherits "^2.0.3"
readable-stream "^2.1.5"

paralleljs@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/paralleljs/-/paralleljs-0.2.1.tgz#ebca745d3e09c01e2bebcc14858891ff4510e926"
integrity sha1-68p0XT4JwB4r68wUhYiR/0UQ6SY=

parent-module@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
Expand Down Expand Up @@ -7675,10 +7691,10 @@ prepend-http@^1.0.0, prepend-http@^1.0.1:
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=

prettier@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
prettier@^1.16.4:
version "1.19.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==

pretty-bytes@^3.0.0:
version "3.0.1"
Expand Down Expand Up @@ -8141,7 +8157,7 @@ repeat-string@^1.6.1:
resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=

replace-in-file@^6.1.0:
replace-in-file@^6.0.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/replace-in-file/-/replace-in-file-6.1.0.tgz#9f9ddd7bb70d6ad231d2ad692e1b646e73d06647"
integrity sha512-URzjyF3nucvejuY13HFd7O+Q6tFJRLKGHLYVvSh+LiZj3gFXzSYGnIkQflnJJulCAI2/RTZaZkpOtdVdW0EhQA==
Expand Down Expand Up @@ -8584,7 +8600,7 @@ shebang-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==

shelljs@^0.8.4:
shelljs@^0.8.3, shelljs@^0.8.4:
version "0.8.4"
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
Expand Down

0 comments on commit dc5ae42

Please sign in to comment.