@modern-js/app-tools 3.0.0-beta.0 → 3.0.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Modern.js
+Copyright (c) 2021-present Modern.js
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -19,8 +19,8 @@ Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-sta
 
 ## Contributing
 
-Please read the [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md).
+Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md).
 
 ## License
 
-Modern.js is [MIT licensed](https://github.com/modern-js-dev/modern.js/blob/main/LICENSE).
+Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE).

package/bin/modern.js

@@ -1,15 +1,36 @@
 #!/usr/bin/env node
-const {
-  INTERNAL_APP_TOOLS_PLUGINS,
-  INTERNAL_SERVER_PLUGINS,
-  INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
-} = require('@modern-js/utils');
-
-require('@modern-js/core/runBin').run({
-  internalPlugins: {
-    cli: INTERNAL_APP_TOOLS_PLUGINS,
-    server: INTERNAL_SERVER_PLUGINS,
-    autoLoad: INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
-  },
-  toolsType: 'app-tools',
-});
+const { INTERNAL_RUNTIME_PLUGINS } = require('@modern-js/utils');
+
+const { version } = require('../package.json');
+
+if (!process.env.MODERN_JS_VERSION) {
+  process.env.MODERN_JS_VERSION = version;
+}
+
+// is esm project?
+let isESM = false;
+try {
+  const { readFileSync } = require('fs');
+  const { join } = require('path');
+  const { cwd } = require('process');
+  const pkg = JSON.parse(
+    readFileSync(join(cwd(), 'package.json'), { encoding: 'utf-8' }),
+  );
+  isESM = pkg.type === 'module';
+} catch (e) {
+  // ignore
+}
+
+if (isESM) {
+  import('../dist/esm-node/run/index.mjs').then(({ run }) => {
+    run({
+      internalPlugins: INTERNAL_RUNTIME_PLUGINS,
+      version,
+    });
+  });
+} else {
+  require('../dist/cjs/run/index.js').run({
+    internalPlugins: INTERNAL_RUNTIME_PLUGINS,
+    version,
+  });
+}

package/dist/cjs/builder/builder-rspack/index.js

@@ -0,0 +1,40 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createRspackBuilderForModern: ()=>createRspackBuilderForModern
+});
+const index_js_namespaceObject = require("../generator/index.js");
+async function createRspackBuilderForModern(options) {
+    const builder = await (0, index_js_namespaceObject.generateBuilder)(options, 'rspack');
+    return builder;
+}
+exports.createRspackBuilderForModern = __webpack_exports__.createRspackBuilderForModern;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createRspackBuilderForModern"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/builder/generator/adapterCopy.js

@@ -0,0 +1,79 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    builderPluginAdapterCopy: ()=>builderPluginAdapterCopy
+});
+const external_path_namespaceObject = require("path");
+var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
+const index_js_namespaceObject = require("../shared/index.js");
+const external_createCopyPattern_js_namespaceObject = require("./createCopyPattern.js");
+const builderPluginAdapterCopy = (options)=>({
+        name: 'builder-plugin-adapter-copy',
+        setup (api) {
+            const { normalizedConfig: modernConfig, appContext } = options;
+            api.modifyBundlerChain((chain, { CHAIN_ID })=>{
+                if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
+                    const defaultCopyPattern = (0, external_createCopyPattern_js_namespaceObject.createPublicPattern)(appContext, modernConfig, chain);
+                    const { customPublicDirs } = (0, index_js_namespaceObject.createCopyInfo)(appContext, modernConfig);
+                    const customCopyPatterns = customPublicDirs.map((customPublicDir)=>{
+                        const relativePath = external_path_default().relative(appContext.appDirectory, customPublicDir);
+                        const outputDir = relativePath || external_path_default().basename(customPublicDir);
+                        return {
+                            from: '**/*',
+                            to: outputDir,
+                            context: customPublicDir,
+                            noErrorOnMissing: true
+                        };
+                    });
+                    chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args)=>[
+                            {
+                                patterns: [
+                                    ...args[0]?.patterns || [],
+                                    defaultCopyPattern,
+                                    ...customCopyPatterns
+                                ]
+                            }
+                        ]);
+                }
+            });
+        }
+    });
+exports.builderPluginAdapterCopy = __webpack_exports__.builderPluginAdapterCopy;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "builderPluginAdapterCopy"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/builder/generator/createBuilderProviderConfig.js

