diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-04-05 12:20:19 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-04-05 12:24:00 -0400 |
| commit | 7e7350eab5adfa25e3641f8fa8829f5c121713aa (patch) | |
| tree | e152391cf1d2cca067a2cf3988588a3401cea80d /scripts | |
| parent | Merge branch 'misskey-develop' into merge/2025-03-24 (diff) | |
| parent | refactor(frontend): refactor styles (diff) | |
| download | sharkey-7e7350eab5adfa25e3641f8fa8829f5c121713aa.tar.gz sharkey-7e7350eab5adfa25e3641f8fa8829f5c121713aa.tar.bz2 sharkey-7e7350eab5adfa25e3641f8fa8829f5c121713aa.zip | |
Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
# .github/workflows/storybook.yml
# package.json
# packages/frontend/src/utility/autogen/settings-search-index.ts
# pnpm-lock.yaml
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/dependency-patches/vite.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/scripts/dependency-patches/vite.patch b/scripts/dependency-patches/vite.patch new file mode 100644 index 0000000000..3fe28ea67e --- /dev/null +++ b/scripts/dependency-patches/vite.patch @@ -0,0 +1,31 @@ +diff --git a/dist/node/chunks/dep-DrOo5SEf.js b/dist/node/chunks/dep-DrOo5SEf.js +index 329e68bd27e55a56d815fa6b4de2d615a8c2b343..9d9f58e90ae836f80063b698e307fec436e53e07 100644 +--- a/dist/node/chunks/dep-DrOo5SEf.js ++++ b/dist/node/chunks/dep-DrOo5SEf.js +@@ -45971,7 +45971,7 @@ function importAnalysisPlugin(config) { + let isPartiallySelfAccepting = false; + const importedBindings = enablePartialAccept ? /* @__PURE__ */ new Map() : null; + const toAbsoluteUrl = (url) => path$d.posix.resolve(path$d.posix.dirname(importerModule.url), url); +- const normalizeUrl = async (url, pos, forceSkipImportAnalysis = false) => { ++ const normalizeUrl = async (url, pos, forceSkipImportAnalysis = false, stripBase2 = false) => { + url = stripBase(url, base); + let importerFile = importer; + if (depsOptimizer && moduleListContains(depsOptimizer.options.exclude, url)) { +@@ -46031,7 +46031,7 @@ function importAnalysisPlugin(config) { + e.pos = pos; + throw e; + } +- if (!ssr) url = joinUrlSegments(base, url); ++ if (!ssr && !stripBase2) url = joinUrlSegments(base, url); + return [url, resolved.id]; + }; + const orderedImportedUrls = new Array(imports.length); +@@ -46288,7 +46288,7 @@ See ${colors$1.blue( + const pluginImports = this._addedImports; + if (pluginImports) { + (await Promise.all( +- [...pluginImports].map((id) => normalizeUrl(id, 0, true)) ++ [...pluginImports].map((id) => normalizeUrl(id, 0, true, true)) + )).forEach(([url]) => importedUrls.add(url)); + } + if (ssr && importerModule.isSelfAccepting) { |