Use cspell-util-bundle in cspell-lib

packages/cspell-lib/package.json

@@ -58,29 +58,29 @@
   "dependencies": {
     "comment-json": "^1.1.3",
     "configstore": "^4.0.0",
-    "cspell-dict-companies": "^1.0.9",
-    "cspell-dict-cpp": "^1.1.18",
+    "cspell-dict-companies": "^1.0.10",
+    "cspell-dict-cpp": "^1.1.19",
     "cspell-dict-django": "^1.0.11",
     "cspell-dict-elixir": "^1.0.8",
     "cspell-dict-en-gb": "^1.1.10",
-    "cspell-dict-en_us": "^1.2.14",
-    "cspell-dict-fullstack": "^1.0.12",
+    "cspell-dict-en_us": "^1.2.15",
+    "cspell-dict-fullstack": "^1.0.13",
     "cspell-dict-golang": "^1.1.11",
     "cspell-dict-html-symbol-entities": "^1.0.10",
     "cspell-dict-java": "^1.0.9",
     "cspell-dict-latex": "^1.0.10",
-    "cspell-dict-lorem-ipsum": "^1.0.8",
+    "cspell-dict-lorem-ipsum": "^1.0.9",
     "cspell-dict-php": "^1.0.10",
     "cspell-dict-powershell": "^1.0.1",
     "cspell-dict-python": "^1.0.11",
     "cspell-dict-rust": "^1.0.8",
     "cspell-dict-scala": "^1.0.8",
     "cspell-io": "^4.0.9",
     "cspell-trie-lib": "^4.0.7",
+    "cspell-util-bundle": "^4.0.0",
     "fs-extra": "^7.0.1",
     "gensequence": "^2.1.2",
-    "vscode-uri": "^1.0.6",
-    "xregexp": "^4.2.4"
+    "vscode-uri": "^1.0.6"
   },
   "engines": {
     "node": ">=10.0.0"

packages/cspell-lib/src/util/text.ts

@@ -1,4 +1,4 @@
-import * as XRegExp from 'xregexp';
+import { xregexp as XRegExp } from 'cspell-util-bundle';
 import {scanMap, Sequence, sequenceFromRegExpMatch } from 'gensequence';
 import {binarySearch} from './search';
 

packages/cspell-lib/src/wordListHelper.ts

@@ -1,7 +1,7 @@
 // cSpell:enableCompoundWords
 import * as Text from './util/text';
 import { readLines } from './util/fileReader';
-import * as XRegExp from 'xregexp';
+import { xregexp as XRegExp } from 'cspell-util-bundle';
 import { toIterableIterator, concatIterables } from './util/iterableIteratorLib';
 
 

packages/cspell-util-bundle/.gitignore

@@ -38,5 +38,5 @@ jspm_packages
 
 dist
 temp
-
+build
 

packages/cspell-util-bundle/package.json

@@ -12,17 +12,16 @@
     "!**/temp/**"
   ],
   "scripts": {
-    "build": "webpack --mode none",
-    "build-production": "webpack --mode production",
+    "build": "tsc -p . && webpack --mode none",
+    "build-production": "rm -rf dist build && tsc -p . && webpack --mode production",
     "watch": "npm run build -- watch",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm run build-production",
+    "prepare": "npm run build-production",
     "clean": "rimraf dist",
     "clean-build": "npm run clean && npm run build",
     "coverage": "NODE_ENV=test nyc --silent --no-clean --temp-dir=../../.nyc_output npm run test-ts",
     "test-ts": "NODE_ENV=test ../../node_modules/.bin/mocha --require ts-node/register --recursive \"src/**/*.test.ts\"",
     "test-watch": "../../node_modules/.bin/mocha --require ts-node/register --watch --recursive \"src/**/*.test.ts\"",
-    "test": "tsc -p . && npm run build && mocha --recursive ./dist/**/*.test.js"
+    "test": "mocha --recursive ./dist/**/*.test.js"
   },
   "repository": {
     "type": "git",
@@ -35,9 +34,7 @@
     "url": "https://github.com/streetsidesoftware/cspell/issues"
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
-  "dependencies": {
-    "xregexp": "^4.2.4"
-  },
+  "dependencies": {},
   "nyc": {
     "include": [
       "src/**/*.ts"
@@ -60,10 +57,12 @@
     "node": ">=10.0.0"
   },
   "devDependencies": {
+    "@types/xregexp": "^3.0.30",
     "rimraf": "^2.6.3",
     "source-map-support": "^0.5.12",
     "ts-loader": "^6.0.1",
     "webpack": "^4.32.0",
-    "webpack-cli": "^3.3.2"
+    "webpack-cli": "^3.3.2",
+    "xregexp": "^4.2.4"
   }
 }