Merge branch 'master' of github.com:TurboWarp/packager

README.md

@@ -40,6 +40,8 @@ The general layout of `src` is:
 
 ## Tips for forks
 
+We strive to make the packager easy to fork for any Scratch mod, even ones that aren't based on TurboWarp. Reading this section, at least the first half, should make it much easier to do so.
+
 **Changing Scratch internals**: If you want to change the VM/renderer/etc. used, just `npm install` or `npm link` a different scratch-vm/scratch-render/etc and rebuild. You can even install a vanilla scratch-vm and all core functionality will still work (but optional features such as interpolation, high quality pen, stage size, etc. may not work)
 
 **Deploying**: The packager is deployed as a simple static website. You can host it anywhere by just copying the `dist` folder after a build. We use GitHub Actions to deploy to GitHub Pages by running the "Deploy" workflow whenever we want to push to production (Actions > Deploy > Run workflow). This should be automatically available in forks after enabling GitHub Actions.
@@ -81,6 +83,6 @@ npm run build-node-prod
 
 <!-- Make sure to also update COPYRIGHT_NOTICE in src/packager/brand.js -->
 
-Copyright (C) 2021 Thomas Weber
+Copyright (C) 2021-2022 Thomas Weber
 
 This project is licensed under the GNU Lesser General Public License version 3. See COPYING and COPYING.LESSER for more information. We believe that packaging a project using the packager "makes use of an interface provided by the Library, but which is not otherwise based on the Library"

package-lock.json

@@ -10266,9 +10266,9 @@
       }
     },
     "svelte": {
-      "version": "3.46.4",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.46.4.tgz",
-      "integrity": "sha512-qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg==",
+      "version": "3.46.5",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.46.5.tgz",
+      "integrity": "sha512-T4txpIgYEGTkpFY2KQoqvtDmapu/suHMx0GN2zAImdJ7liEdG29P0XpjcNHnOEU1a4lLJn1WXxreobBSIGdcbQ==",
       "dev": true
     },
     "svelte-dev-helper": {

src/p4/P4.svelte

@@ -11,7 +11,7 @@
   import {progress, theme} from './stores';
   import {isSupported, isSafari, isStandalone} from './environment';
   import version from '../build/version-loader!';
-  import {LONG_NAME, FEEDBACK_PRIMARY, FEEDBACK_SECONDARY, ACCENT_COLOR, SOURCE_CODE, WEBSITE} from '../packager/brand';
+  import {APP_NAME, FEEDBACK_PRIMARY, FEEDBACK_SECONDARY, ACCENT_COLOR, SOURCE_CODE, WEBSITE} from '../packager/brand';
 
   let projectData;
 
@@ -26,8 +26,9 @@
 
   let modalVisible = false;
 
+  const defaultTitle = document.title;
   let title = '';
-  $: document.title = projectData && title ? `${title} - ${LONG_NAME}` : LONG_NAME;
+  $: document.title = projectData && title ? `${title} - ${APP_NAME}` : defaultTitle;
 
   const getPackagerOptionsComponent = () => import(
     /* webpackChunkName: "packager-options-ui" */
@@ -114,7 +115,7 @@
 <main aria-hidden={modalVisible} class:is-not-safari={!isSafari}>
   <Section accent={ACCENT_COLOR}>
     <div>
-      <h1>{LONG_NAME}</h1>
+      <h1>{APP_NAME}</h1>
       {#if version}
         <p><i>{version}</i> - <a href={WEBSITE}>Online version</a></p>
       {/if}

src/p4/template.ejs

@@ -3,9 +3,9 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <% const {LONG_NAME, WEBSITE} = require('../packager/brand.js'); %>
-    <title><%= LONG_NAME %></title>
-    <meta name="description" content="Converts Scratch projects into HTML files, zip archives, or executable programs for Windows, macOS, and Linux.">
+    <% const {APP_NAME} = require('../packager/brand.js'); %>
+    <title><%= APP_NAME %> - Convert Scratch projects to HTML, EXE, and more</title>
+    <meta name="description" content="Converts Scratch 3, 2, or 1 projects into HTML files, zip archives, or executable programs for Windows, macOS, and Linux.">
     <style>
       body[p4-splash-theme="dark"]:not([p4-loaded]) {
         background-color: #111;

src/packager/brand.js

@@ -8,8 +8,6 @@ These values control branding strings throughout the entire app. If you're forki
 
 APP_NAME is the name of the app. This text is included in packaged projects.
 
-LONG_NAME a longer form of the app's name. Used by the website. Can just be the same as APP_NAME
-
 WEBSITE is your app's website. This link is included in packaged projects.
 
 COPYRIGHT_NOTICE is A copyright notice regarding the app. This text is included in packaged projects.
@@ -27,9 +25,8 @@ name is how they will be labelled in the interface and link is of course a URL
 
 module.exports = {
   APP_NAME: 'TurboWarp Packager',
-  LONG_NAME: 'TurboWarp Packager for Scratch',
   WEBSITE: 'https://packager.turbowarp.org/',
-  COPYRIGHT_NOTICE: `Copyright (C) 2021 Thomas Weber
+  COPYRIGHT_NOTICE: `Copyright (C) 2021-2022 Thomas Weber
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License version 3