@zwa73/dev-utils 1.0.61 → 1.0.62

package/data/CreateElectronFrame/src/index.ts

@@ -1,5 +1,5 @@
-import { app, BrowserWindow, ipcMain, IpcMainInvokeEvent } from 'electron';
-import { FuncObj } from './Static';
+import { app, BrowserWindow, ipcMain, IpcMainInvokeEvent, nativeTheme } from "electron";
+import { FuncObj } from "./Static";
 // This allows TypeScript to pick up the magic constants that's auto-generated by Forge's Webpack
 // plugin that tells the Electron app where to look for the Webpack-bundled app code (depending on
 // whether you're running in development or production).
@@ -7,86 +7,79 @@ declare const MAIN_WINDOW_WEBPACK_ENTRY: string;
 declare const MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY: string;
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
-if (require('electron-squirrel-startup')) {
-  app.quit();
+if (require("electron-squirrel-startup")) {
+    app.quit();
 }
 
 const createWindow = (): void => {
-  // Create the browser window.
-  const mainWindow = new BrowserWindow({
-    height: 600,
-    width: 800,
-    webPreferences: {
-      preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
-      webSecurity: false,
-      allowRunningInsecureContent: true,
-    },
-  });
-
-  mainWindow.webContents.session.webRequest.onHeadersReceived((details, callback) => {
-    callback({
-        responseHeaders: {
-            ...details.responseHeaders,
-            "Content-Security-Policy": [],
+    // Create the browser window.
+    const mainWindow = new BrowserWindow({
+        height: 600,
+        width: 800,
+        webPreferences: {
+            preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
+            webSecurity: false,
+            allowRunningInsecureContent: true,
         },
     });
-});
 
-  // and load the index.html of the app.
-  void mainWindow.loadURL(MAIN_WINDOW_WEBPACK_ENTRY);
+    mainWindow.webContents.session.webRequest.onHeadersReceived((details, callback) => {
+        callback({
+            responseHeaders: {
+                ...details.responseHeaders,
+                "Content-Security-Policy": [],
+            },
+        });
+    });
+
+    // and load the index.html of the app.
+    void mainWindow.loadURL(MAIN_WINDOW_WEBPACK_ENTRY);
 
-  // Open the DevTools.
-  mainWindow.webContents.on('devtools-opened', () => {
-    void mainWindow.webContents.executeJavaScript(`
-      (()=>{
-        console.log('devtools-opened');
-        const devTools = document.querySelector('.devtools');
-        if (devTools) {
-          console.log('devTools');
-          devTools.classList.add('theme-dark');
-          devTools.reload();
-        }
-      })();
-    `);
-  });
-  mainWindow.webContents.openDevTools();
+    // Open the DevTools.
+    mainWindow.webContents.openDevTools();
+    mainWindow.webContents.on("devtools-opened", () => {
+        // First, set the theme to 'light'
+        nativeTheme.themeSource = "light";
+        // After a short delay, set it to 'dark'
+        setTimeout(() => {
+            nativeTheme.themeSource = "system";
+        }, 100); // 100ms delay; adjust if necessary
+    });
 };
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
-app.on('ready', createWindow);
-
+app.on("ready", createWindow);
 
 //#region function define
-Object.entries(FuncObj).forEach(([k, v]) => {
-  ipcMain.handle(k, v);
-});
+Object.entries(FuncObj).forEach(([k, v]) => ipcMain.handle(k, v));
 
-type RemoveFirstArg<T> = T extends (arg1: IpcMainInvokeEvent, ...args: infer Rest) => infer R ? (...args: Rest) => R : T;
+type RemoveFirstArg<T> = T extends (arg1: IpcMainInvokeEvent, ...args: infer Rest) => infer R
+    ? (...args: Rest) => R
+    : T;
 
 export type Bridge = {
-  [P in keyof FuncObj]: FuncObj[P] extends (...args: infer Arg) => infer Out
-      ? RemoveFirstArg<(...args: Arg) => Promise<Out>>
-      : never;
+    [P in keyof FuncObj]: FuncObj[P] extends (...args: infer Arg) => infer Out
+        ? RemoveFirstArg<(...args: Arg) => Promise<Out>>
+        : never;
 };
 //#endregion
 
 // Quit when all windows are closed, except on macOS. There, it's common
 // for applications and their menu bar to stay active until the user quits
 // explicitly with Cmd + Q.
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
+app.on("window-all-closed", () => {
+    if (process.platform !== "darwin") {
+        app.quit();
+    }
 });
 
-app.on('activate', () => {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow();
-  }
+app.on("activate", () => {
+    // On OS X it's common to re-create a window in the app when the
+    // dock icon is clicked and there are no other windows open.
+    if (BrowserWindow.getAllWindows().length === 0)
+        createWindow();
 });
 
 // In this file you can include the rest of your app's specific main process

package/dist/Command/CreateElectronFrame.js

@@ -51,7 +51,7 @@ async function copyData() {
 const CmdCreateElectronFrame = (program) => program
     .command('CreateElectronFrame')
     .command('createelectronframe')
-    .description('对当前目录进行项目初始化')
+    .description('对当前目录进行项目初始化,创建Electron基础环境')
     .action(async (opt) => {
     (0, RouteInterface_1.checkProject)();
     utils_1.SLogger.info(`开始初始化设置当前目录 ${RouteInterface_1.PROJECT_PATH}`);

package/dist/Command/Route.js

@@ -10,6 +10,7 @@ const ScanDups_1 = require("./ScanDups");
 const GenSchema_1 = require("./GenSchema");
 const ExpandMacro_1 = require("./ExpandMacro");
 const GenI18n_1 = require("./GenI18n");
+const CreateElectronFrame_1 = require("./CreateElectronFrame");
 async function cliRoute() {
     (0, Init_1.CmdInit)(commander_1.program);
     (0, Node_1.CmdNode)(commander_1.program);
@@ -19,5 +20,6 @@ async function cliRoute() {
     (0, GenSchema_1.CmdGenSchema)(commander_1.program);
     (0, ExpandMacro_1.CmdExpandMacro)(commander_1.program);
     (0, GenI18n_1.CmdGenI18n)(commander_1.program);
+    (0, CreateElectronFrame_1.CmdCreateElectronFrame)(commander_1.program);
     commander_1.program.parse(process.argv);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.61",
+	"version": "1.0.62",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {

package/src/Command/CreateElectronFrame.ts

@@ -29,7 +29,7 @@ async function copyData() {
 export const CmdCreateElectronFrame = (program:Command)=>program
     .command('CreateElectronFrame')
     .command('createelectronframe')
-    .description('对当前目录进行项目初始化')
+    .description('对当前目录进行项目初始化,创建Electron基础环境')
     .action(async (opt) => {
         checkProject();
         SLogger.info(`开始初始化设置当前目录 ${PROJECT_PATH}`);

package/src/Command/Route.ts

@@ -8,6 +8,7 @@ import { CmdScanDups } from './ScanDups';
 import { CmdGenSchema } from './GenSchema';
 import { CmdExpandMacro } from './ExpandMacro';
 import { CmdGenI18n } from './GenI18n';
+import { CmdCreateElectronFrame } from './CreateElectronFrame';
 
 export async function cliRoute(){
     CmdInit(program);
@@ -18,5 +19,6 @@ export async function cliRoute(){
     CmdGenSchema(program);
     CmdExpandMacro(program);
     CmdGenI18n(program);
+    CmdCreateElectronFrame(program);
     program.parse(process.argv);
 }