Skip to content

Commit be5d980

Browse files
susnuxsusnux
authored
Merge pull request #59996 from nextcloud/chore/harden-vite
build: harden module name generation
2 parents 1047d52 + 4431f30 commit be5d980

290 files changed

Lines changed: 582 additions & 587 deletions

File tree

Some content is hidden

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

‎build/frontend/vite.config.ts‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,11 @@ export default createAppConfig(Object.fromEntries(viteModuleEntries), {
104104
output: {
105105
entryFileNames: '[name].mjs',
106106
chunkFileNames: '[name]-[hash].chunk.mjs',
107-
assetFileNames(ctx) {
108-
const { originalFileNames } = ctx
109-
const [name] = originalFileNames
110-
if (name) {
111-
const [, appId] = name.match(/apps\/([^/]+)\//) ?? []
112-
if (appId) {
113-
return `${appId}-[name]-[hash][extname]`
114-
}
115-
}
116-
return '[name]-[hash][extname]'
107+
assetFileNames({ originalFileNames }) {
108+
const apps = originalFileNames.map((name) => name.match(/apps\/([^/]+)\//)?.[1])
109+
.filter(Boolean)
110+
const appId = apps.length === 1 ? apps[0] : 'common'
111+
return `${appId}-[name]-[hash][extname]`
117112
},
118113
experimentalMinChunkSize: 100 * 1024,
119114
/* // with rolldown-vite:

dist/ActivityCommentAction-405nWX-y.chunk.mjs renamed to dist/ActivityCommentAction-D0d9_xpB.chunk.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
import{a as t}from"./index-C1xmmKTZ-XKFVqjxi.chunk.mjs";import{t as e}from"./translation-DoG5ZELJ-8aobdbPK.chunk.mjs";import{C as m,a}from"./CommentView-i-vD_4je.chunk.mjs";import{l as p}from"./activity-DdSAHrqw.chunk.mjs";import{b as i,r as s,o as n,c,m as u}from"./preload-helper-D9xEqq8S.chunk.mjs";import{_ as l}from"./public-CvthP4YJ.chunk.mjs";import"./NcDialog-nDc1gW50-BF3zId_C.chunk.mjs";import"./NcModal-kyWZ3UFC-DO8otox5.chunk.mjs";import"./ArrowRight-YxbwZNEK.chunk.mjs";import"./Web-7MW_v0ET.chunk.mjs";import"./index-Bp9-GhMo.chunk.mjs";import"./TrashCanOutline-COIylzhj.chunk.mjs";import"./mdi-B3j1XNhV.chunk.mjs";import"./pinia-BhysKopn.chunk.mjs";import"./PencilOutline-BE2yOTiX.chunk.mjs";/* empty css */import"./NcAvatar-ruClKRzS-B7xYQpkD.chunk.mjs";import"./index-DqG-5vGV.chunk.mjs";import"./util-Caafb9Jl.chunk.mjs";import"./colors-BfjxNgsx-DzIYAbgd.chunk.mjs";import"./NcUserStatusIcon-JWiuiAXe-YBMsdL44.chunk.mjs";import"./NcDateTime.vue_vue_type_script_setup_true_lang-B4upiZjL-CEiPv5af.chunk.mjs";import"./NcUserBubble-BE6yD-R0-SSK_qJmL.chunk.mjs";import"./GetComments-CLT9798q.chunk.mjs";import"./index-6X1fPKhd.chunk.mjs";const d=i({components:{Comment:a},mixins:[m],props:{reloadCallback:{type:Function,required:!0}},methods:{onNewComment(){try{this.reloadCallback()}catch(o){t(e("comments","Could not reload comments")),p.error("Could not reload comments",{error:o})}}}});function C(o,f,y,w,D,N){const r=s("Comment");return n(),c(r,u(o.editorData,{autoComplete:o.autoComplete,resourceType:o.resourceType,editor:!0,userData:o.userData,resourceId:o.resourceId,class:"comments-action",onNew:o.onNewComment}),null,16,["autoComplete","resourceType","userData","resourceId","onNew"])}const R=l(d,[["render",C],["__scopeId","data-v-29a1e244"]]);export{R as default};
2-
//# sourceMappingURL=ActivityCommentAction-405nWX-y.chunk.mjs.map
1+
import{a as t}from"./index-C1xmmKTZ-B8cvQ3YK.chunk.mjs";import{t as e}from"./translation-DoG5ZELJ-8aobdbPK.chunk.mjs";import{C as m,a}from"./CommentView-CVXAEzX-.chunk.mjs";import{l as p}from"./activity-DdSAHrqw.chunk.mjs";import{b as i,r as s,o as n,c,m as u}from"./preload-helper-D9xEqq8S.chunk.mjs";import{_ as l}from"./public-CvthP4YJ.chunk.mjs";import"./NcDialog-nDc1gW50-DYP-DHq0.chunk.mjs";import"./NcModal-kyWZ3UFC-BQ5lZJzZ.chunk.mjs";import"./ArrowRight-DeVedBFR.chunk.mjs";import"./Web-ZWEISDeD.chunk.mjs";import"./index-Bp9-GhMo.chunk.mjs";import"./TrashCanOutline-BnR7C5ZT.chunk.mjs";import"./mdi-BM4BS577.chunk.mjs";import"./pinia-BhysKopn.chunk.mjs";import"./PencilOutline-BSJtgsl4.chunk.mjs";/* empty css */import"./NcAvatar-ruClKRzS-DQocEoq7.chunk.mjs";import"./index-DqG-5vGV.chunk.mjs";import"./util-Caafb9Jl.chunk.mjs";import"./colors-BfjxNgsx-C7JIEuLn.chunk.mjs";import"./NcUserStatusIcon-JWiuiAXe-DlwxU1WP.chunk.mjs";import"./NcDateTime.vue_vue_type_script_setup_true_lang-B4upiZjL-CrKGbwF0.chunk.mjs";import"./NcUserBubble-BE6yD-R0-BnnfiATB.chunk.mjs";import"./GetComments-CLT9798q.chunk.mjs";import"./index-6X1fPKhd.chunk.mjs";const d=i({components:{Comment:a},mixins:[m],props:{reloadCallback:{type:Function,required:!0}},methods:{onNewComment(){try{this.reloadCallback()}catch(o){t(e("comments","Could not reload comments")),p.error("Could not reload comments",{error:o})}}}});function C(o,f,y,w,D,N){const r=s("Comment");return n(),c(r,u(o.editorData,{autoComplete:o.autoComplete,resourceType:o.resourceType,editor:!0,userData:o.userData,resourceId:o.resourceId,class:"comments-action",onNew:o.onNewComment}),null,16,["autoComplete","resourceType","userData","resourceId","onNew"])}const R=l(d,[["render",C],["__scopeId","data-v-29a1e244"]]);export{R as default};
2+
//# sourceMappingURL=ActivityCommentAction-D0d9_xpB.chunk.mjs.map

dist/ActivityCommentAction-405nWX-y.chunk.mjs.license renamed to dist/ActivityCommentAction-D0d9_xpB.chunk.mjs.license

File renamed without changes.

dist/ActivityCommentAction-405nWX-y.chunk.mjs.map renamed to dist/ActivityCommentAction-D0d9_xpB.chunk.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ActivityCommentAction-405nWX-y.chunk.mjs.map.license renamed to dist/ActivityCommentAction-D0d9_xpB.chunk.mjs.map.license

File renamed without changes.

dist/ActivityCommentEntry-Bt73TEE1.chunk.mjs renamed to dist/ActivityCommentEntry-C4ovlFUF.chunk.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
import{t as s}from"./translation-DoG5ZELJ-8aobdbPK.chunk.mjs";import{C as p,a}from"./CommentView-i-vD_4je.chunk.mjs";import{_ as i}from"./public-CvthP4YJ.chunk.mjs";import{r as n,o as c,c as u,m as l}from"./preload-helper-D9xEqq8S.chunk.mjs";import"./index-Bp9-GhMo.chunk.mjs";import"./pinia-BhysKopn.chunk.mjs";import"./PencilOutline-BE2yOTiX.chunk.mjs";import"./ArrowRight-YxbwZNEK.chunk.mjs";import"./Web-7MW_v0ET.chunk.mjs";import"./NcModal-kyWZ3UFC-DO8otox5.chunk.mjs";/* empty css */import"./NcAvatar-ruClKRzS-B7xYQpkD.chunk.mjs";import"./index-DqG-5vGV.chunk.mjs";import"./util-Caafb9Jl.chunk.mjs";import"./colors-BfjxNgsx-DzIYAbgd.chunk.mjs";import"./NcUserStatusIcon-JWiuiAXe-YBMsdL44.chunk.mjs";import"./NcDateTime.vue_vue_type_script_setup_true_lang-B4upiZjL-CEiPv5af.chunk.mjs";import"./TrashCanOutline-COIylzhj.chunk.mjs";import"./NcUserBubble-BE6yD-R0-SSK_qJmL.chunk.mjs";import"./index-C1xmmKTZ-XKFVqjxi.chunk.mjs";import"./NcDialog-nDc1gW50-BF3zId_C.chunk.mjs";import"./mdi-B3j1XNhV.chunk.mjs";import"./activity-DdSAHrqw.chunk.mjs";import"./GetComments-CLT9798q.chunk.mjs";import"./index-6X1fPKhd.chunk.mjs";const d={name:"ActivityCommentEntry",components:{Comment:a},mixins:[p],props:{comment:{type:Object,required:!0},reloadCallback:{type:Function,required:!0}},data(){return{commentMessage:""}},watch:{comment(){this.commentMessage=this.comment.props.message}},mounted(){this.commentMessage=this.comment.props.message},methods:{t:s}};function g(t,o,e,f,m,C){const r=n("Comment");return c(),u(r,l({ref:"comment",tag:"li"},e.comment.props,{autoComplete:t.autoComplete,resourceType:t.resourceType,message:m.commentMessage,resourceId:t.resourceId,userData:t.genMentionsData(e.comment.props.mentions),class:"comments-activity",onDelete:o[0]||(o[0]=y=>e.reloadCallback())}),null,16,["autoComplete","resourceType","message","resourceId","userData"])}const P=i(d,[["render",g],["__scopeId","data-v-afc310f1"]]);export{P as default};
2-
//# sourceMappingURL=ActivityCommentEntry-Bt73TEE1.chunk.mjs.map
1+
import{t as s}from"./translation-DoG5ZELJ-8aobdbPK.chunk.mjs";import{C as p,a}from"./CommentView-CVXAEzX-.chunk.mjs";import{_ as i}from"./public-CvthP4YJ.chunk.mjs";import{r as n,o as c,c as u,m as l}from"./preload-helper-D9xEqq8S.chunk.mjs";import"./index-Bp9-GhMo.chunk.mjs";import"./pinia-BhysKopn.chunk.mjs";import"./PencilOutline-BSJtgsl4.chunk.mjs";import"./ArrowRight-DeVedBFR.chunk.mjs";import"./Web-ZWEISDeD.chunk.mjs";import"./NcModal-kyWZ3UFC-BQ5lZJzZ.chunk.mjs";/* empty css */import"./NcAvatar-ruClKRzS-DQocEoq7.chunk.mjs";import"./index-DqG-5vGV.chunk.mjs";import"./util-Caafb9Jl.chunk.mjs";import"./colors-BfjxNgsx-C7JIEuLn.chunk.mjs";import"./NcUserStatusIcon-JWiuiAXe-DlwxU1WP.chunk.mjs";import"./NcDateTime.vue_vue_type_script_setup_true_lang-B4upiZjL-CrKGbwF0.chunk.mjs";import"./TrashCanOutline-BnR7C5ZT.chunk.mjs";import"./NcUserBubble-BE6yD-R0-BnnfiATB.chunk.mjs";import"./index-C1xmmKTZ-B8cvQ3YK.chunk.mjs";import"./NcDialog-nDc1gW50-DYP-DHq0.chunk.mjs";import"./mdi-BM4BS577.chunk.mjs";import"./activity-DdSAHrqw.chunk.mjs";import"./GetComments-CLT9798q.chunk.mjs";import"./index-6X1fPKhd.chunk.mjs";const d={name:"ActivityCommentEntry",components:{Comment:a},mixins:[p],props:{comment:{type:Object,required:!0},reloadCallback:{type:Function,required:!0}},data(){return{commentMessage:""}},watch:{comment(){this.commentMessage=this.comment.props.message}},mounted(){this.commentMessage=this.comment.props.message},methods:{t:s}};function g(t,o,e,f,m,C){const r=n("Comment");return c(),u(r,l({ref:"comment",tag:"li"},e.comment.props,{autoComplete:t.autoComplete,resourceType:t.resourceType,message:m.commentMessage,resourceId:t.resourceId,userData:t.genMentionsData(e.comment.props.mentions),class:"comments-activity",onDelete:o[0]||(o[0]=y=>e.reloadCallback())}),null,16,["autoComplete","resourceType","message","resourceId","userData"])}const P=i(d,[["render",g],["__scopeId","data-v-afc310f1"]]);export{P as default};
2+
//# sourceMappingURL=ActivityCommentEntry-C4ovlFUF.chunk.mjs.map

dist/ActivityCommentEntry-Bt73TEE1.chunk.mjs.license renamed to dist/ActivityCommentEntry-C4ovlFUF.chunk.mjs.license

File renamed without changes.

dist/ActivityCommentEntry-Bt73TEE1.chunk.mjs.map renamed to dist/ActivityCommentEntry-C4ovlFUF.chunk.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ActivityCommentEntry-Bt73TEE1.chunk.mjs.map.license renamed to dist/ActivityCommentEntry-C4ovlFUF.chunk.mjs.map.license

File renamed without changes.

0 commit comments

Comments
 (0)