Skip to content

Commit b0ad0f5

Browse files
committed
feat: update default license ids
1 parent d1aba50 commit b0ad0f5

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎apps/frontend/src/pages/[type]/[project]/settings/license.vue‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,13 +327,12 @@ const availableLicenses = computed<LicenseOption[]>(() => {
327327
)
328328
const defaultIds = new Set<string>(defaultLicenseIds)
329329
return [
330+
{ friendly: 'Custom', short: '', requiresOnlyOrLater: false },
330331
...defaultLicenseIds.map((short) => ({
331332
friendly:
332-
short === ''
333-
? 'Custom'
334-
: short === 'All-Rights-Reserved'
335-
? 'All Rights Reserved/No License'
336-
: (licensesById.get(short)?.name ?? short),
333+
short === 'All-Rights-Reserved'
334+
? 'All Rights Reserved/No License'
335+
: (licensesById.get(short)?.name ?? short),
337336
short,
338337
requiresOnlyOrLater: orLaterLicenseIds.has(short),
339338
})),
@@ -359,7 +358,9 @@ const allLicenseOptions = computed<ComboboxOption<string>[]>(() =>
359358
360359
const licenseOptions = computed(() => {
361360
const defaultIds = new Set<string>(defaultLicenseIds)
362-
return allLicenseOptions.value.filter((license) => defaultIds.has(license.value))
361+
return allLicenseOptions.value.filter(
362+
(license) => license.value === '' || defaultIds.has(license.value),
363+
)
363364
})
364365
365366
function getInitialLicense() {

‎packages/utils/licenses.ts‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
export const defaultLicenseIds = [
2-
'',
32
'All-Rights-Reserved',
4-
'Apache-2.0',
53
'MIT',
4+
'MIT-0',
65
'LGPL-3.0',
76
'LGPL-2.1',
87
'GPL-3.0',
98
'GPL-2.0',
109
'AGPL-3.0',
10+
'AFL-3.0',
1111
'MPL-2.0',
12+
'Apache-2.0',
1213
'BSD-3-Clause',
1314
'BSD-2-Clause',
1415
'CC0-1.0',
1516
'CC-BY-4.0',
1617
'CC-BY-NC-4.0',
17-
'CC-BY-NC-ND-4.0',
18-
'CC-BY-NC-SA-4.0',
1918
'CC-BY-ND-4.0',
2019
'CC-BY-SA-4.0',
21-
'AFL-3.0',
20+
'CC-BY-NC-ND-4.0',
21+
'CC-BY-NC-SA-4.0',
22+
'PolyForm-Noncommercial-1.0.0',
23+
'MMPL-1.0.1',
2224
'EPL-2.0',
2325
'EUPL-1.2',
2426
'ISC',
25-
'MIT-0',
26-
'MMPL-1.0.1',
2727
'OSL-3.0',
28-
'PolyForm-Noncommercial-1.0.0',
2928
'Unlicense',
3029
'WTFPL',
3130
'Zlib',

0 commit comments

Comments
 (0)