Skip to content

Commit 9d365d9

Browse files
authored
Merge pull request #114 from liferay/wincent/ts-first-class-citizen-ii
fix(npm-scripts): bundle TypeScript dependencies
2 parents 6f94843 + 7cb2e67 commit 9d365d9

File tree

3 files changed

+61
-53
lines changed

3 files changed

+61
-53
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"eslint": "7.10.0",
1111
"jest": "26.4.2",
1212
"prettier": "2.1.2",
13-
"typescript": "4.0.3"
13+
"typescript": "^4.0.3"
1414
},
1515
"license": "See LICENSE.md",
1616
"main": "index.js",

projects/npm-tools/packages/npm-scripts/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"@babel/plugin-proposal-optional-chaining": "^7.8.3",
1414
"@babel/preset-env": "^7.4.2",
1515
"@babel/preset-react": "^7.8.3",
16+
"@babel/preset-typescript": "^7.10.4",
1617
"@liferay/eslint-config": "21.2.0",
1718
"@liferay/jest-junit-reporter": "1.2.0",
1819
"@liferay/npm-bundler-preset-liferay-dev": "4.6.3",
@@ -27,6 +28,7 @@
2728
"@testing-library/react": "^8.0.9",
2829
"@testing-library/react-hooks": "^3.4.2",
2930
"@testing-library/user-event": "^4.2.4",
31+
"@types/jest": "^26.0.14",
3032
"babel-eslint": "^10.0.3",
3133
"babel-jest": "^25.1.0",
3234
"babel-loader": "^8.1.0",
@@ -64,6 +66,8 @@
6466
"style-ext-html-webpack-plugin": "4.1.2",
6567
"style-loader": "^1.1.3",
6668
"stylelint": "^13.2.0",
69+
"ts-loader": "^8.0.4",
70+
"typescript": "^4.0.3",
6771
"webpack": "^4.39.1",
6872
"webpack-cli": "^3.3.6",
6973
"webpack-dev-server": "^3.7.2"

yarn.lock

Lines changed: 56 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
levenary "^1.1.1"
116116
semver "^5.5.0"
117117

118-
"@babel/helper-create-class-features-plugin@^7.10.4":
118+
"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5":
119119
version "7.10.5"
120120
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d"
121121
integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==
@@ -520,6 +520,13 @@
520520
dependencies:
521521
"@babel/helper-plugin-utils" "^7.10.4"
522522

523+
"@babel/plugin-syntax-typescript@^7.10.4":
524+
version "7.10.4"
525+
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz#2f55e770d3501e83af217d782cb7517d7bb34d25"
526+
integrity sha512-oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ==
527+
dependencies:
528+
"@babel/helper-plugin-utils" "^7.10.4"
529+
523530
"@babel/plugin-transform-arrow-functions@^7.10.4":
524531
version "7.10.4"
525532
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
@@ -821,6 +828,15 @@
821828
dependencies:
822829
"@babel/helper-plugin-utils" "^7.10.4"
823830

831+
"@babel/plugin-transform-typescript@^7.10.4":
832+
version "7.11.0"
833+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz#2b4879676af37342ebb278216dd090ac67f13abb"
834+
integrity sha512-edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w==
835+
dependencies:
836+
"@babel/helper-create-class-features-plugin" "^7.10.5"
837+
"@babel/helper-plugin-utils" "^7.10.4"
838+
"@babel/plugin-syntax-typescript" "^7.10.4"
839+
824840
"@babel/plugin-transform-unicode-escapes@^7.10.4":
825841
version "7.10.4"
826842
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz#feae523391c7651ddac115dae0a9d06857892007"
@@ -942,6 +958,14 @@
942958
"@babel/plugin-transform-react-jsx-source" "^7.10.4"
943959
"@babel/plugin-transform-react-pure-annotations" "^7.10.4"
944960

961+
"@babel/preset-typescript@^7.10.4":
962+
version "7.10.4"
963+
resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz#7d5d052e52a682480d6e2cc5aa31be61c8c25e36"
964+
integrity sha512-SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ==
965+
dependencies:
966+
"@babel/helper-plugin-utils" "^7.10.4"
967+
"@babel/plugin-transform-typescript" "^7.10.4"
968+
945969
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
946970
version "7.11.2"
947971
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
@@ -2543,6 +2567,14 @@
25432567
dependencies:
25442568
"@types/istanbul-lib-report" "*"
25452569

