@modern-js/core 1.0.0-rc.5 → 1.0.0

package/src/initWatcher.ts

@@ -1,8 +1,7 @@
-import path from 'path';
 import crypto from 'crypto';
 import fs from 'fs';
+import { path, isDev, createDebugger } from '@modern-js/utils';
 import chokidar from 'chokidar';
-import { isDev, createDebugger } from '@modern-js/utils';
 import { NormalizedConfig } from './config/mergeConfig';
 import { LoadedConfig } from './config';
 import { HooksRunner } from '.';
@@ -17,15 +16,12 @@ const hashMap = new Map<string, string>();
 export const initWatcher = async (
   loaded: LoadedConfig,
   appDirectory: string,
-  resovledConfig: NormalizedConfig,
+  configDir: string | undefined,
   hooksRunner: HooksRunner,
   argv: string[],
 ) => {
   // only add fs watcher on dev mode.
   if (isDev() && argv[0] === 'dev') {
-    const {
-      source: { configDir },
-    } = resovledConfig;
 
     const extraFiles = await hooksRunner.watchFiles();
 

package/src/loadEnv.ts

@@ -1,5 +1,5 @@
-import path from 'path';
 import fs from 'fs';
+import { path } from '@modern-js/utils';
 import dotenv from 'dotenv';
 import dotenvExpand from 'dotenv-expand';
 

package/src/loadPlugins.ts

@@ -3,6 +3,7 @@ import {
   createDebugger,
   compatRequire,
   INTERNAL_PLUGINS,
+  upath
 } from '@modern-js/utils';
 
 const debug = createDebugger('load-plugins');
@@ -24,7 +25,7 @@ const resolvePlugin = (appDirectory: string, plugin: PluginConfigItem) => {
   const tryResolve = (name: string) => {
     let filePath = '';
     try {
-      filePath = require.resolve(name, { paths: [appDirectory] });
+      filePath = upath.normalizeSafe(require.resolve(name, { paths: [appDirectory] }));
       delete require.cache[filePath];
     } catch (err) {
       if ((err as any).code === 'MODULE_NOT_FOUND') {

package/tests/loadEnv.test.ts

@@ -1,6 +1,6 @@
-import path from 'path';
 import fs from 'fs';
 import { exec } from 'child_process';
+import { path } from '@modern-js/utils';
 import { loadEnv } from '@/loadEnv';
 
 const fixture = path.resolve(__dirname, './fixtures/load-env');

package/tests/loadPlugin.test.ts

@@ -1,4 +1,4 @@
-import path from 'path';
+import { path } from '@modern-js/utils';
 import { loadPlugins } from '@/loadPlugins';
 
 describe('load plugins', () => {