适配ZeroCat社区

Author: Sunwuyuan

package.json

@@ -18,7 +18,7 @@
     "prune": "./prune-gh-pages.sh",
     "i18n:push": "tx-push-src scratch-editor interface translations/en.json",
     "i18n:src": "rimraf ./translations/messages/src && babel src > tmp.js && rimraf tmp.js && build-i18n-src ./translations/messages/src ./translations/",
-    "start": "webpack-dev-server",
+    "start": "ZEROCAT_BACKEND=http://localhost:3000 ZEROCAT_ASSETS=https://zerocat-bitiful.houlangs.com/material/asset webpack-dev-server",
     "test": "npm run test:lint && npm run test:unit && npm run build && npm run test:integration",
     "test:integration": "jest --maxWorkers=4 test[\\\\/]integration",
     "test:lint": "eslint . --ext .js,.jsx",

src/components/menu-bar/menu-bar.jsx

@@ -340,9 +340,9 @@ class MenuBar extends React.Component {
         if (modifier) {
             if (event.key.toLowerCase() === 's') {
                 this.props.handleSaveProject();
-                event.preventDefault();    
+                event.preventDefault();
             } else if (event.key.toLowerCase() === 'o') {
-                event.preventDefault();    
+                event.preventDefault();
                 this.props.onStartSelectingFileUpload();
             }
         }
@@ -1031,6 +1031,9 @@ class MenuBar extends React.Component {
                             </Button>
                         </a>
                     </div>
+                    <div className={styles.menuBarItem}>
+                    <Button id="zerocattool">ZeroCat服务加载中</Button>
+                    </div>
                 </div>
 
                 <div className={styles.accountInfoGroup}>

src/containers/extension-library.jsx

@@ -42,12 +42,52 @@ const translateGalleryItem = (extension, locale) => ({
 let cachedGallery = null;
 
 const fetchLibrary = async () => {
-    const res = await fetch('https://extensions.turbowarp.org/generated-metadata/extensions-v0.json');
+    const res = await fetch(process.env.ZEROCAT_BACKEND + '/extensions');
     if (!res.ok) {
         throw new Error(`HTTP status ${res.status}`);
     }
     const data = await res.json();
-    return data.extensions.map(extension => ({
+    const extensions = data.extensions.map(extension => ({
+        name: extension.name,
+        nameTranslations: extension.nameTranslations || {},
+        description: extension.description,
+        descriptionTranslations: extension.descriptionTranslations || {},
+        extensionId: extension.id,
+        extensionURL: `${process.env.ZEROCAT_BACKEND}/extensions/${extension.slug}.js`,
+        iconURL: extension.image,
+        tags: ['zerocat'],
+        credits: [
+            ...(extension.original || []),
+            ...(extension.by || [])
+        ].map(credit => {
+            if (credit.link) {
+                return (
+                    <a
+                        href={credit.link}
+                        target="_blank"
+                        rel="noreferrer"
+                        key={credit.name}
+                    >
+                        {credit.name}
+                    </a>
+                );
+            }
+            return credit.name;
+        }),
+        docsURI: extension.docs ? `${process.env.ZEROCAT_BACKEND}/extensions/${extension.slug}` : null,
+        samples: extension.samples ? extension.samples.map(sample => ({
+            href: `${process.env.ROOT}editor?project_url=${process.env.ZEROCAT_BACKEND}/extensions/samples/${encodeURIComponent(sample)}.sb3`,
+            text: sample
+        })) : null,
+        incompatibleWithScratch: !extension.scratchCompatible,
+        featured: true
+    }));
+    const twRes = await fetch('https://extensions.turbowarp.org/generated-metadata/extensions-v0.json');
+    if (!twRes.ok) {
+        throw new Error(`HTTP status ${twRes.status}`);
+    }
+    const twData = await twRes.json();
+    const twExtensions = twData.extensions.map(extension => ({
         name: extension.name,
         nameTranslations: extension.nameTranslations || {},
         description: extension.description,
@@ -82,6 +122,7 @@ const fetchLibrary = async () => {
         incompatibleWithScratch: !extension.scratchCompatible,
         featured: true
     }));
+    return [...extensions, ...twExtensions];
 };
 
 class ExtensionLibrary extends React.PureComponent {

src/containers/library-item.jsx

@@ -139,7 +139,7 @@ class LibraryItem extends React.PureComponent {
     render () {
         const iconMd5 = this.curIconMd5();
         const iconURL = iconMd5 ?
-            `https://cdn.assets.scratch.mit.edu/internalapi/asset/${iconMd5}/get/` :
+            `${process.env.ZEROCAT_ASSETS}/${iconMd5}` :
             this.props.iconRawURL;
         return (
             <LibraryItemComponent

src/containers/tw-security-manager.jsx

@@ -26,7 +26,8 @@ const manuallyTrustExtension = url => {
 const isTrustedExtension = url => (
     // Always trust our official extension repostiory.
     url.startsWith('https://extensions.turbowarp.org/') ||
-
+    // Always trust ZeroCat official extension repostiory.
+    url.startsWith(process.env.ZEROCAT_BACKEND + '/extensions/') ||
     // For development.
     url.startsWith('http://localhost:8000/') ||
 

src/lib/libraries/tw-extension-tags.js

@@ -3,5 +3,6 @@ import {APP_NAME} from '../brand';
 // Because there are all brand names, it is unnecessary for them to be translatable.
 export default [
     {tag: 'scratch', intlLabel: 'Scratch'},
-    {tag: 'tw', intlLabel: APP_NAME}
+    {tag: 'zerocat', intlLabel: 'ZeroCat'},
+    {tag: 'tw', intlLabel: APP_NAME},
 ];

src/lib/project-fetcher-hoc.jsx

@@ -198,7 +198,7 @@ const ProjectFetcherHOC = function (WrappedComponent) {
         vm: PropTypes.instanceOf(VM)
     };
     ProjectFetcherComponent.defaultProps = {
-        assetHost: 'https://assets.scratch.mit.edu',
+        assetHost: process.env.ZEROCAT_ASSETS,
         projectHost: 'https://projects.scratch.mit.edu'
     };
 

src/lib/storage.js

@@ -55,7 +55,7 @@ class Storage extends ScratchStorage {
         this.assetHost = assetHost;
     }
     getAssetGetConfig (asset) {
-        return `${this.assetHost}/internalapi/asset/${asset.assetId}.${asset.dataFormat}/get/`;
+        return `${this.assetHost}/${asset.assetId}.${asset.dataFormat}`;
     }
     getAssetCreateConfig (asset) {
         return {

src/playground/embed.ejs

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="google" value="notranslate">
     <title><%= htmlWebpackPlugin.options.title %></title>
+    <script src="<%= process.env.ZEROCAT_BACKEND %>/scratchtool"></script>
     <style>
       .splash-screen {
         position: absolute;

src/playground/index.ejs

@@ -6,6 +6,7 @@
     <meta name="google" value="notranslate">
     <meta name="description" content="<%= htmlWebpackPlugin.options.APP_NAME %> is a Scratch mod with a compiler to run projects faster, dark mode for your eyes, a bunch of addons to improve the editor, and more." />
     <title><%= htmlWebpackPlugin.options.title %></title>
+    <script src="<%= process.env.ZEROCAT_BACKEND %>/scratchtool"></script>
     <link rel="apple-touch-icon" href="<%= htmlWebpackPlugin.options.root %>images/apple-touch-icon.png">
     <% if (htmlWebpackPlugin.options.root === "/" || htmlWebpackPlugin.options.root === "") { %>
       <link rel="manifest" href="<%= htmlWebpackPlugin.options.root %>manifest.webmanifest">