win_webview2 1.1.11 → 1.1.12

package/dist/node/builder/versiontool.js

@@ -13,7 +13,8 @@ karena package json mungkin gak ada
 async function getWWvVersion() {
     let result = "";
     try {
-        let jsonPath = node_path_1.default.join((0, dirnameTool_1.getWw2Dirname)().ww2ModulePath, "package.json");
+        let wwvModulePath = (0, dirnameTool_1.getWWVNodeModuleFolder)();
+        let jsonPath = node_path_1.default.join(wwvModulePath, "package.json");
         let jsontxt = await (0, promises_1.readFile)(jsonPath, "utf-8");
         let jsonObj = JSON.parse(jsontxt);
         result = jsonObj.version;

package/dist/node/tsExport/dirnameTool.d.ts

@@ -9,6 +9,6 @@
 export declare function getWw2Dirname(): {
     _dirname: string;
     _filename: string;
-    ww2ModulePath: string;
 };
 export declare function findUserProjectRoot(): string | null;
+export declare function getWWVNodeModuleFolder(): string;

package/dist/node/tsExport/dirnameTool.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWw2Dirname = getWw2Dirname;
 exports.findUserProjectRoot = findUserProjectRoot;
+exports.getWWVNodeModuleFolder = getWWVNodeModuleFolder;
 const node_url_1 = require("node:url");
 const node_path_1 = __importStar(require("node:path"));
 const node_fs_1 = require("node:fs");
@@ -55,8 +56,7 @@ function getWw2Dirname() {
     const _dirname = typeof __dirname !== 'undefined'
         ? __dirname
         : (0, node_path_1.dirname)(_filename);
-    let ww2ModulePath = node_path_1.default.join(_dirname, "../../../");
-    return { _dirname, _filename, ww2ModulePath };
+    return { _dirname, _filename };
 }
 function findUserProjectRootRecrusive(currentDir = process.cwd()) {
     const packagePath = node_path_1.default.join(currentDir, 'package.json');
@@ -77,3 +77,10 @@ function findUserProjectRoot() {
     }
     return findUserProjectRootRecrusive(process.cwd());
 }
+function getWWVNodeModuleFolder() {
+    let userRootProject = findUserProjectRoot();
+    if (userRootProject == null)
+        throw "root project user not found";
+    let nodeModuleFolder = node_path_1.default.join(userRootProject, "node_modules/win_webview2");
+    return nodeModuleFolder;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "win_webview2",
-  "version": "1.1.11",
+  "version": "1.1.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/nnttoo/win_webview2"
@@ -29,7 +29,7 @@
     "build_browser": "tsc -p ./src/srcBrowser/tsconfig.json",
     "build_browser_watch": "npm run build_browser -- --watch",
     "build_all" : "npm run build_node && npm run build_browser",
-    "copy_dll": "tsx ./src/srcNode/builder/copyDll.ts"
+    "copy_dll": "tsx ./srcInternal/copyDll.ts"
   },
   "author": "",
   "license": "ISC",

package/src/srcNode/builder/versiontool.ts

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { getWw2Dirname } from "../tsExport/dirnameTool";
+import { getWw2Dirname, getWWVNodeModuleFolder } from "../tsExport/dirnameTool";
 import { readFile } from "node:fs/promises";
 
 
@@ -10,7 +10,8 @@ export async function  getWWvVersion(){
     let result = "";
     
     try {
-        let jsonPath = path.join(getWw2Dirname().ww2ModulePath,"package.json");
+        let wwvModulePath = getWWVNodeModuleFolder();
+        let jsonPath = path.join(wwvModulePath,"package.json");
         let jsontxt = await readFile(jsonPath,"utf-8");
         let jsonObj = JSON.parse(jsontxt) as {  version : string};
 

package/src/srcNode/tsExport/dirnameTool.ts

@@ -21,12 +21,9 @@ export function getWw2Dirname() {
     const _dirname = typeof __dirname !== 'undefined'
         ? __dirname
         : dirname(_filename);
+ 
 
-
-
-    let ww2ModulePath = path.join(_dirname,"../../../")
-
-    return { _dirname, _filename , ww2ModulePath};
+    return { _dirname, _filename };
 }
 
 function findUserProjectRootRecrusive(currentDir : string = process.cwd()) { 
@@ -51,3 +48,11 @@ export function findUserProjectRoot() {
     }  
     return findUserProjectRootRecrusive(process.cwd());
 }
+
+export function getWWVNodeModuleFolder(){
+    let userRootProject = findUserProjectRoot();
+    if(userRootProject == null) throw "root project user not found";
+
+    let nodeModuleFolder = path.join(userRootProject,"node_modules/win_webview2");
+    return nodeModuleFolder;
+}

package/src/srcNode/tsconfig.json

@@ -9,5 +9,5 @@
     "esModuleInterop": true,
     "skipLibCheck": true
   },
-  "include": ["./**/*"] 
+  "include": ["./**/*" ] 
 }

package/{src/srcNode/builder → srcInternal}/copyDll.ts

@@ -1,7 +1,6 @@
 import { exec } from "node:child_process";
 import { copyFile, mkdir } from "node:fs/promises";
-import path from "node:path";
-import { getWw2Dirname } from "../tsExport/dirnameTool";
+import path from "node:path"; 
 
 function debugDir(dirPath: string) {
     exec("cd " + dirPath + "&& dir", (s, o) => {
@@ -13,15 +12,13 @@ function debugDir(dirPath: string) {
 
     let result = "\n";
 
-    let dirname = getWw2Dirname();
-
-    let ww2ModulePath = dirname.ww2ModulePath;
+    let ww2SourcePath = path.join(__dirname,"../");
  
     let copyFromRoot = async (src: string, target: string) => {
         try {
 
-            let rootPath = path.join(ww2ModulePath,"../");
-            console.log("ModulePath : ", ww2ModulePath);
+            let rootPath = path.join(ww2SourcePath,"../");
+            console.log("ModulePath : ", ww2SourcePath);
             console.log("rootPath : ", rootPath);
             result += "\n" + target;
             await copyFile(path.join(rootPath, src), path.join(rootPath, target));
@@ -31,13 +28,13 @@ function debugDir(dirPath: string) {
     }
     
     try{ 
-        await mkdir(path.join(ww2ModulePath, "win_lib"));
+        await mkdir(path.join(ww2SourcePath, "win_lib"));
 
     } catch{
 
     }
     try{ 
-        await mkdir(path.join(ww2ModulePath, "win_lib/Win32"));
+        await mkdir(path.join(ww2SourcePath, "win_lib/Win32"));
 
     } catch{
 
@@ -45,7 +42,7 @@ function debugDir(dirPath: string) {
 
     try {
 
-        await mkdir(path.join(ww2ModulePath, "win_lib/x64"));
+        await mkdir(path.join(ww2SourcePath, "win_lib/x64"));
     } catch (error) {
 
     }

package/srcInternal/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "nodenext",
+    "declaration": true, 
+    "rootDir": "./", 
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "types": ["node"]
+  },
+  "include": ["./**/*"] 
+}