sugar-scripts 1.0.0-beta.6 → 1.0.0-beta.7

package/README.md

@@ -1,64 +1,50 @@
-## 配置文件
-1. `sugar.project.ts`
-2. `sugar.package.ts`
-3. `sugar.build.ts`
+# sugar-scripts
 
 
-#### sugar.project.ts 配置文件
+## 自动配置
 ```ts
-import type {
-  types
-} from 'sugar-scripts';
-
-// 待定
+import HomePageView from 'sugar?browser-entry/../../browser/home';
 ```
 
+## 配置文件
+`sugar.config.ts` 项目说明文件，放于项目根目录，一般和package.json同级
 
-#### sugar.package.js 配置文件
-```ts
-import type {
-  types
-} from 'sugar-scripts';
-
-export const packageConfig: types.PackageConfig;
-```
 
+#### sugar.config.ts 配置文件详细说明
 
+sugar.config.ts按需导出3个配置内容
+1. `packageConfig`
+2. `browserWebpackConfig`
+3. `serverWebpackConfig`
 
 
-#### sugar.build.js 配置文件
+##### packageConfig
 ```ts
-import type {
-  types
+import {
+  SugarScriptsProject
 } from 'sugar-scripts';
 
-export const browserWebpackConfig: types.CustomWebpackConfig;
-
-export const serverWebpackConfig: types.CustomWebpackConfig;
-```
-
-
-## sugar-scripts cli
-
-### start
-```bash
-sugar-scripts start xxx.ts --port 9000
-```
-
-### info
-```bash
-sugar-scripts info
-```
-
-### build
-```bash
-sugar-scripts build
+export const projectConfig: SugarScriptsProject.PackageConfig = {
+    /**
+     * 用于存放打包过程中的一些缓存和过渡产物
+     * 相对于当前sugar.config的路径
+     * 默认使用 './sugar-cache'
+     */
+    cacheDir: './sugar-cache',
+    browser?: {
+      /**
+       * 输出目录
+       */
+      output: string;
+      // exposes?: string[] | {[index: string]: string},
+      entry?: BuildEntry
+    };
+
+    server?: {
+      // dll?: boolean;
+      output: string;
+      entry: string;
+      render?: string;
+    };
+}
 ```
-
-
-### cache
-```bash
-sugar-scripts cache
-```
-
-

package/lib/constants/index.d.ts

@@ -1,4 +1,4 @@
-export declare const SUGAR_PACKAGE_CONFIG_FILENAME = "sugar.package";
-export declare const SUGAR_PROJECT_CONFIG_FILENAME = "sugar.project";
+export declare const SUGAR_CONFIG_FILENAME = "sugar.config";
 export declare const SUGAR_BUILD_EXPORT_BROWSER = "browserWebpackConfig";
 export declare const SUGAR_BUILD_EXPORT_SERVER = "serverWebpackConfig";
+export declare const DEFAULT_CACHED_DIR = "./sugar-cache";

package/lib/constants/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SUGAR_BUILD_EXPORT_SERVER = exports.SUGAR_BUILD_EXPORT_BROWSER = exports.SUGAR_PROJECT_CONFIG_FILENAME = exports.SUGAR_PACKAGE_CONFIG_FILENAME = void 0;
-exports.SUGAR_PACKAGE_CONFIG_FILENAME = 'sugar.package';
-exports.SUGAR_PROJECT_CONFIG_FILENAME = 'sugar.project';
+exports.DEFAULT_CACHED_DIR = exports.SUGAR_BUILD_EXPORT_SERVER = exports.SUGAR_BUILD_EXPORT_BROWSER = exports.SUGAR_CONFIG_FILENAME = void 0;
+exports.SUGAR_CONFIG_FILENAME = 'sugar.config';
 exports.SUGAR_BUILD_EXPORT_BROWSER = 'browserWebpackConfig';
 exports.SUGAR_BUILD_EXPORT_SERVER = 'serverWebpackConfig';
+exports.DEFAULT_CACHED_DIR = './sugar-cache';
 //# sourceMappingURL=index.js.map

package/lib/constants/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":";;;AAAa,QAAA,6BAA6B,GAAG,eAAe,CAAC;AAChD,QAAA,6BAA6B,GAAG,eAAe,CAAC;AAEhD,QAAA,0BAA0B,GAAG,sBAAsB,CAAC;AACpD,QAAA,yBAAyB,GAAG,qBAAqB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG,cAAc,CAAC;AAEvC,QAAA,0BAA0B,GAAG,sBAAsB,CAAC;AACpD,QAAA,yBAAyB,GAAG,qBAAqB,CAAC;AAElD,QAAA,kBAAkB,GAAG,eAAe,CAAC"}

