Skip to content

Commit e74cd65

Browse files
committed
update config
1 parent 11ea452 commit e74cd65

File tree

10 files changed

+776
-293
lines changed

10 files changed

+776
-293
lines changed

package.json

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,26 @@
99
},
1010
"scripts": {
1111
"build": "tsc --noEmit && vite build",
12-
"build:hmr": "rollup --config utils/reload/rollup.config.ts",
12+
"build:firefox": "tsc --noEmit && cross-env __FIREFOX__=true vite build",
13+
"build:watch": "cross-env __DEV__=true vite build -w --mode development",
14+
"build:firefox:watch": "cross-env __DEV__=true __FIREFOX__=true vite build -w --mode development",
15+
"build:hmr": "rollup --config utils/reload/rollup.config.mjs",
1316
"wss": "node utils/reload/initReloadServer.js",
14-
"dev": "npm run build:hmr && (npm run wss & nodemon)",
15-
"test": "jest"
17+
"dev": "pnpm build:hmr && (run-p wss build:watch)",
18+
"dev:firefox": "pnpm build:hmr && (run-p wss build:firefox:watch)",
19+
"test": "vitest"
1620
},
1721
"type": "module",
1822
"dependencies": {
1923
"react": "18.2.0",
20-
"react-dom": "18.2.0"
24+
"react-dom": "18.2.0",
25+
"webextension-polyfill": "0.10.0"
2126
},
2227
"devDependencies": {
23-
"@rollup/plugin-typescript": "8.5.0",
28+
"@rollup/plugin-typescript": "11.1.5",
2429
"@testing-library/react": "14.1.2",
2530
"@types/chrome": "0.0.254",
26-
"@types/jest": "29.5.11",
27-
"@types/node": "18.11.18",
31+
"@types/node": "20.8.10",
2832
"@types/react": "18.2.45",
2933
"@types/react-dom": "18.2.18",
3034
"@types/ws": "8.5.10",
@@ -33,22 +37,24 @@
3337
"@vitejs/plugin-react": "4.2.1",
3438
"autoprefixer": "10.4.16",
3539
"chokidar": "3.5.3",
40+
"cross-env": "7.0.3",
3641
"eslint": "8.56.0",
3742
"eslint-config-prettier": "9.1.0",
3843
"eslint-plugin-prettier": "5.0.1",
3944
"eslint-plugin-react": "7.31.10",
4045
"fs-extra": "11.2.0",
4146
"jest": "29.7.0",
4247
"jest-environment-jsdom": "29.3.1",
43-
"nodemon": "2.0.20",
48+
"npm-run-all": "4.1.5",
4449
"postcss": "8.4.32",
4550
"prettier": "3.1.1",
46-
"rollup": "2.79.1",
51+
"rollup": "4.3.0",
4752
"tailwindcss": "3.3.6",
4853
"ts-jest": "29.1.1",
4954
"ts-loader": "9.5.1",
5055
"typescript": "5.3.3",
5156
"vite": "5.0.10",
57+
"vitest": "0.34.6",
5258
"ws": "8.15.1"
5359
}
5460
}

pnpm-lock.yaml

Lines changed: 718 additions & 251 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/pages/background/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import reloadOnUpdate from "virtual:reload-on-update-in-background-script";
2+
import 'webextension-polyfill'
23

34
reloadOnUpdate("pages/background");
45

src/pages/content/components/Demo/app.test.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { render, screen } from "@testing-library/react";
22
import App from "@pages/content/components/Demo/app";
3+
import { describe, test } from "vitest";
34

45
describe("appTest", () => {
56
test("render text", () => {

test-utils/jest.setup.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

test-utils/vitest.setup.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// Do what you need to set up your test
2+
console.log('setup test: vitest.setup.js');

tsconfig.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@
1515
"allowSyntheticDefaultImports": true,
1616
"lib": ["dom", "dom.iterable", "esnext"],
1717
"forceConsistentCasingInFileNames": true,
18-
"typeRoots": ["./src/global.d.ts"],
18+
"typeRoots": ["./src/global.d.ts", "node_modules/@types"],
1919
"paths": {
20+
"@root/*": ["./*"],
2021
"@src/*": ["src/*"],
2122
"@assets/*": ["src/assets/*"],
2223
"@pages/*": ["src/pages/*"],
2324
"virtual:reload-on-update-in-background-script": ["./src/global.d.ts"],
2425
"virtual:reload-on-update-in-view": ["./src/global.d.ts"]
2526
}
2627
},
27-
"include": ["src", "utils", "vite.config.ts", "node_modules/@types"]
28-
}
28+
"include": ["src", "utils", "vite.config.ts", "node_modules/@types"],
29+
// "exclude": ["./src/**/*.test.tsx"]
30+
}

utils/reload/rollup.config.mjs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import typescript from '@rollup/plugin-typescript';
2+
3+
const plugins = [typescript()];
4+
5+
export default [
6+
{
7+
plugins,
8+
input: 'utils/reload/initReloadServer.ts',
9+
output: {
10+
file: 'utils/reload/initReloadServer.js',
11+
},
12+
external: ['ws', 'chokidar', 'timers'],
13+
},
14+
{
15+
plugins,
16+
input: 'utils/reload/injections/script.ts',
17+
output: {
18+
file: 'utils/reload/injections/script.js',
19+
},
20+
},
21+
{
22+
plugins,
23+
input: 'utils/reload/injections/view.ts',
24+
output: {
25+
file: 'utils/reload/injections/view.js',
26+
},
27+
},
28+
];

utils/reload/rollup.config.ts

Lines changed: 0 additions & 28 deletions
This file was deleted.

vite.config.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ export default defineConfig({
6060
},
6161
},
6262
},
63+
test: {
64+
globals: true,
65+
environment: 'jsdom',
66+
include: ['**/*.test.ts', '**/*.test.tsx'],
67+
setupFiles: './test-utils/vitest.setup.js',
68+
}
6369
});
6470

6571
function getLastElement<T>(array: ArrayLike<T>): T {

0 commit comments

Comments
 (0)