2570+
"@types/jest@^26.0.14":
2571+
version "26.0.14"
2572+
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz#078695f8f65cb55c5a98450d65083b2b73e5a3f3"
2573+
integrity sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg==
2574+
dependencies:
2575+
jest-diff "^25.2.1"
2576+
pretty-format "^25.2.1"
2577+
25462578
"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5":
25472579
version "7.0.6"
25482580
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
@@ -4486,7 +4518,7 @@ browserslist@4.7.0:
44864518
electron-to-chromium "^1.3.247"
44874519
node-releases "^1.1.29"
44884520

4489-
browserslist@^4.12.0:
4521+
browserslist@^4.12.0, browserslist@^4.8.5:
44904522
version "4.14.5"
44914523
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
44924524
integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==
@@ -4496,16 +4528,6 @@ browserslist@^4.12.0:
44964528
escalade "^3.1.0"
44974529
node-releases "^1.1.61"
44984530

4499-
browserslist@^4.8.5:
4500-
version "4.14.4"
4501-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.4.tgz#66a18131439f9e16c3da7f352518dfa12f60b0e3"
4502-
integrity sha512-7FOuawafVdEwa5Jv4nzeik/PepAjVte6HmVGHsjt2bC237jeL9QlcTBDF3PnHEvcC6uHwLGYPwZHNZMB7wWAnw==
4503-
dependencies:
4504-
caniuse-lite "^1.0.30001135"
4505-
electron-to-chromium "^1.3.570"
4506-
escalade "^3.1.0"
4507-
node-releases "^1.1.61"
4508-
45094531
bser@2.1.1:
45104532
version "2.1.1"
45114533
resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -4742,12 +4764,7 @@ can-use-dom@^0.1.0:
47424764
resolved "https://registry.yarnpkg.com/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a"
47434765
integrity sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=
47444766

4745-
caniuse-lite@^1.0.30000989:
4746-
version "1.0.30001135"
4747-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001135.tgz#995b1eb94404a3c9a0d7600c113c9bb27f2cd8aa"
4748-
integrity sha512-ziNcheTGTHlu9g34EVoHQdIu5g4foc8EsxMGC7Xkokmvw0dqNtX8BS8RgCgFBaAiSp2IdjvBxNdh0ssib28eVQ==
4749-
4750-
caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135:
4767+
caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135:
47514768
version "1.0.30001142"
47524769
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001142.tgz#a8518fdb5fee03ad95ac9f32a9a1e5999469c250"
47534770
integrity sha512-pDPpn9ankEpBFZXyCv2I4lh1v/ju+bqb78QfKf+w9XgDAFWBwSYPswXqprRdrgQWK0wQnpIbfwRjNHO1HWqvoQ==
@@ -4774,7 +4791,7 @@ ccount@^1.0.0:
47744791
resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
47754792
integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==
47764793

4777-
chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1, chalk@^2.4.2:
4794+
chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
47784795
version "2.4.2"
47794796
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
47804797
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -6219,12 +6236,7 @@ ejs@^2.7.4:
62196236
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
62206237
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
62216238

6222-
electron-to-chromium@^1.3.247:
6223-
version "1.3.571"
6224-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.571.tgz#e57977f1569f8326ae2a7905e26f3943536ba28f"
6225-
integrity sha512-UYEQ2Gtc50kqmyOmOVtj6Oqi38lm5yRJY3pLuWt6UIot0No1L09uu6Ja6/1XKwmz/p0eJFZTUZi+khd1PV1hHA==
6226-
6227-
electron-to-chromium@^1.3.570, electron-to-chromium@^1.3.571:
6239+
electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.570, electron-to-chromium@^1.3.571:
62286240
version "1.3.576"
62296241
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz#2e70234484e03d7c7e90310d7d79fd3775379c34"
62306242
integrity sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==
@@ -6295,7 +6307,7 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
62956307
dependencies:
62966308
once "^1.4.0"
62976309

6298-
enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0:
6310+
enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0:
62996311
version "4.3.0"
63006312
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
63016313
integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
@@ -9541,7 +9553,7 @@ jest-diff@^24.0.0, jest-diff@^24.9.0:
95419553
jest-get-type "^24.9.0"
95429554
pretty-format "^24.9.0"
95439555

