@_tc/template-core 0.0.1-bate.38 → 0.0.1-bate.39

package/cjs/bundler/utils.js

@@ -10,14 +10,20 @@ glob = require_runtime.__toESM(glob);
 let fs = require("fs");
 let _tailwindcss_vite = require("@tailwindcss/vite");
 _tailwindcss_vite = require_runtime.__toESM(_tailwindcss_vite);
+let module$1 = require("module");
+let url = require("url");
 let vite = require("vite");
 //#region bundler/utils.ts
+var currentFile = typeof __filename === "string" ? __filename : (0, url.fileURLToPath)({}.url);
+var currentDir = path.default.dirname(currentFile);
 var base = process.cwd();
-var framePath = path.default.resolve(__dirname, "../../");
-var frameNodePath = path.default.resolve(__dirname, "../");
+var requireFromFrame = (0, module$1.createRequire)(currentFile);
+var framePath = path.default.resolve(currentDir, "../../");
+var frameNodePath = path.default.resolve(currentDir, "../");
 var frameFEPath = path.default.resolve(framePath, "./fe/frontend");
 var runPath = path.default.resolve(base, ".");
 var runFEPath = path.default.resolve(runPath, "./frontend");
+var resolvePackageDir = (packageName) => path.default.dirname(requireFromFrame.resolve(`${packageName}/package.json`));
 /**
 *
 * 寻找 frontend\/**\/*.entry.[j|t]s(x)?
@@ -145,7 +151,7 @@ function resolveAliasWithFallback(aliasList) {
 	];
 	return aliasList.reduce((o, [aliasName, aliasPath]) => {
 		const businessFilePath = aliasExtensions.map((ext) => path.default.resolve(runFEPath, aliasPath + ext)).find((filePath) => (0, fs.existsSync)(filePath));
-		let filePath = path.default.resolve(__dirname, "./defaultAlias");
+		let filePath = path.default.resolve(currentDir, "./defaultAlias");
 		if (businessFilePath) filePath = businessFilePath;
 		o[aliasName] = filePath;
 		return o;
@@ -168,7 +174,9 @@ var VBuildFE = async (input, OperatingEnv) => {
 				rollupOptions: { input }
 			},
 			resolve: { alias: {
-				"@tc/ui-react": path.default.resolve(__dirname, "../../fe/packages/ui/react/"),
+				"@tc/ui-react": path.default.resolve(currentDir, "../../fe/packages/ui/react/"),
+				react: resolvePackageDir("react"),
+				"react-dom": resolvePackageDir("react-dom"),
 				...resolveAliasWithFallback([["$business/SchemaForm/data", "./extended/SchemaForm/data"]])
 			} }
 		});

package/esm/bundler/utils.js

@@ -5,14 +5,20 @@ import path from "path";
 import * as glob from "glob";
 import { copyFileSync, existsSync, readFileSync, readdirSync, rmdirSync, unlinkSync, writeFileSync } from "fs";
 import tailwindcss from "@tailwindcss/vite";
+import { createRequire } from "module";
+import { fileURLToPath } from "url";
 import { build } from "vite";
 //#region bundler/utils.ts
+var currentFile = typeof __filename === "string" ? __filename : fileURLToPath(import.meta.url);
+var currentDir = path.dirname(currentFile);
 var base = process.cwd();
-var framePath = path.resolve(__dirname, "../../");
-var frameNodePath = path.resolve(__dirname, "../");
+var requireFromFrame = createRequire(currentFile);
+var framePath = path.resolve(currentDir, "../../");
+var frameNodePath = path.resolve(currentDir, "../");
 var frameFEPath = path.resolve(framePath, "./fe/frontend");
 var runPath = path.resolve(base, ".");
 var runFEPath = path.resolve(runPath, "./frontend");
+var resolvePackageDir = (packageName) => path.dirname(requireFromFrame.resolve(`${packageName}/package.json`));
 /**
 *
 * 寻找 frontend\/**\/*.entry.[j|t]s(x)?
@@ -140,7 +146,7 @@ function resolveAliasWithFallback(aliasList) {
 	];
 	return aliasList.reduce((o, [aliasName, aliasPath]) => {
 		const businessFilePath = aliasExtensions.map((ext) => path.resolve(runFEPath, aliasPath + ext)).find((filePath) => existsSync(filePath));
-		let filePath = path.resolve(__dirname, "./defaultAlias");
+		let filePath = path.resolve(currentDir, "./defaultAlias");
 		if (businessFilePath) filePath = businessFilePath;
 		o[aliasName] = filePath;
 		return o;
@@ -163,7 +169,9 @@ var VBuildFE = async (input, OperatingEnv) => {
 				rollupOptions: { input }
 			},
 			resolve: { alias: {
-				"@tc/ui-react": path.resolve(__dirname, "../../fe/packages/ui/react/"),
+				"@tc/ui-react": path.resolve(currentDir, "../../fe/packages/ui/react/"),
+				react: resolvePackageDir("react"),
+				"react-dom": resolvePackageDir("react-dom"),
 				...resolveAliasWithFallback([["$business/SchemaForm/data", "./extended/SchemaForm/data"]])
 			} }
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_tc/template-core",
-  "version": "0.0.1-bate.38",
+  "version": "0.0.1-bate.39",
   "description": "A TypeScript Koa framework template - Monorepo root",
   "main": "./index.js",
   "types": "./index.d.ts",