@modern-js/module-tools 2.0.0-beta.1 → 2.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # @modern-js/module-tools
 
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- d61ca88: update speedy version
+  更新依赖里 speedy 的版本
+- b8bbe036c7: feat: export Hooks type
+  feat: 导出 Hooks 类型
+- ebbeed1: update speedy-core to fix sass resolve error
+  更新 speedy-core 版本以修复 sass resolve 错误
+- d4a4566: chore: rename plugin-jarvis to plugin-lint
+
+  chore: 重命名 plugin-jarvis 为 plugin-lint
+
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [85edee888c]
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [d4a4566]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [f179749]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/core@2.0.0-beta.2
+  - @modern-js/utils@2.0.0-beta.2
+  - @modern-js/plugin-lint@2.0.0-beta.2
+  - @modern-js/plugin@2.0.0-beta.2
+  - @modern-js/babel-preset-module@2.0.0-beta.2
+  - @modern-js/plugin-changeset@2.0.0-beta.2
+  - @modern-js/plugin-i18n@2.0.0-beta.2
+  - @modern-js/new-action@2.0.0-beta.2
+  - @modern-js/babel-compiler@2.0.0-beta.2
+  - @modern-js/style-compiler@2.0.0-beta.2
+  - @modern-js/upgrade@2.0.0-beta.2
+
 ## 2.0.0-beta.1
 
 ### Major Changes

package/dist/js/modern/commands/build.js

