@deot/dev-dever 2.5.4 → 2.6.0

package/README.md

@@ -40,4 +40,11 @@ export default mergeConfig(
 
 ## 预加载配置`preload.ts`
 
-会查找当前文件夹路径下往前查找`preload.ts`文件，直至`process.cwd()`，如果存件，就近添加`preload.ts`
+会查找当前文件夹路径下往前查找`preload.ts`文件，直至`process.cwd()`，如果存件，就近添加`preload.ts`
+
+文件查找优先级
+
+- `z.dev.preload.ts`
+- `dev.preload.ts`
+- `z.preload.ts`
+- `preload.ts`

package/dist/index.cjs

@@ -13,6 +13,7 @@ const sharedReactConfig = require('@deot/dev-react');
 const fs = require('node:fs');
 const ejs = require('ejs');
 
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopNamespaceDefault(e) {
 	const n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } });
 	if (e) {
@@ -33,7 +34,7 @@ function _interopNamespaceDefault(e) {
 const path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 const fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
 
-const dirname$1 = path__namespace.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href))));
+const dirname$1 = path__namespace.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))));
 let target = {
   entries: [],
   html: ""
@@ -72,7 +73,7 @@ const get = () => {
   return target;
 };
 
-const dirname = path__namespace.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href))));
+const dirname = path__namespace.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))));
 const run = (options) => devShared.Utils.autoCatch(async () => {
   const locals = devShared.Locals.impl();
   if (typeof options.dryRun === "undefined") {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@deot/dev-dever",
-  "version": "2.5.4",
+  "version": "2.6.0",
   "type": "module",
-  "main": "dist/index.es.js",
+  "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.js",
       "require": "./dist/index.cjs",
       "types": "./dist/index.d.ts"
     }
@@ -21,14 +21,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@deot/dev-react": "^2.5.1",
-    "@deot/dev-shared": "^2.5.0",
-    "@deot/dev-vue": "^2.5.1",
+    "@deot/dev-react": "^2.6.0",
+    "@deot/dev-shared": "^2.6.0",
+    "@deot/dev-vue": "^2.6.0",
     "ejs": "^3.1.9",
-    "vite": "^4.4.11"
+    "vite": "^4.5.0"
   },
   "devDependencies": {
-    "@deot/dev-test": "^2.5.0",
+    "@deot/dev-test": "^2.6.0",
     "cross-env": "^7.0.3"
   }
 }

package/shared.config.ts

@@ -62,9 +62,16 @@ const getVirtualHtml = async (url: string) => {
 	const getPreload = (fullpath: string) => {
 		let dir$ = path.dirname(fullpath);
 		let preload = '';
-		while (dir$ !== cwd && !preload) {
-			let preloadFullPath = path.resolve(dir$, './preload.ts');
-			if (fs.existsSync(preloadFullPath)) {
+		while (dir$.includes(cwd) && !preload) {
+			
+			let preloadFullPath = [
+				path.resolve(dir$, './z.dev.preload.ts'),
+				path.resolve(dir$, './dev.preload.ts'),
+				path.resolve(dir$, './z.preload.ts'),
+				path.resolve(dir$, './preload.ts')
+			].find(i => fs.existsSync(i));
+
+			if (preloadFullPath) {
 				preload = `		import "/${path.relative(cwd, preloadFullPath)}";\n`;
 			} else {
 				dir$ = path.resolve(dir$, '..');