@modern-js/module-tools 1.5.8 → 1.6.1

package/dist/types/schema/index.d.ts

@@ -1,43 +1,209 @@
 export declare const addSchema: () => ({
-  target: string;
-  schema: {
-    type: string;
-    enum?: undefined;
-    default?: undefined;
-  };
-} | {
   target: string;
   schema: {
     enum: string[];
-    default: string;
-    type?: undefined;
   };
 } | {
   target: string;
   schema: {
-    enum: string[];
-    typeof?: undefined;
-    default?: undefined;
+    if: {
+      type: string;
+    };
+    then: {
+      items: {
+        type: string;
+        properties: {
+          target: {
+            enum: string[];
+          };
+          format: {
+            enum: string[];
+          };
+          sourceMap: {
+            enum: (string | boolean)[];
+          };
+          buildType: {
+            enum: string[];
+          };
+          bundleOptions: {
+            type: string;
+            properties: {
+              entry: {
+                type: string;
+              };
+              splitting: {
+                type: string;
+              };
+              externals: {
+                type: string;
+                items: {
+                  anyOf: ({
+                    instanceof: string;
+                    typeof?: undefined;
+                  } | {
+                    typeof: string;
+                    instanceof?: undefined;
+                  })[];
+                };
+              };
+              platform: {
+                enum: string[];
+              };
+              minify: {
+                enum: (string | boolean)[];
+              };
+              skipDeps: {
+                type: string;
+              };
+            };
+          };
+          bundlelessOptions: {
+            type: string;
+            properties: {
+              sourceDir: {
+                type: string;
+              };
+              style: {
+                type: string;
+                properties: {
+                  compileMode: {
+                    enum: (string | boolean)[];
+                  };
+                  path: {
+                    type: string;
+                  };
+                };
+              };
+              static: {
+                type: string;
+                properties: {
+                  path: {
+                    type: string;
+                  };
+                };
+              };
+            };
+          };
+          tsconfig: {
+            type: string;
+          };
+          enableDts: {
+            type: string;
+          };
+          dtsOnly: {
+            type: string;
+          };
+          outputPath: {
+            type: string;
+          };
+        };
+      }[];
+    };
+    else: {
+      type: string;
+      properties: {
+        target: {
+          enum: string[];
+        };
+        format: {
+          enum: string[];
+        };
+        sourceMap: {
+          enum: (string | boolean)[];
+        };
+        buildType: {
+          enum: string[];
+        };
+        bundleOptions: {
+          type: string;
+          properties: {
+            entry: {
+              type: string;
+            };
+            splitting: {
+              type: string;
+            };
+            externals: {
+              type: string;
+              items: {
+                anyOf: ({
+                  instanceof: string;
+                  typeof?: undefined;
+                } | {
+                  typeof: string;
+                  instanceof?: undefined;
+                })[];
+              };
+            };
+            platform: {
+              enum: string[];
+            };
+            minify: {
+              enum: (string | boolean)[];
+            };
+            skipDeps: {
+              type: string;
+            };
+          };
+        };
+        bundlelessOptions: {
+          type: string;
+          properties: {
+            sourceDir: {
+              type: string;
+            };
+            style: {
+              type: string;
+              properties: {
+                compileMode: {
+                  enum: (string | boolean)[];
+                };
+                path: {
+                  type: string;
+                };
+              };
+            };
+            static: {
+              type: string;
+              properties: {
+                path: {
+                  type: string;
+                };
+              };
+            };
+          };
+        };
+        tsconfig: {
+          type: string;
+        };
+        enableDts: {
+          type: string;
+        };
+        dtsOnly: {
+          type: string;
+        };
+        outputPath: {
+          type: string;
+        };
+      };
+    };
+    enum?: undefined;
   };
 } | {
   target: string;
   schema: {
     typeof: string;
-    enum?: undefined;
     default?: undefined;
   };
 } | {
   target: string;
   schema: {
-    enum: string[];
+    typeof: string;
     default: string;
-    typeof?: undefined;
   };
 } | {
   target: string;
   schema: {
-    typeof: string;
-    default: string;
-    enum?: undefined;
+    typeof: string[];
   };
 })[];

package/dist/types/schema/output.d.ts

