diff --git a/.gitignore b/.gitignore index 6b699e087..e3b9c3c43 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,7 @@ cpu.out /public/assets/js /public/assets/css /public/assets/fonts +/public/assets/licenses.txt /public/assets/img/webpack /vendor /web_src/fomantic/node_modules diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index 3b87f25d6..cf647f1cc 100644 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -23,7 +23,7 @@ {{end}} - {{.locale.Tr "licenses"}} + {{.locale.Tr "licenses"}} {{if .EnableSwagger}}API{{end}} {{template "custom/extra_links_footer" .}} diff --git a/webpack.config.js b/webpack.config.js index 497aca922..c6b28068f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -188,7 +188,7 @@ export default { filename: 'js/monaco-[name].[contenthash:8].worker.js', }), isProduction ? new LicenseCheckerWebpackPlugin({ - outputFilename: 'js/licenses.txt', + outputFilename: 'licenses.txt', outputWriter: ({dependencies}) => { const line = '-'.repeat(80); const goJson = readFileSync('assets/go-licenses.json', 'utf8'); @@ -211,7 +211,7 @@ export default { }, 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)', - }) : new AddAssetPlugin('js/licenses.txt', `Licenses are disabled during development`), + }) : new AddAssetPlugin('licenses.txt', `Licenses are disabled during development`), ], performance: { hints: false, @@ -239,7 +239,7 @@ export default { entrypoints: false, excludeAssets: [ /^js\/monaco-language-.+\.js$/, - !isProduction && /^js\/licenses.txt$/, + !isProduction && /^licenses.txt$/, ].filter(Boolean), groupAssetsByChunk: false, groupAssetsByEmitStatus: false,