@modern-js/app-tools 2.60.4-alpha.2 → 2.60.5

package/dist/cjs/plugins/analyze/getFileSystemEntry.js

@@ -60,7 +60,7 @@ const scanDir = async (hookRunners, dirs, enableCustomEntry) => {
     const entryName = import_path.default.basename(dir);
     const customEntryFile = hasEntry(dir);
     const customServerEntry = hasServerEntry(dir);
-    if (indexFile && !customBootstrap) {
+    if (!enableCustomEntry && indexFile && !customBootstrap) {
       return {
         entryName,
         isMainEntry: false,

package/dist/cjs/plugins/analyze/getServerRoutes.js

@@ -145,7 +145,10 @@ const collectStaticRoutes = (appContext, config) => {
   const { appDirectory } = appContext;
   const { source: { configDir }, server: { publicRoutes = {} } } = config;
   const publicFolder = import_path.default.resolve(appDirectory, configDir || "", "public");
-  return import_fs.default.existsSync(publicFolder) ? (0, import_utils2.walkDirectory)(publicFolder).map((filePath) => {
+  const ignoreFiles = [
+    ".gitkeep"
+  ];
+  return import_fs.default.existsSync(publicFolder) ? (0, import_utils2.walkDirectory)(publicFolder).filter((filePath) => !ignoreFiles.includes(import_path.default.basename(filePath))).map((filePath) => {
     const urlPath = `${(0, import_utils.urlJoin)(toPosix(filePath).slice(toPosix(publicFolder).length))}`;
     return {
       urlPath: publicRoutes[(0, import_utils.removeLeadingSlash)(urlPath)] || urlPath,

package/dist/cjs/utils/register.js

@@ -104,7 +104,9 @@ const registerCompiler = async (appDir, distDir, alias) => {
         ...tsNodeOptions
       });
     } catch (error) {
-      import_utils.logger.error(error);
+      if (process.env.DEBUG) {
+        import_utils.logger.error(error);
+      }
       await registerEsbuild({
         isTsProject,
         tsConfig,

package/dist/esm/plugins/analyze/getFileSystemEntry.js

@@ -78,7 +78,7 @@ var scanDir = function() {
                       entryName = path.basename(dir);
                       customEntryFile = hasEntry(dir);
                       customServerEntry = hasServerEntry(dir);
-                      if (indexFile && !customBootstrap) {
+                      if (!enableCustomEntry && indexFile && !customBootstrap) {
                         return [
                           2,
                           {

package/dist/esm/plugins/analyze/getServerRoutes.js

@@ -110,7 +110,12 @@ var collectStaticRoutes = function(appContext, config) {
   var appDirectory = appContext.appDirectory;
   var configDir = config.source.configDir, _config_server = config.server, _config_server_publicRoutes = _config_server.publicRoutes, publicRoutes = _config_server_publicRoutes === void 0 ? {} : _config_server_publicRoutes;
   var publicFolder = path.resolve(appDirectory, configDir || "", "public");
-  return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map(function(filePath) {
+  var ignoreFiles = [
+    ".gitkeep"
+  ];
+  return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).filter(function(filePath) {
+    return !ignoreFiles.includes(path.basename(filePath));
+  }).map(function(filePath) {
     var urlPath = "".concat(urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length)));
     return {
       urlPath: publicRoutes[removeLeadingSlash(urlPath)] || urlPath,

package/dist/esm/utils/register.js

@@ -132,7 +132,9 @@ var registerCompiler = function() {
           ];
         case 5:
           error = _state.sent();
-          logger.error(error);
+          if (process.env.DEBUG) {
+            logger.error(error);
+          }
           return [
             4,
             registerEsbuild({

package/dist/esm-node/plugins/analyze/getFileSystemEntry.js

@@ -27,7 +27,7 @@ const scanDir = async (hookRunners, dirs, enableCustomEntry) => {
     const entryName = path.basename(dir);
     const customEntryFile = hasEntry(dir);
     const customServerEntry = hasServerEntry(dir);
-    if (indexFile && !customBootstrap) {
+    if (!enableCustomEntry && indexFile && !customBootstrap) {
       return {
         entryName,
         isMainEntry: false,

package/dist/esm-node/plugins/analyze/getServerRoutes.js

@@ -112,7 +112,10 @@ const collectStaticRoutes = (appContext, config) => {
   const { appDirectory } = appContext;
   const { source: { configDir }, server: { publicRoutes = {} } } = config;
   const publicFolder = path.resolve(appDirectory, configDir || "", "public");
-  return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map((filePath) => {
+  const ignoreFiles = [
+    ".gitkeep"
+  ];
+  return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).filter((filePath) => !ignoreFiles.includes(path.basename(filePath))).map((filePath) => {
     const urlPath = `${urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length))}`;
     return {
       urlPath: publicRoutes[removeLeadingSlash(urlPath)] || urlPath,

package/dist/esm-node/utils/register.js

@@ -71,7 +71,9 @@ const registerCompiler = async (appDir, distDir, alias) => {
         ...tsNodeOptions
       });
     } catch (error) {
-      logger.error(error);
+      if (process.env.DEBUG) {
+        logger.error(error);
+      }
       await registerEsbuild({
         isTsProject,
         tsConfig,

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.4-alpha.2",
+  "version": "2.60.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -78,7 +78,7 @@
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.24.7",
     "@rsbuild/core": "~1.0.11",
-    "@rsbuild/plugin-node-polyfill": "~1.0.4",
+    "@rsbuild/plugin-node-polyfill": "~1.2.0",
     "@swc/helpers": "0.5.13",
     "@vercel/nft": "^0.26.4",
     "es-module-lexer": "^1.1.0",
@@ -88,19 +88,19 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/node-bundle-require": "2.60.3",
-    "@modern-js/plugin-data-loader": "2.60.3",
-    "@modern-js/core": "2.60.3",
-    "@modern-js/plugin": "2.60.3",
-    "@modern-js/plugin-i18n": "2.60.3",
-    "@modern-js/prod-server": "2.60.3",
-    "@modern-js/server-core": "2.60.3",
-    "@modern-js/types": "2.60.3",
-    "@modern-js/server": "2.60.3",
-    "@modern-js/rsbuild-plugin-esbuild": "2.60.3",
-    "@modern-js/server-utils": "2.60.3",
-    "@modern-js/utils": "2.60.3",
-    "@modern-js/uni-builder": "2.60.3"
+    "@modern-js/node-bundle-require": "2.60.5",
+    "@modern-js/core": "2.60.5",
+    "@modern-js/plugin-data-loader": "2.60.5",
+    "@modern-js/plugin-i18n": "2.60.5",
+    "@modern-js/plugin": "2.60.5",
+    "@modern-js/prod-server": "2.60.5",
+    "@modern-js/rsbuild-plugin-esbuild": "2.60.5",
+    "@modern-js/server": "2.60.5",
+    "@modern-js/server-core": "2.60.5",
+    "@modern-js/server-utils": "2.60.5",
+    "@modern-js/types": "2.60.5",
+    "@modern-js/utils": "2.60.5",
+    "@modern-js/uni-builder": "2.60.5"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "~1.0.3",
@@ -112,8 +112,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.95.0",
-    "@scripts/build": "2.60.3",
-    "@scripts/jest-config": "2.60.3"
+    "@scripts/build": "2.60.5",
+    "@scripts/jest-config": "2.60.5"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",