From adb4272188235c242dc3c7e05fe60ba471ad2d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Wed, 11 Nov 2020 21:00:53 +0100 Subject: [PATCH] improve build dependencies --- packages/extension-blockquote/package.json | 1 - packages/extension-bullet-list/package.json | 3 ++ packages/extension-code-block/package.json | 3 ++ packages/extension-focus/package.json | 7 ++-- packages/extension-heading/package.json | 4 +++ packages/extension-link/package.json | 3 ++ packages/extension-ordered-list/package.json | 3 ++ packages/extension-task-item/package.json | 3 ++ rollup.config.js | 12 ++++--- yarn.lock | 38 ++++++++++++-------- 10 files changed, 55 insertions(+), 22 deletions(-) diff --git a/packages/extension-blockquote/package.json b/packages/extension-blockquote/package.json index 4835d5ae..0e8f1059 100644 --- a/packages/extension-blockquote/package.json +++ b/packages/extension-blockquote/package.json @@ -14,7 +14,6 @@ "@tiptap/core": "2.x" }, "dependencies": { - "@types/prosemirror-inputrules": "^1.0.3", "prosemirror-inputrules": "^1.1.3" } } diff --git a/packages/extension-bullet-list/package.json b/packages/extension-bullet-list/package.json index 6d2a969a..51caa033 100644 --- a/packages/extension-bullet-list/package.json +++ b/packages/extension-bullet-list/package.json @@ -12,5 +12,8 @@ ], "peerDependencies": { "@tiptap/core": "2.x" + }, + "dependencies": { + "prosemirror-inputrules": "^1.1.3" } } diff --git a/packages/extension-code-block/package.json b/packages/extension-code-block/package.json index ba11d26b..e2aed382 100644 --- a/packages/extension-code-block/package.json +++ b/packages/extension-code-block/package.json @@ -12,5 +12,8 @@ ], "peerDependencies": { "@tiptap/core": "2.x" + }, + "dependencies": { + "prosemirror-inputrules": "^1.1.3" } } diff --git a/packages/extension-focus/package.json b/packages/extension-focus/package.json index 9f7020db..0f025e50 100644 --- a/packages/extension-focus/package.json +++ b/packages/extension-focus/package.json @@ -11,7 +11,10 @@ "dist" ], "peerDependencies": { - "@tiptap/core": "2.x", - "prosemirror-state": "^1.3.3" + "@tiptap/core": "2.x" + }, + "dependencies": { + "prosemirror-state": "^1.3.3", + "prosemirror-view": "^1.16.1" } } diff --git a/packages/extension-heading/package.json b/packages/extension-heading/package.json index 5d852f0e..545ddd0e 100644 --- a/packages/extension-heading/package.json +++ b/packages/extension-heading/package.json @@ -12,5 +12,9 @@ ], "peerDependencies": { "@tiptap/core": "2.x" + }, + "dependencies": { + "@types/prosemirror-inputrules": "^1.0.3", + "prosemirror-inputrules": "^1.1.3" } } diff --git a/packages/extension-link/package.json b/packages/extension-link/package.json index 68fa483a..59b55e4f 100644 --- a/packages/extension-link/package.json +++ b/packages/extension-link/package.json @@ -12,5 +12,8 @@ ], "peerDependencies": { "@tiptap/core": "2.x" + }, + "dependencies": { + "prosemirror-state": "^1.3.3" } } diff --git a/packages/extension-ordered-list/package.json b/packages/extension-ordered-list/package.json index 748d48bd..62f1b35c 100644 --- a/packages/extension-ordered-list/package.json +++ b/packages/extension-ordered-list/package.json @@ -12,5 +12,8 @@ ], "peerDependencies": { "@tiptap/core": "2.x" + }, + "dependencies": { + "prosemirror-inputrules": "^1.1.3" } } diff --git a/packages/extension-task-item/package.json b/packages/extension-task-item/package.json index 51e9b3f3..6d270e7e 100644 --- a/packages/extension-task-item/package.json +++ b/packages/extension-task-item/package.json @@ -12,5 +12,8 @@ ], "peerDependencies": { "@tiptap/core": "2.x" + }, + "dependencies": { + "prosemirror-inputrules": "^1.1.3" } } diff --git a/rollup.config.js b/rollup.config.js index 7df0728b..a8ab7fd0 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -3,6 +3,7 @@ import minimist from 'minimist' import { getPackages } from '@lerna/project' import filterPackages from '@lerna/filter-packages' import batchPackages from '@lerna/batch-packages' +import sourcemaps from 'rollup-plugin-sourcemaps' import typescript from 'rollup-plugin-typescript2' import resolve from '@rollup/plugin-node-resolve' import commonjs from '@rollup/plugin-commonjs' @@ -10,6 +11,7 @@ import vuePlugin from 'rollup-plugin-vue' import babel from '@rollup/plugin-babel' import { terser } from 'rollup-plugin-terser' import sizes from '@atomico/rollup-plugin-sizes' +import autoExternal from 'rollup-plugin-auto-external' async function getSortedPackages(scope, ignore) { const packages = await getPackages(__dirname) @@ -44,11 +46,13 @@ async function build(commandLineArgs) { } = pkg.toJSON() const basePlugins = [ + sourcemaps(), resolve(), commonjs(), vuePlugin(), babel({ babelHelpers: 'bundled', + exclude: 'node_modules/**', }), sizes(), ] @@ -76,12 +80,10 @@ async function build(commandLineArgs) { sourcemap: true, }, ], - external: [ - ...Object.keys(pkg.dependencies || {}), - ...Object.keys(pkg.devDependencies || {}), - ...Object.keys(pkg.peerDependencies || {}), - ], plugins: [ + autoExternal({ + packagePath: path.join(basePath, 'package.json'), + }), ...basePlugins, typescript({ tsconfigOverride: { diff --git a/yarn.lock b/yarn.lock index 2af2030b..f80e8b68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3292,9 +3292,9 @@ balanced-match@^1.0.0: integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= base64-js@^1.0.2, base64-js@^1.3.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.0.tgz#2d03045876d9e2b68a7a0f87d6bd163595e3b6af" - integrity sha512-Jrdy04F2EKcNggUDfubMUPNAZg2vMquLQSm8sKLYJvz40ClFL1S8GKyDshGkNsbNNE5Z+fQavzU7nSK1I9JUGA== + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== base@^0.11.1: version "0.11.2" @@ -5344,7 +5344,7 @@ domutils@^1.5.1, domutils@^1.7.0: dom-serializer "0" domelementtype "1" -domutils@^2.0.0: +domutils@^2.0.0, domutils@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.2.tgz#7ee5be261944e1ad487d9aa0616720010123922b" integrity sha512-NKbgaM8ZJOecTZsIzW5gSuplsX2IWW2mIK7xVr8hTQF2v1CJWTmLZ1HOCh5sH+IzVPAGE5IucooOkvwBRAdowA== @@ -5454,9 +5454,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.591: - version "1.3.592" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.592.tgz#4621521b223bf6e5469373528321e185d3c24670" - integrity sha512-kGNowksvqQiPb1pUSQKpd8JFoGPLxYOwduNRCqCxGh/2Q1qE2JdmwouCW41lUzDxOb/2RIV4lR0tVIfboWlO9A== + version "1.3.593" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.593.tgz#947ccf6dc8e013e2b053d2463ecd1043c164fcef" + integrity sha512-GvO7G1ZxvffnMvPCr4A7+iQPVuvpyqMrx2VWSERAjG+pHK6tmO9XqYdBfMIq9corRyi4bNImSDEiDvIoDb8HrA== elegant-spinner@^1.0.1: version "1.0.1" @@ -5696,11 +5696,11 @@ eslint-plugin-cypress@^2.11.2: globals "^11.12.0" eslint-plugin-html@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-6.1.0.tgz#0e0d4845d4b3eb6e199652385e272f7b722673db" - integrity sha512-xcqithhnjUxoEDRL0hYci4RSS8EZ1NGr3/H8x3BxJvxgbu4R3YaEUea9i93j95NuAgoAbOUfNmybta8fqi4UbA== + version "6.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-6.1.1.tgz#95aee151900b9bb2da5fa017b45cc64456a0a74e" + integrity sha512-JSe3ZDb7feKMnQM27XWGeoIjvP4oWQMJD9GZ6wW67J7/plVL87NK72RBwlvfc3tTZiYUchHhxAwtgEd1GdofDA== dependencies: - htmlparser2 "^4.1.0" + htmlparser2 "^5.0.1" eslint-plugin-import@^2.22.1: version "2.22.1" @@ -7442,6 +7442,16 @@ htmlparser2@^4.1.0: domutils "^2.0.0" entities "^2.0.0" +htmlparser2@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-5.0.1.tgz#7daa6fc3e35d6107ac95a4fc08781f091664f6e7" + integrity sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ== + dependencies: + domelementtype "^2.0.1" + domhandler "^3.3.0" + domutils "^2.4.2" + entities "^2.0.0" + http-cache-semantics@3.8.1, http-cache-semantics@^3.8.1: version "3.8.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" @@ -12240,9 +12250,9 @@ sass-graph@2.2.5: yargs "^13.3.2" sass-loader@^10.0.3: - version "10.0.5" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.5.tgz#f53505b5ddbedf43797470ceb34066ded82bb769" - integrity sha512-2LqoNPtKkZq/XbXNQ4C64GFEleSEHKv6NPSI+bMC/l+jpEXGJhiRYkAQToO24MR7NU4JRY2RpLpJ/gjo2Uf13w== + version "10.1.0" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.0.tgz#1727fcc0c32ab3eb197cda61d78adf4e9174a4b3" + integrity sha512-ZCKAlczLBbFd3aGAhowpYEy69Te3Z68cg8bnHHl6WnSCvnKpbM6pQrz957HWMa8LKVuhnD9uMplmMAHwGQtHeg== dependencies: klona "^2.0.4" loader-utils "^2.0.0"