@@ -1,29 +1,207 @@
 export declare const outputSchema: ({
   target: string;
   schema: {
-    enum: string[];
-    typeof?: undefined;
-    default?: undefined;
+    if: {
+      type: string;
+    };
+    then: {
+      items: {
+        type: string;
+        properties: {
+          target: {
+            enum: string[];
+          };
+          format: {
+            enum: string[];
+          };
+          sourceMap: {
+            enum: (string | boolean)[];
+          };
+          buildType: {
+            enum: string[];
+          };
+          bundleOptions: {
+            type: string;
+            properties: {
+              entry: {
+                type: string;
+              };
+              splitting: {
+                type: string;
+              };
+              externals: {
+                type: string;
+                items: {
+                  anyOf: ({
+                    instanceof: string;
+                    typeof?: undefined;
+                  } | {
+                    typeof: string;
+                    instanceof?: undefined;
+                  })[];
+                };
+              };
+              platform: {
+                enum: string[];
+              };
+              minify: {
+                enum: (string | boolean)[];
+              };
+              skipDeps: {
+                type: string;
+              };
+            };
+          };
+          bundlelessOptions: {
+            type: string;
+            properties: {
+              sourceDir: {
+                type: string;
+              };
+              style: {
+                type: string;
+                properties: {
+                  compileMode: {
+                    enum: (string | boolean)[];
+                  };
+                  path: {
+                    type: string;
+                  };
+                };
+              };
+              static: {
+                type: string;
+                properties: {
+                  path: {
+                    type: string;
+                  };
+                };
+              };
+            };
+          };
+          tsconfig: {
+            type: string;
+          };
+          enableDts: {
+            type: string;
+          };
+          dtsOnly: {
+            type: string;
+          };
+          outputPath: {
+            type: string;
+          };
+        };
+      }[];
+    };
+    else: {
+      type: string;
+      properties: {
+        target: {
+          enum: string[];
+        };
+        format: {
+          enum: string[];
+        };
+        sourceMap: {
+          enum: (string | boolean)[];
+        };
+        buildType: {
+          enum: string[];
+        };
+        bundleOptions: {
+          type: string;
+          properties: {
+            entry: {
+              type: string;
+            };
+            splitting: {
+              type: string;
+            };
+            externals: {
+              type: string;
+              items: {
+                anyOf: ({
+                  instanceof: string;
+                  typeof?: undefined;
+                } | {
+                  typeof: string;
+                  instanceof?: undefined;
+                })[];
+              };
+            };
+            platform: {
+              enum: string[];
+            };
+            minify: {
+              enum: (string | boolean)[];
+            };
+            skipDeps: {
+              type: string;
+            };
+          };
+        };
+        bundlelessOptions: {
+          type: string;
+          properties: {
+            sourceDir: {
+              type: string;
+            };
+            style: {
+              type: string;
+              properties: {
+                compileMode: {
+                  enum: (string | boolean)[];
+                };
+                path: {
+                  type: string;
+                };
+              };
+            };
+            static: {
+              type: string;
+              properties: {
+                path: {
+                  type: string;
+                };
+              };
+            };
+          };
+        };
+        tsconfig: {
+          type: string;
+        };
+        enableDts: {
+          type: string;
+        };
+        dtsOnly: {
+          type: string;
+        };
+        outputPath: {
+          type: string;
+        };
+      };
+    };
+    enum?: undefined;
   };
 } | {
   target: string;
   schema: {
-    typeof: string;
-    enum?: undefined;
-    default?: undefined;
+    enum: string[];
+    if?: undefined;
+    then?: undefined;
+    else?: undefined;
   };
 } | {
   target: string;
   schema: {
-    enum: string[];
-    default: string;
-    typeof?: undefined;
+    typeof: string;
+    default?: undefined;
   };
 } | {
   target: string;
   schema: {
     typeof: string;
     default: string;
-    enum?: undefined;
   };
 })[];

package/dist/types/schema/source.d.ts

@@ -1,15 +1,6 @@
-export declare const sourceSchema: ({
-  target: string;
-  schema: {
-    type: string;
-    enum?: undefined;
-    default?: undefined;
-  };
-} | {
+export declare const sourceSchema: {
   target: string;
   schema: {
     enum: string[];
-    default: string;
-    type?: undefined;
   };
-})[];
+}[];

package/dist/types/schema/tools.d.ts

@@ -0,0 +1,6 @@
+export declare const toolsSchema: {
+  target: string;
+  schema: {
+    typeof: string[];
+  };
+}[];

package/dist/types/schema/types.d.ts

