From c619e36d57594c7962ae27a86fe6ae61ea475f25 Mon Sep 17 00:00:00 2001 From: SunLxy <1011771396@qq.com> Date: Fri, 2 Dec 2022 21:14:23 +0800 Subject: [PATCH] =?UTF-8?q?chore:=E4=BF=AE=E6=94=B9=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 ++ lerna.json | 11 ++++++++++- package.json | 19 +++++++------------ packages/config/package.json | 1 + 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5aaa33ae6..47409beb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,8 @@ jobs: filter: '[R|r]elease[d]\s+[v|V]\d(\.\d+){0,2}' - run: npm install + - run: npm run build + - run: npm run hoist - run: npm run build:antdp-base - run: npm run build:website diff --git a/lerna.json b/lerna.json index 7788a636f..a6ca9c387 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,14 @@ { "packages": ["examples/*", "packages/*"], "version": "1.8.24", - "useWorker": true + "command": { + "create": { + "license": "MIT" + }, + "bootstrap": { + "yarnClientArgs": ["--no-yarn-lock"], + "npmClientArgs": ["--no-package-lock"], + "forceLocal": true + } + } } diff --git a/package.json b/package.json index 844f35858..9046e1261 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "build:website": "lerna exec --scope @example/website -- npm run build", "build": "lerna exec --scope @antdp/* --ignore @antdp/dependencies -- tsbb build", "⬇️⬇️⬇️⬇️⬇️ install ⬇️⬇️⬇️⬇️⬇️": "▼▼▼▼▼ install::package ▼▼▼▼▼", - "install": "npm run build && npm run install:pkg && npm run install:example", "bootstrap": "lerna bootstrap", + "hoist": "lerna bootstrap --hoist", "install:pkg": "lerna bootstrap --scope @antdp/* --hoist", "install:example": "lerna bootstrap --scope @example/* --hoist", "⬆️⬆️⬆️⬆️⬆️ install ⬆️⬆️⬆️⬆️⬆️": "▲▲▲▲▲ install::package ▲▲▲▲▲", @@ -33,12 +33,16 @@ "watch:user-login": "lerna exec --scope @antdp/user-login -- tsbb watch", "watch:hooks": "lerna exec --scope @antdp/hooks -- tsbb watch", "⬆️⬆️⬆️⬆️⬆️ watch::package ⬆️⬆️⬆️⬆️⬆️": "▲▲▲▲▲ watch::package ▲▲▲▲▲", - "remove": "lerna exec --scope @antdp/* --scope @example/* -- rm -rf package-lock.json", "version": "lerna version --exact --force-publish --no-push --no-git-tag-version", "publish": "lerna publish from-package", "start": "lerna exec --scope @example/antdp-base npm run start", "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'", - "clean": "lerna clean --yes && npm run remove", + "clean": "lerna clean --yes && npm run remove && rm -rf ./package-lock.json && rm -rf node_modules && npm run remove:c ", + "remove": " lerna exec --scope @antdp/* --scope @example/* -- rm -rf package-lock.json", + "remove:c": "rm -rf package-lock.json && npm run remove:yarn && npm run remove:lib && npm run remove:esm", + "remove:yarn": "lerna exec --scope @antdp/* --scope @example/* -- rm -rf yarn.lock", + "remove:lib": "lerna exec --scope @antdp/* -- rm -rf ./lib", + "remove:esm": "lerna exec --scope @antdp/* -- rm -rf ./esm", "tsbb": "tsbb", "lerna": "lerna" }, @@ -47,15 +51,6 @@ "prettier --write" ] }, - "workspaces": { - "packages": [ - "packages/*", - "examples/*" - ] - }, - "engines": { - "node": ">=16.0.0" - }, "dependencies": { "compile-less-cli": "1.8.11", "husky": "8.0.2", diff --git a/packages/config/package.json b/packages/config/package.json index 50321474f..754bbca38 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -11,6 +11,7 @@ "files": [ "lib", "esm", + "src", "index.d.ts" ], "keywords": [