9544-
jest-diff@^25.5.0:
9556+
jest-diff@^25.2.1, jest-diff@^25.5.0:
95459557
version "25.5.0"
95469558
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9"
95479559
integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==
@@ -10869,7 +10881,7 @@ loader-utils@1.2.3:
1086910881
emojis-list "^2.0.0"
1087010882
json5 "^1.0.1"
1087110883

10872-
loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
10884+
loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
1087310885
version "1.4.0"
1087410886
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
1087510887
integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
@@ -11465,7 +11477,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
1146511477
snapdragon "^0.8.1"
1146611478
to-regex "^3.0.2"
1146711479

11468-
micromatch@^4.0.2:
11480+
micromatch@^4.0.0, micromatch@^4.0.2:
1146911481
version "4.0.2"
1147011482
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
1147111483
integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
@@ -12946,17 +12958,7 @@ postcss-scss@^2.1.1:
1294612958
dependencies:
1294712959
postcss "^7.0.6"
1294812960

12949-
postcss-selector-parser@^6.0.0:
12950-
version "6.0.3"
12951-
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.3.tgz#766d77728728817cc140fa1ac6da5e77f9fada98"
12952-
integrity sha512-0ClFaY4X1ra21LRqbW6y3rUbWcxnSVkDFG57R7Nxus9J9myPFlv+jYDMohzpkBx0RrjjiqjtycpchQ+PLGmZ9w==
12953-
dependencies:
12954-
cssesc "^3.0.0"
12955-
indexes-of "^1.0.1"
12956-
uniq "^1.0.1"
12957-
util-deprecate "^1.0.2"
12958-
12959-
postcss-selector-parser@^6.0.2:
12961+
postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
1296012962
version "6.0.4"
1296112963
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
1296212964
integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
@@ -12976,16 +12978,7 @@ postcss-value-parser@^4.1.0:
1297612978
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
1297712979
integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
1297812980

12979-
postcss@^7.0.0, postcss@^7.0.5:
12980-
version "7.0.34"
12981-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.34.tgz#f2baf57c36010df7de4009940f21532c16d65c20"
12982-
integrity sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==
12983-
dependencies:
12984-
chalk "^2.4.2"
12985-
source-map "^0.6.1"
12986-
supports-color "^6.1.0"
12987-
12988-
postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.6:
12981+
postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
1298912982
version "7.0.35"
1299012983
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
1299112984
integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
@@ -13042,7 +13035,7 @@ pretty-format@^24.0.0, pretty-format@^24.8.0, pretty-format@^24.9.0:
1304213035
ansi-styles "^3.2.0"
1304313036
react-is "^16.8.4"
1304413037

13045-
pretty-format@^25.5.0:
13038+
pretty-format@^25.2.1, pretty-format@^25.5.0:
1304613039
version "25.5.0"
1304713040
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
1304813041
integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==
@@ -15926,6 +15919,17 @@ ts-dedent@^1.1.0:
1592615919
resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-1.1.1.tgz#68fad040d7dbd53a90f545b450702340e17d18f3"
1592715920
integrity sha512-UGTRZu1evMw4uTPyYF66/KFd22XiU+jMaIuHrkIHQ2GivAXVlLV0v/vHrpOuTRf9BmpNHi/SO7Vd0rLu0y57jg==
1592815921

15922+
ts-loader@^8.0.4:
15923+
version "8.0.4"
15924+
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.4.tgz#02b9c91fbcfdb3114d8b1e98a3829265270eee7a"
15925+
integrity sha512-5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ==
15926+
dependencies:
15927+
chalk "^2.3.0"
15928+
enhanced-resolve "^4.0.0"
15929+
loader-utils "^1.0.2"
15930+
micromatch "^4.0.0"
15931+
semver "^6.0.0"
15932+
1592915933
ts-pnp@^1.1.2:
1593015934
version "1.2.0"
1593115935
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
@@ -16039,7 +16043,7 @@ typedarray@^0.0.6:
1603916043
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
1604016044
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
1604116045

16042-
typescript@*, typescript@4.0.3:
16046+
typescript@^4.0.3:
1604316047
version "4.0.3"
1604416048
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"
1604516049
integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==

0 commit comments

Comments
 (0)