@@ -32,7 +32,7 @@ export const init = api => {
   });
 };
 export const build = async (api, buildCommandOption) => {
-  var _modernConfig$output$;
+  var _modernConfig$output$, _modernConfig$output;
   const {
     watch = false,
     tsconfig: tsconfigName,
@@ -48,7 +48,7 @@ export const build = async (api, buildCommandOption) => {
   } = api.useAppContext();
   const modernConfig = api.useResolvedConfigContext();
   const tsconfigPath = path.join(appDirectory, tsconfigName);
-  const outputPath = (_modernConfig$output$ = modernConfig.output.path) !== null && _modernConfig$output$ !== void 0 ? _modernConfig$output$ : 'dist';
+  const outputPath = (_modernConfig$output$ = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig$output = modernConfig.output) === null || _modernConfig$output === void 0 ? void 0 : _modernConfig$output.path) !== null && _modernConfig$output$ !== void 0 ? _modernConfig$output$ : 'dist';
   const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
   const enableDtsGen = isTsProject && dts;
   valid.valideBeforeTask({

package/dist/js/modern/features/build/bundle/runSpeedy.js

@@ -87,6 +87,8 @@ export const runSpeedy = async (api, config) => {
     },
     tools: {
       speedy: userSpeedyConfig
+    } = {
+      speedy: undefined
     }
   } = api.useResolvedConfigContext();
   const {

package/dist/js/modern/index.js

@@ -8,7 +8,9 @@ const cli = Import.lazy('./cli', require);
 const local = Import.lazy('./locale', require);
 const schema = Import.lazy('./schema', require);
 const lang = Import.lazy('./utils/language', require);
-export { defineConfig } from '@modern-js/core';
+
+// export { defineConfig } from '@modern-js/core';
+
 const isBuildMode = process.argv.slice(2)[0] === 'build';
 export default (() => ({
   name: '@modern-js/module-tools',
@@ -37,10 +39,12 @@ export default (() => ({
       },
       config() {
         return {
+          source: {},
           output: {
             enableSourceMap: false,
             jsPath: 'js'
-          }
+          },
+          tools: {}
         };
       },
       commands({

package/dist/js/modern/schema/output.js

@@ -31,4 +31,15 @@ export const outputSchema = [/** packageMode will deprecated */
     typeof: 'string',
     default: 'styles'
   }
+}, {
+  target: 'output.jsPath',
+  schema: {
+    typeof: 'string',
+    default: ''
+  }
+}, {
+  target: 'output.disableSourceMap',
+  schema: {
+    typeof: 'boolean'
+  }
 }, ...buildSchema];

package/dist/js/modern/utils/babel.js

@@ -21,6 +21,7 @@ export const getFinalAlias = (modernConfig, option) => {
   return aliasConfig;
 };
 export const resolveBabelConfig = (appDirectory, modernConfig, sourceMap, bundlelessOptions, option) => {
+  var _modernConfig$tools;
   const {
     source: {
       envVars,
@@ -33,6 +34,9 @@ export const resolveBabelConfig = (appDirectory, modernConfig, sourceMap, bundle
     tools: {
       lodash: userLodashOption,
       styledComponents
+    } = {
+      lodash: {},
+      styledComponents: {}
     }
   } = modernConfig;
 
@@ -46,7 +50,7 @@ export const resolveBabelConfig = (appDirectory, modernConfig, sourceMap, bundle
     id: ['lodash', 'ramda']
   },
   // TODO: 需要处理类型问题
-  userLodashOption);
+  userLodashOption || {});
   // babel config
   const internalBabelConfig = getBabelConfig({
     appDirectory,
@@ -75,6 +79,6 @@ export const resolveBabelConfig = (appDirectory, modernConfig, sourceMap, bundle
   // Preventing warning when files are too large
   internalBabelConfig.compact = false;
   internalBabelConfig.sourceMaps = sourceMap === 'external' ? true : sourceMap;
-  const userBabelConfig = modernConfig.tools.babel;
+  const userBabelConfig = (_modernConfig$tools = modernConfig.tools) === null || _modernConfig$tools === void 0 ? void 0 : _modernConfig$tools.babel;
   return applyUserBabelConfig(internalBabelConfig, userBabelConfig);
 };

package/dist/js/modern/utils/valide.js

@@ -1,16 +1,18 @@
 import { validAlias } from '@modern-js/utils';
 export const valideBeforeTask = ({
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   modernConfig,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   tsconfigPath
 }) => {
-  const modernConfigValidResult = modernConfigValid(modernConfig, {
-    tsconfigPath
-  });
-  if (modernConfigValidResult) {
-    console.error(modernConfigValidResult);
-    // eslint-disable-next-line no-process-exit
-    process.exit(0);
-  }
+  // const modernConfigValidResult = modernConfigValid(modernConfig, {
+  //   tsconfigPath,
+  // });
+  // if (modernConfigValidResult) {
+  //   console.error(modernConfigValidResult);
+  //   // eslint-disable-next-line no-process-exit
+  //   process.exit(0);
+  // }
 };
 export const modernConfigValid = (modernConfig, option) => {
   const valids = [validAlias];

package/dist/js/node/commands/build.js

@@ -42,7 +42,7 @@ const init = api => {
 };
 exports.init = init;
 const build = async (api, buildCommandOption) => {
-  var _modernConfig$output$;
+  var _modernConfig$output$, _modernConfig$output;
   const {
     watch = false,
     tsconfig: tsconfigName,
@@ -58,7 +58,7 @@ const build = async (api, buildCommandOption) => {
   } = api.useAppContext();
   const modernConfig = api.useResolvedConfigContext();
   const tsconfigPath = path.join(appDirectory, tsconfigName);
-  const outputPath = (_modernConfig$output$ = modernConfig.output.path) !== null && _modernConfig$output$ !== void 0 ? _modernConfig$output$ : 'dist';
+  const outputPath = (_modernConfig$output$ = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig$output = modernConfig.output) === null || _modernConfig$output === void 0 ? void 0 : _modernConfig$output.path) !== null && _modernConfig$output$ !== void 0 ? _modernConfig$output$ : 'dist';
   const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
   const enableDtsGen = isTsProject && dts;
   valid.valideBeforeTask({

package/dist/js/node/features/build/bundle/runSpeedy.js

@@ -96,6 +96,8 @@ const runSpeedy = async (api, config) => {
     },
     tools: {
       speedy: userSpeedyConfig
+    } = {
+      speedy: undefined
     }
   } = api.useResolvedConfigContext();
   const {

package/dist/js/node/index.js

@@ -3,16 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {
-  defineConfig: true
-};
+var _exportNames = {};
 exports.default = void 0;
-Object.defineProperty(exports, "defineConfig", {
-  enumerable: true,
-  get: function () {
-    return _core.defineConfig;
-  }
-});
 var _utils = require("@modern-js/utils");
 var _pluginChangeset = _interopRequireDefault(require("@modern-js/plugin-changeset"));
 var _pluginLint = _interopRequireDefault(require("@modern-js/plugin-lint"));
@@ -29,13 +21,15 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
-var _core = require("@modern-js/core");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const upgradeModel = _utils.Import.lazy('@modern-js/upgrade', require);
 const cli = _utils.Import.lazy('./cli', require);
 const local = _utils.Import.lazy('./locale', require);
 const schema = _utils.Import.lazy('./schema', require);
 const lang = _utils.Import.lazy('./utils/language', require);
+
+// export { defineConfig } from '@modern-js/core';
+
 const isBuildMode = process.argv.slice(2)[0] === 'build';
 var _default = () => ({
   name: '@modern-js/module-tools',
@@ -64,10 +58,12 @@ var _default = () => ({
       },
       config() {
         return {
+          source: {},
           output: {
             enableSourceMap: false,
             jsPath: 'js'
-          }
+          },
+          tools: {}
         };
       },
       commands({

package/dist/js/node/schema/output.js

@@ -37,5 +37,16 @@ const outputSchema = [/** packageMode will deprecated */
     typeof: 'string',
     default: 'styles'
   }
+}, {
+  target: 'output.jsPath',
+  schema: {
+    typeof: 'string',
+    default: ''
+  }
+}, {
+  target: 'output.disableSourceMap',
+  schema: {
+    typeof: 'boolean'
+  }
 }, ..._buildConfig.buildSchema];
 exports.outputSchema = outputSchema;

package/dist/js/node/utils/babel.js

@@ -29,6 +29,7 @@ const getFinalAlias = (modernConfig, option) => {
 };
 exports.getFinalAlias = getFinalAlias;
 const resolveBabelConfig = (appDirectory, modernConfig, sourceMap, bundlelessOptions, option) => {
+  var _modernConfig$tools;
   const {
     source: {
       envVars,
@@ -41,6 +42,9 @@ const resolveBabelConfig = (appDirectory, modernConfig, sourceMap, bundlelessOpt
     tools: {
       lodash: userLodashOption,
       styledComponents
+    } = {
+      lodash: {},
+      styledComponents: {}
     }
   } = modernConfig;
 
@@ -54,7 +58,7 @@ const resolveBabelConfig = (appDirectory, modernConfig, sourceMap, bundlelessOpt
     id: ['lodash', 'ramda']
   },
   // TODO: 需要处理类型问题
-  userLodashOption);
+  userLodashOption || {});
   // babel config
   const internalBabelConfig = (0, _babelPresetModule.getBabelConfig)({
     appDirectory,
@@ -83,7 +87,7 @@ const resolveBabelConfig = (appDirectory, modernConfig, sourceMap, bundlelessOpt
   // Preventing warning when files are too large
   internalBabelConfig.compact = false;
   internalBabelConfig.sourceMaps = sourceMap === 'external' ? true : sourceMap;
-  const userBabelConfig = modernConfig.tools.babel;
+  const userBabelConfig = (_modernConfig$tools = modernConfig.tools) === null || _modernConfig$tools === void 0 ? void 0 : _modernConfig$tools.babel;
   return (0, _babelPresetModule.applyUserBabelConfig)(internalBabelConfig, userBabelConfig);
 };
 exports.resolveBabelConfig = resolveBabelConfig;

package/dist/js/node/utils/valide.js

@@ -6,17 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.valideBeforeTask = exports.modernConfigValid = void 0;
 var _utils = require("@modern-js/utils");
 const valideBeforeTask = ({
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   modernConfig,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   tsconfigPath
 }) => {
-  const modernConfigValidResult = modernConfigValid(modernConfig, {
-    tsconfigPath
-  });
-  if (modernConfigValidResult) {
-    console.error(modernConfigValidResult);
-    // eslint-disable-next-line no-process-exit
-    process.exit(0);
-  }
+  // const modernConfigValidResult = modernConfigValid(modernConfig, {
+  //   tsconfigPath,
+  // });
+  // if (modernConfigValidResult) {
+  //   console.error(modernConfigValidResult);
+  //   // eslint-disable-next-line no-process-exit
+  //   process.exit(0);
+  // }
 };
 exports.valideBeforeTask = valideBeforeTask;
 const modernConfigValid = (modernConfig, option) => {

package/dist/types/features/build/normalize.d.ts

@@ -2,7 +2,7 @@ import type { PluginAPI } from '@modern-js/core';
 import type { BuildConfig, BaseBuildConfig, SourceMap } from '../../schema/types';
 import type { IBuildFeatOption } from '../../types';
 import type { NormalizedBuildConfig } from './types';
-export declare const getNormalizeModuleConfigByPackageModeAndFileds: (api: PluginAPI, buildFeatOption: IBuildFeatOption) => BuildConfig;
+export declare const getNormalizeModuleConfigByPackageModeAndFileds: (api: PluginAPI, buildFeatOption: IBuildFeatOption) => BuildConfig[];
 export declare const getFinalTsconfig: (config: {
   tsconfig?: string;
 }, buildFeatOption: IBuildFeatOption) => string;

package/dist/types/hooks/build.d.ts

@@ -10,13 +10,13 @@ export declare const platformBuild: import("@modern-js/plugin").ParallelWorkflow
   params: string[];
 }>;
 export declare const moduleLessConfig: import("@modern-js/plugin").AsyncPipeline<{
-  modernConfig: NormalizedConfig;
+  modernConfig: NormalizedConfig<any>;
 }, LessOption | undefined>;
 export declare const moduleSassConfig: import("@modern-js/plugin").AsyncPipeline<{
-  modernConfig: NormalizedConfig;
+  modernConfig: NormalizedConfig<any>;
 }, SassOptions<"sync"> | undefined>;
 export declare const moduleTailwindConfig: import("@modern-js/plugin").AsyncPipeline<{
-  modernConfig: NormalizedConfig;
+  modernConfig: NormalizedConfig<any>;
 }, any>;
 export declare const buildHooks: {
   platformBuild: import("@modern-js/plugin").ParallelWorkflow<PlatformBuildOption, {
@@ -26,13 +26,13 @@ export declare const buildHooks: {
     params: string[];
   }>;
   moduleLessConfig: import("@modern-js/plugin").AsyncPipeline<{
-    modernConfig: NormalizedConfig;
+    modernConfig: NormalizedConfig<any>;
   }, LessOption | undefined>;
   moduleSassConfig: import("@modern-js/plugin").AsyncPipeline<{
-    modernConfig: NormalizedConfig;
+    modernConfig: NormalizedConfig<any>;
   }, SassOptions<"sync"> | undefined>;
   moduleTailwindConfig: import("@modern-js/plugin").AsyncPipeline<{
-    modernConfig: NormalizedConfig;
+    modernConfig: NormalizedConfig<any>;
   }, any>;
 };
 export declare const lifecycle: () => void;

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

@@ -18,13 +18,13 @@ export declare const hooks: {
     params: string[];
   }>;
   moduleLessConfig: import("@modern-js/plugin").AsyncPipeline<{
-    modernConfig: import("@modern-js/core").NormalizedConfig;
+    modernConfig: import("@modern-js/core").NormalizedConfig<any, {}, {}, {}>;
   }, import("@modern-js/style-compiler").LessOption | undefined>;
   moduleSassConfig: import("@modern-js/plugin").AsyncPipeline<{
-    modernConfig: import("@modern-js/core").NormalizedConfig;
+    modernConfig: import("@modern-js/core").NormalizedConfig<any, {}, {}, {}>;
   }, import("@modern-js/style-compiler").SassOptions<"sync"> | undefined>;
   moduleTailwindConfig: import("@modern-js/plugin").AsyncPipeline<{
-    modernConfig: import("@modern-js/core").NormalizedConfig;
+    modernConfig: import("@modern-js/core").NormalizedConfig<any, {}, {}, {}>;
   }, any>;
 };
 export declare type ModuleHooks = typeof hooks;

package/dist/types/index.d.ts

@@ -2,6 +2,5 @@ import type { CliPlugin } from '@modern-js/core';
 import { ModuleHooks } from './hooks';
 export * from './types';
 export type { ModuleHooks, CliPlugin };
-export { defineConfig } from '@modern-js/core';
 declare const _default: () => CliPlugin;
 export default _default;

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

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

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

@@ -1,12 +1,12 @@
 import type { NormalizedConfig } from '@modern-js/core';
 export interface IValideOption {
-  modernConfig: NormalizedConfig;
+  modernConfig: NormalizedConfig<any>;
   tsconfigPath: string;
 }
 export declare const valideBeforeTask: ({
   modernConfig,
   tsconfigPath
 }: IValideOption) => void;
-export declare const modernConfigValid: (modernConfig: NormalizedConfig, option: {
+export declare const modernConfigValid: (modernConfig: NormalizedConfig<any>, option: {
   tsconfigPath: string;
 }) => string | null;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -66,17 +66,17 @@
     "rollup-plugin-dts": "^4.2.1",
     "rollup-plugin-hashbang": "^3.0.0",
     "signal-exit": "^3.0.7",
-    "@modern-js/babel-preset-module": "2.0.0-beta.1",
-    "@modern-js/core": "2.0.0-beta.1",
-    "@modern-js/new-action": "2.0.0-beta.1",
-    "@modern-js/upgrade": "2.0.0-beta.1",
-    "@modern-js/plugin": "2.0.0-beta.1",
-    "@modern-js/plugin-changeset": "2.0.0-beta.1",
-    "@modern-js/plugin-i18n": "2.0.0-beta.1",
-    "@modern-js/plugin-lint": "2.0.0-beta.1",
-    "@modern-js/style-compiler": "2.0.0-beta.1",
-    "@modern-js/utils": "2.0.0-beta.1",
-    "@modern-js/babel-compiler": "2.0.0-beta.1"
+    "@modern-js/babel-compiler": "2.0.0-beta.2",
+    "@modern-js/babel-preset-module": "2.0.0-beta.2",
+    "@modern-js/core": "2.0.0-beta.2",
+    "@modern-js/new-action": "2.0.0-beta.2",
+    "@modern-js/upgrade": "2.0.0-beta.2",
+    "@modern-js/plugin": "2.0.0-beta.2",
+    "@modern-js/plugin-changeset": "2.0.0-beta.2",
+    "@modern-js/plugin-i18n": "2.0.0-beta.2",
+    "@modern-js/plugin-lint": "2.0.0-beta.2",
+    "@modern-js/style-compiler": "2.0.0-beta.2",
+    "@modern-js/utils": "2.0.0-beta.2"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -91,8 +91,8 @@
     "typescript": "^4",
     "ajv": "^8",
     "ajv-keywords": "^5",
-    "@scripts/build": "2.0.0-beta.1",
-    "@scripts/jest-config": "2.0.0-beta.1"
+    "@scripts/build": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -105,9 +105,9 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern new",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests",
-    "dev": "modern build --watch"
+    "dev": "modern-lib build --watch"
   }
 }