sugar-scripts 1.0.0-beta.6 → 1.0.0-beta.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +36 -50
- package/lib/commander/index.js +3 -1
- package/lib/commander/index.js.map +1 -1
- package/lib/constants/index.d.ts +2 -2
- package/lib/constants/index.js +3 -3
- package/lib/constants/index.js.map +1 -1
- package/lib/core/cache.js +1 -1
- package/lib/core/cache.js.map +1 -1
- package/lib/core/init-running-context.js +3 -6
- package/lib/core/init-running-context.js.map +1 -1
- package/lib/core/running-context.d.ts +1 -7
- package/lib/core/running-context.js +3 -10
- package/lib/core/running-context.js.map +1 -1
- package/lib/custom-config.type.d.ts +29 -15
- package/lib/custom-config.type.js.map +1 -1
- package/lib/shared/file-helpers.d.ts +1 -5
- package/lib/shared/file-helpers.js +7 -53
- package/lib/shared/file-helpers.js.map +1 -1
- package/lib/webpack/webpack.browser.js +0 -3
- package/lib/webpack/webpack.browser.js.map +1 -1
- package/lib/webpack/webpack.server.js +9 -5
- package/lib/webpack/webpack.server.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -1,64 +1,50 @@
|
|
|
1
|
-
|
|
2
|
-
1. `sugar.project.ts`
|
|
3
|
-
2. `sugar.package.ts`
|
|
4
|
-
3. `sugar.build.ts`
|
|
1
|
+
# sugar-scripts
|
|
5
2
|
|
|
6
3
|
|
|
7
|
-
|
|
4
|
+
## 自动配置
|
|
8
5
|
```ts
|
|
9
|
-
import
|
|
10
|
-
types
|
|
11
|
-
} from 'sugar-scripts';
|
|
12
|
-
|
|
13
|
-
// 待定
|
|
6
|
+
import HomePageView from 'sugar?browser-entry/../../browser/home';
|
|
14
7
|
```
|
|
15
8
|
|
|
9
|
+
## 配置文件
|
|
10
|
+
`sugar.config.ts` 项目说明文件，放于项目根目录，一般和package.json同级
|
|
16
11
|
|
|
17
|
-
#### sugar.package.js 配置文件
|
|
18
|
-
```ts
|
|
19
|
-
import type {
|
|
20
|
-
types
|
|
21
|
-
} from 'sugar-scripts';
|
|
22
|
-
|
|
23
|
-
export const packageConfig: types.PackageConfig;
|
|
24
|
-
```
|
|
25
12
|
|
|
13
|
+
#### sugar.config.ts 配置文件详细说明
|
|
26
14
|
|
|
15
|
+
sugar.config.ts按需导出3个配置内容
|
|
16
|
+
1. `packageConfig`
|
|
17
|
+
2. `browserWebpackConfig`
|
|
18
|
+
3. `serverWebpackConfig`
|
|
27
19
|
|
|
28
20
|
|
|
29
|
-
|
|
21
|
+
##### packageConfig
|
|
30
22
|
```ts
|
|
31
|
-
import
|
|
32
|
-
|
|
23
|
+
import {
|
|
24
|
+
SugarScriptsProject
|
|
33
25
|
} from 'sugar-scripts';
|
|
34
26
|
|
|
35
|
-
export const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
27
|
+
export const projectConfig: SugarScriptsProject.PackageConfig = {
|
|
28
|
+
/**
|
|
29
|
+
* 用于存放打包过程中的一些缓存和过渡产物
|
|
30
|
+
* 相对于当前sugar.config的路径
|
|
31
|
+
* 默认使用 './sugar-cache'
|
|
32
|
+
*/
|
|
33
|
+
cacheDir: './sugar-cache',
|
|
34
|
+
browser?: {
|
|
35
|
+
/**
|
|
36
|
+
* 输出目录
|
|
37
|
+
*/
|
|
38
|
+
output: string;
|
|
39
|
+
// exposes?: string[] | {[index: string]: string},
|
|
40
|
+
entry?: BuildEntry
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
server?: {
|
|
44
|
+
// dll?: boolean;
|
|
45
|
+
output: string;
|
|
46
|
+
entry: string;
|
|
47
|
+
render?: string;
|
|
48
|
+
};
|
|
49
|
+
}
|
|
56
50
|
```
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
### cache
|
|
60
|
-
```bash
|
|
61
|
-
sugar-scripts cache
|
|
62
|
-
```
|
|
63
|
-
|
|
64
|
-
|
package/lib/commander/index.js
CHANGED
|
@@ -38,6 +38,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
38
38
|
const path_1 = __importDefault(require("path"));
|
|
39
39
|
const commander_1 = require("commander");
|
|
40
40
|
const nodemon_1 = __importDefault(require("nodemon"));
|
|
41
|
+
// @ts-ignore
|
|
42
|
+
const package_json_1 = __importDefault(require("../../package.json"));
|
|
41
43
|
const logger = __importStar(require("../shared/logger"));
|
|
42
44
|
const init_running_context_1 = require("../core/init-running-context");
|
|
43
45
|
const build_1 = require("../core/build");
|
|
@@ -45,7 +47,7 @@ const cache_1 = require("../core/cache");
|
|
|
45
47
|
const run_application_1 = require("../core/run-application");
|
|
46
48
|
const program = new commander_1.Command();
|
|
47
49
|
program
|
|
48
|
-
.version(
|
|
50
|
+
.version(package_json_1.default.version);
|
|
49
51
|
program
|
|
50
52
|
.command('info')
|
|
51
53
|
.description('工程信息')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commander/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,yCAAoC;AACpC,sDAA8B;AAE9B,yDAA2C;AAC3C,uEAEsC;AACtC,yCAEuB;AAIvB,yCAEuB;AACvB,6DAEiC;AAEjC,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAC9B,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commander/index.ts"],"names":[],"mappings":"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"}
|
package/lib/constants/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare const
|
|
2
|
-
export declare const SUGAR_PROJECT_CONFIG_FILENAME = "sugar.project";
|
|
1
|
+
export declare const SUGAR_CONFIG_FILENAME = "sugar.config";
|
|
3
2
|
export declare const SUGAR_BUILD_EXPORT_BROWSER = "browserWebpackConfig";
|
|
4
3
|
export declare const SUGAR_BUILD_EXPORT_SERVER = "serverWebpackConfig";
|
|
4
|
+
export declare const DEFAULT_CACHED_DIR = "./sugar-cache";
|
package/lib/constants/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
5
|
-
exports.SUGAR_PROJECT_CONFIG_FILENAME = 'sugar.project';
|
|
3
|
+
exports.DEFAULT_CACHED_DIR = exports.SUGAR_BUILD_EXPORT_SERVER = exports.SUGAR_BUILD_EXPORT_BROWSER = exports.SUGAR_CONFIG_FILENAME = void 0;
|
|
4
|
+
exports.SUGAR_CONFIG_FILENAME = 'sugar.config';
|
|
6
5
|
exports.SUGAR_BUILD_EXPORT_BROWSER = 'browserWebpackConfig';
|
|
7
6
|
exports.SUGAR_BUILD_EXPORT_SERVER = 'serverWebpackConfig';
|
|
7
|
+
exports.DEFAULT_CACHED_DIR = './sugar-cache';
|
|
8
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":";;;AAAa,QAAA,
|
|
1
|
+
{"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
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.clean = void 0;
|
|
4
4
|
const file_helpers_1 = require("../shared/file-helpers");
|
|
5
5
|
const clean = (context) => {
|
|
6
|
-
return (0, file_helpers_1.rm)(context.
|
|
6
|
+
return (0, file_helpers_1.rm)(context.getCacheDir());
|
|
7
7
|
};
|
|
8
8
|
exports.clean = clean;
|
|
9
9
|
//# sourceMappingURL=cache.js.map
|
package/lib/core/cache.js.map
CHANGED
|
@@ -1 +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,
|
|
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,WAAW,EAAE,CACtB,CAAC;AACJ,CAAC,CAAA;AANY,QAAA,KAAK,SAMjB"}
|
|
@@ -13,17 +13,14 @@ exports.initRunningContext = void 0;
|
|
|
13
13
|
const file_helpers_1 = require("../shared/file-helpers");
|
|
14
14
|
const running_context_1 = require("./running-context");
|
|
15
15
|
const initRunningContext = (dir, { watch } = {}) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
|
-
const { root, packageJson, packageConfigs } = yield (0, file_helpers_1.
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
throw new Error('');
|
|
16
|
+
const { root, packageJson, packageConfigs } = yield (0, file_helpers_1.findConfig)(dir);
|
|
17
|
+
if (!packageConfigs) {
|
|
18
|
+
throw new Error('not found packageConfigs');
|
|
20
19
|
}
|
|
21
20
|
return new running_context_1.SugarScriptsContext({
|
|
22
21
|
root,
|
|
23
22
|
packageName: packageJson.name,
|
|
24
23
|
packageConfigs,
|
|
25
|
-
projectRoot,
|
|
26
|
-
projectConfigs,
|
|
27
24
|
watch: !!watch
|
|
28
25
|
});
|
|
29
26
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-running-context.js","sourceRoot":"","sources":["../../src/core/init-running-context.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"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"}
|
|
@@ -3,23 +3,17 @@ export declare class SugarScriptsContext {
|
|
|
3
3
|
root: string;
|
|
4
4
|
rootHash: string;
|
|
5
5
|
packageName: string;
|
|
6
|
-
projectRoot: string;
|
|
7
6
|
packageConfigs: SugarScriptsProject.SugarPackageConfigs;
|
|
8
|
-
projectConfigs: SugarScriptsProject.SugarProjectConfigs;
|
|
9
7
|
watch: boolean;
|
|
10
|
-
constructor({ root, packageName, packageConfigs,
|
|
8
|
+
constructor({ root, packageName, packageConfigs, watch }: {
|
|
11
9
|
root: string;
|
|
12
10
|
packageName: string;
|
|
13
11
|
packageConfigs: SugarScriptsProject.SugarPackageConfigs;
|
|
14
|
-
projectRoot: string;
|
|
15
|
-
projectConfigs: SugarScriptsProject.SugarProjectConfigs;
|
|
16
12
|
watch: boolean;
|
|
17
13
|
});
|
|
18
14
|
serverEntryName: string;
|
|
19
15
|
get packageConfig(): SugarScriptsProject.PackageConfig;
|
|
20
|
-
get projectConfig(): SugarScriptsProject.ProjectConfig;
|
|
21
16
|
getStartFilePath(): string | undefined;
|
|
22
|
-
getCacheRootDir(): string;
|
|
23
17
|
getCacheDir(): string;
|
|
24
18
|
getDirHash(): Promise<unknown>;
|
|
25
19
|
}
|
|
@@ -15,33 +15,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.SugarScriptsContext = void 0;
|
|
16
16
|
const path_1 = __importDefault(require("path"));
|
|
17
17
|
const file_helpers_1 = require("../shared/file-helpers");
|
|
18
|
+
const constants_1 = require("../constants");
|
|
18
19
|
class SugarScriptsContext {
|
|
19
|
-
constructor({ root, packageName, packageConfigs,
|
|
20
|
+
constructor({ root, packageName, packageConfigs, watch }) {
|
|
20
21
|
this.serverEntryName = 'main';
|
|
21
22
|
this.root = root;
|
|
22
23
|
this.packageName = packageName;
|
|
23
|
-
this.projectRoot = projectRoot;
|
|
24
24
|
this.packageConfigs = packageConfigs;
|
|
25
|
-
this.projectConfigs = projectConfigs;
|
|
26
25
|
this.rootHash = (0, file_helpers_1.getHashFromRoot)(root);
|
|
27
26
|
this.watch = watch;
|
|
28
27
|
}
|
|
29
28
|
get packageConfig() {
|
|
30
29
|
return this.packageConfigs.packageConfig;
|
|
31
30
|
}
|
|
32
|
-
get projectConfig() {
|
|
33
|
-
return this.projectConfigs.projectConfig;
|
|
34
|
-
}
|
|
35
31
|
getStartFilePath() {
|
|
36
32
|
if (this.packageConfig.server) {
|
|
37
33
|
return path_1.default.resolve(this.root, this.packageConfig.server.output, this.serverEntryName);
|
|
38
34
|
}
|
|
39
35
|
}
|
|
40
|
-
getCacheRootDir() {
|
|
41
|
-
return path_1.default.resolve(this.projectRoot, this.projectConfig.cacheDir);
|
|
42
|
-
}
|
|
43
36
|
getCacheDir() {
|
|
44
|
-
return path_1.default.resolve(this.
|
|
37
|
+
return path_1.default.resolve(this.root, this.packageConfig.cacheDir || constants_1.DEFAULT_CACHED_DIR);
|
|
45
38
|
}
|
|
46
39
|
getDirHash() {
|
|
47
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"running-context.js","sourceRoot":"","sources":["../../src/core/running-context.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAKxB,yDAGgC;
|
|
1
|
+
{"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"}
|
|
@@ -1,51 +1,65 @@
|
|
|
1
1
|
import type { Controller } from 'sugar-server';
|
|
2
2
|
import type WebpackChainConfig from 'webpack-chain';
|
|
3
3
|
import { SugarScriptsContext } from './core/running-context';
|
|
4
|
-
|
|
4
|
+
type ControllerContext = Controller["context"];
|
|
5
5
|
export declare namespace SugarScriptsProject {
|
|
6
6
|
type BrowserWebpackConfig = CustomWebpackConfig;
|
|
7
7
|
type ServerWebpackConfig = CustomWebpackConfig;
|
|
8
8
|
interface PackageConfig {
|
|
9
|
+
/**
|
|
10
|
+
* 用于存放打包过程中的一些缓存和过渡产物
|
|
11
|
+
* 相对于当前sugar.config的路径
|
|
12
|
+
* 默认使用 './sugar-cache'
|
|
13
|
+
*/
|
|
14
|
+
cacheDir?: string;
|
|
15
|
+
/**
|
|
16
|
+
* 浏览器端js输出目录，不配置就不会进行相关打包
|
|
17
|
+
*/
|
|
9
18
|
browser?: {
|
|
10
19
|
/**
|
|
11
|
-
*
|
|
20
|
+
* 输出目录，必填
|
|
12
21
|
*/
|
|
22
|
+
output: string;
|
|
13
23
|
/**
|
|
14
|
-
*
|
|
24
|
+
* 额外入口配置，可以不用
|
|
15
25
|
*/
|
|
16
|
-
output: string;
|
|
17
26
|
entry?: BuildEntry;
|
|
18
27
|
};
|
|
28
|
+
/**
|
|
29
|
+
* node server端输出目录，不配置就不会进行相关打包
|
|
30
|
+
*/
|
|
19
31
|
server?: {
|
|
32
|
+
/**
|
|
33
|
+
* 输出目录，必填
|
|
34
|
+
*/
|
|
20
35
|
output: string;
|
|
36
|
+
/**
|
|
37
|
+
* node的启动文件
|
|
38
|
+
*/
|
|
21
39
|
entry: string;
|
|
40
|
+
/**
|
|
41
|
+
* 自动注入的render文件
|
|
42
|
+
* 为sugar-server-utils 提供的自动render
|
|
43
|
+
*/
|
|
22
44
|
render?: string;
|
|
23
45
|
};
|
|
24
46
|
}
|
|
25
|
-
interface ProjectConfig {
|
|
26
|
-
cacheDir: string;
|
|
27
|
-
}
|
|
28
47
|
type SugarPackageConfigs = {
|
|
29
48
|
packageConfig: PackageConfig;
|
|
30
49
|
browserWebpackConfig?: BrowserWebpackConfig;
|
|
31
50
|
serverWebpackConfig?: ServerWebpackConfig;
|
|
32
51
|
};
|
|
33
|
-
type SugarProjectConfigs = {
|
|
34
|
-
projectConfig: ProjectConfig;
|
|
35
|
-
browserWebpackConfig?: BrowserWebpackConfig;
|
|
36
|
-
serverWebpackConfig?: ServerWebpackConfig;
|
|
37
|
-
};
|
|
38
52
|
interface CustomRender<C = any> {
|
|
39
53
|
(ctx: ControllerContext, entries: string[] | {
|
|
40
54
|
[key: string]: string[];
|
|
41
55
|
}, custom: C): string;
|
|
42
56
|
}
|
|
43
57
|
}
|
|
44
|
-
|
|
58
|
+
type BuildEntry = {
|
|
45
59
|
[key: string]: string | string[];
|
|
46
60
|
};
|
|
47
|
-
export
|
|
48
|
-
export
|
|
61
|
+
export type CustomWebpackConfig = (webpackChainConfig: WebpackChainConfig, context: SugarScriptsContext) => void;
|
|
62
|
+
export type CustomRender<C = any> = (ctx: ControllerContext, entries: string[] | {
|
|
49
63
|
[key: string]: string[];
|
|
50
64
|
}, custom: C) => string;
|
|
51
65
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-config.type.js","sourceRoot":"","sources":["../src/custom-config.type.ts"],"names":[],"mappings":";;;AAWA,IAAiB,mBAAmB,
|
|
1
|
+
{"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"}
|
|
@@ -4,15 +4,11 @@ export declare const findSiblingFile: (currentFilePath: string, searchFileName:
|
|
|
4
4
|
export declare const findParentFile: (currentFilePath: string, searchFileName: string) => Promise<string | null>;
|
|
5
5
|
export declare const loadJSON: (filePath: string) => Promise<any>;
|
|
6
6
|
export declare const writeFileSync: (filePath: string, data: string | NodeJS.ArrayBufferView) => void;
|
|
7
|
-
export declare const
|
|
7
|
+
export declare const findConfig: (dir: string) => Promise<{
|
|
8
8
|
root: string;
|
|
9
9
|
packageJson: any;
|
|
10
10
|
packageConfigs: SugarScriptsProject.SugarPackageConfigs | null;
|
|
11
11
|
}>;
|
|
12
|
-
export declare const findProject: (dir: string) => Promise<{
|
|
13
|
-
projectRoot: string;
|
|
14
|
-
projectConfigs: SugarScriptsProject.SugarProjectConfigs;
|
|
15
|
-
}>;
|
|
16
12
|
export declare const rm: (filePath: string) => Promise<void>;
|
|
17
13
|
export declare function getHashFromRoot(root: string): string;
|
|
18
14
|
export declare function asyncGetDirHash(dirPath: string): Promise<unknown>;
|
|
@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
exports.asyncGetDirHash = exports.getHashFromRoot = exports.rm = exports.
|
|
38
|
+
exports.asyncGetDirHash = exports.getHashFromRoot = exports.rm = exports.findConfig = exports.writeFileSync = exports.loadJSON = exports.findParentFile = exports.findSiblingFile = exports.searchFiles = void 0;
|
|
39
39
|
const fs_1 = __importDefault(require("fs"));
|
|
40
40
|
const path_1 = __importDefault(require("path"));
|
|
41
41
|
const crypto_1 = require("crypto");
|
|
@@ -114,7 +114,7 @@ const writeFileSync = (filePath, data) => {
|
|
|
114
114
|
fs_1.default.writeFileSync(filePath, data);
|
|
115
115
|
};
|
|
116
116
|
exports.writeFileSync = writeFileSync;
|
|
117
|
-
const
|
|
117
|
+
const findConfig = (dir) => __awaiter(void 0, void 0, void 0, function* () {
|
|
118
118
|
const packagePath = path_1.default.resolve(dir, 'package.json');
|
|
119
119
|
let existed = true;
|
|
120
120
|
try {
|
|
@@ -124,7 +124,7 @@ const findPackage = (dir) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
124
124
|
existed = false;
|
|
125
125
|
}
|
|
126
126
|
let packageConfigs = null;
|
|
127
|
-
const sugarPackagePath = path_1.default.resolve(dir, constants_1.
|
|
127
|
+
const sugarPackagePath = path_1.default.resolve(dir, constants_1.SUGAR_CONFIG_FILENAME);
|
|
128
128
|
let existedFile = '';
|
|
129
129
|
try {
|
|
130
130
|
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* () {
|
|
|
148
148
|
existedFile
|
|
149
149
|
]
|
|
150
150
|
});
|
|
151
|
-
logger.success(`find ${constants_1.
|
|
151
|
+
logger.success(`find ${constants_1.SUGAR_CONFIG_FILENAME}: ${existedFile}`);
|
|
152
152
|
try {
|
|
153
153
|
packageConfigs = require(existedFile);
|
|
154
154
|
}
|
|
@@ -158,7 +158,7 @@ const findPackage = (dir) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
158
158
|
}
|
|
159
159
|
if (existed) {
|
|
160
160
|
if (!packageConfigs) {
|
|
161
|
-
throw new Error(`not found ${constants_1.
|
|
161
|
+
throw new Error(`not found ${constants_1.SUGAR_CONFIG_FILENAME}`);
|
|
162
162
|
}
|
|
163
163
|
return {
|
|
164
164
|
root: dir,
|
|
@@ -169,55 +169,9 @@ const findPackage = (dir) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
169
169
|
if (dir === '/') {
|
|
170
170
|
throw new Error('not found package.json');
|
|
171
171
|
}
|
|
172
|
-
return (0, exports.
|
|
172
|
+
return (0, exports.findConfig)(path_1.default.resolve(dir, '../'));
|
|
173
173
|
});
|
|
174
|
-
exports.
|
|
175
|
-
const findProject = (dir) => __awaiter(void 0, void 0, void 0, function* () {
|
|
176
|
-
const projectPath = path_1.default.resolve(dir, constants_1.SUGAR_PROJECT_CONFIG_FILENAME);
|
|
177
|
-
let projectConfigs = null;
|
|
178
|
-
let existedFile = '';
|
|
179
|
-
try {
|
|
180
|
-
yield fsPromises.access(projectPath + '.ts', fs_1.default.constants.F_OK);
|
|
181
|
-
existedFile = projectPath + '.ts';
|
|
182
|
-
}
|
|
183
|
-
catch (e) { }
|
|
184
|
-
if (!existedFile) {
|
|
185
|
-
try {
|
|
186
|
-
yield fsPromises.access(projectPath + '.js', fs_1.default.constants.F_OK);
|
|
187
|
-
existedFile = projectPath + '.js';
|
|
188
|
-
}
|
|
189
|
-
catch (e) { }
|
|
190
|
-
}
|
|
191
|
-
if (existedFile) {
|
|
192
|
-
tsNode.register({
|
|
193
|
-
cwd: dir,
|
|
194
|
-
projectSearchDir: dir,
|
|
195
|
-
project: path_1.default.resolve(dir, './tsconfig.json'),
|
|
196
|
-
transpileOnly: true,
|
|
197
|
-
require: [
|
|
198
|
-
existedFile
|
|
199
|
-
]
|
|
200
|
-
});
|
|
201
|
-
logger.success(`find ${constants_1.SUGAR_PROJECT_CONFIG_FILENAME}: ${existedFile}`);
|
|
202
|
-
try {
|
|
203
|
-
projectConfigs = require(existedFile);
|
|
204
|
-
}
|
|
205
|
-
catch (e) {
|
|
206
|
-
throw e;
|
|
207
|
-
}
|
|
208
|
-
if (projectConfigs) {
|
|
209
|
-
return {
|
|
210
|
-
projectRoot: dir,
|
|
211
|
-
projectConfigs
|
|
212
|
-
};
|
|
213
|
-
}
|
|
214
|
-
}
|
|
215
|
-
if (dir === '/') {
|
|
216
|
-
throw new Error(`not found ${constants_1.SUGAR_PROJECT_CONFIG_FILENAME}`);
|
|
217
|
-
}
|
|
218
|
-
return (0, exports.findProject)(path_1.default.resolve(dir, '../'));
|
|
219
|
-
});
|
|
220
|
-
exports.findProject = findProject;
|
|
174
|
+
exports.findConfig = findConfig;
|
|
221
175
|
const rm = (filePath) => __awaiter(void 0, void 0, void 0, function* () {
|
|
222
176
|
const stat = yield fsPromises.stat(filePath);
|
|
223
177
|
if (stat.isFile()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-helpers.js","sourceRoot":"","sources":["../../src/shared/file-helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,mCAAoC;AAEpC,gDAAkC;AAElC,yDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"file-helpers.js","sourceRoot":"","sources":["../../src/shared/file-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,9 +76,6 @@ function mergeBrowserEntry(context, chainConfig) {
|
|
|
76
76
|
exports.mergeBrowserEntry = mergeBrowserEntry;
|
|
77
77
|
function mergeBrowserCustomConfig(context, chainConfig) {
|
|
78
78
|
return __awaiter(this, void 0, void 0, function* () {
|
|
79
|
-
if (context.projectConfigs.browserWebpackConfig) {
|
|
80
|
-
yield context.projectConfigs.browserWebpackConfig(chainConfig, context);
|
|
81
|
-
}
|
|
82
79
|
if (context.packageConfigs.browserWebpackConfig) {
|
|
83
80
|
yield context.packageConfigs.browserWebpackConfig(chainConfig, context);
|
|
84
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;
|
|
1
|
+
{"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"}
|
|
@@ -17,6 +17,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
17
17
|
const webpack_1 = __importDefault(require("webpack"));
|
|
18
18
|
const server_browser_entry_1 = require("./server-browser-entry");
|
|
19
19
|
function mergeServerEntry(context, chainConfig) {
|
|
20
|
+
var _a, _b;
|
|
20
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
22
|
if (!context.packageConfig.server)
|
|
22
23
|
return;
|
|
@@ -28,6 +29,11 @@ function mergeServerEntry(context, chainConfig) {
|
|
|
28
29
|
].filter((path) => !!path));
|
|
29
30
|
chainConfig.merge({
|
|
30
31
|
target: 'node',
|
|
32
|
+
node: {
|
|
33
|
+
global: false,
|
|
34
|
+
__filename: false,
|
|
35
|
+
__dirname: false,
|
|
36
|
+
},
|
|
31
37
|
output: {
|
|
32
38
|
filename: '[name].js',
|
|
33
39
|
library: {
|
|
@@ -50,8 +56,9 @@ function mergeServerEntry(context, chainConfig) {
|
|
|
50
56
|
'DefinePlugin': {
|
|
51
57
|
plugin: webpack_1.default.DefinePlugin,
|
|
52
58
|
args: [{
|
|
53
|
-
'process.env.SUGAR_PROJECT_ROOT': JSON.stringify(context.
|
|
54
|
-
'process.env.
|
|
59
|
+
'process.env.SUGAR_PROJECT_ROOT': JSON.stringify(context.root),
|
|
60
|
+
'process.env.SUGAR_SERVER_DIR': JSON.stringify(path_1.default.resolve(context.root, serverConfig.output)),
|
|
61
|
+
'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)),
|
|
55
62
|
'process.env.SUGAR_PROJECT_RUN': JSON.stringify(true),
|
|
56
63
|
'process.env.SUGAR_PROJECT_RENDER': JSON.stringify(serverConfig.render
|
|
57
64
|
&& path_1.default.resolve(context.root, serverConfig.render)),
|
|
@@ -65,9 +72,6 @@ function mergeServerEntry(context, chainConfig) {
|
|
|
65
72
|
exports.mergeServerEntry = mergeServerEntry;
|
|
66
73
|
function mergeServerCustomConfig(context, chainConfig) {
|
|
67
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
68
|
-
if (context.projectConfigs.serverWebpackConfig) {
|
|
69
|
-
yield context.projectConfigs.serverWebpackConfig(chainConfig, context);
|
|
70
|
-
}
|
|
71
75
|
if (context.packageConfigs.serverWebpackConfig) {
|
|
72
76
|
yield context.packageConfigs.serverWebpackConfig(chainConfig, context);
|
|
73
77
|
}
|
|
@@ -1 +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
|
|
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,IAAI,EAAE;gBACJ,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,KAAK;gBACjB,SAAS,EAAE,KAAK;aACjB;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;AAxED,4CAwEC;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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sugar-scripts",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.8",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"commander": "^9.4.0",
|
|
17
17
|
"glob": "^8.0.3",
|
|
18
18
|
"nodemon": "^2.0.20",
|
|
19
|
-
"sugar-server": "^1.0.0-beta.
|
|
19
|
+
"sugar-server": "^1.0.0-beta.5",
|
|
20
20
|
"ts-node": "^10.9.1",
|
|
21
21
|
"webpack": "^5.74.0",
|
|
22
22
|
"webpack-chain": "~6.5.1",
|