diff --git a/integration/ng_elements/package.json b/integration/ng_elements/package.json index 2ad97831d41..746947f7ec2 100644 --- a/integration/ng_elements/package.json +++ b/integration/ng_elements/package.json @@ -23,8 +23,7 @@ "concurrently": "3.4.0", "lite-server": "2.2.2", "protractor": "file:../../node_modules/protractor", - "rollup": "file:../../node_modules/rollup", - "tsickle": "file:../../node_modules/tsickle" + "rollup": "file:../../node_modules/rollup" }, "scripts": { "build": "yarn ngc && yarn rollup -c rollup.config.mjs", diff --git a/integration/ng_elements/yarn.lock b/integration/ng_elements/yarn.lock index 48f72150227..6fd862663c1 100644 --- a/integration/ng_elements/yarn.lock +++ b/integration/ng_elements/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@ampproject/remapping@^2.1.0": +"@ampproject/remapping@^2.1.0", "@ampproject/remapping@^2.2.0": version "2.2.1" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== @@ -59,6 +59,11 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g== +"@babel/compat-data@^7.22.0": + version "7.22.3" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.3.tgz#cd502a6a0b6e37d7ad72ce7e71a7160a3ae36f7e" + integrity sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ== + "@babel/core@7.19.3": version "7.19.3" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.3.tgz#2519f62a51458f43b682d61583c3810e7dcee64c" @@ -81,22 +86,22 @@ semver "^6.3.0" "@babel/core@file:../../node_modules/@babel/core": - version "7.19.3" + version "7.21.8" dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.3" - "@babel/helper-compilation-targets" "^7.19.3" - "@babel/helper-module-transforms" "^7.19.0" - "@babel/helpers" "^7.19.0" - "@babel/parser" "^7.19.3" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.3" - "@babel/types" "^7.19.3" + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.21.5" + "@babel/helper-compilation-targets" "^7.21.5" + "@babel/helper-module-transforms" "^7.21.5" + "@babel/helpers" "^7.21.5" + "@babel/parser" "^7.21.8" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.5" + "@babel/types" "^7.21.5" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.1" + json5 "^2.2.2" semver "^6.3.0" "@babel/generator@^7.19.3", "@babel/generator@^7.21.4": @@ -109,6 +114,16 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" +"@babel/generator@^7.21.5", "@babel/generator@^7.22.3": + version "7.22.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.3.tgz#0ff675d2edb93d7596c5f6728b52615cfc0df01e" + integrity sha512-C17MW4wlk//ES/CJDL51kPNwl+qiBQyN7b9SKyVp11BLGFeSPoVaHrv+MNt8jwQFhQWowW88z1eeBx3pFz9v8A== + dependencies: + "@babel/types" "^7.22.3" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/helper-compilation-targets@^7.19.3": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656" @@ -120,11 +135,27 @@ lru-cache "^5.1.1" semver "^6.3.0" +"@babel/helper-compilation-targets@^7.21.5": + version "7.22.1" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.1.tgz#bfcd6b7321ffebe33290d68550e2c9d7eb7c7a58" + integrity sha512-Rqx13UM3yVB5q0D/KwQ8+SPfX/+Rnsy1Lw1k/UwOC4KC6qrzIQoY3lYnBu5EHKBlEHHcj0M0W8ltPSkD8rqfsQ== + dependencies: + "@babel/compat-data" "^7.22.0" + "@babel/helper-validator-option" "^7.21.0" + browserslist "^4.21.3" + lru-cache "^5.1.1" + semver "^6.3.0" + "@babel/helper-environment-visitor@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== +"@babel/helper-environment-visitor@^7.22.1": + version "7.22.1" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz#ac3a56dbada59ed969d712cf527bd8271fe3eba8" + integrity sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA== + "@babel/helper-function-name@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" @@ -140,7 +171,7 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-imports@^7.18.6": +"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af" integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg== @@ -161,6 +192,20 @@ "@babel/traverse" "^7.21.2" "@babel/types" "^7.21.2" +"@babel/helper-module-transforms@^7.21.5": + version "7.22.1" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.1.tgz#e0cad47fedcf3cae83c11021696376e2d5a50c63" + integrity sha512-dxAe9E7ySDGbQdCVOY/4+UcD8M9ZFqZcZhSPsPacvCG4M+9lwtDDQfI2EoaSvmf7W/8yCBkGU0m7Pvt1ru3UZw== + dependencies: + "@babel/helper-environment-visitor" "^7.22.1" + "@babel/helper-module-imports" "^7.21.4" + "@babel/helper-simple-access" "^7.21.5" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.21.9" + "@babel/traverse" "^7.22.1" + "@babel/types" "^7.22.0" + "@babel/helper-simple-access@^7.20.2": version "7.20.2" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" @@ -168,6 +213,13 @@ dependencies: "@babel/types" "^7.20.2" +"@babel/helper-simple-access@^7.21.5": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz#d697a7971a5c39eac32c7e63c0921c06c8a249ee" + integrity sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg== + dependencies: + "@babel/types" "^7.21.5" + "@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" @@ -180,6 +232,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== +"@babel/helper-string-parser@^7.21.5": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd" + integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w== + "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" @@ -199,6 +256,15 @@ "@babel/traverse" "^7.21.0" "@babel/types" "^7.21.0" +"@babel/helpers@^7.21.5": + version "7.22.3" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.3.tgz#53b74351da9684ea2f694bf0877998da26dd830e" + integrity sha512-jBJ7jWblbgr7r6wYZHMdIqKc73ycaTcCaWRq4/2LpuPHcx7xMlZvpGQkOYc9HeSjn6rcx15CPlgVcBtZ4WZJ2w== + dependencies: + "@babel/template" "^7.21.9" + "@babel/traverse" "^7.22.1" + "@babel/types" "^7.22.3" + "@babel/highlight@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" @@ -213,6 +279,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17" integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw== +"@babel/parser@^7.21.8", "@babel/parser@^7.21.9", "@babel/parser@^7.22.4": + version "7.22.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.4.tgz#a770e98fd785c231af9d93f6459d36770993fb32" + integrity sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA== + "@babel/template@^7.18.10", "@babel/template@^7.20.7": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" @@ -222,6 +293,15 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" +"@babel/template@^7.21.9": + version "7.21.9" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.21.9.tgz#bf8dad2859130ae46088a99c1f265394877446fb" + integrity sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ== + dependencies: + "@babel/code-frame" "^7.21.4" + "@babel/parser" "^7.21.9" + "@babel/types" "^7.21.5" + "@babel/traverse@^7.19.3", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36" @@ -238,6 +318,22 @@ debug "^4.1.0" globals "^11.1.0" +"@babel/traverse@^7.21.5", "@babel/traverse@^7.22.1": + version "7.22.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.4.tgz#c3cf96c5c290bd13b55e29d025274057727664c0" + integrity sha512-Tn1pDsjIcI+JcLKq1AVlZEr4226gpuAQTsLMorsYg9tuS/kG7nuwwJ4AB8jfQuEgb/COBwR/DqJxmoiYFu5/rQ== + dependencies: + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.22.3" + "@babel/helper-environment-visitor" "^7.22.1" + "@babel/helper-function-name" "^7.21.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.22.4" + "@babel/types" "^7.22.4" + debug "^4.1.0" + globals "^11.1.0" + "@babel/types@^7.18.6", "@babel/types@^7.19.3", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4" @@ -247,6 +343,15 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" +"@babel/types@^7.21.5", "@babel/types@^7.22.0", "@babel/types@^7.22.3", "@babel/types@^7.22.4": + version "7.22.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.4.tgz#56a2653ae7e7591365dabf20b76295410684c071" + integrity sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA== + dependencies: + "@babel/helper-string-parser" "^7.21.5" + "@babel/helper-validator-identifier" "^7.19.1" + to-fast-properties "^2.0.0" + "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.3" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" @@ -285,10 +390,10 @@ "@jridgewell/sourcemap-codec" "1.4.14" "@rollup/plugin-babel@file:../../node_modules/@rollup/plugin-babel": - version "6.0.0" + version "6.0.3" dependencies: "@babel/helper-module-imports" "^7.18.6" - "@rollup/pluginutils" "^4.2.1" + "@rollup/pluginutils" "^5.0.1" "@rollup/plugin-node-resolve@file:../../node_modules/@rollup/plugin-node-resolve": version "13.3.0" @@ -309,13 +414,14 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@rollup/pluginutils@^4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" - integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ== +"@rollup/pluginutils@^5.0.1": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33" + integrity sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA== dependencies: - estree-walker "^2.0.1" - picomatch "^2.2.2" + "@types/estree" "^1.0.0" + estree-walker "^2.0.2" + picomatch "^2.3.1" "@socket.io/component-emitter@~3.1.0": version "3.1.0" @@ -339,24 +445,19 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== -"@types/jasmine@*": - version "4.3.1" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-4.3.1.tgz#2d8ab5601c2fe7d9673dcb157e03f128ab5c5fff" - integrity sha512-Vu8l+UGcshYmV1VWwULgnV/2RDbBaO6i2Ptx7nd//oJPIZGhoI1YLST4VKagD2Pq/Bc2/7zvtvhM7F3p4SN7kQ== +"@types/estree@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" + integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== -"@types/jasmine@file:../../node_modules/@types/jasmine": - version "4.0.3" +"@types/jasmine@*", "@types/jasmine@file:../../node_modules/@types/jasmine": + version "4.3.1" "@types/jasminewd2@file:../../node_modules/@types/jasminewd2": version "2.0.10" dependencies: "@types/jasmine" "*" -"@types/minimist@^1.2.1": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" - integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== - "@types/node@*", "@types/node@>=10.0.0": version "18.15.11" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f" @@ -1072,7 +1173,7 @@ estree-walker@^1.0.1: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== -estree-walker@^2.0.1: +estree-walker@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== @@ -1544,7 +1645,7 @@ json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== -json5@^2.2.1: +json5@^2.2.1, json5@^2.2.2: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -2019,7 +2120,7 @@ rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4: glob "^7.1.3" "rollup@file:../../node_modules/rollup": - version "2.79.0" + version "2.79.1" optionalDependencies: fsevents "~2.3.2" @@ -2375,11 +2476,6 @@ tree-kill@^1.1.0: resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== -"tsickle@file:../../node_modules/tsickle": - version "0.46.3" - dependencies: - "@types/minimist" "^1.2.1" - tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -2391,7 +2487,7 @@ tslib@^2.3.0: integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== "tslib@file:../../node_modules/tslib": - version "2.4.0" + version "2.5.0" tunnel-agent@^0.6.0: version "0.6.0" @@ -2406,7 +2502,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== "typescript@file:../../node_modules/typescript": - version "5.0.2" + version "5.1.3" ua-parser-js@^1.0.33: version "1.0.35" diff --git a/integration/npm_package_archives.bzl b/integration/npm_package_archives.bzl index 90723bd2a08..cbcd88628e5 100644 --- a/integration/npm_package_archives.bzl +++ b/integration/npm_package_archives.bzl @@ -10,7 +10,6 @@ NPM_PACKAGE_ARCHIVES = [ "typescript", "rxjs", "systemjs", - "tsickle", "tslib", "protractor", "terser", diff --git a/package.json b/package.json index 10d79a83b16..3164e7d9cfd 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,6 @@ "terser": "^5.8.0", "todomvc-app-css": "^2.3.0", "todomvc-common": "^1.0.5", - "tsickle": "0.46.3", "tslib": "^2.3.0", "tslint": "6.1.3", "typescript": "5.1.3", diff --git a/packages/bazel/package.json b/packages/bazel/package.json index f8337008476..e704547d80d 100644 --- a/packages/bazel/package.json +++ b/packages/bazel/package.json @@ -24,7 +24,6 @@ "dependencies": { "@microsoft/api-extractor": "^7.24.2", "magic-string": "^0.30.0", - "tsickle": "^0.46.3", "tslib": "^2.3.0" }, "peerDependencies": { diff --git a/packages/bazel/src/ngc-wrapped/BUILD.bazel b/packages/bazel/src/ngc-wrapped/BUILD.bazel index d885c2a8f06..03e6dbb19e9 100644 --- a/packages/bazel/src/ngc-wrapped/BUILD.bazel +++ b/packages/bazel/src/ngc-wrapped/BUILD.bazel @@ -19,7 +19,6 @@ ts_library( "//packages/compiler-cli/private", "@npm//@bazel/concatjs", "@npm//@types/node", - "@npm//tsickle", "@npm//typescript", "@npm//typescript:typescript__typings", ], diff --git a/packages/bazel/src/ngc-wrapped/index.ts b/packages/bazel/src/ngc-wrapped/index.ts index 5c1916323fc..5238ac3d67f 100644 --- a/packages/bazel/src/ngc-wrapped/index.ts +++ b/packages/bazel/src/ngc-wrapped/index.ts @@ -12,7 +12,6 @@ import {PerfPhase} from '@angular/compiler-cli/private/bazel'; import tscw from '@bazel/concatjs/internal/tsc_wrapped/index.js'; import * as fs from 'fs'; import * as path from 'path'; -import * as tsickle from 'tsickle'; import ts from 'typescript'; import {EXT, patchNgHostWithFileNameToModuleName as patchNgHost, relativeToRootDirs} from './utils'; @@ -295,7 +294,7 @@ export function compile({ console.error('Check that it\'s included in the `assets` attribute of the `ng_module` rule.\n'); }; - const emitCallback: ng.TsEmitCallback = ({ + const emitCallback: ng.TsEmitCallback = ({ program, targetSourceFile, writeFile, @@ -303,36 +302,21 @@ export function compile({ emitOnlyDtsFiles, customTransformers = {}, }) => - tsickle.emitWithTsickle( - program, bazelHost!, bazelHost!, compilerOpts, targetSourceFile, writeFile, - cancellationToken, emitOnlyDtsFiles, { - beforeTs: customTransformers.before, - afterTs: customTransformers.after, - afterDeclarations: customTransformers.afterDeclarations, - }); + program.emit( + targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers); + if (!gatherDiagnostics) { gatherDiagnostics = (program) => gatherDiagnosticsForInputsOnly(compilerOpts, bazelOpts, program); } - const {diagnostics, emitResult, program} = ng.performCompilation({ - rootNames: files, - options: compilerOpts, - host: ngHost, - emitCallback, - mergeEmitResultsCallback: tsickle.mergeEmitResults, - gatherDiagnostics - }); - const tsickleEmitResult = emitResult as tsickle.EmitResult; + const {diagnostics, emitResult, program} = ng.performCompilation( + {rootNames: files, options: compilerOpts, host: ngHost, emitCallback, gatherDiagnostics}); let externs = '/** @externs */\n'; const hasError = diagnostics.some((diag) => diag.category === ts.DiagnosticCategory.Error); if (!hasError) { - if (bazelOpts.tsickleGenerateExterns) { - externs += tsickle.getGeneratedExterns(tsickleEmitResult.externs, rootDir); - } if (bazelOpts.manifest) { - const manifest = tscw.constructManifest(tsickleEmitResult.modulesManifest, bazelHost); - fs.writeFileSync(bazelOpts.manifest, manifest); + fs.writeFileSync(bazelOpts.manifest, '// Empty. Should not be used.'); } } diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel index e8545e1fc68..ed9ce710be5 100644 --- a/packages/compiler-cli/BUILD.bazel +++ b/packages/compiler-cli/BUILD.bazel @@ -35,7 +35,6 @@ esbuild( external = [ "@angular/compiler", "typescript", - "tsickle", "@babel/core", "reflect-metadata", "chokidar", @@ -94,7 +93,6 @@ ts_library( "@npm//@types/yargs", "@npm//chokidar", "@npm//reflect-metadata", - "@npm//tsickle", "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/bin/ngc.ts b/packages/compiler-cli/src/bin/ngc.ts index 4c49044bff2..ba2e29c1af7 100644 --- a/packages/compiler-cli/src/bin/ngc.ts +++ b/packages/compiler-cli/src/bin/ngc.ts @@ -19,17 +19,7 @@ async function runNgcComamnd() { // We are running the real compiler so run against the real file-system setFileSystem(new NodeJSFileSystem()); - let tsickleModule: typeof import('tsickle')|undefined; - - // Load tsickle if it's available. We load it here because tsickle - // is not needed in all Angular projects directly using `ngc`. - try { - tsickleModule = (await import('tsickle')).default; - } catch { - } - - process.exitCode = - main(args, undefined, undefined, undefined, undefined, undefined, tsickleModule); + process.exitCode = main(args, undefined, undefined, undefined, undefined, undefined); } runNgcComamnd().catch(e => { diff --git a/packages/compiler-cli/src/main.ts b/packages/compiler-cli/src/main.ts index a55abbb267b..83294119ae2 100644 --- a/packages/compiler-cli/src/main.ts +++ b/packages/compiler-cli/src/main.ts @@ -7,20 +7,18 @@ */ import ts from 'typescript'; -import type {TsickleHost, EmitResult as TsickleEmitResult} from 'tsickle'; import yargs from 'yargs'; + import {exitCodeFromResult, formatDiagnostics, ParsedConfiguration, performCompilation, readConfiguration} from './perform_compile'; import {createPerformWatchHost, performWatchCompilation} from './perform_watch'; import * as api from './transformers/api'; -type TsickleModule = typeof import('tsickle'); - export function main( args: string[], consoleError: (s: string) => void = console.error, config?: NgcParsedConfiguration, customTransformers?: api.CustomTransformers, programReuse?: { program: api.Program|undefined, }, - modifiedResourceFiles?: Set|null, tsickle?: TsickleModule): number { + modifiedResourceFiles?: Set|null): number { let {project, rootNames, options, errors: configErrors, watch, emitFlags} = config || readNgcCommandLineAndConfiguration(args); if (configErrors.length) { @@ -36,15 +34,8 @@ export function main( oldProgram = programReuse.program; } - const {diagnostics: compileDiags, program} = performCompilation({ - rootNames, - options, - emitFlags, - oldProgram, - emitCallback: createEmitCallback(options, tsickle), - customTransformers, - modifiedResourceFiles - }); + const {diagnostics: compileDiags, program} = performCompilation( + {rootNames, options, emitFlags, oldProgram, customTransformers, modifiedResourceFiles}); if (programReuse !== undefined) { programReuse.program = program; } @@ -53,8 +44,7 @@ export function main( export function mainDiagnosticsForTest( args: string[], config?: NgcParsedConfiguration, - programReuse?: {program: api.Program|undefined}, modifiedResourceFiles?: Set|null, - tsickle?: TsickleModule): { + programReuse?: {program: api.Program|undefined}, modifiedResourceFiles?: Set|null): { exitCode: number, diagnostics: ReadonlyArray, } { @@ -78,7 +68,6 @@ export function mainDiagnosticsForTest( emitFlags, oldProgram, modifiedResourceFiles, - emitCallback: createEmitCallback(options, tsickle), }); if (programReuse !== undefined) { @@ -91,54 +80,6 @@ export function mainDiagnosticsForTest( }; } -function createEmitCallback(options: api.CompilerOptions, tsickle?: TsickleModule): - api.TsEmitCallback|undefined { - if (!options.annotateForClosureCompiler) { - return undefined; - } - if (tsickle == undefined) { - throw Error('Tsickle is not provided but `annotateForClosureCompiler` is enabled.'); - } - const tsickleHost: Pick< - TsickleHost, - 'shouldSkipTsickleProcessing'|'pathToModuleName'|'shouldIgnoreWarningsForPath'| - 'fileNameToModuleId'|'googmodule'|'untyped'|'transformDecorators'|'transformTypesToClosure'| - 'generateExtraSuppressions'|'rootDirsRelative'> = { - shouldSkipTsickleProcessing: (fileName) => fileName.endsWith('.d.ts'), - pathToModuleName: (context, importPath) => '', - shouldIgnoreWarningsForPath: (filePath) => false, - fileNameToModuleId: (fileName) => fileName, - googmodule: false, - untyped: true, - // Decorators are transformed as part of the Angular compiler programs. To avoid - // conflicts, we disable decorator transformations for tsickle. - transformDecorators: false, - transformTypesToClosure: true, - generateExtraSuppressions: true, - // Only used by the http://go/tsjs-migration-independent-javascript-imports migration in - // tsickle. This migration is not relevant externally and is only enabled when users - // would explicitly invoke `goog.tsMigrationExportsShim` (which is internal-only). - rootDirsRelative: (fileName) => fileName, - }; - - return ({ - program, - targetSourceFile, - writeFile, - cancellationToken, - emitOnlyDtsFiles, - customTransformers = {}, - host, - options - }) => - tsickle.emitWithTsickle( - program, {...tsickleHost, options, moduleResolutionHost: host}, host, options, - targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, { - beforeTs: customTransformers.before, - afterTs: customTransformers.after, - }); -} - export interface NgcParsedConfiguration extends ParsedConfiguration { watch?: boolean; } @@ -236,7 +177,7 @@ export function watchMode( project: string, options: api.CompilerOptions, consoleError: (s: string) => void) { return performWatchCompilation(createPerformWatchHost(project, diagnostics => { printDiagnostics(diagnostics, options, consoleError); - }, options, options => createEmitCallback(options))); + }, options, undefined)); } function printDiagnostics( diff --git a/packages/compiler-cli/test/ngtsc/BUILD.bazel b/packages/compiler-cli/test/ngtsc/BUILD.bazel index e73677971d5..e9b55352512 100644 --- a/packages/compiler-cli/test/ngtsc/BUILD.bazel +++ b/packages/compiler-cli/test/ngtsc/BUILD.bazel @@ -19,7 +19,6 @@ ts_library( "//packages/compiler-cli/src/ngtsc/util", "//packages/compiler-cli/test:test_utils", "@npm//source-map", - "@npm//tsickle", "@npm//typescript", ], ) diff --git a/packages/compiler-cli/test/ngtsc/env.ts b/packages/compiler-cli/test/ngtsc/env.ts index 08742ccb5b4..bfe20ad1f5f 100644 --- a/packages/compiler-cli/test/ngtsc/env.ts +++ b/packages/compiler-cli/test/ngtsc/env.ts @@ -8,7 +8,6 @@ import {CustomTransformers, defaultGatherDiagnostics, Program} from '@angular/compiler-cli'; import * as api from '@angular/compiler-cli/src/transformers/api'; -import * as tsickle from 'tsickle'; import ts from 'typescript'; import {createCompilerHost, createProgram} from '../../index'; @@ -222,7 +221,7 @@ export class NgtscTestEnvironment { } const exitCode = main( this.commandLineArgs, errorSpy, undefined, customTransformers, reuseProgram, - this.changedResources, tsickle); + this.changedResources); expect(errorSpy).not.toHaveBeenCalled(); expect(exitCode).toBe(0); if (this.multiCompileHostExt !== null) { @@ -243,7 +242,7 @@ export class NgtscTestEnvironment { } const {exitCode, diagnostics} = mainDiagnosticsForTest( - this.commandLineArgs, undefined, reuseProgram, this.changedResources, tsickle); + this.commandLineArgs, undefined, reuseProgram, this.changedResources); if (expectedExitCode !== undefined) { expect(exitCode) .withContext(`Expected program to exit with code ${ diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts index 3be4892e0f9..36088108dd8 100644 --- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts +++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts @@ -660,29 +660,19 @@ function allTests(os: string) { const verifyOutput = (jsContents: string) => { // verify that there is no pattern that triggers automatic semicolon - // insertion by checking that there are no return statements not wrapped in - // parentheses - expect(trim(jsContents)).not.toContain(trim(` - return /** - * @return {?} - */ - `)); + // insertion by checking that there are no function return statements + // not wrapped in parentheses + expect(trim(jsContents)).not.toMatch(/return\s+function/); expect(trim(jsContents)).toContain(trim(` [{ provide: 'token-a', useFactory: ((service) => { - return (/** - * @return {?} - */ - () => service.id); + return (() => service.id); }) }, { provide: 'token-b', useFactory: (function (service) { - return (/** - * @return {?} - */ - function () { return service.id; }); + return (function () { return service.id; }); }) }] `)); @@ -6654,119 +6644,6 @@ function allTests(os: string) { expect(afterCount).toBe(1); }); - // These tests trigger the Tsickle compiler which asserts that the file-paths - // are valid for the real OS. When on non-Windows systems it doesn't like paths - // that start with `C:`. - if (os !== 'Windows' || platform() === 'win32') { - describe('@fileoverview Closure annotations', () => { - it('should be produced if not present in source file', () => { - env.tsconfig({ - 'annotateForClosureCompiler': true, - }); - env.write(`test.ts`, ` - import {Component} from '@angular/core'; - - @Component({ - template: '
', - }) - export class SomeComp {} - `); - - env.driveMain(); - const jsContents = env.getContents('test.js'); - const fileoverview = ` - /** - * @fileoverview added by tsickle - * Generated from: test.ts - * @suppress {checkTypes,const,extraRequire,missingOverride,missingRequire,missingReturn,unusedPrivateMembers,uselessCode} - */ - `; - expect(trim(jsContents).startsWith(trim(fileoverview))).toBeTruthy(); - }); - - it('should be produced for empty source files', () => { - env.tsconfig({ - 'annotateForClosureCompiler': true, - }); - env.write(`test.ts`, ``); - - env.driveMain(); - const jsContents = env.getContents('test.js'); - const fileoverview = ` - /** - * @fileoverview added by tsickle - * Generated from: test.ts - * @suppress {checkTypes,const,extraRequire,missingOverride,missingRequire,missingReturn,unusedPrivateMembers,uselessCode} - */ - `; - expect(trim(jsContents).startsWith(trim(fileoverview))).toBeTruthy(); - }); - - it('should always be at the very beginning of a script (if placed above imports)', () => { - env.tsconfig({ - 'annotateForClosureCompiler': true, - }); - env.write(`test.ts`, ` - /** - * @fileoverview Some Comp overview - * @modName {some_comp} - */ - - import {Component} from '@angular/core'; - - @Component({ - template: '
', - }) - export class SomeComp {} - `); - - env.driveMain(); - const jsContents = env.getContents('test.js'); - const fileoverview = ` - /** - * - * @fileoverview Some Comp overview - * Generated from: test.ts - * @modName {some_comp} - * - * @suppress {checkTypes,const,extraRequire,missingOverride,missingRequire,missingReturn,unusedPrivateMembers,uselessCode} - */ - `; - expect(trim(jsContents).startsWith(trim(fileoverview))).toBeTruthy(); - }); - - it('should always be at the very beginning of a script (if placed above non-imports)', - () => { - env.tsconfig({ - 'annotateForClosureCompiler': true, - }); - env.write(`test.ts`, ` - /** - * @fileoverview Some Comp overview - * @modName {some_comp} - */ - - const testConst = 'testConstValue'; - const testFn = function() { return true; } - `); - - env.driveMain(); - const jsContents = env.getContents('test.js'); - const fileoverview = ` - /** - * - * @fileoverview Some Comp overview - * Generated from: test.ts - * @modName {some_comp} - * - * @suppress {checkTypes,const,extraRequire,missingOverride,missingRequire,missingReturn,unusedPrivateMembers,uselessCode} - */ - `; - expect(trim(jsContents).startsWith(trim(fileoverview))).toBeTruthy(); - }); - }); - } - describe('sanitization', () => { it('should generate sanitizers for unsafe attributes in hostBindings fn in Directives', () => { diff --git a/yarn.lock b/yarn.lock index daa1c00c04e..2900b03eac5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3663,7 +3663,7 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== -"@types/minimist@^1.2.0", "@types/minimist@^1.2.1": +"@types/minimist@^1.2.0": version "1.2.2" resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== @@ -15789,13 +15789,6 @@ tsec@0.2.7: glob "^7.1.1" minimatch "^3.0.3" -tsickle@0.46.3: - version "0.46.3" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.46.3.tgz#b74918a77e3ca1310a2ce4d019f5d6294360b56d" - integrity sha512-9PDXxOrtn2AdpvDin6FLGveXVGg8ec3ga8fh8mPR5lz9KtitW6riVgxgagicdfF1rgiBxDeH+5hVowPXhmZbYQ== - dependencies: - "@types/minimist" "^1.2.1" - tslib@1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"