Просмотр исходного кода

use escape-string-regexp@^4.0.0

Yuki Takei 3 лет назад
Родитель
Сommit
2d045c039e

+ 1 - 1
apps/app/package.json

@@ -96,7 +96,7 @@
     "diff_match_patch": "^0.1.1",
     "ejs": "^3.1.8",
     "esa-node": "^0.2.2",
-    "escape-string-regexp": "=4.0.0",
+    "escape-string-regexp": "^4.0.0",
     "eslint-plugin-regex": "^1.8.0",
     "expose-gc": "^1.0.0",
     "express": "^4.16.1",

+ 1 - 1
apps/app/src/server/models/obsolete-page.js

@@ -1,4 +1,5 @@
 import { templateChecker, pagePathUtils, pathUtils } from '@growi/core';
+import escapeStringRegexp from 'escape-string-regexp';
 
 import { PageGrant } from '~/interfaces/page';
 import loggerFactory from '~/utils/logger';
@@ -14,7 +15,6 @@ const debug = require('debug')('growi:models:page');
 const nodePath = require('path');
 
 const differenceInYears = require('date-fns/differenceInYears');
-const escapeStringRegexp = require('escape-string-regexp');
 const mongoose = require('mongoose');
 const urljoin = require('url-join');
 

+ 4 - 1
packages/core/package.json

@@ -21,9 +21,12 @@
     "lint": "npm-run-all -p lint:*",
     "test": "jest --verbose"
   },
+  "// comments for dependencies": {
+    "escape-string-regexp": "5.0.0 or above exports only ESM"
+  },
   "dependencies": {
     "bson-objectid": "^2.0.4",
-    "escape-string-regexp": "^5.0.0"
+    "escape-string-regexp": "^4.0.0"
   },
   "devDependencies": {
     "eslint-plugin-regex": "^1.8.0",

+ 1 - 0
packages/core/vite.config.ts

@@ -22,6 +22,7 @@ export default defineConfig({
         preserveModulesRoot: 'src',
       },
       external: [
+        'escape-string-regexp',
         'bson-objectid',
         'swr',
         /^node:.*/,

+ 5 - 5
yarn.lock

@@ -8151,11 +8151,6 @@ escape-quotes@1.0.2:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-escape-string-regexp@=4.0.0, escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -8166,6 +8161,11 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escape-string-regexp@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"