From c9e31d0ba5de1c34cec9396c77f68a3f7333400b Mon Sep 17 00:00:00 2001 From: Justin Poehnelt Date: Mon, 15 Nov 2021 16:37:31 -0700 Subject: [PATCH] build: update rollup dev dependencies --- package-lock.json | 74 +++++++++++++++++++++++++---------------------- package.json | 10 +++---- rollup.config.js | 2 +- 3 files changed, 46 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97310895e..5ca98c3bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -881,14 +881,40 @@ "fastq": "^1.6.0" } }, +<<<<<<< HEAD "@rollup/pluginutils": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.1.tgz", "integrity": "sha512-clDjivHqWGXi7u+0d2r2sBi4Ie6VLEAzWMIkvJLnDmxoOhBYOTfzGbOQBA32THHm11/LiJbd01tJUpJsbshSWQ==", +======= + "@rollup/plugin-typescript": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.3.0.tgz", + "integrity": "sha512-I5FpSvLbtAdwJ+naznv+B4sjXZUcIvLLceYpITAn7wAP8W0wqc5noLdGIp9HGVntNhRWXctwPYrSSFQxtl0FPA==", +>>>>>>> 79b86df (build: update rollup dev dependencies) "dev": true, "requires": { - "estree-walker": "^2.0.1", - "picomatch": "^2.2.2" + "@rollup/pluginutils": "^3.1.0", + "resolve": "^1.17.0" + }, + "dependencies": { + "@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", + "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "dev": true, + "requires": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + } + }, + "estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true + } } }, "@sinonjs/commons": { @@ -966,6 +992,12 @@ "@babel/types": "^7.3.0" } }, + "@types/estree": { + "version": "0.0.39", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", + "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", + "dev": true + }, "@types/google.maps": { "version": "3.46.1", "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.46.1.tgz", @@ -1722,12 +1754,6 @@ "delayed-stream": "~1.0.0" } }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -2160,12 +2186,6 @@ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true }, - "estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true - }, "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -2297,6 +2317,7 @@ "to-regex-range": "^5.0.1" } }, +<<<<<<< HEAD "find-cache-dir": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", @@ -2308,6 +2329,8 @@ "pkg-dir": "^4.1.0" } }, +======= +>>>>>>> 79b86df (build: update rollup dev dependencies) "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -2345,17 +2368,6 @@ "mime-types": "^2.1.12" } }, - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -3778,15 +3790,6 @@ "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", "dev": true }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, "kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", @@ -4376,6 +4379,7 @@ "fsevents": "~2.3.2" } }, +<<<<<<< HEAD "rollup-plugin-typescript2": { "version": "0.31.0", "resolved": "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.31.0.tgz", @@ -4398,6 +4402,8 @@ } } }, +======= +>>>>>>> 79b86df (build: update rollup dev dependencies) "run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", diff --git a/package.json b/package.json index a3a1a820a..d6c8f0771 100644 --- a/package.json +++ b/package.json @@ -16,19 +16,20 @@ }, "license": "Apache-2.0", "author": "Justin Poehnelt", + "main": "dist/index.js", + "types": "dist/index.d.ts", "files": [ "dist/*" ], - "main": "dist/index.js", - "types": "dist/index.d.ts", "scripts": { + "docs": "typedoc src/index.ts", "format": "eslint . --fix", "lint": "eslint .", "prepare": "rm -rf dist && rollup -c", - "test": "jest src/*", - "docs": "typedoc src/index.ts" + "test": "jest src/*" }, "devDependencies": { + "@rollup/plugin-typescript": "^8.3.0", "@types/google.maps": "^3.46.1", "@types/jest": "^27.0.2", "@typescript-eslint/eslint-plugin": ">=4.33.0", @@ -40,7 +41,6 @@ "jest": "^27.3.1", "prettier": "^2.4.1", "rollup": "^2.60.0", - "rollup-plugin-typescript2": "^0.31.0", "ts-jest": "^27.0.7", "typedoc": "^0.22.9", "typescript": "^4.4.4" diff --git a/rollup.config.js b/rollup.config.js index 0d4655fe4..26e56870c 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import typescript from "rollup-plugin-typescript2"; +import typescript from "@rollup/plugin-typescript"; export default [ {