Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix!: Rollup build XSS vulnerability (CVE-2024-43788) #759

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix!: Rollup build XSS vulnerability (CVE-2024-43788) #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
},
"peerDependencies": {
"@vite-pwa/assets-generator": "^0.2.6",
"vite": "^3.1.0 || ^4.0.0 || ^5.0.0",
"vite": "^4.2.0 || ^5.0.0",
"workbox-build": "^7.1.0",
"workbox-window": "^7.1.0"
},
Expand Down Expand Up @@ -145,7 +145,6 @@
"prompts": "^2.4.2",
"publint": "^0.2.5",
"react": "^18.2.0",
"rollup": "^4.4.1",
"solid-js": "^1.8.5",
"svelte": "^4.2.5",
"tsup": "^7.3.0",
Expand Down
3 changes: 0 additions & 3 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { BuildOptions, InlineConfig, Plugin, ResolvedConfig, UserConfig } from 'vite'
import type { BuildOptions, InlineConfig, Plugin, ResolvedConfig, Rollup, UserConfig } from 'vite'
import type { GenerateSWOptions, InjectManifestOptions, ManifestEntry } from 'workbox-build'
import type { OutputBundle, RollupOptions } from 'rollup'
import type { BuiltInPreset, Preset } from '@vite-pwa/assets-generator/config'
import type { HtmlLinkPreset } from '@vite-pwa/assets-generator/api'
import type { PWAAssetsGenerator } from './pwa-assets/types'
Expand Down Expand Up @@ -78,13 +77,13 @@ export type CustomInjectManifestOptions = InjectManifestOptions & {
* **WARN**: this option is for advanced usage, beware, you can break your application build.
*/
buildPlugins?: {
rollup?: RollupOptions['plugins']
rollup?: Rollup.RollupOptions['plugins']
vite?: UserConfig['plugins']
}
/**
* Since `v0.15.0` you can add custom Rollup options to build your service worker: we expose the same configuration to build a worker using Vite.
*/
rollupOptions?: Omit<RollupOptions, 'plugins' | 'output'>
rollupOptions?: Omit<Rollup.RollupOptions, 'plugins' | 'output'>

/**
* Environment options.
Expand Down Expand Up @@ -407,7 +406,7 @@ export interface VitePWAOptions {
export interface ResolvedServiceWorkerOptions {
format: 'es' | 'iife'
plugins?: Plugin[]
rollupOptions: RollupOptions
rollupOptions: Rollup.RollupOptions
}

export interface ResolvedVitePWAOptions extends Required<Omit<VitePWAOptions, 'pwaAssets' | 'showMaximumFileSizeToCacheInBytesWarning'>> {
Expand Down Expand Up @@ -706,7 +705,7 @@ export interface VitePluginPWAAPI {
/*
* Explicitly generate the manifests.
*/
generateBundle(bundle?: OutputBundle): OutputBundle | undefined
generateBundle(bundle?: Rollup.OutputBundle): Rollup.OutputBundle | undefined
/*
* Explicitly generate the PWA services worker.
*/
Expand Down