From 919593c9fc031931d250fe768d6d897b5e441a04 Mon Sep 17 00:00:00 2001 From: HcySunYang Date: Sun, 13 Jan 2019 18:02:06 +0800 Subject: [PATCH] build: tweak external --- package.json | 2 +- rollup.config.js | 16 ++++++++++------ tsconfig.json | 3 +-- yarn.lock | 36 ++++++++++++++++++++++-------------- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index bdd4642..7e465cb 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "prettier": "^1.14.3", "prettier-tslint": "^0.4.0", "rollup": "^1.1.0", - "rollup-plugin-node-resolve": "^4.0.0", + "rollup-plugin-auto-external": "^2.0.0", "rollup-plugin-typescript2": "^0.17.0", "ts-jest": "^23.10.1", "tslint": "^5.11.0", diff --git a/rollup.config.js b/rollup.config.js index 4642826..4eb3f1e 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,6 +1,5 @@ import path from 'path' import typescript from 'rollup-plugin-typescript2' -import moduleResolve from 'rollup-plugin-node-resolve' import isBuiltinModule from 'is-builtin-module' function resolveInput(projectDir) { @@ -11,19 +10,24 @@ function resolveOnput(projectDir) { return path.resolve('packages', `${projectDir}/dist/index.js`) } +const PKG_DIR = process.env.PKG_DIR +const pkgMeta = require(path.resolve(`packages`, `${PKG_DIR}/package.json`)) + export default { - input: resolveInput(process.env.PKG_DIR), + input: resolveInput(PKG_DIR), external(id) { - return id.includes('node_modules') || id.includes('@vuese') + return ( + (pkgMeta.dependencies && !!pkgMeta.dependencies[id]) || + id === 'prismjs/components' + ) }, plugins: [ typescript({ cacheRoot: path.resolve(__dirname, 'node_modules/.rts2_cache') - }), - moduleResolve() + }) ], output: { - file: resolveOnput(process.env.PKG_DIR), + file: resolveOnput(PKG_DIR), format: 'cjs' }, onwarn(warning, warn) { diff --git a/tsconfig.json b/tsconfig.json index 9f6b2c0..8f89e04 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,8 +17,7 @@ "declaration": true, "jsx": "preserve", "lib": [ - "esnext", - "dom" + "esnext" ], "rootDir": ".", "paths": { diff --git a/yarn.lock b/yarn.lock index 0a94792..cccdf7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -66,7 +66,7 @@ "@babel/parser" "^7.2.2" "@babel/types" "^7.2.2" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.2.3": +"@babel/traverse@^7.1.0": version "7.2.3" resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8" integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw== @@ -1440,6 +1440,13 @@ builtins@^1.0.3: resolved "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= +builtins@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/builtins/-/builtins-2.0.0.tgz#018999641e11252188652dbb2db01ad386fcdc46" + integrity sha512-8srrxpDx3a950BHYcbse+xMjupHHECvQYnShkoPz2ZLhTBrk/HQO6nWMh4o4ui8YYp2ourGVYXlGqFm+UYQwmA== + dependencies: + semver "^5.4.1" + byline@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" @@ -4032,11 +4039,6 @@ is-installed-globally@^0.1.0: global-dirs "^0.1.0" is-path-inside "^1.0.0" -is-module@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" - integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= - is-natural-number@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" @@ -6853,7 +6855,7 @@ resolve@1.8.1: dependencies: path-parse "^1.0.5" -resolve@1.x, resolve@^1.3.2, resolve@^1.8.1: +resolve@1.x, resolve@^1.3.2: version "1.9.0" resolved "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06" integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ== @@ -6890,14 +6892,15 @@ rimraf@2, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: dependencies: glob "^7.1.3" -rollup-plugin-node-resolve@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.0.tgz#9bc6b8205e9936cc0e26bba2415f1ecf1e64d9b2" - integrity sha512-7Ni+/M5RPSUBfUaP9alwYQiIKnKeXCOHiqBpKUl9kwp3jX5ZJtgXAait1cne6pGEVUUztPD6skIKH9Kq9sNtfw== +rollup-plugin-auto-external@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/rollup-plugin-auto-external/-/rollup-plugin-auto-external-2.0.0.tgz#98fd137d66c1cbe0f4e245b31560a72dbde896aa" + integrity sha512-HQM3ZkZYfSam1uoZtAB9sK26EiAsfs1phrkf91c/YX+S07wugyRXSigBxrIwiLr5EPPilKYmoMxsrnlGBsXnuQ== dependencies: - builtin-modules "^3.0.0" - is-module "^1.0.0" - resolve "^1.8.1" + builtins "^2.0.0" + read-pkg "^3.0.0" + safe-resolve "^1.0.0" + semver "^5.5.0" rollup-plugin-typescript2@^0.17.0: version "0.17.2" @@ -6981,6 +6984,11 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" +safe-resolve@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/safe-resolve/-/safe-resolve-1.0.0.tgz#fe34f8d29d7a3becfd249d0aa8a799b5c3cf6559" + integrity sha1-/jT40p16O+z9JJ0KqKeZtcPPZVk= + "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"