Skip to content

Commit 668e935

Browse files
committed
Revert "Remove trigen for Windows compatibility (#4)"
This reverts commit 19fd35d.
1 parent 18c0923 commit 668e935

File tree

4 files changed

+1605
-167
lines changed

4 files changed

+1605
-167
lines changed

.eslintrc.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{
22
"root": true,
3+
"extends": [
4+
"@trigen/eslint-config",
5+
"@trigen/eslint-config/typescript",
6+
"@trigen/eslint-config/typescript-requiring-type-checking",
7+
"@trigen/eslint-config/jest"
8+
],
39
"env": {
410
"node": true
511
},
612
"parserOptions": {
713
"tsconfigRootDir": "./",
8-
"project": [
9-
"./tsconfig.json",
10-
"./test/tsconfig.json",
11-
"./vite/tsconfig.json"
12-
]
14+
"project": ["./tsconfig.json", "./test/tsconfig.json", "./vite/tsconfig.json"]
1315
},
1416
"rules": {
1517
"prefer-destructuring": "off",
@@ -21,4 +23,4 @@
2123
"plugins": [
2224
"html"
2325
]
24-
}
26+
}

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@
5757
"clear": "del ./package ./dist ./coverage",
5858
"prepublishOnly": "run test build clear:package clean-publish",
5959
"postpublish": "pnpm clear:package",
60-
"build": "run-p build:**",
61-
"build:emitDeclarations": "tsc --emitDeclarationOnly",
62-
"build:rollup": "rollup -c",
60+
"emitDeclarations": "tsc --emitDeclarationOnly",
61+
"build": "run -p [ rollup -c ] emitDeclarations",
6362
"lint": "eslint 'rollup.config.js' 'types/**/*.ts' 'test/**/*.{js,ts}' 'src/**/*.ts'",
6463
"jest": "cross-env NODE_ENV=test jest -c jest.config.json",
6564
"test:size": "size-limit",
@@ -79,6 +78,8 @@
7978
"prepare": "yarn run build"
8079
},
8180
"dependencies": {
81+
"@types/offscreencanvas": "^2019.6.4",
82+
"@types/raf": "^3.4.0",
8283
"raf": "^3.4.1",
8384
"rgbcolor": "^1.0.1",
8485
"stackblur-canvas": "^2.0.0",
@@ -90,17 +91,18 @@
9091
"@rollup/plugin-commonjs": "^21.0.1",
9192
"@rollup/plugin-node-resolve": "^13.0.5",
9293
"@rollup/plugin-replace": "^4.0.0",
93-
"@rollup/plugin-typescript": "^11.1.2",
9494
"@size-limit/preset-small-lib": "^7.0.8",
9595
"@swc/core": "^1.2.136",
9696
"@swc/helpers": "^0.3.2",
9797
"@swc/jest": "^0.2.17",
98+
"@trigen/babel-preset": "^8.0.0-alpha.5",
99+
"@trigen/browserslist-config": "^8.0.0-alpha.2",
100+
"@trigen/eslint-config": "^8.0.0-alpha.14",
101+
"@trigen/scripts": "^8.0.0-alpha.9",
98102
"@types/jest": "^27.0.2",
99103
"@types/node": "^17.0.16",
100104
"@types/node-fetch": "^2.5.12",
101-
"@types/offscreencanvas": "^2019.6.4",
102105
"@types/puppeteer": "^5.4.2",
103-
"@types/raf": "^3.4.0",
104106
"@types/xmldom": "^0.1.29",
105107
"browserslist": "^4.19.1",
106108
"canvas": "^2.1.0",
@@ -115,7 +117,6 @@
115117
"jest-image-snapshot": "^4.3.0",
116118
"nano-staged": "^0.8.0",
117119
"node-fetch": "^2.6.0",
118-
"npm-run-all": "^4.1.5",
119120
"puppeteer": "^13.0.0",
120121
"rollup": "^2.67.1",
121122
"rollup-plugin-swc": "^0.2.1",

rollup.config.js

Lines changed: 67 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,75 @@
1+
import swc from 'rollup-plugin-swc'
2+
import { nodeResolve } from '@rollup/plugin-node-resolve'
3+
import replace from '@rollup/plugin-replace'
4+
import commonjs from '@rollup/plugin-commonjs'
5+
import browsersEsm from '@trigen/browserslist-config/browsers-esm'
6+
import nodeEsm from '@trigen/browserslist-config/node-esm'
7+
import browsers from '@trigen/browserslist-config/browsers'
8+
import node from '@trigen/browserslist-config/node'
19
import pkg from './package.json'
2-
import typescript from '@rollup/plugin-typescript';
3-
import { nodeResolve } from '@rollup/plugin-node-resolve';
4-
import commonjs from '@rollup/plugin-commonjs';
510

6-
export default {
11+
const extensions = ['.js', '.ts']
12+
const external = _ => /node_modules/.test(_) && !/@swc\/helpers/.test(_)
13+
const plugins = targets => [
14+
nodeResolve({
15+
extensions
16+
}),
17+
replace({
18+
preventAssignment: true,
19+
values: {
20+
'process.env.NODE_ENV': JSON.stringify(
21+
process.env.ROLLUP_WATCH
22+
? 'development'
23+
: 'production'
24+
)
25+
}
26+
}),
27+
swc({
28+
jsc: {
29+
parser: {
30+
syntax: 'typescript'
31+
},
32+
externalHelpers: false
33+
},
34+
env: {
35+
targets
36+
},
37+
module: {
38+
type: 'es6'
39+
},
40+
sourceMaps: true
41+
})
42+
]
43+
44+
export default process.env.NODE_ENV !== 'development' ? [
45+
{
46+
input: pkg.main,
47+
plugins: plugins(browsersEsm.concat(nodeEsm).join(', ')),
48+
external,
49+
output: {
50+
file: pkg.publishConfig.module,
51+
format: 'es',
52+
sourcemap: true
53+
}
54+
},
55+
{
56+
input: pkg.main,
57+
plugins: plugins(browsers.concat(node).join(', ')),
58+
external,
59+
output: {
60+
file: pkg.publishConfig.main,
61+
format: 'cjs',
62+
sourcemap: true
63+
}
64+
}
65+
] : {
766
input: pkg.main,
67+
plugins: [...plugins(browsersEsm.join(', ')), commonjs()],
868
output: {
969
file: './dist/umd.js',
1070
format: 'umd',
71+
exports: 'named',
1172
name: 'pith',
1273
sourcemap: true
13-
},
14-
plugins: [
15-
typescript(),
16-
nodeResolve(),
17-
commonjs(),
18-
],
19-
};
20-
74+
}
75+
}

0 commit comments

Comments
 (0)