@modern-js/module-tools 1.5.8 → 1.6.1

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

@@ -0,0 +1,174 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.startRollup = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _typescript = _interopRequireDefault(require("typescript"));
+
+var _rollupPluginHashbang = _interopRequireDefault(require("rollup-plugin-hashbang"));
+
+var _pluginJson = _interopRequireDefault(require("@rollup/plugin-json"));
+
+var _error = require("../error");
+
+var _utils = require("../utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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; }
+
+// Copied from https://github.com/egoist/tsup/blob/dev/src/rollup.ts
+const loadCompilerOptions = tsconfig => {
+  if (!tsconfig) {
+    return {};
+  }
+
+  const configFile = _typescript.default.readConfigFile(tsconfig, _typescript.default.sys.readFile);
+
+  const {
+    options
+  } = _typescript.default.parseJsonConfigFileContent(configFile.config, _typescript.default.sys, './');
+
+  return options;
+};
+
+const dtsPlugin = require('rollup-plugin-dts');
+
+const getRollupConfig = async (api, options) => {
+  const {
+    appDirectory
+  } = api.useAppContext();
+  const {
+    output: {
+      path: distPath = 'dist'
+    }
+  } = api.useResolvedConfigContext();
+  const {
+    outputPath,
+    bundleOptions,
+    tsconfig
+  } = options;
+
+  const distDir = _path.default.join(appDirectory, distPath, outputPath);
+
+  const compilerOptions = loadCompilerOptions(tsconfig);
+  const dtsOptions = {
+    entry: bundleOptions.entry
+  };
+  const ignoreFiles = {
+    name: 'ignore-files',
+
+    load(id) {
+      if (!/\.(js|cjs|mjs|jsx|ts|tsx|mts|json)$/.test(id)) {
+        return '';
+      }
+
+      return null;
+    }
+
+  };
+  return {
+    inputConfig: {
+      input: dtsOptions.entry,
+      external: bundleOptions.externals,
+
+      onwarn(warning, handler) {
+        if (warning.code === 'UNRESOLVED_IMPORT' || warning.code === 'CIRCULAR_DEPENDENCY' || warning.code === 'EMPTY_BUNDLE') {
+          return;
+        }
+
+        handler(warning);
+      },
+
+      plugins: [(0, _rollupPluginHashbang.default)(), (0, _pluginJson.default)(), ignoreFiles, dtsPlugin.default({
+        // use external to prevent them which come from node_modules from be bundled.
+        respectExternal: true,
+        compilerOptions: _objectSpread(_objectSpread({}, compilerOptions), {}, {
+          baseUrl: _path.default.resolve(compilerOptions.baseUrl || '.'),
+          // Ensure ".d.ts" modules are generated
+          declaration: true,
+          // Skip ".js" generation
+          noEmit: false,
+          emitDeclarationOnly: true,
+          // Skip code generation when error occurs
+          noEmitOnError: true,
+          // Avoid extra work
+          checkJs: false,
+          declarationMap: false,
+          skipLibCheck: true,
+          preserveSymlinks: false,
+          // Ensure we can parse the latest code
+          target: _typescript.default.ScriptTarget.ESNext
+        })
+      })].filter(Boolean)
+    },
+    outputConfig: {
+      dir: distDir,
+      format: 'esm',
+      exports: 'named'
+    }
+  };
+};
+
+async function runRollup(options, context) {
+  try {
+    const {
+      rollup
+    } = await Promise.resolve().then(() => _interopRequireWildcard(require('rollup')));
+    const bundle = await rollup(options.inputConfig);
+    await bundle.write(options.outputConfig);
+  } catch (e) {
+    if (e instanceof Error) {
+      throw new _error.InternalDTSError(e, _objectSpread({
+        buildType: 'bundle'
+      }, context));
+    }
+  }
+}
+
+async function watchRollup(options) {
+  const {
+    watch
+  } = await Promise.resolve().then(() => _interopRequireWildcard(require('rollup')));
+  const titleText = '[Bundle:DTS]';
+  watch(_objectSpread(_objectSpread({}, options.inputConfig), {}, {
+    plugins: options.inputConfig.plugins,
+    output: options.outputConfig
+  })).on('event', event => {
+    if (event.code === 'START') {
+      console.info((0, _utils.watchSectionTitle)(titleText, _utils.SectionTitleStatus.Log));
+    } else if (event.code === 'BUNDLE_END') {
+      console.info((0, _utils.watchSectionTitle)(titleText, _utils.SectionTitleStatus.Success));
+    } else if (event.code === 'ERROR') {// this is dts rollup plugin bug, error not complete message
+    }
+  });
+}
+
+const startRollup = async (api, options) => {
+  if (options.enableDts) {
+    const config = await getRollupConfig(api, options);
+
+    if (options.watch) {
+      watchRollup(config);
+    } else {
+      await runRollup(config, {
+        target: options.target,
+        format: options.format
+      });
+    }
+  }
+};
+
+exports.startRollup = startRollup;

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

@@ -0,0 +1,209 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.runSpeedy = exports.getDefine = exports.getAlias = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _speedyCore = require("@speedy-js/speedy-core");
+
+var _speedyPluginEs = require("@speedy-js/speedy-plugin-es5");
+
+var _utils = require("@modern-js/utils");
+
+var _error = require("../error");
+
+var _utils2 = require("../utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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 getAlias = api => {
+  const {
+    appDirectory,
+    srcDirectory
+  } = api.useAppContext();
+  const {
+    source
+  } = api.useResolvedConfigContext(); // TODO: maybe check tsconfig `paths`
+
+  const defaultAlias = {
+    '@': srcDirectory
+  };
+  const alias = (0, _utils.applyOptionsChain)(defaultAlias, source === null || source === void 0 ? void 0 : source.alias);
+  return Object.keys(alias).reduce((o, name) => {
+    return _objectSpread(_objectSpread({}, o), {}, {
+      [name]: (0, _utils.ensureAbsolutePath)(appDirectory, alias[name])
+    });
+  }, {});
+};
+
+exports.getAlias = getAlias;
+
+const getDefine = api => {
+  const {
+    source: {
+      envVars,
+      globalVars
+    }
+  } = api.useResolvedConfigContext();
+  const envVarsDefine = [...(envVars || [])].reduce((memo, name) => {
+    memo[`process.env.${name}`] = JSON.stringify(process.env[name]);
+    return memo;
+  }, {});
+  const globalVarsDefine = Object.keys(globalVars || {}).reduce((memo, name) => {
+    memo[name] = globalVars ? JSON.stringify(globalVars[name]) : '';
+    return memo;
+  }, {});
+  return _objectSpread(_objectSpread({}, envVarsDefine), globalVarsDefine);
+};
+
+exports.getDefine = getDefine;
+
+const getStyleOptionFromModern = async api => {
+  const runner = api.useHookRunners();
+  const {
+    appDirectory
+  } = api.useAppContext();
+  const modernConfig = api.useResolvedConfigContext();
+  const lessOption = await runner.moduleLessConfig({
+    modernConfig
+  }, {
+    onLast: async _ => undefined
+  });
+  const sassOption = await runner.moduleSassConfig({
+    modernConfig
+  }, {
+    onLast: async _ => undefined
+  });
+  const tailwindPlugin = await runner.moduleTailwindConfig({
+    modernConfig
+  }, {
+    onLast: async _ => undefined
+  });
+  const postcssOption = (0, _utils2.getPostcssOption)(appDirectory, modernConfig);
+
+  if (tailwindPlugin) {
+    var _postcssOption$plugin;
+
+    (_postcssOption$plugin = postcssOption.plugins) === null || _postcssOption$plugin === void 0 ? void 0 : _postcssOption$plugin.push(tailwindPlugin);
+  }
+
+  return {
+    less: lessOption === null || lessOption === void 0 ? void 0 : lessOption.lessOption,
+    sass: sassOption,
+    postcss: _objectSpread(_objectSpread({}, postcssOption.options), {}, {
+      plugins: postcssOption.plugins
+    })
+  };
+};
+
+const runSpeedy = async (api, config) => {
+  const {
+    appDirectory
+  } = api.useAppContext();
+  const {
+    output: {
+      path: distPath = 'dist'
+    },
+    tools: {
+      speedy: userSpeedyConfig
+    }
+  } = api.useResolvedConfigContext();
+  const {
+    target,
+    watch,
+    bundleOptions,
+    outputPath,
+    format,
+    sourceMap
+  } = config;
+  const {
+    entry,
+    platform,
+    splitting,
+    minify,
+    externals
+  } = bundleOptions;
+
+  const distDir = _path.default.join(appDirectory, distPath, outputPath);
+
+  const titleText = `[Bundle:Speedy:${format}_${target}]`;
+  const style = await getStyleOptionFromModern(api);
+  const alias = getAlias(api);
+  const define = getDefine(api);
+
+  const watchPlugin = () => {
+    return {
+      name: 'watch-plugin',
+
+      apply(compiler) {
+        compiler.hooks.watchChange.tap('watch-plugin', async () => {
+          console.info((0, _utils2.watchSectionTitle)(titleText, _utils2.SectionTitleStatus.Log));
+        });
+      }
+
+    };
+  };
+
+  const plugins = target === 'es5' ? [(0, _speedyPluginEs.es5InputPlugin)()] : [];
+  plugins.push(watchPlugin());
+  const internalSpeedyConfig = {
+    command: 'build',
+    mode: 'production',
+    html: false,
+    preset: 'webapp',
+    // support css and json
+    platform,
+    watch,
+    input: entry,
+    target,
+    clearScreen: false,
+    output: {
+      path: distDir,
+      format,
+      splitting,
+      filename: '[name]'
+    },
+    style,
+    resolve: {
+      alias
+    },
+    define,
+    sourceMap,
+    minify,
+    external: externals,
+    plugins
+  };
+  const speedyConfig = (0, _utils.applyOptionsChain)(internalSpeedyConfig, userSpeedyConfig);
+  const compiler = await _speedyCore.SpeedyBundler.create(speedyConfig);
+
+  try {
+    if (watch) {
+      console.info((0, _utils2.watchSectionTitle)(titleText, _utils2.SectionTitleStatus.Log));
+    }
+
+    await compiler.build();
+  } catch (e) {
+    /**
+     * in watch mode
+     * use speedy watch log
+     */
+    if (e instanceof Error) {
+      throw new _error.InternalBuildError(e, {
+        target,
+        format,
+        buildType: 'bundle'
+      });
+    }
+  }
+};
+
+exports.runSpeedy = runSpeedy;

package/dist/js/node/{tasks → features/build/bundleless}/copy-assets.js

@@ -1,5 +1,10 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.copyStaticAssets = void 0;
+
 var path = _interopRequireWildcard(require("path"));
 
 var _utils = require("@modern-js/utils");
@@ -8,13 +13,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-const argv = _utils.Import.lazy('process.argv', require);
-
-const core = _utils.Import.lazy('@modern-js/core', require);
-
-const copyUtils = _utils.Import.lazy('../utils/copy', require);
+const copyUtils = _utils.Import.lazy('../../../utils/copy', require);
 
-const STYLE_DIRS = 'styles';
 const SRC_DIRS = 'src';
 
 const copyAssets = ({
@@ -38,11 +38,13 @@ const copyAssets = ({
   }
 };
 
-const watchAssets = ({
+const watchAssets = (api, {
   targetDir,
   outputDir
 }) => {
-  (0, _utils.watch)(`${targetDir}/**/*.*`, ({
+  const appContext = api.useAppContext();
+  const modernConfig = api.useResolvedConfigContext();
+  (0, _utils.watch)(`${targetDir}/**/*.*`, async ({
     changeType,
     changedFilePath
   }) => {
@@ -57,74 +59,53 @@ const watchAssets = ({
     const file = path.relative(targetDir, changedFilePath);
 
     _utils.fs.copyFileSync(changedFilePath, path.resolve(outputDir, file));
+
+    await copyUtils.copyTask({
+      modernConfig,
+      appContext
+    });
   }, ['**/*.{js,jsx,ts,tsx,d.ts,scss,less,css,sass}']);
 };
 
-const taskMain = ({
-  modernConfig,
-  appContext
-}) => {
-  const processArgv = argv(process.argv.slice(2));
-  const config = processArgv({});
+const copyStaticAssets = async (api, config) => {
+  var _bundlelessOptions$so;
+
+  const appContext = api.useAppContext();
+  const modernConfig = api.useResolvedConfigContext();
   const {
     appDirectory
   } = appContext;
   const {
-    jsPath = 'js',
-    assetsPath = 'styles',
-    path: outputPath = 'dist'
+    path: distPath = 'dist'
   } = modernConfig.output;
-  const srcDir = path.join(appDirectory, SRC_DIRS);
-  const outputDirToSrc = path.join(appDirectory, outputPath, jsPath, assetsPath);
-  const styleDir = path.join(appDirectory, STYLE_DIRS);
-  const outputDirToStyle = path.join(appDirectory, outputPath, assetsPath);
+  const {
+    outputPath,
+    bundlelessOptions
+  } = config;
+  const {
+    static: {
+      path: staticPath = './'
+    } = {
+      path: './'
+    }
+  } = bundlelessOptions;
+  const srcDir = path.join(appDirectory, (_bundlelessOptions$so = bundlelessOptions.sourceDir) !== null && _bundlelessOptions$so !== void 0 ? _bundlelessOptions$so : SRC_DIRS);
+  const outputDirToSrc = path.join(appDirectory, distPath, outputPath, staticPath);
   copyAssets({
     targetDir: srcDir,
     outputDir: outputDirToSrc
   });
-  copyAssets({
-    targetDir: styleDir,
-    outputDir: outputDirToStyle
-  });
-  copyUtils.copyTask({
+  await copyUtils.copyTask({
     modernConfig,
     appContext
   });
 
   if (config.watch) {
-    watchAssets({
+    watchAssets(api, {
       targetDir: srcDir,
       outputDir: outputDirToSrc
     });
-    watchAssets({
-      targetDir: styleDir,
-      outputDir: outputDirToStyle
-    });
   }
 };
 
-(async () => {
-  let options;
-
-  if (process.env.CORE_INIT_OPTION_FILE) {
-    ({
-      options
-    } = require(process.env.CORE_INIT_OPTION_FILE));
-  }
-
-  const {
-    resolved: modernConfig,
-    appContext
-  } = await core.cli.init([], options);
-
-  (() => {
-    try {
-      taskMain({
-        modernConfig,
-        appContext
-      });
-    } catch (e) {
-      console.error(e.message);
-    }
-  })();
-})();
+exports.copyStaticAssets = copyStaticAssets;