package/lib/core/cache.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.clean = void 0;
 const file_helpers_1 = require("../shared/file-helpers");
 const clean = (context) => {
-    return (0, file_helpers_1.rm)(context.getCacheRootDir());
+    return (0, file_helpers_1.rm)(context.getCacheDir());
 };
 exports.clean = clean;
 //# sourceMappingURL=cache.js.map

package/lib/core/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/core/cache.ts"],"names":[],"mappings":";;;AAIA,yDAEgC;AAEzB,MAAM,KAAK,GAAG,CACnB,OAA4B,EAC5B,EAAE;IACF,OAAO,IAAA,iBAAE,EACP,OAAO,CAAC,eAAe,EAAE,CAC1B,CAAC;AACJ,CAAC,CAAA;AANY,QAAA,KAAK,SAMjB"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/core/cache.ts"],"names":[],"mappings":";;;AAIA,yDAEgC;AAEzB,MAAM,KAAK,GAAG,CACnB,OAA4B,EAC5B,EAAE;IACF,OAAO,IAAA,iBAAE,EACP,OAAO,CAAC,WAAW,EAAE,CACtB,CAAC;AACJ,CAAC,CAAA;AANY,QAAA,KAAK,SAMjB"}

package/lib/core/init-running-context.js

@@ -13,17 +13,14 @@ exports.initRunningContext = void 0;
 const file_helpers_1 = require("../shared/file-helpers");
 const running_context_1 = require("./running-context");
 const initRunningContext = (dir, { watch } = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    const { root, packageJson, packageConfigs } = yield (0, file_helpers_1.findPackage)(dir);
-    const { projectRoot, projectConfigs } = yield (0, file_helpers_1.findProject)(root);
-    if (!packageConfigs || !projectConfigs) {
-        throw new Error('');
+    const { root, packageJson, packageConfigs } = yield (0, file_helpers_1.findConfig)(dir);
+    if (!packageConfigs) {
+        throw new Error('not found packageConfigs');
     }
     return new running_context_1.SugarScriptsContext({
         root,
         packageName: packageJson.name,
         packageConfigs,
-        projectRoot,
-        projectConfigs,
         watch: !!watch
     });
 });

