From 2e6fc512f918c637dec6009d99157a8941b3b7fb Mon Sep 17 00:00:00 2001 From: thinkinggis Date: Mon, 30 Dec 2019 20:06:12 +0800 Subject: [PATCH] fix: rollup plugin --- build/rollup.config.js | 4 ++-- package.json | 1 + yarn.lock | 27 +++++++++++++++++++++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/build/rollup.config.js b/build/rollup.config.js index 38ab7a66bb..42401c847e 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -1,7 +1,7 @@ import path from 'path'; import alias from '@rollup/plugin-alias'; import json from '@rollup/plugin-json'; -import resolve from 'sharp'; +import resolve from '@rollup/plugin-node-resolve'; import commonjs from '@rollup/plugin-commonjs'; import { terser } from 'rollup-plugin-terser'; import analyze from 'rollup-plugin-analyzer'; @@ -41,7 +41,7 @@ module.exports = [ { find: /^@antv\/l7$/, replacement: resolveFile('packages/l7/src'), - }, + } ] } ), diff --git a/package.json b/package.json index 78e9815348..fb0203b29d 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@rollup/plugin-alias": "^2.2.0", "@rollup/plugin-commonjs": "^11.0.0", "@rollup/plugin-json": "^4.0.0", + "@rollup/plugin-node-resolve": "^6.0.0", "@storybook/react": "^5.1.9", "@types/dat.gui": "^0.7.1", "@types/enzyme": "^3.1.14", diff --git a/yarn.lock b/yarn.lock index e9cf0fba47..04b8c154a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3006,6 +3006,17 @@ dependencies: rollup-pluginutils "^2.5.0" +"@rollup/plugin-node-resolve@^6.0.0": + version "6.0.0" + resolved "https://registry.npm.taobao.org/@rollup/plugin-node-resolve/download/@rollup/plugin-node-resolve-6.0.0.tgz#f351e29b45c007c17df4e28a0efd0d1f5662f59b" + integrity sha1-81Him0XAB8F99OKKDv0NH1Zi9Zs= + dependencies: + "@rollup/pluginutils" "^3.0.0" + "@types/resolve" "0.0.8" + builtin-modules "^3.1.0" + is-module "^1.0.0" + resolve "^1.11.1" + "@rollup/pluginutils@^3.0.0": version "3.0.1" resolved "https://registry.npm.taobao.org/@rollup/pluginutils/download/@rollup/pluginutils-3.0.1.tgz#6923a24c4a0db2917e5c77b1ed7d6721ac7fe58e" @@ -3842,6 +3853,13 @@ "@types/prop-types" "*" csstype "^2.2.0" +"@types/resolve@0.0.8": + version "0.0.8" + resolved "https://registry.npm.taobao.org/@types/resolve/download/@types/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194" + integrity sha1-8mB00jjgJlnjI84aE9BB7uKA4ZQ= + dependencies: + "@types/node" "*" + "@types/semver@^6.0.1": version "6.2.0" resolved "https://registry.npm.taobao.org/@types/semver/download/@types/semver-6.2.0.tgz#d688d574400d96c5b0114968705366f431831e1a" @@ -6045,7 +6063,7 @@ builtin-modules@^1.1.1: resolved "https://registry.npm.taobao.org/builtin-modules/download/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= -builtin-modules@^3.0.0: +builtin-modules@^3.0.0, builtin-modules@^3.1.0: version "3.1.0" resolved "https://registry.npm.taobao.org/builtin-modules/download/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484" integrity sha1-qtl8FRMet2tltQ7yCOdYTNdqdIQ= @@ -13307,6 +13325,11 @@ is-mobile@^2.1.0: resolved "https://registry.npm.taobao.org/is-mobile/download/is-mobile-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-mobile%2Fdownload%2Fis-mobile-2.1.0.tgz#4c0cab72f3358dd9986007389b30729fae80da0b" integrity sha1-TAyrcvM1jdmYYAc4mzByn66A2gs= +is-module@^1.0.0: + version "1.0.0" + resolved "https://registry.npm.taobao.org/is-module/download/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= + is-natural-number@^4.0.1: version "4.0.1" resolved "https://registry.npm.taobao.org/is-natural-number/download/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" @@ -20218,7 +20241,7 @@ resolve@1.1.7: resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@1.x, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1, resolve@~1.14.1: +resolve@1.x, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1, resolve@~1.14.1: version "1.14.1" resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.14.1.tgz#9e018c540fcf0c427d678b9931cbf45e984bcaff" integrity sha1-ngGMVA/PDEJ9Z4uZMcv0XphLyv8=