@modern-js/module-tools 1.1.3 → 1.1.5

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/module-tools
 
+## 1.1.5
+
+### Patch Changes
+
+- 2da27d3b: fix sourcemap 'source' config
+- Updated dependencies [5e3de7d8]
+- Updated dependencies [2da27d3b]
+- Updated dependencies [4819a3c7]
+- Updated dependencies [b7fb82ec]
+- Updated dependencies [81d93503]
+  - @modern-js/plugin-i18n@1.1.2
+  - @modern-js/babel-compiler@1.1.4
+  - @modern-js/new-action@1.2.2
+  - @modern-js/plugin-changeset@1.1.2
+  - @modern-js/utils@1.1.6
+
+## 1.1.4
+
+### Patch Changes
+
+- 10676d31: fix build watch error
+
 ## 1.1.3
 
 ### Patch Changes

package/dist/js/modern/tasks/build-source-code.js

@@ -5,6 +5,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import { Import, fs } from '@modern-js/utils';
+import { initEnv } from "../utils/init-env";
 const babelCompiler = Import.lazy('@modern-js/babel-compiler', require);
 const glob = Import.lazy('glob', require);
 const argv = Import.lazy('process.argv', require);
@@ -62,7 +63,8 @@ export const getWillCompilerCode = (srcDirOrFile, option) => {
   const exts = getExts(isTsProject);
   const globPattern = `${srcDirOrFile}/**/*{${exts.join(',')}}`;
   const files = glob.sync(globPattern, {
-    ignore: [`${srcDirOrFile}/**/*.d.ts`]
+    ignore: [`${srcDirOrFile}/**/*.d.ts`],
+    absolute: true
   });
   return files;
 };
@@ -113,20 +115,6 @@ const generatorRealFiles = virtualDists => {
   }
 };
 
-export const initEnv = ({
-  syntax,
-  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 '';
-};
 const defaultConfig = {
   srcRootDir: `${process.cwd()}/src`,
   willCompilerDirOrFile: `${process.cwd()}/src`,

package/dist/js/modern/tasks/build-watch-source-code.js

@@ -1,5 +1,11 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 import { Import, fs } from '@modern-js/utils';
-import { initEnv } from "./build-source-code";
+import { initEnv } from "../utils/init-env";
 const babelCompiler = Import.lazy('@modern-js/babel-compiler', require);
 const logger = Import.lazy('../features/build/logger', require);
 const ts = Import.lazy('../utils/tsconfig', require);
@@ -61,7 +67,9 @@ const runBabelCompiler = async (config, modernConfig) => {
     distDir: config.distDir,
     watchDir: config.srcRootDir,
     extensions: getExts(isTs)
-  }, babelConfig);
+  }, _objectSpread(_objectSpread({}, babelConfig), {}, {
+    sourceMaps: config.sourceMaps
+  }));
   emitter.on(babelCompiler.BuildWatchEvent.compiling, () => {
     console.info(logger.clearFlag, `Compiling...`);
   });

package/dist/js/modern/utils/init-env.js

@@ -0,0 +1,14 @@
+export const initEnv = ({
+  syntax,
+  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 '';
+};

package/dist/js/node/tasks/build-source-code.js

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.initEnv = exports.getWillCompilerCode = exports.buildSourceCode = exports.Compiler = void 0;
+exports.getWillCompilerCode = exports.buildSourceCode = exports.Compiler = void 0;
 
 var _utils = require("@modern-js/utils");
 
+var _initEnv = require("../utils/init-env");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -77,7 +79,8 @@ const getWillCompilerCode = (srcDirOrFile, option) => {
   const exts = getExts(isTsProject);
   const globPattern = `${srcDirOrFile}/**/*{${exts.join(',')}}`;
   const files = glob.sync(globPattern, {
-    ignore: [`${srcDirOrFile}/**/*.d.ts`]
+    ignore: [`${srcDirOrFile}/**/*.d.ts`],
+    absolute: true
   });
   return files;
 };
@@ -136,22 +139,6 @@ const generatorRealFiles = virtualDists => {
   }
 };
 
