Skip to content

Commit e726def

Browse files
authored
chore(vite): migrate build from rollup to vite (#1943)
1 parent bb4163f commit e726def

File tree

86 files changed

+7240
-4990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+7240
-4990
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
"@scaleway/validate-icu-locales": patch
3+
"@scaleway/changesets-renovate": patch
4+
"@scaleway/outdated-browser": patch
5+
"@scaleway/use-query-params": patch
6+
"@scaleway/use-random-name": patch
7+
"@scaleway/cookie-consent": patch
8+
"@scaleway/use-dataloader": patch
9+
"@scaleway/use-growthbook": patch
10+
"@scaleway/jest-helpers": patch
11+
"@scaleway/random-name": patch
12+
"@scaleway/use-segment": patch
13+
"@scaleway/use-storage": patch
14+
"@scaleway/use-media": patch
15+
"@scaleway/use-i18n": patch
16+
"@scaleway/use-gtm": patch
17+
"@scaleway/regex": patch
18+
---
19+
20+
Migration from rollup to vite

package.json

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"packages/*"
66
],
77
"type": "module",
8-
"packageManager": "pnpm@8.15.7",
8+
"packageManager": "pnpm@9.0.4",
99
"engines": {
1010
"node": ">=20.x",
1111
"pnpm": ">=8.x"
1212
},
13-
"devDependencies": {
13+
"dependencies": {
1414
"@babel/core": "7.24.4",
1515
"@babel/eslint-parser": "7.24.1",
1616
"@babel/plugin-transform-runtime": "7.24.3",
@@ -22,43 +22,38 @@
2222
"@commitlint/cli": "19.2.2",
2323
"@commitlint/config-conventional": "19.2.2",
2424
"@jest/globals": "29.7.0",
25-
"@rollup/plugin-babel": "6.0.4",
26-
"@rollup/plugin-node-resolve": "15.2.3",
2725
"@scaleway/eslint-config-react": "workspace:*",
2826
"@scaleway/tsconfig": "workspace:*",
2927
"@testing-library/jest-dom": "6.4.2",
3028
"@testing-library/react": "15.0.2",
3129
"@types/jest": "29.5.12",
3230
"@types/node": "20.12.7",
33-
"@types/react": "18.2.78",
3431
"@types/react-dom": "18.2.25",
32+
"@types/react": "18.2.78",
33+
"@vitejs/plugin-react": "4.2.1",
34+
"browserslist": "4.23.0",
3535
"builtin-modules": "3.3.0",
3636
"cross-env": "7.0.3",
37+
"esbuild-plugin-browserslist": "0.11.1",
3738
"eslint": "8.57.0",
3839
"husky": "9.0.11",
39-
"jest": "29.7.0",
4040
"jest-environment-jsdom": "29.7.0",
4141
"jest-junit": "16.0.0",
4242
"jest-localstorage-mock": "2.4.26",
43+
"jest": "29.7.0",
4344
"lint-staged": "15.2.2",
4445
"mockdate": "3.0.5",
4546
"prettier": "3.2.5",
46-
"react": "18.2.0",
47-
"react-dom": "18.2.0",
4847
"read-pkg": "9.0.1",
49-
"rollup": "4.14.3",
50-
"rollup-plugin-dts": "6.1.0",
51-
"rollup-plugin-preserve-shebangs": "0.2.0",
52-
"rollup-plugin-visualizer": "5.12.0",
5348
"tstyche": "1.1.0 ",
5449
"typescript": "5.4.5",
50+
"vite": "5.2.10",
5551
"wait-for-expect": "3.0.2"
5652
},
5753
"scripts": {
5854
"lint": "eslint --ext js,ts,tsx --cache .",
5955
"lint:fix": "pnpm run lint --fix",
60-
"build": "pnpm recursive --filter='!@scaleway/eslint-config-react' --filter='!@scaleway/tsconfig' exec -- rollup -c ../../rollup.config.mjs",
61-
"build:profile": "cross-env PROFILE=true pnpm run build",
56+
"build": "pnpm recursive run build",
6257
"commit": "npx git-cz -a",
6358
"format": "prettier --write '**/*.{ts,tsx,js,json,md,mdx}'",
6459
"test": "TZ=UTC jest",
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dist/
2+
coverage/
3+
node_modules
4+
.reports/

packages/changesets-renovate/package.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,35 @@
33
"version": "2.0.2",
44
"description": "Automatically create changesets for Renovate",
55
"type": "module",
6+
"module": "./dist/index.js",
7+
"types": "./dist/index.d.ts",
8+
"sideEffects": false,
9+
"exports": {
10+
".": {
11+
"types": "./dist/index.d.ts",
12+
"default": "./dist/index.js"
13+
}
14+
},
15+
"files": [
16+
"dist"
17+
],
618
"engines": {
719
"node": ">=20.x"
820
},
921
"bin": {
1022
"changesets-renovate": "dist/index.js"
1123
},
12-
"sideEffects": false,
1324
"publishConfig": {
1425
"access": "public"
1526
},
27+
"scripts": {
28+
"typecheck": "tsc --noEmit",
29+
"type:generate": "tsc --declaration -p tsconfig.build.json",
30+
"build": "vite build --config vite.config.ts && pnpm run type:generate",
31+
"build:profile": "npx vite-bundle-visualizer -c vite.config.ts",
32+
"lint": "eslint --report-unused-disable-directives --cache --cache-strategy content --ext ts,tsx ."
33+
},
34+
1635
"repository": {
1736
"type": "git",
1837
"url": "https://github.com/scaleway/scaleway-lib",
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"extends": "./tsconfig.json",
3+
"compilerOptions": {
4+
"noEmit": false,
5+
"emitDeclarationOnly": true,
6+
"rootDir": "src",
7+
"outDir": "dist"
8+
},
9+
"exclude": ["*.config.ts", "*.setup.ts", "**/__tests__", "**/__mocks__"]
10+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"extends": "../../tsconfig.json",
3+
"include": ["src/**/*.ts", "src/**/*.tsx", "*.config.ts"]
4+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/* eslint-disable eslint-comments/disable-enable-pair */
2+
/* eslint-disable import/no-relative-packages */
3+
/* eslint-disable-next-line import/no-extraneous-dependencies */
4+
import { defineConfig, mergeConfig } from 'vite'
5+
import { defaultConfig } from '../../vite.config'
6+
7+
export default mergeConfig(defineConfig(defaultConfig), {
8+
build: {
9+
target: ['node20'],
10+
},
11+
})
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dist/
2+
coverage/
3+
node_modules
4+
.reports/

packages/cookie-consent/package.json

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,25 @@
33
"version": "1.2.1",
44
"description": "React provider to handle website end user consent cookie storage based on segment integrations",
55
"type": "module",
6+
"module": "./dist/index.js",
7+
"types": "./dist/index.d.ts",
68
"sideEffects": false,
79
"exports": {
8-
"types": "./dist/index.d.ts",
9-
"default": "./dist/index.js"
10+
".": {
11+
"types": "./dist/index.d.ts",
12+
"default": "./dist/index.js"
13+
}
1014
},
1115
"publishConfig": {
1216
"access": "public"
1317
},
18+
"scripts": {
19+
"typecheck": "tsc --noEmit",
20+
"type:generate": "tsc --declaration -p tsconfig.build.json",
21+
"build": "vite build --config vite.config.ts && pnpm run type:generate",
22+
"build:profile": "npx vite-bundle-visualizer -c vite.config.ts",
23+
"lint": "eslint --report-unused-disable-directives --cache --cache-strategy content --ext ts,tsx ."
24+
},
1425
"keywords": [
1526
"react",
1627
"reactjs",
@@ -30,10 +41,10 @@
3041
"devDependencies": {
3142
"@types/cookie": "0.6.0",
3243
"react": "18.2.0",
33-
"@scaleway/use-segment": "1.0.1"
44+
"@scaleway/use-segment": "workspace:*"
3445
},
3546
"peerDependencies": {
3647
"react": "18.x || 18",
37-
"@scaleway/use-segment": "1.0.1"
48+
"@scaleway/use-segment": "^1.0.1"
3849
}
3950
}

packages/cookie-consent/src/CookieConsentProvider/SegmentConsentMiddleware.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ export const SegmentConsentMiddleware = ({
4848
categoryPreferences: categoriesConsent,
4949
}
5050

51-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, no-param-reassign
51+
// eslint-disable-next-line , no-param-reassign
5252
payload.obj.context['consent'] = consent
5353
}
5454

5555
// actually there is a bug on the default script.
5656
if (payload.integrations()[amplitudeIntegrationName]) {
57-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, no-param-reassign
57+
// eslint-disable-next-line , no-param-reassign
5858
payload.obj.integrations = {
5959
...payload.obj.integrations,
6060
[amplitudeIntegrationName]: {

0 commit comments

Comments
 (0)