package/lib/core/init-running-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"init-running-context.js","sourceRoot":"","sources":["../../src/core/init-running-context.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAGgC;AAEhC,uDAE2B;AAEpB,MAAM,kBAAkB,GAAG,CAChC,GAAW,EACX,EACE,KAAK,KAGH,EAAE,EACN,EAAE;IACF,MAAM,EACJ,IAAI,EACJ,WAAW,EACX,cAAc,EACf,GAAG,MAAM,IAAA,0BAAW,EAAC,GAAG,CAAC,CAAC;IAC3B,MAAM,EACJ,WAAW,EACX,cAAc,EACf,GAAG,MAAM,IAAA,0BAAW,EAAC,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC,CAAA;KACpB;IACD,OAAO,IAAI,qCAAmB,CAAC;QAC7B,IAAI;QACJ,WAAW,EAAE,WAAW,CAAC,IAAI;QAC7B,cAAc;QACd,WAAW;QACX,cAAc;QACd,KAAK,EAAE,CAAC,CAAC,KAAK;KACf,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AA5BY,QAAA,kBAAkB,sBA4B9B"}
+{"version":3,"file":"init-running-context.js","sourceRoot":"","sources":["../../src/core/init-running-context.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAEgC;AAEhC,uDAE2B;AAEpB,MAAM,kBAAkB,GAAG,CAChC,GAAW,EACX,EACE,KAAK,KAGH,EAAE,EACN,EAAE;IACF,MAAM,EACJ,IAAI,EACJ,WAAW,EACX,cAAc,EACf,GAAG,MAAM,IAAA,yBAAU,EAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;KAC5C;IACD,OAAO,IAAI,qCAAmB,CAAC;QAC7B,IAAI;QACJ,WAAW,EAAE,WAAW,CAAC,IAAI;QAC7B,cAAc;QACd,KAAK,EAAE,CAAC,CAAC,KAAK;KACf,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AAtBY,QAAA,kBAAkB,sBAsB9B"}

package/lib/core/running-context.d.ts

@@ -3,23 +3,17 @@ export declare class SugarScriptsContext {
     root: string;
     rootHash: string;
     packageName: string;
-    projectRoot: string;
     packageConfigs: SugarScriptsProject.SugarPackageConfigs;
-    projectConfigs: SugarScriptsProject.SugarProjectConfigs;
     watch: boolean;
-    constructor({ root, packageName, packageConfigs, projectRoot, projectConfigs, watch }: {
+    constructor({ root, packageName, packageConfigs, watch }: {
         root: string;
         packageName: string;
         packageConfigs: SugarScriptsProject.SugarPackageConfigs;
-        projectRoot: string;
-        projectConfigs: SugarScriptsProject.SugarProjectConfigs;
         watch: boolean;
     });
     serverEntryName: string;
     get packageConfig(): SugarScriptsProject.PackageConfig;
-    get projectConfig(): SugarScriptsProject.ProjectConfig;
     getStartFilePath(): string | undefined;
-    getCacheRootDir(): string;
     getCacheDir(): string;
     getDirHash(): Promise<unknown>;
 }

package/lib/core/running-context.js

@@ -15,33 +15,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SugarScriptsContext = void 0;
 const path_1 = __importDefault(require("path"));
 const file_helpers_1 = require("../shared/file-helpers");
+const constants_1 = require("../constants");
 class SugarScriptsContext {
-    constructor({ root, packageName, packageConfigs, projectRoot, projectConfigs, watch }) {
+    constructor({ root, packageName, packageConfigs, watch }) {
         this.serverEntryName = 'main';
         this.root = root;
         this.packageName = packageName;
-        this.projectRoot = projectRoot;
         this.packageConfigs = packageConfigs;
-        this.projectConfigs = projectConfigs;
         this.rootHash = (0, file_helpers_1.getHashFromRoot)(root);
         this.watch = watch;
     }
     get packageConfig() {
         return this.packageConfigs.packageConfig;
     }
-    get projectConfig() {
-        return this.projectConfigs.projectConfig;
-    }
     getStartFilePath() {
         if (this.packageConfig.server) {
             return path_1.default.resolve(this.root, this.packageConfig.server.output, this.serverEntryName);
         }
     }
-    getCacheRootDir() {
-        return path_1.default.resolve(this.projectRoot, this.projectConfig.cacheDir);
-    }
     getCacheDir() {
-        return path_1.default.resolve(this.projectRoot, this.projectConfig.cacheDir, path_1.default.relative(this.projectRoot, this.root));
+        return path_1.default.resolve(this.root, this.packageConfig.cacheDir || constants_1.DEFAULT_CACHED_DIR);
     }
     getDirHash() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/core/running-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"running-context.js","sourceRoot":"","sources":["../../src/core/running-context.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAKxB,yDAGgC;AAEhC,MAAa,mBAAmB;IAS9B,YACE,EACE,IAAI,EACJ,WAAW,EACX,cAAc,EACd,WAAW,EACX,cAAc,EACd,KAAK,EAQN;QAWH,oBAAe,GAAG,MAAM,CAAC;QATvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,IAAA,8BAAe,EAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAID,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;IAC3C,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;IAC3C,CAAC;IAED,gBAAgB;QACd,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;YAC7B,OAAO,cAAI,CAAC,OAAO,CACjB,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAChC,IAAI,CAAC,eAAe,CACrB,CAAA;SACF;IACH,CAAC;IAED,eAAe;QACb,OAAO,cAAI,CAAC,OAAO,CACjB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC5B,CAAA;IACH,CAAC;IAED,WAAW;QACT,OAAO,cAAI,CAAC,OAAO,CACjB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,aAAa,CAAC,QAAQ,EAC3B,cAAI,CAAC,QAAQ,CACX,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,IAAI,CACV,CACF,CAAA;IACH,CAAC;IAEK,UAAU;;YACd,OAAO,MAAM,IAAA,8BAAe,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC;KAAA;CACF;AA5ED,kDA4EC"}
+{"version":3,"file":"running-context.js","sourceRoot":"","sources":["../../src/core/running-context.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAKxB,yDAGgC;AAChC,4CAEqB;AAErB,MAAa,mBAAmB;IAO9B,YACE,EACE,IAAI,EACJ,WAAW,EACX,cAAc,EACd,KAAK,EAMN;QASH,oBAAe,GAAG,MAAM,CAAC;QAPvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,IAAA,8BAAe,EAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAID,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;IAC3C,CAAC;IAED,gBAAgB;QACd,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;YAC7B,OAAO,cAAI,CAAC,OAAO,CACjB,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAChC,IAAI,CAAC,eAAe,CACrB,CAAA;SACF;IACH,CAAC;IAED,WAAW;QACT,OAAO,cAAI,CAAC,OAAO,CACjB,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,8BAAkB,CAClD,CAAA;IACH,CAAC;IAEK,UAAU;;YACd,OAAO,MAAM,IAAA,8BAAe,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC;KAAA;CACF;AArDD,kDAqDC"}

package/lib/custom-config.type.d.ts

@@ -1,51 +1,65 @@
 import type { Controller } from 'sugar-server';
 import type WebpackChainConfig from 'webpack-chain';
 import { SugarScriptsContext } from './core/running-context';
-declare type ControllerContext = Controller["context"];
+type ControllerContext = Controller["context"];
 export declare namespace SugarScriptsProject {
     type BrowserWebpackConfig = CustomWebpackConfig;
     type ServerWebpackConfig = CustomWebpackConfig;
     interface PackageConfig {
+        /**
+         * 用于存放打包过程中的一些缓存和过渡产物
+         * 相对于当前sugar.config的路径
+         * 默认使用 './sugar-cache'
+         */
+        cacheDir?: string;
+        /**
+         * 浏览器端js输出目录，不配置就不会进行相关打包
+         */
         browser?: {
             /**
-             * 是否构建dll用的输出
+             * 输出目录，必填
              */
+            output: string;
             /**
-             * 输出目录
+             * 额外入口配置，可以不用
              */
-            output: string;
             entry?: BuildEntry;
         };
+        /**
+         * node server端输出目录，不配置就不会进行相关打包
+         */
         server?: {
+            /**
+             * 输出目录，必填
+             */
             output: string;
+            /**
+             * node的启动文件
+             */
             entry: string;
+            /**
+             * 自动注入的render文件
+             * 为sugar-server-utils 提供的自动render
+             */
             render?: string;
         };
     }
-    interface ProjectConfig {
-        cacheDir: string;
-    }
     type SugarPackageConfigs = {
         packageConfig: PackageConfig;
         browserWebpackConfig?: BrowserWebpackConfig;
         serverWebpackConfig?: ServerWebpackConfig;
     };
-    type SugarProjectConfigs = {
-        projectConfig: ProjectConfig;
-        browserWebpackConfig?: BrowserWebpackConfig;
-        serverWebpackConfig?: ServerWebpackConfig;
-    };
     interface CustomRender<C = any> {
         (ctx: ControllerContext, entries: string[] | {
             [key: string]: string[];
         }, custom: C): string;
     }
 }
-declare type BuildEntry = {
+type BuildEntry = {
     [key: string]: string | string[];
 };
-export declare type CustomWebpackConfig = (webpackChainConfig: WebpackChainConfig, context: SugarScriptsContext) => void;
-export declare type CustomRender<C = any> = (ctx: ControllerContext, entries: string[] | {
+export type CustomWebpackConfig = (webpackChainConfig: WebpackChainConfig, context: SugarScriptsContext) => void;
+export type CustomRender<C = any> = (ctx: ControllerContext, entries: string[] | {
     [key: string]: string[];
 }, custom: C) => string;
 export {};

package/lib/custom-config.type.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom-config.type.js","sourceRoot":"","sources":["../src/custom-config.type.ts"],"names":[],"mappings":";;;AAWA,IAAiB,mBAAmB,CAmDnC;AAnDD,WAAiB,mBAAmB;IAkDjC,CAAC;AACJ,CAAC,EAnDgB,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAmDnC"}
+{"version":3,"file":"custom-config.type.js","sourceRoot":"","sources":["../src/custom-config.type.ts"],"names":[],"mappings":";;;AAWA,IAAiB,mBAAmB,CA4DnC;AA5DD,WAAiB,mBAAmB;IA2DjC,CAAC;AACJ,CAAC,EA5DgB,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QA4DnC"}

package/lib/shared/file-helpers.d.ts

@@ -4,15 +4,11 @@ export declare const findSiblingFile: (currentFilePath: string, searchFileName:
 export declare const findParentFile: (currentFilePath: string, searchFileName: string) => Promise<string | null>;
 export declare const loadJSON: (filePath: string) => Promise<any>;
 export declare const writeFileSync: (filePath: string, data: string | NodeJS.ArrayBufferView) => void;
-export declare const findPackage: (dir: string) => Promise<{
+export declare const findConfig: (dir: string) => Promise<{
     root: string;
     packageJson: any;
     packageConfigs: SugarScriptsProject.SugarPackageConfigs | null;
 }>;
-export declare const findProject: (dir: string) => Promise<{
-    projectRoot: string;
-    projectConfigs: SugarScriptsProject.SugarProjectConfigs;
-}>;
 export declare const rm: (filePath: string) => Promise<void>;
 export declare function getHashFromRoot(root: string): string;
 export declare function asyncGetDirHash(dirPath: string): Promise<unknown>;

package/lib/shared/file-helpers.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.asyncGetDirHash = exports.getHashFromRoot = exports.rm = exports.findProject = exports.findPackage = exports.writeFileSync = exports.loadJSON = exports.findParentFile = exports.findSiblingFile = exports.searchFiles = void 0;
+exports.asyncGetDirHash = exports.getHashFromRoot = exports.rm = exports.findConfig = exports.writeFileSync = exports.loadJSON = exports.findParentFile = exports.findSiblingFile = exports.searchFiles = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const crypto_1 = require("crypto");
@@ -114,7 +114,7 @@ const writeFileSync = (filePath, data) => {
     fs_1.default.writeFileSync(filePath, data);
 };
 exports.writeFileSync = writeFileSync;
-const findPackage = (dir) => __awaiter(void 0, void 0, void 0, function* () {
+const findConfig = (dir) => __awaiter(void 0, void 0, void 0, function* () {
     const packagePath = path_1.default.resolve(dir, 'package.json');
     let existed = true;
     try {
@@ -124,7 +124,7 @@ const findPackage = (dir) => __awaiter(void 0, void 0, void 0, function* () {
         existed = false;
     }
     let packageConfigs = null;
-    const sugarPackagePath = path_1.default.resolve(dir, constants_1.SUGAR_PACKAGE_CONFIG_FILENAME);
+    const sugarPackagePath = path_1.default.resolve(dir, constants_1.SUGAR_CONFIG_FILENAME);
     let existedFile = '';
     try {
         yield fsPromises.access(sugarPackagePath + '.ts', fs_1.default.constants.F_OK);
@@ -148,7 +148,7 @@ const findPackage = (dir) => __awaiter(void 0, void 0, void 0, function* () {
                 existedFile
             ]
         });
-        logger.success(`find ${constants_1.SUGAR_PACKAGE_CONFIG_FILENAME}: ${existedFile}`);
+        logger.success(`find ${constants_1.SUGAR_CONFIG_FILENAME}: ${existedFile}`);
         try {
             packageConfigs = require(existedFile);
         }
@@ -158,7 +158,7 @@ const findPackage = (dir) => __awaiter(void 0, void 0, void 0, function* () {
     }
     if (existed) {
         if (!packageConfigs) {
-            throw new Error(`not found ${constants_1.SUGAR_PACKAGE_CONFIG_FILENAME}`);
+            throw new Error(`not found ${constants_1.SUGAR_CONFIG_FILENAME}`);
         }
         return {
             root: dir,
@@ -169,55 +169,9 @@ const findPackage = (dir) => __awaiter(void 0, void 0, void 0, function* () {
     if (dir === '/') {
         throw new Error('not found package.json');
     }
-    return (0, exports.findPackage)(path_1.default.resolve(dir, '../'));
+    return (0, exports.findConfig)(path_1.default.resolve(dir, '../'));
 });
-exports.findPackage = findPackage;
-const findProject = (dir) => __awaiter(void 0, void 0, void 0, function* () {
-    const projectPath = path_1.default.resolve(dir, constants_1.SUGAR_PROJECT_CONFIG_FILENAME);
-    let projectConfigs = null;
-    let existedFile = '';
-    try {
-        yield fsPromises.access(projectPath + '.ts', fs_1.default.constants.F_OK);
-        existedFile = projectPath + '.ts';
-    }
-    catch (e) { }
-    if (!existedFile) {
-        try {
-            yield fsPromises.access(projectPath + '.js', fs_1.default.constants.F_OK);
-            existedFile = projectPath + '.js';
-        }
-        catch (e) { }
-    }
-    if (existedFile) {
-        tsNode.register({
-            cwd: dir,
-            projectSearchDir: dir,
-            project: path_1.default.resolve(dir, './tsconfig.json'),
-            transpileOnly: true,
-            require: [
-                existedFile
-            ]
-        });
-        logger.success(`find ${constants_1.SUGAR_PROJECT_CONFIG_FILENAME}: ${existedFile}`);
-        try {
-            projectConfigs = require(existedFile);
-        }
-        catch (e) {
-            throw e;
-        }
-        if (projectConfigs) {
-            return {
-                projectRoot: dir,
-                projectConfigs
-            };
-        }
-    }
-    if (dir === '/') {
-        throw new Error(`not found ${constants_1.SUGAR_PROJECT_CONFIG_FILENAME}`);
-    }
-    return (0, exports.findProject)(path_1.default.resolve(dir, '../'));
-});
-exports.findProject = findProject;
+exports.findConfig = findConfig;
 const rm = (filePath) => __awaiter(void 0, void 0, void 0, function* () {
     const stat = yield fsPromises.stat(filePath);
     if (stat.isFile()

package/lib/shared/file-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-helpers.js","sourceRoot":"","sources":["../../src/shared/file-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file-helpers.js","sourceRoot":"","sources":["../../src/shared/file-helpers.ts"],"names":[],"mappings":"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"}

package/lib/webpack/webpack.browser.js

@@ -76,9 +76,6 @@ function mergeBrowserEntry(context, chainConfig) {
 exports.mergeBrowserEntry = mergeBrowserEntry;
 function mergeBrowserCustomConfig(context, chainConfig) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (context.projectConfigs.browserWebpackConfig) {
-            yield context.projectConfigs.browserWebpackConfig(chainConfig, context);
-        }
         if (context.packageConfigs.browserWebpackConfig) {
             yield context.packageConfigs.browserWebpackConfig(chainConfig, context);
         }

package/lib/webpack/webpack.browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.browser.js","sourceRoot":"","sources":["../../src/webpack/webpack.browser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpack.browser.js","sourceRoot":"","sources":["../../src/webpack/webpack.browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,+BAA4B;AAC5B,qEAAgE;AAKhE,iEAEgC;AAGhC,SAAS,eAAe,CACtB,SAAiB,EACjB,IAAY;IAEZ,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC7B,OAAO,WAAI,CAAC,IAAI,CACd,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAC3B,CAAA;KACF;IACD,OAAO,CAAC,SAAS,CAAC,CAAC;AACrB,CAAC;AAGD,SAAsB,iBAAiB,CACrC,OAA4B,EAC5B,WAA+B;;QAE/B,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO;YAAE,OAAO;QAC3C,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC;QAEpD,MAAM,wBAAwB,GAAG,IAAA,uCAAgB,EAAC,OAAO,CAAC,CAAC;QAE3D,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE;YAChC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC;iBAC3B,GAAG,CACF,+CAAqB,EACrB,CAAC;oBACC,QAAQ,EAAE,cAAI,CAAC,OAAO,CACpB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EACnC,yBAAyB,CAC1B;oBACD,YAAY,EAAE,IAAI;oBAClB,eAAe,EAAE,IAAI;iBACtB,CAAC,CACH,CAAA;SACJ;QAED,IAAI;YACF,MAAM,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;YAEtD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;iBACrB,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACpB,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;gBACxC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;oBACjC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC;yBACxB,GAAG,CACF,SAAS,CACV,CAAA;iBACJ;YACH,CAAC,CAAC,CAAC;SACN;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAChB;QAED,IAAI,aAAa,CAAC,KAAK,EAAE;YACvB,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;iBACf,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACpB,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAClC,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;oBAC5B,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC;yBACxB,KAAK,CACJ,SAAS,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;wBACxC,OAAO;4BACL,GAAG,UAAU;4BACb,GAAG,eAAe,CAChB,QAAQ,EACR,OAAO,CAAC,IAAI,CACb;yBACF,CAAA;oBACH,CAAC,EAAE,EAAc,CAAC,CACnB,CAAA;iBACJ;qBAAM;oBACL,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC;yBACxB,KAAK,CAAC,eAAe,CACpB,SAAS,EACT,OAAO,CAAC,IAAI,CACb,CAAC,CAAA;iBACL;YACH,CAAC,CAAC,CAAC;SACN;IACH,CAAC;CAAA;AApED,8CAoEC;AAED,SAAsB,wBAAwB,CAC5C,OAA4B,EAC5B,WAA+B;;QAE/B,IAAI,OAAO,CAAC,cAAc,CAAC,oBAAoB,EAAE;YAC/C,MAAM,OAAO,CAAC,cAAc,CAAC,oBAAoB,CAC/C,WAAW,EACX,OAAO,CACR,CAAA;SACF;IACH,CAAC;CAAA;AAVD,4DAUC"}

package/lib/webpack/webpack.server.js

@@ -17,6 +17,7 @@ const path_1 = __importDefault(require("path"));
 const webpack_1 = __importDefault(require("webpack"));
 const server_browser_entry_1 = require("./server-browser-entry");
 function mergeServerEntry(context, chainConfig) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         if (!context.packageConfig.server)
             return;
@@ -50,8 +51,9 @@ function mergeServerEntry(context, chainConfig) {
                 'DefinePlugin': {
                     plugin: webpack_1.default.DefinePlugin,
                     args: [{
-                            'process.env.SUGAR_PROJECT_ROOT': JSON.stringify(context.projectRoot),
-                            'process.env.SUGAR_PACKAGE_ROOT': JSON.stringify(context.root),
+                            'process.env.SUGAR_PROJECT_ROOT': JSON.stringify(context.root),
+                            'process.env.SUGAR_SERVER_DIR': JSON.stringify(path_1.default.resolve(context.root, serverConfig.output)),
+                            'process.env.SUGAR_BROWSER_DIR': ((_a = context.packageConfig.browser) === null || _a === void 0 ? void 0 : _a.output) && JSON.stringify(path_1.default.resolve(context.root, (_b = context.packageConfig.browser) === null || _b === void 0 ? void 0 : _b.output)),
                             'process.env.SUGAR_PROJECT_RUN': JSON.stringify(true),
                             'process.env.SUGAR_PROJECT_RENDER': JSON.stringify(serverConfig.render
                                 && path_1.default.resolve(context.root, serverConfig.render)),
@@ -65,9 +67,6 @@ function mergeServerEntry(context, chainConfig) {
 exports.mergeServerEntry = mergeServerEntry;
 function mergeServerCustomConfig(context, chainConfig) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (context.projectConfigs.serverWebpackConfig) {
-            yield context.projectConfigs.serverWebpackConfig(chainConfig, context);
-        }
         if (context.packageConfigs.serverWebpackConfig) {
             yield context.packageConfigs.serverWebpackConfig(chainConfig, context);
         }

package/lib/webpack/webpack.server.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.server.js","sourceRoot":"","sources":["../../src/webpack/webpack.server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,sDAA8B;AAO9B,iEAGgC;AAEhC,SAAsB,gBAAgB,CACpC,OAA4B,EAC5B,WAA+B;;QAE/B,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM;YAAE,OAAO;QAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC;QAElD,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC;aACtB,KAAK,CACJ;YACE,YAAY,CAAC,MAAM,IAAI,EAAE;YACzB,YAAY,CAAC,KAAK;SACnB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAa,CACvC,CAAC;QAEJ,WAAW,CAAC,KAAK,CAAC;YACd,MAAM,EAAE,MAAM;YACd,MAAM,EAAE;gBACN,QAAQ,EAAE,WAAW;gBACrB,OAAO,EAAE;oBACP,IAAI,EAAE,UAAU;iBACjB;aACF;YACD,YAAY,EAAE;gBACZ,QAAQ,EAAE,KAAK;aAChB;YACD,OAAO,EAAE,YAAY;YACrB,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;YAChC,MAAM,EAAE;gBACN,+BAA+B,EAAE;oBAC/B,MAAM,EAAE,oDAA6B;oBACrC,IAAI,EAAE,CAAC;4BACL,IAAI,EAAE,OAAO,CAAC,IAAI;4BAClB,MAAM,EAAE,IAAA,uCAAgB,EAAC,OAAO,CAAC;yBAClC,CAAC;iBACH;gBACD,cAAc,EAAE;oBACd,MAAM,EAAE,iBAAO,CAAC,YAAY;oBAC5B,IAAI,EAAE,CAAC;4BACL,gCAAgC,EAAE,IAAI,CAAC,SAAS,CAC9C,OAAO,CAAC,WAAW,CACpB;4BACD,gCAAgC,EAAE,IAAI,CAAC,SAAS,CAC9C,OAAO,CAAC,IAAI,CACb;4BACD,+BAA+B,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;4BACrD,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAChD,YAAY,CAAC,MAAM;mCAChB,cAAI,CAAC,OAAO,CACb,OAAO,CAAC,IAAI,EACZ,YAAY,CAAC,MAAM,CACpB,CACF;4BACD,mCAAmC,EAAE,oCAAoC;yBAC1E,CAAC;iBACH;aACF;SACF,CAAC,CAAA;IACN,CAAC;CAAA;AA1DD,4CA0DC;AAED,SAAsB,uBAAuB,CAC3C,OAA4B,EAC5B,WAA+B;;QAE/B,IAAI,OAAO,CAAC,cAAc,CAAC,mBAAmB,EAAE;YAC9C,MAAM,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAC9C,WAAW,EACX,OAAO,CACR,CAAA;SACF;QAED,IAAI,OAAO,CAAC,cAAc,CAAC,mBAAmB,EAAE;YAC9C,MAAM,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAC9C,WAAW,EACX,OAAO,CACR,CAAA;SACF;IACH,CAAC;CAAA;AAjBD,0DAiBC"}
+{"version":3,"file":"webpack.server.js","sourceRoot":"","sources":["../../src/webpack/webpack.server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,sDAA8B;AAO9B,iEAGgC;AAEhC,SAAsB,gBAAgB,CACpC,OAA4B,EAC5B,WAA+B;;;QAE/B,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM;YAAE,OAAO;QAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC;QAElD,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC;aACtB,KAAK,CACJ;YACE,YAAY,CAAC,MAAM,IAAI,EAAE;YACzB,YAAY,CAAC,KAAK;SACnB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAa,CACvC,CAAC;QAEJ,WAAW,CAAC,KAAK,CAAC;YACd,MAAM,EAAE,MAAM;YACd,MAAM,EAAE;gBACN,QAAQ,EAAE,WAAW;gBACrB,OAAO,EAAE;oBACP,IAAI,EAAE,UAAU;iBACjB;aACF;YACD,YAAY,EAAE;gBACZ,QAAQ,EAAE,KAAK;aAChB;YACD,OAAO,EAAE,YAAY;YACrB,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;YAChC,MAAM,EAAE;gBACN,+BAA+B,EAAE;oBAC/B,MAAM,EAAE,oDAA6B;oBACrC,IAAI,EAAE,CAAC;4BACL,IAAI,EAAE,OAAO,CAAC,IAAI;4BAClB,MAAM,EAAE,IAAA,uCAAgB,EAAC,OAAO,CAAC;yBAClC,CAAC;iBACH;gBACD,cAAc,EAAE;oBACd,MAAM,EAAE,iBAAO,CAAC,YAAY;oBAC5B,IAAI,EAAE,CAAC;4BACL,gCAAgC,EAAE,IAAI,CAAC,SAAS,CAC9C,OAAO,CAAC,IAAI,CACb;4BACD,8BAA8B,EAAE,IAAI,CAAC,SAAS,CAC5C,cAAI,CAAC,OAAO,CACV,OAAO,CAAC,IAAI,EACZ,YAAY,CAAC,MAAM,CACpB,CACF;4BACD,+BAA+B,EAAE,CAAA,MAAA,OAAO,CAAC,aAAa,CAAC,OAAO,0CAAE,MAAM,KAAI,IAAI,CAAC,SAAS,CACtF,cAAI,CAAC,OAAO,CACV,OAAO,CAAC,IAAI,EACZ,MAAA,OAAO,CAAC,aAAa,CAAC,OAAO,0CAAE,MAAM,CACtC,CACF;4BACD,+BAA+B,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;4BACrD,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAChD,YAAY,CAAC,MAAM;mCAChB,cAAI,CAAC,OAAO,CACb,OAAO,CAAC,IAAI,EACZ,YAAY,CAAC,MAAM,CACpB,CACF;4BACD,mCAAmC,EAAE,oCAAoC;yBAC1E,CAAC;iBACH;aACF;SACF,CAAC,CAAA;;CACL;AAnED,4CAmEC;AAED,SAAsB,uBAAuB,CAC3C,OAA4B,EAC5B,WAA+B;;QAE/B,IAAI,OAAO,CAAC,cAAc,CAAC,mBAAmB,EAAE;YAC9C,MAAM,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAC9C,WAAW,EACX,OAAO,CACR,CAAA;SACF;IACH,CAAC;CAAA;AAVD,0DAUC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-scripts",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.7",
   "description": "",
   "main": "lib/index.js",
   "bin": {
@@ -16,7 +16,7 @@
     "commander": "^9.4.0",
     "glob": "^8.0.3",
     "nodemon": "^2.0.20",
-    "sugar-server": "^1.0.0-beta.3",
+    "sugar-server": "^1.0.0-beta.4",
     "ts-node": "^10.9.1",
     "webpack": "^5.74.0",
     "webpack-chain": "~6.5.1",