@modern-js/app-tools 2.31.3-alpha.0 → 2.31.3-alpha.1

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/dist/cjs/analyze/constants.js

@@ -106,20 +106,22 @@ const HTML_PARTIALS_EXTENSIONS = [
 const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
 const NESTED_ROUTE = {
   LAYOUT_FILE: "layout",
+  LAYOUT_CONFIG_FILE: "layout.config",
   LAYOUT_LOADER_FILE: "layout.loader",
   LAYOUT_DATA_FILE: "layout.data",
   LAYOUT_CLIENT_LOADER: "layout.data.client",
   PAGE_FILE: "page",
+  PAGE_CONFIG_FILE: "page.config",
   PAGE_LOADER_FILE: "page.loader",
-  PAGE_DATA_FILE: "layout.data",
+  PAGE_DATA_FILE: "page.data",
   PAGE_CLIENT_LOADER: "page.data.client",
-  LOADING_FILE: "loading",
-  ERROR_FILE: "error",
-  LOADER_FILE: "loader",
   SPLATE_FILE: "$",
   SPLATE_LOADER_FILE: "$.loader",
-  LAYOUT_CONFIG_FILE: "layout.config",
-  PAGE_CONFIG_FILE: "page.config"
+  SPLATE_DATA_FILE: "$.data",
+  SPLATE_CLIENT_DATA: "$.data.client",
+  LOADING_FILE: "loading",
+  ERROR_FILE: "error",
+  LOADER_FILE: "loader"
 };
 const APP_CONFIG_NAME = "config";
 const APP_INIT_EXPORTED = "init";

package/dist/cjs/analyze/nestedRoutes.js

@@ -120,6 +120,8 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
   let pageLoaderFile = "";
   let pageRoute = null;
   let splatLoaderFile = "";
+  let splatClientData = "";
+  let splatData = "";
   let splatRoute = null;
   let pageConfigFile = "";
   const items = await _utils.fs.readdir(dirname);
@@ -185,6 +187,12 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
     if (itemWithoutExt === _constants.NESTED_ROUTE.SPLATE_LOADER_FILE) {
       splatLoaderFile = itemPath;
     }
+    if (itemWithoutExt === _constants.NESTED_ROUTE.SPLATE_CLIENT_DATA) {
+      splatClientData = itemPath;
+    }
+    if (itemWithoutExt === _constants.NESTED_ROUTE.SPLATE_DATA_FILE) {
+      splatData = itemPath;
+    }
     if (itemWithoutExt === _constants.NESTED_ROUTE.SPLATE_FILE) {
       var _route_children2;
       splatRoute = createRoute({
@@ -194,6 +202,12 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
       if (splatLoaderFile) {
         splatRoute.loader = splatLoaderFile;
       }
+      if (splatClientData) {
+        splatRoute.clientData = splatClientData;
+      }
+      if (splatData) {
+        splatRoute.data = splatData;
+      }
       (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
     }
     if (itemWithoutExt === _constants.NESTED_ROUTE.LOADING_FILE) {

package/dist/cjs/index.js

@@ -219,10 +219,7 @@ const appTools = (options = {
         },
         async beforeGenerateRoutes({ entrypoint, code }) {
           const { distDirectory } = api.useAppContext();
-          if (!_utils.fs.existsSync(distDirectory)) {
-            await _utils.fs.mkdir(distDirectory);
-          }
-          await _utils.fs.writeJSON(_path.default.resolve(distDirectory, _utils.NESTED_ROUTE_SPEC_FILE), nestedRoutes);
+          await _utils.fs.outputJSON(_path.default.resolve(distDirectory, _utils.NESTED_ROUTE_SPEC_FILE), nestedRoutes);
           return {
             entrypoint,
             code

package/dist/esm/analyze/constants.js

@@ -27,20 +27,22 @@ export var HTML_PARTIALS_EXTENSIONS = [
 export var FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
 export var NESTED_ROUTE = {
   LAYOUT_FILE: "layout",
+  LAYOUT_CONFIG_FILE: "layout.config",
   LAYOUT_LOADER_FILE: "layout.loader",
   LAYOUT_DATA_FILE: "layout.data",
   LAYOUT_CLIENT_LOADER: "layout.data.client",
   PAGE_FILE: "page",
+  PAGE_CONFIG_FILE: "page.config",
   PAGE_LOADER_FILE: "page.loader",
-  PAGE_DATA_FILE: "layout.data",
+  PAGE_DATA_FILE: "page.data",
   PAGE_CLIENT_LOADER: "page.data.client",
-  LOADING_FILE: "loading",
-  ERROR_FILE: "error",
-  LOADER_FILE: "loader",
   SPLATE_FILE: "$",
   SPLATE_LOADER_FILE: "$.loader",
-  LAYOUT_CONFIG_FILE: "layout.config",
-  PAGE_CONFIG_FILE: "page.config"
+  SPLATE_DATA_FILE: "$.data",
+  SPLATE_CLIENT_DATA: "$.data.client",
+  LOADING_FILE: "loading",
+  ERROR_FILE: "error",
+  LOADER_FILE: "loader"
 };
 export var APP_CONFIG_NAME = "config";
 export var APP_INIT_EXPORTED = "init";

package/dist/esm/analyze/nestedRoutes.js

@@ -73,7 +73,7 @@ export var optimizeRoute = function(routeTree) {
 };
 export var walk = function() {
   var _ref = _async_to_generator(function(dirname, rootDir, alias, entryName, isMainEntry, oldVersion) {
-    var _routePath, _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, pageConfigFile, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, optimizedRoutes;
+    var _routePath, _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatClientData, splatData, splatRoute, pageConfigFile, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, optimizedRoutes;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -119,6 +119,8 @@ export var walk = function() {
           pageLoaderFile = "";
           pageRoute = null;
           splatLoaderFile = "";
+          splatClientData = "";
+          splatData = "";
           splatRoute = null;
           pageConfigFile = "";
           return [
@@ -224,6 +226,12 @@ export var walk = function() {
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
             splatLoaderFile = itemPath;
           }
+          if (itemWithoutExt === NESTED_ROUTE.SPLATE_CLIENT_DATA) {
+            splatClientData = itemPath;
+          }
+          if (itemWithoutExt === NESTED_ROUTE.SPLATE_DATA_FILE) {
+            splatData = itemPath;
+          }
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
             ;
             splatRoute = createRoute({
@@ -233,6 +241,12 @@ export var walk = function() {
             if (splatLoaderFile) {
               splatRoute.loader = splatLoaderFile;
             }
+            if (splatClientData) {
+              splatRoute.clientData = splatClientData;
+            }
+            if (splatData) {
+              splatRoute.data = splatData;
+            }
             (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
           }
           if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {

package/dist/esm/index.js

@@ -626,24 +626,11 @@ export var appTools = function() {
               switch (_state.label) {
                 case 0:
                   distDirectory = api.useAppContext().distDirectory;
-                  if (!!fs.existsSync(distDirectory))
-                    return [
-                      3,
-                      2
-                    ];
                   return [
                     4,
-                    fs.mkdir(distDirectory)
+                    fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes)
                   ];
                 case 1:
-                  _state.sent();
-                  _state.label = 2;
-                case 2:
-                  return [
-                    4,
-                    fs.writeJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes)
-                  ];
-                case 3:
                   _state.sent();
                   return [
                     2,

package/dist/esm-node/analyze/constants.js

@@ -27,20 +27,22 @@ export const HTML_PARTIALS_EXTENSIONS = [
 export const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
 export const NESTED_ROUTE = {
   LAYOUT_FILE: "layout",
+  LAYOUT_CONFIG_FILE: "layout.config",
   LAYOUT_LOADER_FILE: "layout.loader",
   LAYOUT_DATA_FILE: "layout.data",
   LAYOUT_CLIENT_LOADER: "layout.data.client",
   PAGE_FILE: "page",
+  PAGE_CONFIG_FILE: "page.config",
   PAGE_LOADER_FILE: "page.loader",
-  PAGE_DATA_FILE: "layout.data",
+  PAGE_DATA_FILE: "page.data",
   PAGE_CLIENT_LOADER: "page.data.client",
-  LOADING_FILE: "loading",
-  ERROR_FILE: "error",
-  LOADER_FILE: "loader",
   SPLATE_FILE: "$",
   SPLATE_LOADER_FILE: "$.loader",
-  LAYOUT_CONFIG_FILE: "layout.config",
-  PAGE_CONFIG_FILE: "page.config"
+  SPLATE_DATA_FILE: "$.data",
+  SPLATE_CLIENT_DATA: "$.data.client",
+  LOADING_FILE: "loading",
+  ERROR_FILE: "error",
+  LOADER_FILE: "loader"
 };
 export const APP_CONFIG_NAME = "config";
 export const APP_INIT_EXPORTED = "init";

package/dist/esm-node/analyze/nestedRoutes.js

@@ -97,6 +97,8 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
   let pageLoaderFile = "";
   let pageRoute = null;
   let splatLoaderFile = "";
+  let splatClientData = "";
+  let splatData = "";
   let splatRoute = null;
   let pageConfigFile = "";
   const items = await fs.readdir(dirname);
@@ -162,6 +164,12 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
       splatLoaderFile = itemPath;
     }
+    if (itemWithoutExt === NESTED_ROUTE.SPLATE_CLIENT_DATA) {
+      splatClientData = itemPath;
+    }
+    if (itemWithoutExt === NESTED_ROUTE.SPLATE_DATA_FILE) {
+      splatData = itemPath;
+    }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
       var _route_children2;
       splatRoute = createRoute({
@@ -171,6 +179,12 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
       if (splatLoaderFile) {
         splatRoute.loader = splatLoaderFile;
       }
+      if (splatClientData) {
+        splatRoute.clientData = splatClientData;
+      }
+      if (splatData) {
+        splatRoute.data = splatData;
+      }
       (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
     }
     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {

package/dist/esm-node/index.js

@@ -185,10 +185,7 @@ export const appTools = (options = {
         },
         async beforeGenerateRoutes({ entrypoint, code }) {
           const { distDirectory } = api.useAppContext();
-          if (!fs.existsSync(distDirectory)) {
-            await fs.mkdir(distDirectory);
-          }
-          await fs.writeJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes);
+          await fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes);
           return {
             entrypoint,
             code

package/dist/types/analyze/constants.d.ts

@@ -18,20 +18,22 @@ export declare const HTML_PARTIALS_EXTENSIONS: string[];
 export declare const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
 export declare const NESTED_ROUTE: {
   LAYOUT_FILE: string;
+  LAYOUT_CONFIG_FILE: string;
   LAYOUT_LOADER_FILE: string;
   LAYOUT_DATA_FILE: string;
   LAYOUT_CLIENT_LOADER: string;
   PAGE_FILE: string;
+  PAGE_CONFIG_FILE: string;
   PAGE_LOADER_FILE: string;
   PAGE_DATA_FILE: string;
   PAGE_CLIENT_LOADER: string;
+  SPLATE_FILE: string;
+  SPLATE_LOADER_FILE: string;
+  SPLATE_DATA_FILE: string;
+  SPLATE_CLIENT_DATA: string;
   LOADING_FILE: string;
   ERROR_FILE: string;
   LOADER_FILE: string;
-  SPLATE_FILE: string;
-  SPLATE_LOADER_FILE: string;
-  LAYOUT_CONFIG_FILE: string;
-  PAGE_CONFIG_FILE: string;
 };
 export declare const APP_CONFIG_NAME = "config";
 export declare const APP_INIT_EXPORTED = "init";

package/dist/types/defineConfig.d.ts

@@ -1,6 +1,6 @@
 import type { UserConfigExport } from '@modern-js/core';
 import type { AppLegacyUserConfig, AppUserConfig } from './types';
-export declare const defineConfig: <B extends "webpack" | "rspack" = "webpack">(config: UserConfigExport<AppUserConfig<B>>) => UserConfigExport<AppUserConfig<B>>;
+export declare const defineConfig: <B extends "rspack" | "webpack" = "webpack">(config: UserConfigExport<AppUserConfig<B>>) => UserConfigExport<AppUserConfig<B>>;
 /**
  * Recommend use `defineConfig` first.
  *

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.31.3-alpha.0",
+  "version": "2.31.3-alpha.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -73,24 +73,24 @@
     "esbuild": "0.17.19",
     "rspack-plugin-virtual-module": "0.1.7",
     "@swc/helpers": "0.5.1",
+    "@modern-js/builder-plugin-esbuild": "2.31.2",
     "@modern-js/builder": "2.31.2",
     "@modern-js/builder-shared": "2.31.2",
     "@modern-js/builder-webpack-provider": "2.31.2",
     "@modern-js/core": "2.31.2",
+    "@modern-js/new-action": "2.31.2",
     "@modern-js/node-bundle-require": "2.31.2",
+    "@modern-js/builder-plugin-node-polyfill": "2.31.2",
     "@modern-js/plugin-i18n": "2.31.2",
-    "@modern-js/plugin": "2.31.2",
     "@modern-js/plugin-lint": "2.31.2",
-    "@modern-js/prod-server": "2.31.2",
     "@modern-js/server": "2.31.2",
-    "@modern-js/upgrade": "2.31.2",
-    "@modern-js/types": "2.31.2",
-    "@modern-js/utils": "2.31.2",
+    "@modern-js/plugin": "2.31.2",
+    "@modern-js/plugin-data-loader": "2.31.2",
     "@modern-js/server-core": "2.31.2",
-    "@modern-js/new-action": "2.31.2",
-    "@modern-js/builder-plugin-esbuild": "2.31.2",
-    "@modern-js/builder-plugin-node-polyfill": "2.31.2",
-    "@modern-js/plugin-data-loader": "2.31.2"
+    "@modern-js/prod-server": "2.31.2",
+    "@modern-js/utils": "2.31.2",
+    "@modern-js/types": "2.31.2",
+    "@modern-js/upgrade": "2.31.2"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -100,9 +100,9 @@
     "typescript": "^5",
     "webpack": "^5.88.1",
     "@modern-js/builder-rspack-provider": "2.31.2",
+    "@modern-js/builder-plugin-swc": "2.31.2",
     "@scripts/build": "2.31.1",
-    "@scripts/jest-config": "2.31.1",
-    "@modern-js/builder-plugin-swc": "2.31.2"
+    "@scripts/jest-config": "2.31.1"
   },
   "peerDependencies": {
     "@modern-js/builder-rspack-provider": "^2.31.2"