Merge pull request #462 from chocolatey/release/1.2.1

(#460)(#458)(#194) choco-theme v1.2.1

Author: alexaveldanez

CREDITS.md

@@ -677,14 +677,14 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ```
 
-#### [@eonasdan/tempus-dominus@6.10.3](https://github.com/Eonasdan/tempus-dominus)
+#### [@eonasdan/tempus-dominus@v6.10.4](https://github.com/Eonasdan/tempus-dominus)
 
 [Repository Link](https://github.com/Eonasdan/tempus-dominus)
 
 No additional license information is available for this package.
 Refer to the license text above, listed under [MIT License](#mit-license).
 
-#### [@eslint/js@9.26.0](https://github.com/eslint/eslint)
+#### [@eslint/js@9.28.0](https://github.com/eslint/eslint)
 
 [Repository Link](https://github.com/eslint/eslint)
 
@@ -698,7 +698,7 @@ Refer to the license text above, listed under [MIT License](#mit-license).
 No additional license information is available for this package.
 Refer to the license text above, listed under [MIT License](#mit-license).
 
-#### [@stylistic/eslint-plugin@4.2.0](https://github.com/eslint-stylistic/eslint-stylistic)
+#### [@stylistic/eslint-plugin@4.4.1](https://github.com/eslint-stylistic/eslint-stylistic)
 
 [Repository Link](https://github.com/eslint-stylistic/eslint-stylistic)
 
@@ -719,7 +719,7 @@ Refer to the license text above, listed under [MIT License](#mit-license).
 No additional license information is available for this package.
 Refer to the license text above, listed under [MIT License](#mit-license).
 
-#### [@types/node@22.15.14](https://github.com/DefinitelyTyped/DefinitelyTyped)
+#### [@types/node@22.15.31](https://github.com/DefinitelyTyped/DefinitelyTyped)
 
 [Repository Link](https://github.com/DefinitelyTyped/DefinitelyTyped)
 
@@ -768,28 +768,28 @@ Refer to the license text above, listed under [MIT License](#mit-license).
 No additional license information is available for this package.
 Refer to the license text above, listed under [MIT License](#mit-license).
 
-#### [[email protected].0](https://github.com/DataTables/Dist-DataTables-Bootstrap5)
+#### [[email protected].2](https://github.com/DataTables/Dist-DataTables-Bootstrap5)
 
 [Repository Link](https://github.com/DataTables/Dist-DataTables-Bootstrap5)
 
 No additional license information is available for this package.
 Refer to the license text above, listed under [MIT License](#mit-license).
 
-#### [[email protected].0](https://github.com/DataTables/Dist-DataTables-DataTables)
+#### [[email protected].2](https://github.com/DataTables/Dist-DataTables-DataTables)
 
 [Repository Link](https://github.com/DataTables/Dist-DataTables-DataTables)
 
 No additional license information is available for this package.
 Refer to the license text above, listed under [MIT License](#mit-license).
 
-#### [[email protected].4](https://github.com/evanw/esbuild)
+#### [[email protected].5](https://github.com/evanw/esbuild)
 
 [Repository Link](https://github.com/evanw/esbuild)
 
 No additional license information is available for this package.
 Refer to the license text above, listed under [MIT License](#mit-license).
 
-#### [eslint@9.26.0](https://github.com/eslint/eslint)
+#### [eslint@9.28.0](https://github.com/eslint/eslint)
 
 [Repository Link](https://github.com/eslint/eslint)
 
@@ -887,7 +887,7 @@ Refer to the license text above, listed under [MIT License](#mit-license).
 No additional license information is available for this package.
 Refer to the license text above, listed under [MIT License](#mit-license).
 
-#### [[email protected].3](https://github.com/postcss/postcss)
+#### [[email protected].4](https://github.com/postcss/postcss)
 
 [Repository Link](https://github.com/postcss/postcss)
 
@@ -922,7 +922,7 @@ Refer to the license text above, listed under [MIT License](#mit-license).
 No additional license information is available for this package.
 Refer to the license text above, listed under [MIT License](#mit-license).
 
-#### [stylelint@16.19.1](https://github.com/stylelint/stylelint)
+#### [stylelint@16.20.0](https://github.com/stylelint/stylelint)
 
 [Repository Link](https://github.com/stylelint/stylelint)
 
@@ -950,7 +950,7 @@ Refer to the license text above, listed under [MIT License](#mit-license).
 No additional license information is available for this package.
 Refer to the license text above, listed under [MIT License](#mit-license).
 
-#### [sweetalert2@11.21.0](https://github.com/sweetalert2/sweetalert2)
+#### [sweetalert2@11.22.0](https://github.com/sweetalert2/sweetalert2)
 
 [Repository Link](https://github.com/sweetalert2/sweetalert2)
 
@@ -978,7 +978,7 @@ Refer to the license text above, listed under [MIT License](#mit-license).
 No additional license information is available for this package.
 Refer to the license text above, listed under [MIT License](#mit-license).
 
-#### [typescript-eslint@8.32.0](https://github.com/typescript-eslint/typescript-eslint)
+#### [typescript-eslint@8.34.0](https://github.com/typescript-eslint/typescript-eslint)
 
 [Repository Link](https://github.com/typescript-eslint/typescript-eslint)
 

README.md

@@ -1,4 +1,4 @@
-# Chocolatey choco-theme 1.2.0
+# Chocolatey choco-theme 1.2.1
 
 **NOTE: This project is used on Chocolatey websites and is being released for the benefit of the community. While we endeavour to help and fix issues, it will be limited to GitHub issues, discussions and pull requests when we are able to.**
 

build/build-partials.ts

@@ -87,6 +87,16 @@ const init = async () => {
             replacementContentIsFile: false
         });
 
+        // astro files
+        await updateContent({
+            destination: destinationAstro,
+            targetFile: 'SocialMedia.html',
+            targetFileDestination: destinationAstro,
+            targetFileContentToReplace: '@@chocolatey',
+            replaceWithContent: '@chocolatey',
+            replacementContentIsFile: false
+        });
+
         // Delete TopAlertBanner.html
         await fs.rm(path.join(destinationHbs, 'TopAlertBanner.html'));
         await fs.rm(path.join(destinationAstro, 'TopAlertBanner.html'));

build/credits-rename.ts

@@ -0,0 +1,18 @@
+#!/usr/bin/env ts-node
+
+/*!
+ * Script to rename the credits.json file.
+ * Copyright 2020-2025 Chocolatey Software
+ * Licensed under Apache License (https://github.com/chocolatey/choco-theme/blob/main/LICENSE)
+ */
+
+import * as fs from 'fs/promises';
+
+export const init = async () => {
+    await fs.rename('./credits.json', './credits.old.json');
+};
+
+init().catch(error => {
+    console.error(error);
+    process.exit(1);
+});

build/credits.ts

@@ -0,0 +1,151 @@
+#!/usr/bin/env ts-node
+
+/*!
+ * Script to generate the credits.json file.
+ * Copyright 2020-2025 Chocolatey Software
+ * Licensed under Apache License (https://github.com/chocolatey/choco-theme/blob/main/LICENSE)
+ */
+
+import * as fs from 'fs/promises';
+
+const file = 'credits.json';
+const oldFile = 'credits.old.json';
+const packageJsonFile = 'package.json';
+const yellowOpen = '\x1b[33m';
+const yellowClose = '\x1b[0m';
+
+interface DependencyEntry {
+    name: string;
+    link: string;
+    version: string;
+    licenseType?: string | string[];
+    installedVersion?: string;
+    licenses: {
+        type: string;
+        link: string;
+    }[];
+}
+
+interface OutputJson {
+    name: string;
+    version: string;
+    dependencies: DependencyEntry[];
+}
+
+const splitLicenses = (str: string) =>
+    str
+        .replace(/[()]/g, '')
+        .split(/\s+(AND|OR)\s+/i)
+        .filter(part => part !== 'AND' && part !== 'OR');
+
+const init = async () => {
+    const data = await fs.readFile(file, 'utf8');
+    const rawArray: DependencyEntry[] = JSON.parse(data);
+
+    // Load old data if available
+    let oldDependencies: Record<string, DependencyEntry> = {};
+    try {
+        const oldData = await fs.readFile(oldFile, 'utf8');
+        const oldJson: OutputJson = JSON.parse(oldData);
+        oldDependencies = Object.fromEntries(
+            oldJson.dependencies.map(dep => [dep.name, dep])
+        );
+    } catch {
+        console.warn(`${yellowOpen}No old file found or failed to parse. Proceeding with empty defaults.${yellowClose}`);
+    }
+
+    for (const entry of rawArray) {
+        // Rename installedVersion to version
+        entry.version = entry.installedVersion;
+        delete entry.installedVersion;
+
+        // Remove git+ and .git from urls
+        if (entry.link) {
+            entry.link = entry.link
+                .replaceAll('git+', '')
+                .replaceAll('.git', '')
+                .replaceAll('git://', 'https://');
+        }
+
+        // If no licenseType is provided
+        if (!entry.licenseType) {
+            switch (entry.name) {
+                case 'block-ui':
+                    entry.licenseType = 'MIT';
+                    break;
+                default:
+                    // Default to 'Other' if no specific license is known
+                    entry.licenseType = 'Other';
+                    console.warn(`${yellowOpen}No licenseType provided for ${entry.name}. Setting to 'Other'. License must be updated manually.${yellowClose}`);
+                    break;
+            }
+        }
+
+        // Manually update/keep licenseType if it contains multiple licenses
+        switch (entry.name) {
+            case 'chartist':
+            case 'pwstrength-bootstrap':
+                entry.licenseType = 'MIT';
+                break;
+        }
+
+        if (typeof entry.licenseType === 'string') {
+            entry.licenseType = splitLicenses(entry.licenseType);
+        }
+
+        const old = oldDependencies[entry.name];
+
+        // Set licenses array with preserved links if versions match
+        entry.licenses = entry.licenseType.map(type => {
+            const oldLink = old?.licenses?.find(l => l.type === type)?.link ?? '';
+            const keepLink = old && old.version === entry.version;
+
+            if (!keepLink && oldLink) {
+                console.warn(`${yellowOpen}License link for ${entry.name} has been removed. The license url must be manually updated.${yellowClose}`);
+            }
+
+            return {
+                type: type,
+                link: keepLink ? oldLink : ''
+            };
+        });
+
+        // If no license link are found, warn the user
+        if (!entry.licenses.some(l => l.link)) {
+            console.warn(`${yellowOpen}No license link found for ${entry.name}. The license url must be manually updated.${yellowClose}`);
+        }
+
+        // If the entry has multiple licenses, either add to the known multi-license packages or warn the user
+        const knownMultiLicensePackages = ['@fortawesome/fontawesome-free'];
+
+        if (entry.licenses.length > 1) {
+            if (!knownMultiLicensePackages.includes(entry.name)) {
+                console.warn(`${yellowOpen}Multiple licenses detected for ${entry.name}. You must manually inspect and choose the correct license, or include multiple if needed.${yellowClose}`);
+            }
+        }
+
+        // Remove licenseType from the entry
+        delete entry.licenseType;
+    }
+
+    // Get the package.json content to extract the version
+    const packageJsonContent = await fs.readFile(packageJsonFile, 'utf8');
+    const parsedPackageJson = JSON.parse(packageJsonContent);
+
+    const wrapped: OutputJson = {
+        name: 'choco-theme',
+        version: parsedPackageJson.version,
+        dependencies: rawArray
+    };
+
+    // Generate the new file
+    await fs.writeFile(file, JSON.stringify(wrapped, null, 4));
+
+    // Delete the old file if everything succeeded
+    await fs.unlink(oldFile);
+};
+
+init().catch(err => {
+    console.error('Error generating credits.json:', err);
+    process.exit(1);
+});

build/esbuild.ts

@@ -13,7 +13,7 @@ const init = async () => {
     const minify = process.argv.includes('--minify');
 
     const banner = `/*!
-  * choco-theme v1.2.0 (https://github.com/chocolatey/choco-theme#readme)
+  * choco-theme v1.2.1 (https://github.com/chocolatey/choco-theme#readme)
   * Copyright 2020-2024 Chocolatey Software
   * Licensed under MIT (https://github.com/chocolatey/choco-theme/blob/main/LICENSE)
 */`;