Skip to content

Commit

Permalink
build: use father instead of tsc (#8297)
Browse files Browse the repository at this point in the history
* build: use father instead of tsc

* build: remove client build script

* refactor: enable runtime babel helpers for all client dist

* chore: update father version

* build(bundler-webpack): ignore client dir for cjs
  • Loading branch information
PeachScript committed Jul 20, 2022
1 parent 7a1de5c commit 19fcf0a
Show file tree
Hide file tree
Showing 52 changed files with 566 additions and 291 deletions.
7 changes: 7 additions & 0 deletions .fatherrc.base.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { defineConfig } from 'father';

export default defineConfig({
cjs: {
output: 'dist',
},
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"scripts": {
"bootstrap": "umi-scripts bootstrap",
"build": "umi-scripts turbo --cmd build",
"build:client": "umi-scripts turbo --cmd build:client",
"build:extra": "umi-scripts turbo --cmd build:extra",
"build:force": "umi-scripts turbo --cmd build --no-cache",
"build:release": "umi-scripts turbo --cmd build --no-cache -- --declarationMap false",
Expand Down Expand Up @@ -68,6 +67,7 @@
"@vercel/ncc": "0.33.3",
"dts-packer": "^0.0.3",
"expect-playwright": "^0.8.0",
"father": "^4.0.0-rc.4",
"git-repo-info": "^2.1.1",
"husky": "^7.0.4",
"jest": "^27.5.1",
Expand Down
5 changes: 5 additions & 0 deletions packages/ast/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/ast/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"dist"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"test": "umi-scripts jest-turbo"
},
"dependencies": {
Expand Down
5 changes: 5 additions & 0 deletions packages/babel-preset-umi/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/babel-preset-umi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"dist"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"test": "umi-scripts jest-turbo"
},
"dependencies": {
Expand Down
5 changes: 5 additions & 0 deletions packages/bundler-esbuild/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/bundler-esbuild/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"dist"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"test": "umi-scripts jest-turbo"
},
"dependencies": {
Expand Down
5 changes: 5 additions & 0 deletions packages/bundler-utils/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/bundler-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"compiled"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch"
"dev": "pnpm father dev"
},
"dependencies": {
"@umijs/utils": "4.0.0-canary.20220718.2",
Expand Down
5 changes: 5 additions & 0 deletions packages/bundler-vite/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/bundler-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"scripts"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"postinstall": "node scripts/linkDeps.js",
"test": "umi-scripts jest-turbo"
},
Expand Down
16 changes: 16 additions & 0 deletions packages/bundler-webpack/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
cjs: {
ignores: ['src/client/**'],
},
esm: {
output: 'client',
ignores: [
'!src/client/**',
'!src/constants.ts',
'!src/utils/formatWebpackMessages.ts',
],
},
});
6 changes: 3 additions & 3 deletions packages/bundler-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"dist"
],
"scripts": {
"build": "pnpm tsc",
"build:client": "pnpm tsc --project ./tsconfig.client.json",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs",
"test": "umi-scripts jest-turbo"
},
"dependencies": {
"@babel/runtime": "7.17.9",
"@parcel/css": "1.9.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
"@svgr/core": "6.2.1",
Expand Down
16 changes: 0 additions & 16 deletions packages/bundler-webpack/tsconfig.client.json

This file was deleted.

5 changes: 5 additions & 0 deletions packages/core/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"compiled"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"test": "umi-scripts jest-turbo"
},
"dependencies": {
Expand Down
5 changes: 5 additions & 0 deletions packages/create-umi/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/create-umi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"templates"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"test": "umi-scripts jest-turbo"
},
"dependencies": {
Expand Down
5 changes: 5 additions & 0 deletions packages/lint/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/lint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"dist"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch"
"dev": "pnpm father dev"
},
"dependencies": {
"@babel/core": "7.17.9",
Expand Down
5 changes: 5 additions & 0 deletions packages/max/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/max/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"stylelint.js"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch"
"dev": "pnpm father dev"
},
"dependencies": {
"@umijs/lint": "4.0.0-canary.20220718.2",
Expand Down
5 changes: 5 additions & 0 deletions packages/mfsu/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/mfsu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"vendors"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"test": "umi-scripts jest-turbo"
},
"dependencies": {
Expand Down
5 changes: 5 additions & 0 deletions packages/plugin-docs/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/plugin-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"compiled"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:css": "tailwindcss -i ./client/theme-doc/tailwind.css -o ./client/theme-doc/tailwind.out.css",
"build:deps": "umi-scripts bundleDeps",
"build:extra": "pnpm build:css",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"dev:css": "pnpm build:css --watch",
"test": "umi-scripts jest-turbo"
},
Expand Down
5 changes: 5 additions & 0 deletions packages/plugins/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/plugins/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"libs"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"test": "umi-scripts jest-turbo"
},
"dependencies": {
Expand Down
5 changes: 5 additions & 0 deletions packages/preset-umi/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/preset-umi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"devToolAppDist"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"test": "umi-scripts jest-turbo"
},
"dependencies": {
Expand Down
5 changes: 5 additions & 0 deletions packages/preset-vue/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});
4 changes: 2 additions & 2 deletions packages/preset-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"compiled"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch"
"dev": "pnpm father dev"
},
"dependencies": {
"@umijs/renderer-vue": "4.0.0-canary.20220718.2",
Expand Down
9 changes: 9 additions & 0 deletions packages/renderer-react/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
cjs: undefined,
esm: {
output: 'dist',
},
});
5 changes: 3 additions & 2 deletions packages/renderer-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@
"dist"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch",
"dev": "pnpm father dev",
"test": "umi-scripts jest-turbo"
},
"dependencies": {
"@babel/runtime": "7.17.9",
"@loadable/component": "5.15.2",
"history": "5.3.0",
"react-router-dom": "6.3.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/renderer-react/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export {
createBrowserHistory,
createHashHistory,
createMemoryHistory,
History,
type History,
} from 'history';
export {
createSearchParams,
Expand Down
9 changes: 9 additions & 0 deletions packages/renderer-vue/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
cjs: undefined,
esm: {
output: 'dist',
},
});
7 changes: 5 additions & 2 deletions packages/renderer-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
"dist"
],
"scripts": {
"build": "pnpm tsc",
"build": "pnpm father build",
"build:deps": "umi-scripts bundleDeps",
"dev": "pnpm build --watch"
"dev": "pnpm father dev"
},
"dependencies": {
"@babel/runtime": "7.17.9"
},
"peerDependencies": {
"vue": ">=3.2.31",
Expand Down
5 changes: 5 additions & 0 deletions packages/server/.fatherrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from 'father';

export default defineConfig({
extends: '../../.fatherrc.base.ts',
});

1 comment on commit 19fcf0a

@vercel
Copy link

@vercel vercel bot commented on 19fcf0a Jul 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.