remove wrong import way

2026-07-01 12:21:38 +08:00 · 2026-01-17 11:34:13 +08:00
parent 55a04bb1ad
commit 5634ac0260
29 changed files with 66 additions and 59 deletions
--- a/packages/sqlite-plugin/package.json
+++ b/packages/sqlite-plugin/package.json
@@ -5,11 +5,13 @@
  "main": "dist/index.js",
  "dependencies": {
    "cli-highlight": "^2.1.11",
+    "lodash": "^4.17.21",
    "reflect-metadata": "^0.2.1",
    "sqlite3": "5.1.6",
    "typeorm": "0.3.11"
  },
  "devDependencies": {
+    "@types/lodash": "^4.17.23",
    "ts-node": "^10.9.2",
    "typescript": "^5.3.3"
  },
--- a/packages/sqlite-plugin/src/entity/AutoStartChatRunRecord.ts
+++ b/packages/sqlite-plugin/src/entity/AutoStartChatRunRecord.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm();
+import * as typeorm from 'typeorm';
+const { Entity, Column, PrimaryGeneratedColumn } = typeorm;

@Entity()
 export class AutoStartChatRunRecord {
--- a/packages/sqlite-plugin/src/entity/BossActiveStatusRecord.ts
+++ b/packages/sqlite-plugin/src/entity/BossActiveStatusRecord.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm();
+import * as typeorm from 'typeorm';
+const { Entity, Column, PrimaryGeneratedColumn } = typeorm;

@Entity()
 export class BossActiveStatusRecord {
--- a/packages/sqlite-plugin/src/entity/BossInfo.ts
+++ b/packages/sqlite-plugin/src/entity/BossInfo.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, Column, PrimaryColumn } = requireTypeorm();
+import * as typeorm from 'typeorm';
+const { Entity, Column, PrimaryColumn } = typeorm;

@Entity()
 export class BossInfo {
--- a/packages/sqlite-plugin/src/entity/BossInfoChangeLog.ts
+++ b/packages/sqlite-plugin/src/entity/BossInfoChangeLog.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm()
+import * as typeorm from 'typeorm';
+const { Entity, Column, PrimaryGeneratedColumn } = typeorm

@Entity()
 export class BossInfoChangeLog {
--- a/packages/sqlite-plugin/src/entity/ChatMessageRecord.ts
+++ b/packages/sqlite-plugin/src/entity/ChatMessageRecord.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm()
+import * as typeorm from 'typeorm';
+const { Entity, Column, PrimaryGeneratedColumn } = typeorm

@Entity()
 export class ChatMessageRecord {
--- a/packages/sqlite-plugin/src/entity/ChatStartupLog.ts
+++ b/packages/sqlite-plugin/src/entity/ChatStartupLog.ts
@@ -1,6 +1,6 @@
 import { JobSource } from "../enums";
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm()
+import * as typeorm from 'typeorm';
+const { Entity, Column, PrimaryGeneratedColumn } = typeorm

 export enum ChatStartupFrom {
  AutoFromRecommendList = null,
--- a/packages/sqlite-plugin/src/entity/CompanyInfo.ts
+++ b/packages/sqlite-plugin/src/entity/CompanyInfo.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, Column, PrimaryColumn } = requireTypeorm()
+import * as typeorm from 'typeorm';
+const { Entity, Column, PrimaryColumn } = typeorm

@Entity()
 export class CompanyInfo {
--- a/packages/sqlite-plugin/src/entity/CompanyInfoChangeLog.ts
+++ b/packages/sqlite-plugin/src/entity/CompanyInfoChangeLog.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, PrimaryGeneratedColumn, Column } = requireTypeorm()
+import * as typeorm from 'typeorm';
+const { Entity, PrimaryGeneratedColumn, Column } = typeorm

@Entity()
 export class CompanyInfoChangeLog {
--- a/packages/sqlite-plugin/src/entity/JobHireStatusRecord.ts
+++ b/packages/sqlite-plugin/src/entity/JobHireStatusRecord.ts
@@ -1,6 +1,6 @@
 import { JobHireStatus } from "../enums";
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, Column, PrimaryColumn } = requireTypeorm();
+import * as typeorm from 'typeorm';
+const { Entity, Column, PrimaryColumn } = typeorm;

@Entity()
 export class JobHireStatusRecord {
--- a/packages/sqlite-plugin/src/entity/JobInfo.ts
+++ b/packages/sqlite-plugin/src/entity/JobInfo.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, Column, PrimaryColumn } = requireTypeorm()
+import * as typeorm from 'typeorm';
+const { Entity, Column, PrimaryColumn } = typeorm

@Entity()
 export class JobInfo {
--- a/packages/sqlite-plugin/src/entity/JobInfoChangeLog.ts
+++ b/packages/sqlite-plugin/src/entity/JobInfoChangeLog.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, PrimaryGeneratedColumn, Column } = requireTypeorm()
+import * as typeorm from 'typeorm';
+const { Entity, PrimaryGeneratedColumn, Column } = typeorm

@Entity()
 export class JobInfoChangeLog {
--- a/packages/sqlite-plugin/src/entity/LlmModelUsageRecord.ts
+++ b/packages/sqlite-plugin/src/entity/LlmModelUsageRecord.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, PrimaryGeneratedColumn, Column, Index } = requireTypeorm()
+import * as typeorm from 'typeorm';
+const { Entity, PrimaryGeneratedColumn, Column, Index } = typeorm

@Entity()
@Index(["providerCompleteApiUrl", "model", "providerApiSecret"])
--- a/packages/sqlite-plugin/src/entity/MarkAsNotSuitLog.ts
+++ b/packages/sqlite-plugin/src/entity/MarkAsNotSuitLog.ts
@@ -1,7 +1,7 @@
 import { JobSource, MarkAsNotSuitOp, MarkAsNotSuitReason } from "../enums";
-import { requireTypeorm } from "../utils/module-loader";
+import * as typeorm from 'typeorm';
 import { ChatStartupFrom } from "./ChatStartupLog";
-const { Entity, Column, PrimaryGeneratedColumn } = requireTypeorm()
+const { Entity, Column, PrimaryGeneratedColumn } = typeorm

@Entity()
 export class MarkAsNotSuitLog {
--- a/packages/sqlite-plugin/src/entity/UserInfo.ts
+++ b/packages/sqlite-plugin/src/entity/UserInfo.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { Entity, Column, PrimaryColumn } = requireTypeorm()
+import * as typeorm from 'typeorm';
+const { Entity, Column, PrimaryColumn } = typeorm

@Entity()
 export class UserInfo {
--- a/packages/sqlite-plugin/src/entity/VBossLibrary.ts
+++ b/packages/sqlite-plugin/src/entity/VBossLibrary.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { ViewEntity, ViewColumn } = requireTypeorm();
+import * as typeorm from 'typeorm';
+const { ViewEntity, ViewColumn } = typeorm;
@ViewEntity({
  expression: `SELECT
    boss_info.encryptBossId,
--- a/packages/sqlite-plugin/src/entity/VChatStartupLog.ts
+++ b/packages/sqlite-plugin/src/entity/VChatStartupLog.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { ViewEntity, ViewColumn } = requireTypeorm();
+import * as typeorm from 'typeorm';
+const { ViewEntity, ViewColumn } = typeorm;
@ViewEntity({
  expression: `SELECT
    job_info.*,
--- a/packages/sqlite-plugin/src/entity/VCompanyLibrary.ts
+++ b/packages/sqlite-plugin/src/entity/VCompanyLibrary.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { ViewEntity, ViewColumn } = requireTypeorm();
+import * as typeorm from 'typeorm';
+const { ViewEntity, ViewColumn } = typeorm;
@ViewEntity({
  expression: `SELECT
    company_info.*
--- a/packages/sqlite-plugin/src/entity/VJobLibrary.ts
+++ b/packages/sqlite-plugin/src/entity/VJobLibrary.ts
@@ -1,5 +1,5 @@
-import { requireTypeorm } from "../utils/module-loader";
-const { ViewEntity, ViewColumn } = requireTypeorm();
+import * as typeorm from 'typeorm';
+const { ViewEntity, ViewColumn } = typeorm;
@ViewEntity({
  expression: `SELECT
    job_info.*,
--- a/packages/sqlite-plugin/src/entity/VMarkAsNotSuitLog.ts
+++ b/packages/sqlite-plugin/src/entity/VMarkAsNotSuitLog.ts
@@ -1,7 +1,7 @@
-import { requireTypeorm } from "../utils/module-loader";
+import * as typeorm from 'typeorm';
 import { ChatStartupFrom } from "./ChatStartupLog";
 import { MarkAsNotSuitReason } from "../enums";
-const { ViewEntity, ViewColumn } = requireTypeorm();
+const { ViewEntity, ViewColumn } = typeorm;
@ViewEntity({
  expression: `SELECT
    job_info.*,
--- a/packages/sqlite-plugin/src/index.ts
+++ b/packages/sqlite-plugin/src/index.ts
@@ -1,6 +1,5 @@
 import "reflect-metadata";
 import { type DataSource } from "typeorm";
-import { requireTypeorm } from "./utils/module-loader";

 import { BossInfo } from "./entity/BossInfo";
 import { BossInfoChangeLog } from "./entity/BossInfoChangeLog";
@@ -40,10 +39,11 @@ import { AddColumnForMarkAsNotSuitLog1746092370665 } from "./migrations/17460923
 import { Init1000000000000 } from "./migrations/1000000000000-Init";
 import { AddJobSourceColumnForChatStartupLogAndMarkAsNotSuitLog1752380078526 } from "./migrations/1752380078526-AddJobSourceColumnForChatStartupLogAndMarkAsNotSuitLog";
 import { AddJobHireStatusTable1766466476822 } from "./migrations/1766466476822-AddJobHireStatusTable";
-const lodashImportPromise = import('lodash-es')
+import chunk from 'lodash/chunk'
+import * as typeorm from 'typeorm'

 export function initDb(dbFilePath) {
-  const { DataSource } = requireTypeorm()
+  const { DataSource } = typeorm
  const appDataSource = new DataSource({
    type: "sqlite",
    synchronize: false,
@@ -202,7 +202,6 @@ export default class SqlitePlugin {
          if (chattedJobIds.length === 0) {
            return
          }
-          const { chunk } = await lodashImportPromise
          const chattedJobIdChunks = chunk(chattedJobIds, 200)
          const chattedBossIds = [];
          for (const chattedJobIdChunk of chattedJobIdChunks) {
--- a/packages/sqlite-plugin/src/utils/module-loader.ts
+++ b/packages/sqlite-plugin/src/utils/module-loader.ts
@@ -1,4 +0,0 @@
-export function requireTypeorm () {
-  const importResult = require('typeorm')
-  return importResult
-}
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -33,14 +33,14 @@
    "@geekgeekrun/dingtalk-plugin": "workspace:*",
    "@geekgeekrun/geek-auto-start-chat-with-boss": "workspace:*",
    "@geekgeekrun/launch-bosszhipin-login-page-with-preload-extension": "workspace:*",
+    "@geekgeekrun/pm": "workspace:*",
    "@geekgeekrun/puppeteer-extra-plugin-laodeng": "workspace:*",
    "@geekgeekrun/sqlite-plugin": "workspace:*",
    "@geekgeekrun/utils": "workspace:*",
-    "@geekgeekrun/pm": "workspace:*",
    "JSONStream": "^1.3.5",
    "diff": "^7.0.0",
    "electron-updater": "^6.1.7",
-    "lodash-es": "^4.17.21",
+    "lodash": "^4.17.21",
    "minimist": "^1.2.8",
    "mitt": "^3.0.1",
    "node-machine-id": "^1.1.12",
@@ -58,6 +58,7 @@
    "@inquirer/select": "^4.0.1",
    "@puppeteer/browsers": "^2.11.0",
    "@rushstack/eslint-patch": "^1.7.1",
+    "@types/lodash": "^4.17.23",
    "@types/node": "^18.19.9",
    "@unocss/preset-attributify": "^0.58.5",
    "@unocss/preset-icons": "^0.58.5",
--- a/packages/ui/src/renderer/src/features/FlyingCompanyLogoList/index.vue
+++ b/packages/ui/src/renderer/src/features/FlyingCompanyLogoList/index.vue
@@ -11,7 +11,7 @@

 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
-import { random } from 'lodash-es'
+import { random } from 'lodash'

 const rowCount = 4
 const colCount = 6
--- a/packages/ui/src/renderer/src/page/BootstrapSplash/page/FailMessage.vue
+++ b/packages/ui/src/renderer/src/page/BootstrapSplash/page/FailMessage.vue
@@ -18,7 +18,7 @@

 <script lang="ts" setup>
 import { gtagRenderer } from '@renderer/utils/gtag'
-import debounce from 'lodash-es/debounce'
+import debounce from 'lodash/debounce'
 const { ipcRenderer } = electron

 const handleOpenChromeDownloadPage = debounce(
--- a/packages/ui/src/renderer/src/page/MainLayout/GeekAutoStartChatWithBoss/index.vue
+++ b/packages/ui/src/renderer/src/page/MainLayout/GeekAutoStartChatWithBoss/index.vue
@@ -1079,7 +1079,7 @@ import {
  SalaryCalculateWay,
  JobDetailRegExpMatchLogic
 } from '@geekgeekrun/sqlite-plugin/src/enums'
-import { debounce } from 'lodash-es'
+import { debounce } from 'lodash'
 import mittBus from '../../../utils/mitt'
 import CityChooser from './components/CityChooser.vue'
 import conditions from '@geekgeekrun/geek-auto-start-chat-with-boss/internal-config/job-filter-conditions-20241002.json'
--- a/packages/ui/src/renderer/src/page/MainLayout/index.vue
+++ b/packages/ui/src/renderer/src/page/MainLayout/index.vue
@@ -150,7 +150,7 @@ import { onMounted, onUnmounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { TopRight, QuestionFilled } from '@element-plus/icons-vue'
 import useBuildInfo from '@renderer/hooks/useBuildInfo'
-import { debounce } from 'lodash-es'
+import { debounce } from 'lodash'
 import { gtagRenderer } from '@renderer/utils/gtag'
 import { useUpdateStore, useTaskManagerStore } from '../../store/index'

--- a/packages/ui/src/renderer/src/store/index.ts
+++ b/packages/ui/src/renderer/src/store/index.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { NewReleaseInfo } from '../../../common/types/update'
 import { ref } from 'vue'
-import { throttle } from 'lodash-es'
+import { throttle } from 'lodash'

 export const useUpdateStore = defineStore('update', () => {
  const availableNewRelease = ref<NewReleaseInfo | null>(null)
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,6 +125,9 @@ importers:
      cli-highlight:
        specifier: ^2.1.11
        version: 2.1.11
+      lodash:
+        specifier: ^4.17.21
+        version: 4.17.21
      reflect-metadata:
        specifier: ^0.2.1
        version: 0.2.1
@@ -135,6 +138,9 @@ importers:
        specifier: 0.3.11
        version: 0.3.11(sqlite3@5.1.6)(ts-node@10.9.2)
    devDependencies:
+      '@types/lodash':
+        specifier: ^4.17.23
+        version: 4.17.23
      ts-node:
        specifier: ^10.9.2
        version: 10.9.2(@types/node@18.19.15)(typescript@5.3.3)
@@ -180,7 +186,7 @@ importers:
      electron-updater:
        specifier: ^6.1.7
        version: 6.1.7
-      lodash-es:
+      lodash:
        specifier: ^4.17.21
        version: 4.17.21
      minimist:
@@ -229,6 +235,9 @@ importers:
      '@rushstack/eslint-patch':
        specifier: ^1.7.1
        version: 1.7.1
+      '@types/lodash':
+        specifier: ^4.17.23
+        version: 4.17.23
      '@types/node':
        specifier: ^18.19.9
        version: 18.19.9
@@ -1734,11 +1743,11 @@ packages:
  /@types/lodash-es@4.17.12:
    resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}
    dependencies:
-      '@types/lodash': 4.14.202
+      '@types/lodash': 4.17.23
    dev: true

-  /@types/lodash@4.14.202:
-    resolution: {integrity: sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==}
+  /@types/lodash@4.17.23:
+    resolution: {integrity: sha512-RDvF6wTulMPjrNdCoYRC8gNR880JNGT8uB+REUpC2Ns4pRqQJhGz90wh7rgdXDPpCczF3VGktDuFGVnz8zP7HA==}
    dev: true

  /@types/ms@0.7.34:
@@ -3549,7 +3558,7 @@ packages:
      '@element-plus/icons-vue': 2.3.1(vue@3.4.15)
      '@floating-ui/dom': 1.6.1
      '@popperjs/core': /@sxzz/popperjs-es@2.11.7
-      '@types/lodash': 4.14.202
+      '@types/lodash': 4.17.23
      '@types/lodash-es': 4.17.12
      '@vueuse/core': 9.13.0(vue@3.4.15)
      async-validator: 4.2.5
@@ -4759,6 +4768,7 @@ packages:

  /lodash-es@4.17.21:
    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
+    dev: true

  /lodash-unified@1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21):
    resolution: {integrity: sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==}
@@ -4786,7 +4796,6 @@ packages:

  /lodash@4.17.21:
    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
-    dev: true

  /lowercase-keys@2.0.0:
    resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}