@@ -0,0 +1,46 @@
+import type { UserConfig as SpeedyConfig } from '@speedy-js/speedy-core';
+export declare type Format = 'esm' | 'cjs' | 'umd';
+export declare type Target = 'es5' | 'es6' | 'es2015' | 'es2016' | 'es2017' | 'es2018' | 'es2019' | 'es2020' | 'esnext';
+export declare type BuildType = 'bundle' | 'bundleless';
+export declare type SourceMap = boolean | 'inline' | 'external';
+export declare type BundleOptions = {
+  entry?: Record<string, string>;
+  platform?: SpeedyConfig['platform'];
+  splitting?: boolean;
+  minify?: SpeedyConfig['minify'];
+  externals?: SpeedyConfig['external'];
+  skipDeps?: boolean;
+};
+export declare type BundlelessOptions = {
+  sourceDir?: string;
+  style?: {
+    compileMode?: 'all' | 'only-compiled-code' |
+    /* may be will be deprecated */
+    'only-source-code' | false;
+    path?: string;
+  };
+  static?: {
+    path?: string;
+  };
+};
+export declare type BaseBuildConfig = {
+  format?: Format;
+  target?: Target;
+  sourceMap?: SourceMap;
+  buildType?: BuildType;
+  bundleOptions?: BundleOptions;
+  bundlelessOptions?: BundlelessOptions;
+  tsconfig?: string;
+  enableDts?: boolean;
+  dtsOnly?: boolean;
+  outputPath?: string;
+};
+export declare type BuildConfig = BaseBuildConfig | BaseBuildConfig[];
+export declare type BuildPreset = 'npm-library' | 'npm-library-with-umd' | 'npm-component' | 'npm-component-with-umd';
+export declare type JsSyntaxType = 'CJS+ES6' | 'ESM+ES5' | 'ESM+ES6';
+export interface PackageFields {
+  main?: JsSyntaxType;
+  'jsnext:modern'?: JsSyntaxType;
+  module?: JsSyntaxType;
+}
+export declare type PackageModeType = 'universal-js' | 'universal-js-lite' | 'browser-js' | 'browser-js-lite' | 'node-js';

package/dist/types/types.d.ts

@@ -1,8 +1,8 @@
-import type { OutputConfig, SourceConfig } from '@modern-js/core/config';
 import type { ImportStyleType } from '@modern-js/babel-preset-module';
-import type { NormalizedConfig } from '@modern-js/core';
+import type { CLIConfig as SpeedyConfig } from '@speedy-js/speedy-core';
 import type { LoggerText } from './features/build/logger/logText';
 import type { Platform } from './features/build/build-platform';