@@ -0,0 +1,93 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createBuilderProviderConfig: ()=>createBuilderProviderConfig
+});
+const utils_namespaceObject = require("@modern-js/utils");
+const external_createCopyPattern_js_namespaceObject = require("./createCopyPattern.js");
+function modifyOutputConfig(config, appContext) {
+    const defaultCopyPattern = (0, external_createCopyPattern_js_namespaceObject.createUploadPattern)(appContext, config);
+    const { copy } = config.output;
+    const copyOptions = Array.isArray(copy) ? copy : copy?.patterns;
+    const builderCopy = [
+        ...copyOptions || [],
+        defaultCopyPattern
+    ];
+    config.output = {
+        ...config.output,
+        copy: builderCopy
+    };
+}
+function createBuilderProviderConfig(resolveConfig, appContext) {
+    const htmlConfig = {
+        ...resolveConfig.html
+    };
+    if (!htmlConfig.template) htmlConfig.template = ({ entryName })=>appContext.htmlTemplates[entryName];
+    const serverConfig = {
+        ...resolveConfig.server
+    };
+    if (resolveConfig.dev?.server?.cors !== void 0) serverConfig.cors = resolveConfig.dev?.server?.cors;
+    const config = {
+        ...resolveConfig,
+        plugins: [],
+        resolve: {
+            ...resolveConfig.resolve
+        },
+        dev: {
+            ...resolveConfig.dev,
+            port: appContext.port
+        },
+        server: serverConfig,
+        html: htmlConfig,
+        output: {
+            ...resolveConfig.output,
+            cleanDistPath: false
+        },
+        tools: {
+            ...resolveConfig.tools,
+            devServer: {
+                ...resolveConfig.tools?.devServer,
+                compress: {
+                    filter: (req)=>{
+                        const bffPrefix = resolveConfig.bff?.prefix || utils_namespaceObject.DEFAULT_API_PREFIX;
+                        const url = req.url;
+                        if (url?.startsWith(bffPrefix)) return false;
+                        return true;
+                    }
+                }
+            }
+        }
+    };
+    modifyOutputConfig(config, appContext);
+    return config;
+}
+exports.createBuilderProviderConfig = __webpack_exports__.createBuilderProviderConfig;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createBuilderProviderConfig"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/builder/generator/createCopyPattern.js

@@ -0,0 +1,67 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createUploadPattern: ()=>createUploadPattern,
+    createPublicPattern: ()=>createPublicPattern
+});
+const utils_namespaceObject = require("@modern-js/utils");
+const index_js_namespaceObject = require("../shared/index.js");
+const minifiedJsRexExp = /\.min\.js/;
+const info = (file)=>({
+        minimized: minifiedJsRexExp.test(file.sourceFilename)
+    });
+function createPublicPattern(appContext, config, chain) {
+    const { publicDir } = (0, index_js_namespaceObject.createCopyInfo)(appContext, config);
+    return {
+        info,
+        from: '**/*',
+        to: 'public',
+        context: publicDir,
+        noErrorOnMissing: true,
+        transform: (content, absoluteFrom)=>{
+            if (!/\.html?$/.test(absoluteFrom)) return content;
+            return content.toString('utf8').replace(/<%=\s*assetPrefix\s*%>/g, (0, utils_namespaceObject.removeTailSlash)(chain.output.get('publicPath')));
+        }
+    };
+}
+function createUploadPattern(appContext, config) {
+    const { uploadDir } = (0, index_js_namespaceObject.createCopyInfo)(appContext, config);
+    return {
+        from: '**/*',
+        to: 'upload',
+        context: uploadDir,
+        noErrorOnMissing: true
+    };
+}
+exports.createPublicPattern = __webpack_exports__.createPublicPattern;
+exports.createUploadPattern = __webpack_exports__.createUploadPattern;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createPublicPattern",
+    "createUploadPattern"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/builder/generator/getBuilderEnvironments.js

@@ -0,0 +1,90 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    getBuilderEnvironments: ()=>getBuilderEnvironments
+});
+const builder_namespaceObject = require("@modern-js/builder");
+const utils_namespaceObject = require("@modern-js/utils");
+function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig) {
+    const entries = {};
+    const { entrypoints = [], checkedEntries } = appContext;
+    for (const { entryName, internalEntry, entry } of entrypoints){
+        if (checkedEntries && !checkedEntries.includes(entryName)) continue;
+        const finalEntry = internalEntry || entry;
+        if (entryName in entries) entries[entryName].push(finalEntry);
+        else entries[entryName] = [
+            finalEntry
+        ];
+    }
+    const serverEntries = {};
+    for(const entry in entries){
+        const v = entries[entry];
+        serverEntries[entry] = v.map((entry)=>entry.replace('index.jsx', 'index.server.jsx')).map((entry)=>entry.replace('bootstrap.jsx', 'bootstrap.server.jsx'));
+    }
+    const environments = {
+        web: {
+            output: {
+                target: 'web'
+            },
+            source: {
+                entry: entries
+            }
+        }
+    };
+    if (tempBuilderConfig.output?.copy) {
+        environments.web.output.copy = tempBuilderConfig.output.copy;
+        delete tempBuilderConfig.output.copy;
+    }
+    const useNodeTarget = (0, utils_namespaceObject.isUseRsc)(normalizedConfig) || ((0, utils_namespaceObject.isProd)() ? (0, utils_namespaceObject.isUseSSRBundle)(normalizedConfig) : (0, utils_namespaceObject.isSSR)(normalizedConfig));
+    if (useNodeTarget) environments.node = {
+        output: {
+            target: 'node'
+        },
+        source: {
+            entry: serverEntries
+        }
+    };
+    const useWorkerTarget = (0, utils_namespaceObject.isServiceWorker)(normalizedConfig);
+    if (useWorkerTarget) environments[builder_namespaceObject.SERVICE_WORKER_ENVIRONMENT_NAME] = {
+        output: {
+            target: 'web-worker'
+        },
+        source: {
+            entry: serverEntries
+        }
+    };
+    return {
+        environments,
+        builderConfig: tempBuilderConfig
+    };
+}
+exports.getBuilderEnvironments = __webpack_exports__.getBuilderEnvironments;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "getBuilderEnvironments"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/builder/generator/index.js