-const initEnv = ({
-  syntax,
-  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 '';
-};
-
-exports.initEnv = initEnv;
 const defaultConfig = {
   srcRootDir: `${process.cwd()}/src`,
   willCompilerDirOrFile: `${process.cwd()}/src`,
@@ -171,7 +158,7 @@ const taskMain = async ({
   // Execution of the script's parameter handling and related required configuration acquisition
   const processArgv = argv(process.argv.slice(2));
   const config = processArgv(defaultConfig);
-  process.env.BUILD_FORMAT = initEnv(config);
+  process.env.BUILD_FORMAT = (0, _initEnv.initEnv)(config);
   const compiler = Compiler.babel; // Currently, only babel is supported.
 
   const babelConfig = bc.resolveBabelConfig(config.appDirectory, modernConfig, {

package/dist/js/node/tasks/build-watch-source-code.js

@@ -2,7 +2,13 @@
 
 var _utils = require("@modern-js/utils");
 
-var _buildSourceCode = require("./build-source-code");
+var _initEnv = require("../utils/init-env");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 const babelCompiler = _utils.Import.lazy('@modern-js/babel-compiler', require);
 
@@ -73,7 +79,9 @@ const runBabelCompiler = async (config, modernConfig) => {
     distDir: config.distDir,
     watchDir: config.srcRootDir,
     extensions: getExts(isTs)
-  }, babelConfig);
+  }, _objectSpread(_objectSpread({}, babelConfig), {}, {
+    sourceMaps: config.sourceMaps
+  }));
   emitter.on(babelCompiler.BuildWatchEvent.compiling, () => {
     console.info(logger.clearFlag, `Compiling...`);
   });
@@ -136,7 +144,7 @@ const taskMain = async ({
     syntax: 'es5',
     type: 'module'
   });
-  process.env.BUILD_FORMAT = (0, _buildSourceCode.initEnv)(config);
+  process.env.BUILD_FORMAT = (0, _initEnv.initEnv)(config);
   await buildSourceCode(config, modernConfig);
 };
 

package/dist/js/node/utils/init-env.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.initEnv = void 0;
+
+const initEnv = ({
+  syntax,
+  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 '';
+};
+
+exports.initEnv = initEnv;

package/dist/types/tasks/build-source-code.d.ts

@@ -22,24 +22,4 @@ export declare const getWillCompilerCode: (srcDirOrFile: string, option: {
   isTsProject: boolean;
 }) => string[];
 export declare const buildSourceCode: (config: IBuildSourceCodeConfig) => Promise<import("@modern-js/babel-compiler").ICompilerResult>;
-export declare const initEnv: ({
-  syntax,
-  type
-}: {
-  syntax: ITaskConfig['syntax'];
-  type: ITaskConfig['type'];
-}) => "" | "CJS_ES6" | "ESM_ES6" | "ESM_ES5";
-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 {};

package/dist/types/utils/init-env.d.ts

@@ -0,0 +1,21 @@
+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 declare const initEnv: ({
+  syntax,
+  type
+}: {
+  syntax: ITaskConfig['syntax'];
+  type: ITaskConfig['type'];
+}) => "" | "CJS_ES6" | "ESM_ES6" | "ESM_ES5";
+export {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.3",
+  "version": "1.1.5",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -44,19 +44,19 @@
     "@babel/runtime": "^7",
     "@babel/traverse": "^7.15.0",
     "@babel/types": "^7.15.0",
-    "@modern-js/babel-compiler": "^1.1.3",
+    "@modern-js/babel-compiler": "^1.1.4",
     "@modern-js/babel-preset-module": "^1.1.2",
     "@modern-js/core": "^1.2.0",
     "@modern-js/css-config": "^1.1.2",
     "@modern-js/i18n-cli-language-detector": "^1.1.1",
     "@modern-js/module-tools-hooks": "^1.1.2",
-    "@modern-js/new-action": "^1.2.0",
+    "@modern-js/new-action": "^1.2.1",
     "@modern-js/plugin-analyze": "^1.1.2",
-    "@modern-js/plugin-changeset": "^1.1.1",
+    "@modern-js/plugin-changeset": "^1.1.2",
     "@modern-js/plugin-fast-refresh": "^1.1.1",
-    "@modern-js/plugin-i18n": "^1.1.1",
+    "@modern-js/plugin-i18n": "^1.1.2",
     "@modern-js/style-compiler": "^1.1.3",
-    "@modern-js/utils": "^1.1.5",
+    "@modern-js/utils": "^1.1.6",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "dotenv": "^10.0.0",
@@ -75,7 +75,7 @@
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.15.0",
-    "@modern-js/babel-chain": "^1.1.1",
+    "@modern-js/babel-chain": "^1.1.2",
     "@types/babel__core": "^7.1.15",
     "@types/babel__generator": "^7.6.3",
     "@types/babel__traverse": "^7.14.2",
@@ -88,8 +88,8 @@
     "@types/signale": "^1.4.2",
     "commander": "^8.1.0",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/module-tools": "^1.1.2"
+    "@modern-js/plugin-testing": "^1.2.2",
+    "@modern-js/module-tools": "^1.1.4"
   },
   "sideEffects": false,
   "modernConfig": {

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

@@ -2,6 +2,7 @@ import { Import, fs } from '@modern-js/utils';
 import type { NormalizedConfig, CoreOptions } from '@modern-js/core';
 import type { BabelOptions, 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',
@@ -91,6 +92,7 @@ export const getWillCompilerCode = (
   const globPattern = `${srcDirOrFile}/**/*{${exts.join(',')}}`;
   const files = glob.sync(globPattern, {
     ignore: [`${srcDirOrFile}/**/*.d.ts`],
+    absolute: true,
   });
 
   return files;
@@ -138,24 +140,6 @@ const generatorRealFiles = (virtualDists: IVirtualDist[]) => {
   }
 };
 
-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 '';
-};
-
 interface ITaskConfig {
   srcRootDir: string; // 源码的根目录
   willCompilerDirOrFile: string; // 用于编译的源码文件或者源码目录

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

@@ -2,7 +2,7 @@ import { Import, fs } from '@modern-js/utils';
 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 './build-source-code';
+import { initEnv } from '../utils/init-env';
 
 const babelCompiler: typeof import('@modern-js/babel-compiler') = Import.lazy(
   '@modern-js/babel-compiler',
@@ -82,7 +82,7 @@ const runBabelCompiler = async (
       watchDir: config.srcRootDir,
       extensions: getExts(isTs),
     },
-    babelConfig,
+    { ...babelConfig, sourceMaps: config.sourceMaps },
   );
   emitter.on(babelCompiler.BuildWatchEvent.compiling, () => {
     console.info(logger.clearFlag, `Compiling...`);

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 '';
+};