@modern-js/module-tools 1.1.1 → 1.1.4-beta.0

package/src/tasks/build-style.ts

@@ -1,6 +1,10 @@
 import * as path from 'path';
 import { fs, Import } from '@modern-js/utils';
-import type { NormalizedConfig, IAppContext } from '@modern-js/core';
+import type {
+  NormalizedConfig,
+  IAppContext,
+  CoreOptions,
+} from '@modern-js/core';
 import type { ICompilerResult, PostcssOption } from '@modern-js/style-compiler';
 import type { ModuleToolsOutput } from '../types';
 
@@ -171,8 +175,15 @@ const taskMain = async ({
 };
 
 (async () => {
+  let options: CoreOptions | undefined;
+  if (process.env.CORE_INIT_OPTION_FILE) {
+    ({ options } = require(process.env.CORE_INIT_OPTION_FILE));
+  }
   hooks.buildLifeCycle();
-  const { resolved: modernConfig, appContext } = await core.cli.init();
+  const { resolved: modernConfig, appContext } = await core.cli.init(
+    [],
+    options,
+  );
   await core.manager.run(async () => {
     try {
       await taskMain({ modernConfig, appContext });

package/src/tasks/build-watch-source-code.ts

@@ -1,7 +1,8 @@
 import { Import, fs } from '@modern-js/utils';
-import type { NormalizedConfig } from '@modern-js/core';
+import type { NormalizedConfig, CoreOptions } from '@modern-js/core';
 import type { ICompilerResult, IVirtualDist } from '@modern-js/babel-compiler';
 import type { ITsconfig } from '../types';
+import { initEnv } from '../utils/init-env';
 
 const babelCompiler: typeof import('@modern-js/babel-compiler') = Import.lazy(
   '@modern-js/babel-compiler',
@@ -164,12 +165,17 @@ const taskMain = async ({
     syntax: 'es5',
     type: 'module',
   });
+  process.env.BUILD_FORMAT = initEnv(config);
 
   await buildSourceCode(config, modernConfig);
 };
 
 (async () => {
-  const { resolved } = await core.cli.init();
+  let options: CoreOptions | undefined;
+  if (process.env.CORE_INIT_OPTION_FILE) {
+    ({ options } = require(process.env.CORE_INIT_OPTION_FILE));
+  }
+  const { resolved } = await core.cli.init([], options);
   await core.manager.run(async () => {
     try {
       await taskMain({ modernConfig: resolved });

package/src/tasks/build-watch-style.ts

@@ -1,6 +1,10 @@
 /* eslint-disable max-statements */
 import * as path from 'path';
-import type { NormalizedConfig, IAppContext } from '@modern-js/core';
+import type {
+  NormalizedConfig,
+  IAppContext,
+  CoreOptions,
+} from '@modern-js/core';
 import type { ICompilerResult, PostcssOption } from '@modern-js/style-compiler';
 import { fs, watch, WatchChangeType, Import } from '@modern-js/utils';
 import type { ModuleToolsOutput } from '../types';
@@ -79,6 +83,7 @@ const copyOriginStyleFiles = ({
   }
   for (const styleFile of styleFiles) {
     const file = path.relative(targetDir, styleFile);
+    fs.ensureFileSync(path.join(outputDir, file));
     fs.copyFileSync(styleFile, path.join(outputDir, file));
   }
 };
@@ -107,12 +112,18 @@ const taskMain = async ({
   } = modernConfig.output as ModuleToolsOutput;
   const { appDirectory } = appContext;
 
-  const lessOption = await (core.mountHook() as any).moduleLessConfig({
-    onLast: async (_: any) => null as any,
-  });
-  const sassOption = await (core.mountHook() as any).moduleSassConfig({
-    onLast: async (_: any) => null as any,
-  });
+  const lessOption = await (core.mountHook() as any).moduleLessConfig(
+    { modernConfig },
+    {
+      onLast: async (_: any) => null as any,
+    },
+  );
+  const sassOption = await (core.mountHook() as any).moduleSassConfig(
+    { modernConfig },
+    {
+      onLast: async (_: any) => null as any,
+    },
+  );
   const postcssOption = getPostcssOption(appDirectory, modernConfig);
   const existStylesDir = checkStylesDirExist({ appDirectory });
   const compilerMessage = {
@@ -240,13 +251,20 @@ const taskMain = async ({
 };
 
 (async () => {
+  let options: CoreOptions | undefined;
+  if (process.env.CORE_INIT_OPTION_FILE) {
+    ({ options } = require(process.env.CORE_INIT_OPTION_FILE));
+  }
   hooks.buildLifeCycle();
-  const { resolved: modernConfig, appContext } = await core.cli.init();
+  const { resolved: modernConfig, appContext } = await core.cli.init(
+    [],
+    options,
+  );
   await core.manager.run(async () => {
     try {
       await taskMain({ modernConfig, appContext });
     } catch (e: any) {
-      console.error(e.message);
+      console.error(e);
     }
   });
 })();

package/src/tasks/copy-assets.ts

@@ -1,6 +1,10 @@
 import * as path from 'path';
 import { fs, watch, WatchChangeType, Import } from '@modern-js/utils';
-import type { NormalizedConfig, IAppContext } from '@modern-js/core';
+import type {
+  NormalizedConfig,
+  IAppContext,
+  CoreOptions,
+} from '@modern-js/core';
 import type { ModuleToolsOutput } from '../types';
 
 const argv: typeof import('process.argv').default = Import.lazy(
@@ -101,7 +105,14 @@ const taskMain = ({
 };
 
 (async () => {
-  const { resolved: modernConfig, appContext } = await core.cli.init();
+  let options: CoreOptions | undefined;
+  if (process.env.CORE_INIT_OPTION_FILE) {
+    ({ options } = require(process.env.CORE_INIT_OPTION_FILE));
+  }
+  const { resolved: modernConfig, appContext } = await core.cli.init(
+    [],
+    options,
+  );
   core.manager.run(() => {
     try {
       taskMain({ modernConfig, appContext });

package/src/tasks/generator-dts.ts

@@ -2,7 +2,7 @@ import type { ChildProcess } from 'child_process';
 import * as path from 'path';
 import * as os from 'os';
 import { Import, fs } from '@modern-js/utils';
-import type { NormalizedConfig } from '@modern-js/core';
+import type { NormalizedConfig, CoreOptions } from '@modern-js/core';
 import type { ITsconfig } from '@/types';
 
 const tsPathsTransform: typeof import('../utils/tspaths-transform') =
@@ -261,7 +261,11 @@ const taskMain = async ({
 };
 
 (async () => {
-  const { resolved } = await core.cli.init();
+  let options: CoreOptions | undefined;
+  if (process.env.CORE_INIT_OPTION_FILE) {
+    ({ options } = require(process.env.CORE_INIT_OPTION_FILE));
+  }
+  const { resolved } = await core.cli.init([], options);
   await core.manager.run(async () => {
     try {
       await taskMain({ modernConfig: resolved });

package/src/utils/init-env.ts

@@ -0,0 +1,31 @@
+interface ITaskConfig {
+  srcRootDir: string; // 源码的根目录
+  willCompilerDirOrFile: string; // 用于编译的源码文件或者源码目录
+  distDir: string;
+  appDirectory: string;
+  sourceMaps: boolean;
+  syntax: 'es5' | 'es6+';
+  type: 'module' | 'commonjs';
+  tsconfigPath: string;
+  copyDirs?: string;
+  compiler?: 'babel' | 'esbuild' | 'swc';
+  watch: boolean;
+}
+
+export const initEnv = ({
+  syntax,
+  type,
+}: {
+  syntax: ITaskConfig['syntax'];
+  type: ITaskConfig['type'];
+}) => {
+  if (syntax === 'es6+' && type === 'commonjs') {
+    return 'CJS_ES6';
+  } else if (syntax === 'es6+' && type === 'module') {
+    return 'ESM_ES6';
+  } else if (syntax === 'es5' && type === 'module') {
+    return 'ESM_ES5';
+  }
+
+  return '';
+};