magic_rb/forgejo
Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-24 18:56:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move licenses.txt to /assets directory (#26866)

Browse source 
Now that we have the `/assets` directory, we can put`licenses.txt`
directly into it instead of incorrect `/js` path which was previously
only done to avoid reserving a username.

---------

Co-authored-by: Giteabot <teabot@gitea.io>
This commit is contained in:
silverwind 2023-09-01 16:42:33 +02:00 committed by GitHub
parent 327a7ad518
commit 02efd99010
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -75,6 +75,7 @@ cpu.out
/public/assets/js /public/assets/js
/public/assets/css /public/assets/css
/public/assets/fonts /public/assets/fonts
/public/assets/licenses.txt
/public/assets/img/webpack /public/assets/img/webpack
/vendor /vendor
/web_src/fomantic/node_modules /web_src/fomantic/node_modules

2
templates/base/footer_content.tmpl
View file

@ -23,7 +23,7 @@
{{end}} {{end}}
</div> </div>
</div> </div>
<a href="{{AssetUrlPrefix}}/js/licenses.txt">{{.locale.Tr "licenses"}}</a> <a href="{{AssetUrlPrefix}}/licenses.txt">{{.locale.Tr "licenses"}}</a>
{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}} {{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
{{template "custom/extra_links_footer" .}} {{template "custom/extra_links_footer" .}}
</div> </div>

6
webpack.config.js
View file

@ -188,7 +188,7 @@ export default {
filename: 'js/monaco-[name].[contenthash:8].worker.js', filename: 'js/monaco-[name].[contenthash:8].worker.js',
}), }),
isProduction ? new LicenseCheckerWebpackPlugin({ isProduction ? new LicenseCheckerWebpackPlugin({
outputFilename: 'js/licenses.txt', outputFilename: 'licenses.txt',
outputWriter: ({dependencies}) => { outputWriter: ({dependencies}) => {
const line = '-'.repeat(80); const line = '-'.repeat(80);
const goJson = readFileSync('assets/go-licenses.json', 'utf8'); const goJson = readFileSync('assets/go-licenses.json', 'utf8');
@ -211,7 +211,7 @@ export default {
}, },
emitError: true, emitError: true,
allow: '(Apache-2.0 OR BSD-2-Clause OR BSD-3-Clause OR MIT OR ISC OR CPAL-1.0 OR Unlicense OR EPL-1.0 OR EPL-2.0)', allow: '(Apache-2.0 OR BSD-2-Clause OR BSD-3-Clause OR MIT OR ISC OR CPAL-1.0 OR Unlicense OR EPL-1.0 OR EPL-2.0)',
}) : new AddAssetPlugin('js/licenses.txt', `Licenses are disabled during development`), }) : new AddAssetPlugin('licenses.txt', `Licenses are disabled during development`),
], ],
performance: { performance: {
hints: false, hints: false,
@ -239,7 +239,7 @@ export default {
entrypoints: false, entrypoints: false,
excludeAssets: [ excludeAssets: [
/^js\/monaco-language-.+\.js$/, /^js\/monaco-language-.+\.js$/,
!isProduction && /^js\/licenses.txt$/, !isProduction && /^licenses.txt$/,
].filter(Boolean), ].filter(Boolean),
groupAssetsByChunk: false, groupAssetsByChunk: false,
groupAssetsByEmitStatus: false, groupAssetsByEmitStatus: false,