Merge branch 'master' into Claude.ai-v2.1

josStorer · Dec 3, 2023 · 269c477 · 269c477
2 parents 615a3e3 + d24958f
commit 269c477
Show file tree

Hide file tree

Showing 9 changed files with 4,582 additions and 2,343 deletions.
diff --git a/build.mjs b/build.mjs
@@ -18,7 +18,7 @@ async function deleteOldDir() {
   await fs.rm(outdir, { recursive: true, force: true })
 }
 
-async function runWebpack(isWithoutKatex, isWithoutTiktoken, callback) {
+async function runWebpack(isWithoutKatex, isWithoutTiktoken, minimal, callback) {
   const shared = [
     'preact',
     'webextension-polyfill',
@@ -70,6 +70,12 @@ async function runWebpack(isWithoutKatex, isWithoutTiktoken, callback) {
       concatenateModules: !isAnalyzing,
     },
     plugins: [
+      minimal
+        ? undefined
+        : new webpack.ProvidePlugin({
+            process: 'process/browser.js',
+            Buffer: ['buffer', 'Buffer'],
+          }),
       new ProgressBarPlugin({
         format: '  build [:bar] :percent (:elapsed seconds)',
         clear: false,
@@ -97,6 +103,14 @@ async function runWebpack(isWithoutKatex, isWithoutTiktoken, callback) {
       extensions: ['.jsx', '.mjs', '.js'],
       alias: {
         parse5: path.resolve(__dirname, 'node_modules/parse5'),
+        ...(minimal
+          ? {}
+          : {
+              util: path.resolve(__dirname, 'node_modules/util'),
+              buffer: path.resolve(__dirname, 'node_modules/buffer'),
+              stream: 'stream-browserify',
+              crypto: 'crypto-browserify',
+            }),
       },
     },
     module: {
@@ -206,7 +220,7 @@ async function runWebpack(isWithoutKatex, isWithoutTiktoken, callback) {
               },
             }
           : {},
-        isWithoutKatex && isWithoutTiktoken
+        minimal
           ? {
               test: /styles\.scss$/,
               loader: 'string-replace-loader',
@@ -220,6 +234,32 @@ async function runWebpack(isWithoutKatex, isWithoutTiktoken, callback) {
               },
             }
           : {},
+        minimal
+          ? {
+              test: /index\.mjs$/,
+              loader: 'string-replace-loader',
+              options: {
+                multiple: [
+                  {
+                    search: 'import { generateAnswersWithChatGLMApi }',
+                    replace: '//',
+                  },
+                  {
+                    search: 'await generateAnswersWithChatGLMApi',
+                    replace: '//',
+                  },
+                  {
+                    search: 'chatglmTurbo',
+                    replace: '//',
+                  },
+                  {
+                    search: "'chatglmTurbo",
+                    replace: '//',
+                  },
+                ],
+              },
+            }
+          : {},
       ],
     },
   })
@@ -305,13 +345,15 @@ async function build() {
     // )
     // await new Promise((r) => setTimeout(r, 5000))
     await runWebpack(
+      true,
       true,
       true,
       generateWebpackCallback(() => finishOutput('-without-katex-and-tiktoken')),
     )
     await new Promise((r) => setTimeout(r, 10000))
   }
   await runWebpack(
+    false,
     false,
     false,
     generateWebpackCallback(() => finishOutput('')),