fix: resolve conflicts

Jonghakseo · Dec 16, 2024 · a8d94cd · a8d94cd
1 parent 8f06376
commit a8d94cd
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 182 deletions.
diff --git a/chrome-extension/manifest.js b/chrome-extension/manifest.js
diff --git a/chrome-extension/utils/plugins/make-manifest-plugin.ts b/chrome-extension/utils/plugins/make-manifest-plugin.ts
@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, writeFileSync, copyFileSync } from 'node:fs';
+import { copyFileSync, existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { env, platform } from 'node:process';
@@ -7,7 +7,17 @@ import { colorLog, ManifestParser } from '@extension/dev-utils';
 import type { PluginOption } from 'vite';
 
 const manifestFile = resolve(import.meta.dirname, '..', '..', 'manifest.js');
-const refreshFile = resolve(import.meta.dirname, '..', 'refresh.js');
+const refreshFile = resolve(
+  import.meta.dirname,
+  '..',
+  '..',
+  '..',
+  'packages',
+  'hmr',
+  'lib',
+  'injections',
+  'refresh.js',
+);
 
 const getManifestWithCacheBurst = async () => {
   const withCacheBurst = (path: string) => `${path}?${Date.now().toString()}`;
@@ -31,14 +41,12 @@ export default (config: { outDir: string }): PluginOption => {
 
     const manifestPath = resolve(to, 'manifest.json');
     const isFirefox = env.__FIREFOX__ === 'true';
-    const isDev = process.env.__DEV__ === 'true';
+    const isDev = env.__DEV__ === 'true';
 
     writeFileSync(manifestPath, ManifestParser.convertManifestToString(manifest, isFirefox));
 
     isDev && addRefreshContentScript(manifest);
 
-    writeFileSync(manifestPath, ManifestParser.convertManifestToString(manifest, isFirefox ? 'firefox' : 'chrome'));
-
     isDev && copyFileSync(refreshFile, resolve(to, 'refresh.js'));
 
     colorLog(`Manifest file copy complete: ${manifestPath}`, 'success');

diff --git a/chrome-extension/utils/refresh.js b/chrome-extension/utils/refresh.js
diff --git a/packages/storage/lib/impl/index.ts b/packages/storage/lib/impl/index.ts
@@ -1 +1 @@
-export * from './exampleThemeStorage';
+export * from './exampleThemeStorage.js';
diff --git a/packages/storage/lib/index.ts b/packages/storage/lib/index.ts
@@ -1,2 +1,2 @@
 export type { BaseStorage } from './base/types.js';
-export * from './impl';
+export * from './impl/index.js';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export * from './exampleThemeStorage';
		export * from './exampleThemeStorage.js';