@@ -0,0 +1,79 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    generateBuilder: ()=>generateBuilder
+});
+const builder_namespaceObject = require("@modern-js/builder");
+const core_namespaceObject = require("@rsbuild/core");
+const index_js_namespaceObject = require("../shared/builderPlugins/index.js");
+const external_adapterCopy_js_namespaceObject = require("./adapterCopy.js");
+const external_createBuilderProviderConfig_js_namespaceObject = require("./createBuilderProviderConfig.js");
+const external_getBuilderEnvironments_js_namespaceObject = require("./getBuilderEnvironments.js");
+async function generateBuilder(options, bundlerType) {
+    const { normalizedConfig, appContext } = options;
+    const tempBuilderConfig = (0, external_createBuilderProviderConfig_js_namespaceObject.createBuilderProviderConfig)(normalizedConfig, appContext);
+    const { environments, builderConfig } = (0, external_getBuilderEnvironments_js_namespaceObject.getBuilderEnvironments)(normalizedConfig, appContext, tempBuilderConfig);
+    if (builderConfig.environments) {
+        const mergedEnvironments = {
+            ...environments
+        };
+        for(const name in builderConfig.environments)if (environments[name]) mergedEnvironments[name] = (0, core_namespaceObject.mergeRsbuildConfig)(environments[name], builderConfig.environments[name]);
+        else mergedEnvironments[name] = builderConfig.environments[name];
+        builderConfig.environments = mergedEnvironments;
+    } else builderConfig.environments = environments;
+    const builder = await (0, builder_namespaceObject.createBuilder)({
+        cwd: appContext.appDirectory,
+        rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,
+        rscServerRuntimePath: `@${appContext.metaName}/runtime/rsc/server`,
+        internalDirectory: appContext.internalDirectory,
+        frameworkConfigPath: appContext.configFile || void 0,
+        bundlerType,
+        config: builderConfig
+    });
+    await applyBuilderPlugins(builder, options);
+    return builder;
+}
+async function applyBuilderPlugins(builder, options) {
+    builder.addPlugins([
+        (0, index_js_namespaceObject.builderPluginAdapterBasic)(options),
+        (0, index_js_namespaceObject.builderPluginAdapterSSR)(options),
+        (0, index_js_namespaceObject.builderPluginAdapterHtml)(options),
+        (0, index_js_namespaceObject.builderPluginAdapterHooks)(options)
+    ]);
+    builder.addPlugins([
+        (0, external_adapterCopy_js_namespaceObject.builderPluginAdapterCopy)(options)
+    ], {
+        environment: 'web'
+    });
+    const { normalizedConfig } = options;
+}
+exports.generateBuilder = __webpack_exports__.generateBuilder;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "generateBuilder"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/builder/index.js

@@ -0,0 +1,50 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createBuilderGenerator: ()=>createBuilderGenerator,
+    builderPluginAdapterBasic: ()=>index_js_namespaceObject.builderPluginAdapterBasic,
+    builderPluginAdapterHooks: ()=>index_js_namespaceObject.builderPluginAdapterHooks,
+    parseRspackConfig: ()=>builder_namespaceObject.parseRspackConfig
+});
+const builder_namespaceObject = require("@modern-js/builder");
+const index_js_namespaceObject = require("./shared/builderPlugins/index.js");
+async function createBuilderGenerator() {
+    const { createRspackBuilderForModern } = await import("./builder-rspack/index.js");
+    return createRspackBuilderForModern;
+}
+exports.builderPluginAdapterBasic = __webpack_exports__.builderPluginAdapterBasic;
+exports.builderPluginAdapterHooks = __webpack_exports__.builderPluginAdapterHooks;
+exports.createBuilderGenerator = __webpack_exports__.createBuilderGenerator;
+exports.parseRspackConfig = __webpack_exports__.parseRspackConfig;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "builderPluginAdapterBasic",
+    "builderPluginAdapterHooks",
+    "createBuilderGenerator",
+    "parseRspackConfig"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});