@waline/vercel 1.26.5 → 1.27.0

package/.eslintrc.yml

@@ -1,6 +1,10 @@
 globals:
   think: readonly
 
+rules:
+  import/no-commonjs:
+    - off
+
 overrides:
   - files:
       - '__tests__/**/*.spec.js'

package/__tests__/katex.spec.js

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/unbound-method */
-import { describe, expect, it } from 'vitest';
 import MarkdownIt from 'markdown-it';
+import { describe, expect, it, vi } from 'vitest';
+
 import { katexPlugin } from '../src/service/markdown/katex';
-import { vi } from 'vitest';
 
 const markdownIt = MarkdownIt({ linkify: true }).use(katexPlugin, {
   output: 'mathml',

package/__tests__/mathjax.spec.js

@@ -1,5 +1,6 @@
-import { describe, expect, it } from 'vitest';
 import MarkdownIt from 'markdown-it';
+import { describe, expect, it } from 'vitest';
+
 import { mathjaxPlugin } from '../src/service/markdown/mathjax';
 
 const markdownIt = MarkdownIt({ linkify: true }).use(mathjaxPlugin);

package/__tests__/xss.spec.js

@@ -1,5 +1,6 @@
-import { describe, expect, it } from 'vitest';
 import MarkdownIt from 'markdown-it';
+import { describe, expect, it } from 'vitest';
+
 import { sanitize } from '../src/service/markdown/xss';
 
 const parser = (content) =>

package/dist/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@waline/vercel",
-	"version": "1.26.4-deta",
+	"version": "1.26.5-deta",
 	"description": "vercel server for waline comment system",
 	"keywords": [
 		"waline",
@@ -23,7 +23,7 @@
 		"dy-node-ip2region": "1.0.1",
 		"fast-csv": "4.3.6",
 		"form-data": "4.0.0",
-		"jsdom": "21.1.0",
+		"jsdom": "21.1.1",
 		"jsonwebtoken": "9.0.0",
 		"katex": "0.16.4",
 		"leancloud-storage": "4.14.0",
@@ -47,7 +47,7 @@
 		"think-mongo": "2.2.1",
 		"think-router-rest": "1.0.5",
 		"thinkjs": "3.2.14",
-		"ua-parser-js": "1.0.33"
+		"ua-parser-js": "1.0.34"
 	},
 	"engines": {
 		"node": ">=14"

package/dist/src/extend/think.js

@@ -6,7 +6,7 @@ const preventMessage = 'PREVENT_NEXT_PROCESS';
 const regionSearch = ip2region.create(process.env.IP2REGION_DB);
 
 const OS_VERSION_MAP = {
-  'Windows': {
+  Windows: {
     'NT 11.0': '11',
   },
 };

package/dist/src/service/markdown/xss.js

@@ -5,13 +5,13 @@ const DOMPurify = createDOMPurify(new JSDOM('').window);
 
 /**
  * Add a hook to make all links open a new window
- * and force their rel to be 'noreferrer noopener'
+ * and force their rel to be 'nofollow noreferrer noopener'
  */
 DOMPurify.addHook('afterSanitizeAttributes', function (node) {
   // set all elements owning target to target=_blank
   if ('target' in node && node.href && !node.href.startsWith('about:blank#')) {
     node.setAttribute('target', '_blank');
-    node.setAttribute('rel', 'noreferrer noopener');
+    node.setAttribute('rel', 'nofollow noreferrer noopener');
   }
 
   // set non-HTML/MathML links to xlink:show=new

package/index.js

@@ -1,5 +1,6 @@
 const os = require('os');
 const path = require('path');
+
 const Application = require('thinkjs');
 const Loader = require('thinkjs/lib/loader');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.26.5",
+  "version": "1.27.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",

package/src/config/middleware.js

@@ -1,5 +1,6 @@
 const cors = require('@koa/cors');
 const routerREST = require('think-router-rest');
+
 const isDev = think.env === 'development';
 const isTcb = think.env === 'cloudbase';
 const isDeta = think.env === 'deta' || process.env.DETA_RUNTIME === 'true';

package/src/controller/token/2fa.js

@@ -1,4 +1,5 @@
 const speakeasy = require('speakeasy');
+
 const BaseRest = require('../rest');
 
 module.exports = class extends BaseRest {

package/src/controller/token.js

@@ -1,7 +1,8 @@
-const speakeasy = require('speakeasy');
 const jwt = require('jsonwebtoken');
-const helper = require('think-helper');
 const { PasswordHash } = require('phpass');
+const speakeasy = require('speakeasy');
+const helper = require('think-helper');
+
 const BaseRest = require('./rest');
 
 module.exports = class extends BaseRest {

package/src/controller/user/password.js

@@ -1,4 +1,5 @@
 const jwt = require('jsonwebtoken');
+
 const BaseRest = require('../rest');
 
 module.exports = class extends BaseRest {

package/src/controller/user.js

@@ -1,4 +1,5 @@
 const { PasswordHash } = require('phpass');
+
 const BaseRest = require('./rest');
 
 module.exports = class extends BaseRest {

package/src/extend/controller.js

@@ -1,4 +1,5 @@
 const nunjucks = require('nunjucks');
+
 const locales = require('../locales');
 
 module.exports = {

package/src/extend/think.js

@@ -1,6 +1,7 @@
-const parser = require('ua-parser-js');
 const ip2region = require('dy-node-ip2region');
 const helper = require('think-helper');
+const parser = require('ua-parser-js');
+
 const preventMessage = 'PREVENT_NEXT_PROCESS';
 
 const regionSearch = ip2region.create(process.env.IP2REGION_DB);

package/src/logic/base.js

@@ -1,7 +1,8 @@
 const path = require('path');
 const qs = require('querystring');
-const fetch = require('node-fetch');
+
 const jwt = require('jsonwebtoken');
+const fetch = require('node-fetch');
 const helper = require('think-helper');
 
 module.exports = class extends think.Logic {

package/src/service/akismet.js

@@ -1,4 +1,5 @@
 const Akismet = require('akismet');
+
 const DEFAULT_KEY = '70542d86693e';
 
 module.exports = function (comment, blog) {

package/src/service/avatar.js

@@ -1,5 +1,6 @@
 const nunjucks = require('nunjucks');
 const helper = require('think-helper');
+
 const { GRAVATAR_STR } = process.env;
 
 const env = new nunjucks.Environment();

package/src/service/markdown/index.js

@@ -2,9 +2,10 @@ const MarkdownIt = require('markdown-it');
 const emojiPlugin = require('markdown-it-emoji');
 const subPlugin = require('markdown-it-sub');
 const supPlugin = require('markdown-it-sup');
+
+const { resolveHighlighter } = require('./highlight');
 const { katexPlugin } = require('./katex');
 const { mathjaxPlugin } = require('./mathjax');
-const { resolveHighlighter } = require('./highlight');
 const { sanitize } = require('./xss');
 
 const getMarkdownParser = () => {

package/src/service/markdown/katex.js

@@ -1,6 +1,7 @@
 const katex = require('katex');
-const { escapeHtml } = require('./utils');
+
 const { inlineTex, blockTex } = require('./mathCommon');
+const { escapeHtml } = require('./utils');
 
 // set KaTeX as the renderer for markdown-it-simplemath
 const katexInline = (tex, options) => {

package/src/service/markdown/mathjax.js

@@ -1,12 +1,12 @@
-const { mathjax } = require('mathjax-full/js/mathjax');
-const { TeX } = require('mathjax-full/js/input/tex.js');
-const { SVG } = require('mathjax-full/js/output/svg.js');
 const { liteAdaptor } = require('mathjax-full/js/adaptors/liteAdaptor.js');
 const { RegisterHTMLHandler } = require('mathjax-full/js/handlers/html.js');
 const { AllPackages } = require('mathjax-full/js/input/tex/AllPackages.js');
+const { TeX } = require('mathjax-full/js/input/tex.js');
+const { mathjax } = require('mathjax-full/js/mathjax');
+const { SVG } = require('mathjax-full/js/output/svg.js');
 
-const { escapeHtml } = require('./utils');
 const { inlineTex, blockTex } = require('./mathCommon');
+const { escapeHtml } = require('./utils');
 
 // set MathJax as the renderer
 class MathToSvg {

package/src/service/notify.js

@@ -1,8 +1,9 @@
+const crypto = require('crypto');
+
 const FormData = require('form-data');
-const nodemailer = require('nodemailer');
 const fetch = require('node-fetch');
+const nodemailer = require('nodemailer');
 const nunjucks = require('nunjucks');
-const crypto = require('crypto');
 
 module.exports = class extends think.Service {
   constructor(ctx) {

package/src/service/storage/cloudbase.js

@@ -1,4 +1,5 @@
 const cloudbase = require('@cloudbase/node-sdk');
+
 const Base = require('./base');
 
 const { TCB_ENV, TCB_ID, TCB_KEY } = process.env;

package/src/service/storage/deta.js

@@ -1,5 +1,7 @@
-const { Deta } = require('deta');
 const { performance } = require('perf_hooks');
+
+const { Deta } = require('deta');
+
 const Base = require('./base');
 
 module.exports = class extends Base {

package/src/service/storage/github.js

@@ -1,6 +1,8 @@
+const path = require('path');
+
 const { parseString, writeToString } = require('fast-csv');
 const fetch = require('node-fetch');
-const path = require('path');
+
 const Base = require('./base');
 
 const CSV_HEADERS = {

package/src/service/storage/leancloud.js

@@ -1,5 +1,7 @@
 const AV = require('leancloud-storage');
+
 const Base = require('./base');
+
 const { LEAN_ID, LEAN_KEY, LEAN_MASTER_KEY, LEAN_SERVER } = process.env;
 
 if (LEAN_ID && LEAN_KEY && LEAN_MASTER_KEY) {

package/src/service/storage/mongodb.js

@@ -1,4 +1,5 @@
 const { ObjectID: ObjectId } = require('think-mongo/lib/model');
+
 const Base = require('./base');
 
 module.exports = class extends Base {

package/vanilla.js

@@ -1,4 +1,5 @@
 const path = require('path');
+
 const Application = require('thinkjs');
 
 const instance = new Application({

package/build/build.js

@@ -1,69 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const blackList = ['think-model-sqlite'];
-const pkg = require(path.join(__dirname, '../package.json'));
-
-// pkg.name = '@waline/deta';
-
-const dist = path.join(__dirname, '../dist');
-
-function readFileRecursive(dir) {
-  const files = fs.readdirSync(dir);
-  const ret = [];
-
-  for (let i = 0; i < files.length; i++) {
-    const filePath = path.join(dir, files[i]);
-    const fileInfo = fs.lstatSync(filePath);
-
-    if (fileInfo.isDirectory()) {
-      ret.push(...readFileRecursive(filePath));
-    } else {
-      ret.push(fs.readFileSync(filePath, 'utf-8'));
-    }
-  }
-
-  return ret;
-}
-
-function findDeps(text) {
-  const reg = /require\(\'([^.']+)\'\)/g;
-  const matches = text.matchAll(reg);
-  const deps = Array.from(matches, ([_, moduleName]) => {
-    if (moduleName.includes('/') && !moduleName.startsWith('@')) {
-      return moduleName.split('/')[0];
-    }
-
-    return moduleName;
-  });
-
-  return deps;
-}
-
-function main() {
-  const codes = readFileRecursive(path.join(dist, 'src'));
-  const deps = [];
-
-  for (const code of codes) {
-    const codeDeps = findDeps(code);
-
-    deps.push(...codeDeps);
-  }
-
-  for (let dep in pkg.dependencies) {
-    const exist = deps.includes(dep);
-    const isBlack = blackList.includes(dep);
-
-    if (!exist || isBlack) {
-      delete pkg.dependencies[dep];
-    }
-  }
-
-  fs.writeFileSync(
-    path.join(dist, 'package.json'),
-    JSON.stringify(pkg, null, '\t'),
-    'utf-8'
-  );
-}
-
-main();