+import type { BuildPreset, BuildConfig, PackageModeType, PackageFields } from './schema/types';
 export type { Platform } from './features/build/build-platform';
 export type { ITsconfig } from './utils/tsconfig';
 export interface ITaskMapper {
@@ -10,23 +10,16 @@ export interface ITaskMapper {
   taskPath: string;
   params?: string[];
 }
-export declare type PackageModeType = 'universal-js' | 'universal-js-lite' | 'browser-js' | 'browser-js-lite' | 'node-js';
-export declare type JsSyntaxType = 'CJS+ES6' | 'ESM+ES5' | 'ESM+ES6';
-export interface IPackageFields {
-  main?: JsSyntaxType;
-  modern?: JsSyntaxType;
-  module?: JsSyntaxType;
-}
-export interface IBuildConfig {
-  appDirectory: string;
+export interface IBuildFeatOption {
   platform: boolean | Exclude<Platform, 'all'>;
-  enableTscCompiler: boolean;
+  enableDtsGen: boolean;
   enableWatchMode?: boolean;
   isTsProject: boolean;
-  sourceDir: string;
-  tsconfigName?: string;
+  tsconfigName: string;
   clear?: boolean;
   styleOnly?: boolean;
+  outputPath: string;
+  legacyTsc: boolean;
 }
 export interface IPackageModeValue {
   type: 'module' | 'commonjs';
@@ -34,18 +27,26 @@ export interface IPackageModeValue {
   outDir: 'node' | 'treeshaking' | 'modern';
   copyDirs?: ('node' | 'treeshaking' | 'modern')[];
 }
-export interface ModuleToolsOutput extends OutputConfig {
-  assetsPath: string;
-  disableTsChecker: boolean;
-  enableSourceMap: boolean;
-  packageMode: PackageModeType;
-  packageFields: IPackageFields;
-  importStyle: ImportStyleType;
-}
-export interface ModuleToolsSource extends SourceConfig {
-  jsxTransformRuntime: 'automatic' | 'classic';
+interface ToolsConfig {
+  speedy?: SpeedyConfig | ((config: SpeedyConfig) => SpeedyConfig);
 }
-export declare type ModuleToolsConfig = NormalizedConfig & {
-  output: OutputConfig & ModuleToolsOutput;
-  source: NormalizedConfig['source'] & ModuleToolsSource;
-};
+declare module '@modern-js/core' {
+  interface OutputConfig {
+    /** @deprecated Use the `buildConfig.bundlelessOptions.static.path` instead . */
+    assetsPath?: string;
+    /** @deprecated Use the `buildConfig.sourceMap` instead */
+
+    disableSourceMap?: boolean;
+    buildPreset?: BuildPreset;
+    buildConfig?: BuildConfig;
+    importStyle?: ImportStyleType;
+    packageMode?: PackageModeType;
+    packageFields?: PackageFields;
+  }
+  interface NormalizedToolsConfig {
+    speedy: ToolsConfig['speedy'] | Array<NonNullable<ToolsConfig['speedy']>>;
+  }
+  interface SourceConfig {
+    jsxTransformRuntime?: 'automatic' | 'classic';
+  }
+}

package/dist/types/utils/babel.d.ts

@@ -1,7 +1,8 @@
 import type { NormalizedConfig } from '@modern-js/core';
-import { IPackageModeValue } from '../types';
+import type { IPackageModeValue } from '../types';
+import type { BundlelessOptions, SourceMap } from '../schema/types';
 export declare const getFinalAlias: any;
-export declare const resolveBabelConfig: (appDirectory: string, modernConfig: NormalizedConfig, option: Pick<IPackageModeValue, 'syntax' | 'type'> & {
+export declare const resolveBabelConfig: (appDirectory: string, modernConfig: NormalizedConfig, sourceMap: SourceMap, bundlelessOptions: Required<BundlelessOptions>, option: Pick<IPackageModeValue, 'syntax' | 'type'> & {
   sourceAbsDir: string;
   tsconfigPath: string;
 }) => import("@modern-js/core").TransformOptions;

package/dist/types/utils/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const tempTsconfigName = "tsconfig.temp.json";
+export declare const cliTsConfigDefaultValue = "./tsconfig.json";

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.5.8",
+  "version": "1.6.1",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -55,8 +55,8 @@
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.0",
     "@modern-js/babel-compiler": "^1.2.6",
-    "@modern-js/babel-preset-module": "^1.3.8",
-    "@modern-js/core": "^1.12.2",
+    "@modern-js/babel-preset-module": "^1.3.10",
+    "@modern-js/core": "^1.12.4",
     "@modern-js/css-config": "^1.2.7",
     "@modern-js/i18n-cli-language-detector": "^1.2.4",
     "@modern-js/new-action": "^1.3.11",
@@ -65,15 +65,24 @@
     "@modern-js/plugin-changeset": "^1.3.1",
     "@modern-js/plugin-i18n": "^1.2.7",
     "@modern-js/plugin-jarvis": "^1.2.14",
-    "@modern-js/style-compiler": "^1.2.10",
-    "@modern-js/utils": "^1.7.9",
+    "@modern-js/style-compiler": "^1.2.12",
+    "@modern-js/utils": "^1.7.11",
+    "@rollup/plugin-json": "~4.1.0",
+    "@speedy-js/speedy-types": "0.13.2-alpha.3",
+    "@speedy-js/speedy-core": "0.13.2-alpha.3",
+    "@speedy-js/speedy-plugin-es5": "0.13.2-alpha.3",
     "normalize-path": "^3.0.0",
     "p-map": "^4",
-    "process.argv": "^0.6.0"
+    "process.argv": "^0.6.0",
+    "rollup": "^2.70.2",
+    "rollup-plugin-dts": "^4.2.1",
+    "rollup-plugin-hashbang": "^3.0.0",
+    "signal-exit": "^3.0.7"
   },
   "devDependencies": {
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
+    "@speedy-js/speedy-types": "0.13.2-alpha.3",
     "@types/babel__core": "^7.1.15",
     "@types/babel__generator": "^7.6.3",
     "@types/babel__traverse": "^7.14.2",
@@ -83,8 +92,11 @@
     "@types/normalize-path": "^3.0.0",
     "@types/react": "^17",
     "@types/react-dom": "^17",
+    "@types/signal-exit": "^3.0.1",
     "jest": "^27",
-    "typescript": "^4"
+    "typescript": "^4",
+    "ajv": "^8",
+    "ajv-keywords": "^5"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -102,7 +114,8 @@
       "files": [
         "src/**/*",
         "tsconfig.json",
-        "package.json"
+        "package.json",
+        "./modern.config.js"
       ],
       "output": [
         "dist/**/*"
@@ -122,7 +135,8 @@
   "scripts": {
     "new": "modern new",
     "build": "wireit",
-    "test": "wireit"
+    "test": "wireit",
+    "dev": "modern build --watch"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }