@dcloudio/uni-cli-shared 2.0.1-alpha-35420220810001 → 2.0.1-alpha-35520220824001

package/lib/preprocess.js

@@ -51,7 +51,8 @@ module.exports = function initPreprocess (name, platforms, userDefines = {}) {
   }
 
   if (name.startsWith('app-')) {
-    vueContext.APP = true
+    vueContext.APP = true
+    nvueContext.APP = true
   }
 
   if (name === 'quickapp-webview') {

package/lib/source-map.js

@@ -4,16 +4,10 @@ const webpack = require('webpack')
 
 const {
   normalizePath,
+  pathToRegexp,
   isInHBuilderX
 } = require('@dcloudio/uni-cli-shared/lib/util')
 
-const isWin = /^win/.test(process.platform)
-
-function genTranspileDepRegex (depPath) {
-  return new RegExp(isWin
-    ? depPath.replace(/\\/g, '\\\\') // double escape for windows style path
-    : depPath)
-}
 let sourceRoot = false
 
 function getSourceRoot () {
@@ -60,7 +54,7 @@ module.exports = {
   },
   createEvalSourceMapDevToolPlugin () {
     return new webpack.EvalSourceMapDevToolPlugin({
-      test: genTranspileDepRegex(process.env.UNI_INPUT_DIR),
+      test: pathToRegexp(process.env.UNI_INPUT_DIR, { start: true }),
       exclude,
       moduleFilenameTemplate
     })

package/lib/util.js

@@ -2,6 +2,8 @@ const path = require('path')
 const fs = require('fs')
 const hash = require('hash-sum')
 const crypto = require('crypto')
+const escapeStringRegexp = require('escape-string-regexp')
+const escapeGlob = require('glob-escape')
 
 const isWin = /^win/.test(process.platform)
 
@@ -121,6 +123,34 @@ function normalizeNodeModules (str) {
 
 const _hasOwnProperty = Object.prototype.hasOwnProperty
 
+/**
+ * pathToRegexp
+ * @param {string} pathString
+ * @param {{start:?boolean,end:?boolean,global:?boolean}?} options
+ * @returns {RegExp}
+ */
+function pathToRegexp (pathString, options = {}) {
+  return new RegExp((options.start ? '^' : '') + escapeStringRegexp(pathString) + (options.end ? '$' : ''), 'i' + (options.global ? 'g' : ''))
+}
+
+/**
+ * pathToGlob
+ * @param {string} pathString
+ * @param {string} glob
+ * @param {{windows:?boolean,escape:?boolean}?} options
+ * @returns {string}
+ */
+function pathToGlob (pathString, glob, options = {}) {
+  const isWindows = 'windows' in options ? options.windows : /^win/.test(process.platform)
+  const useEscape = options.escape
+  const str = isWindows ? pathString.replace(/\\/g, '/') : pathString
+  let safeStr = escapeGlob(str)
+  if (isWindows || !useEscape) {
+    safeStr = safeStr.replace(/\\(.)/g, '[$1]')
+  }
+  return path.posix.join(safeStr, glob)
+}
+
 module.exports = {
   isInHBuilderX,
   isInHBuilderXAlpha,
@@ -149,6 +179,8 @@ module.exports = {
   hyphenate,
   normalizePath,
   convertStaticStyle,
+  pathToRegexp,
+  pathToGlob,
   getComponentName: cached((str) => {
     if (str.indexOf('wx-') === 0) {
       return str.replace('wx-', 'weixin-')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.1-alpha-35420220810001",
+  "version": "2.0.1-alpha-35520220824001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -19,9 +19,11 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
+    "escape-string-regexp": "^4.0.0",
+    "glob-escape": "^0.0.2",
     "hash-sum": "^1.0.2",
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "6755694c6b183543bf706e53966e795fee92946f"
+  "gitHead": "1073084863774ca9497f28782d47abf8c44b3661"
 }