@supersdk/supercli 0.3.2-staging.44 → 0.3.2
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/dist/cli.js +11 -22
- package/dist/cli.js.map +1 -1
- package/dist/commands/add.js +31 -79
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/analytics.js +9 -15
- package/dist/commands/analytics.js.map +1 -1
- package/dist/commands/db.js +19 -24
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/deploy.js +751 -434
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/env.js +8 -8
- package/dist/commands/env.js.map +1 -1
- package/dist/commands/image.js +20 -31
- package/dist/commands/image.js.map +1 -1
- package/dist/commands/init.js +37 -68
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/logs.js +7 -16
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/publishSite.js +943 -28
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/register.js +30 -51
- package/dist/commands/register.js.map +1 -1
- package/dist/commands/settings.js +6 -10
- package/dist/commands/settings.js.map +1 -1
- package/dist/config/appConfig.js +36 -40
- package/dist/config/appConfig.js.map +1 -1
- package/dist/docker/dockerCli.js +1 -63
- package/dist/docker/dockerCli.js.map +1 -1
- package/dist/output/envelope.js +1 -5
- package/dist/output/envelope.js.map +1 -1
- package/dist/output/resultPrinter.js +0 -3
- package/dist/output/resultPrinter.js.map +1 -1
- package/dist/publish/responseClassifier.js +4 -4
- package/dist/publish/responseClassifier.js.map +1 -1
- package/dist/publish/runClient.js +11 -11
- package/dist/publish/runClient.js.map +1 -1
- package/dist/publish/siteConfig.js +649 -0
- package/dist/publish/siteConfig.js.map +1 -0
- package/dist/publish/siteZip.js +5 -4
- package/dist/publish/siteZip.js.map +1 -1
- package/dist/template/README.md +227 -64
- package/dist/template/android/app/src/main/java/com/supersdk/simple/EnvironmentStore.java +1 -1
- package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +2 -2
- package/dist/template/android/gradle/supersdk-config-reader.gradle +5 -6
- package/dist/template/android/supersdk-default.config.json +2 -3
- package/dist/template/ios/Sources/App/AppDelegate.swift +1 -1
- package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +1 -1
- package/dist/template/scripts/build_android.sh +10 -26
- package/dist/template/scripts/build_ios.sh +9 -41
- package/dist/template/scripts/build_site.sh +26 -40
- package/dist/template/scripts/lib/workspace.sh +4 -4
- package/dist/template/scripts/serve_web.py +4 -2
- package/dist/template/scripts/super_build_orchestrator.py +355 -278
- package/dist/template/scripts/supersdk_template.py +181 -414
- package/dist/template/scripts/web_package.py +8 -9
- package/dist/template/super_build.sh +113 -39
- package/dist/template/{super.json → supersdk.json} +1 -20
- package/dist/template/template_manifest.json +4 -5
- package/dist/workspace/config.js +119 -81
- package/dist/workspace/config.js.map +1 -1
- package/dist/workspace/identity.js +14 -15
- package/dist/workspace/identity.js.map +1 -1
- package/dist/workspace/inspect.js +0 -1
- package/dist/workspace/inspect.js.map +1 -1
- package/dist/workspace/projectIdentity.js +96 -53
- package/dist/workspace/projectIdentity.js.map +1 -1
- package/dist/workspace/template.js +8 -5
- package/dist/workspace/template.js.map +1 -1
- package/package.json +2 -2
- package/dist/build/artifactIntegrity.js +0 -119
- package/dist/build/artifactIntegrity.js.map +0 -1
- package/dist/commands/build.js +0 -231
- package/dist/commands/build.js.map +0 -1
- package/dist/commands/config.js +0 -170
- package/dist/commands/config.js.map +0 -1
- package/dist/config/superConfig.js +0 -429
- package/dist/config/superConfig.js.map +0 -1
- package/dist/deploy/adapterTypes.js +0 -3
- package/dist/deploy/adapterTypes.js.map +0 -1
- package/dist/deploy/manifest.js +0 -381
- package/dist/deploy/manifest.js.map +0 -1
- package/dist/deploy/preflight.js +0 -202
- package/dist/deploy/preflight.js.map +0 -1
- package/dist/deploy/resultWriter.js +0 -178
- package/dist/deploy/resultWriter.js.map +0 -1
- package/dist/deploy/runAdapter.js +0 -299
- package/dist/deploy/runAdapter.js.map +0 -1
- package/dist/deploy/siteAdapter.js +0 -182
- package/dist/deploy/siteAdapter.js.map +0 -1
- package/dist/template/scripts/build_service.sh +0 -89
- package/dist/template/service/Dockerfile +0 -2
- package/dist/workspace/projectContext.js +0 -93
- package/dist/workspace/projectContext.js.map +0 -1
|
@@ -7,14 +7,11 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
|
7
7
|
WORKSPACE_ROOT="$(supersdk_require_workspace_root "$SCRIPT_DIR")"
|
|
8
8
|
PYTHON_BIN="${PYTHON_BIN:-python3}"
|
|
9
9
|
HELPER="$WORKSPACE_ROOT/scripts/supersdk_template.py"
|
|
10
|
-
CONFIG="$WORKSPACE_ROOT/
|
|
11
|
-
PROJECT_ID=""
|
|
10
|
+
CONFIG="$WORKSPACE_ROOT/supersdk.json"
|
|
12
11
|
PROJECT_DIR=""
|
|
13
|
-
OUTPUT_DIR=""
|
|
14
|
-
EVIDENCE_PATH=""
|
|
15
12
|
|
|
16
13
|
usage() {
|
|
17
|
-
echo "Usage: scripts/build_ios.sh --build --
|
|
14
|
+
echo "Usage: scripts/build_ios.sh --build [--project DIR]" >&2
|
|
18
15
|
}
|
|
19
16
|
|
|
20
17
|
build_seen=false
|
|
@@ -28,23 +25,14 @@ while [ "$#" -gt 0 ]; do
|
|
|
28
25
|
build_seen=true
|
|
29
26
|
shift
|
|
30
27
|
;;
|
|
31
|
-
--project
|
|
28
|
+
--project)
|
|
32
29
|
if [ "$#" -lt 2 ]; then
|
|
33
30
|
usage
|
|
34
31
|
exit 2
|
|
35
32
|
fi
|
|
36
|
-
|
|
33
|
+
PROJECT_DIR="$2"
|
|
37
34
|
shift 2
|
|
38
35
|
;;
|
|
39
|
-
--config)
|
|
40
|
-
if [ "$#" -lt 2 ]; then usage; exit 2; fi
|
|
41
|
-
CONFIG="$2"; shift 2 ;;
|
|
42
|
-
--output-dir)
|
|
43
|
-
if [ "$#" -lt 2 ]; then usage; exit 2; fi
|
|
44
|
-
OUTPUT_DIR="$2"; shift 2 ;;
|
|
45
|
-
--evidence)
|
|
46
|
-
if [ "$#" -lt 2 ]; then usage; exit 2; fi
|
|
47
|
-
EVIDENCE_PATH="$2"; shift 2 ;;
|
|
48
36
|
*)
|
|
49
37
|
echo "error: expected --build" >&2
|
|
50
38
|
exit 2
|
|
@@ -52,12 +40,9 @@ while [ "$#" -gt 0 ]; do
|
|
|
52
40
|
esac
|
|
53
41
|
done
|
|
54
42
|
|
|
55
|
-
if [ -z "$
|
|
56
|
-
PROJECT_DIR="$("$PYTHON_BIN" "$HELPER" resolve --config "$CONFIG" --platform ios
|
|
57
|
-
|
|
58
|
-
if [ -z "$EVIDENCE_PATH" ]; then EVIDENCE_PATH="$WORKSPACE_ROOT/$PROJECT_DIR/.supersdk/evidence/ios-build-evidence.json"; fi
|
|
59
|
-
|
|
60
|
-
"$PYTHON_BIN" "$HELPER" inject --root "$WORKSPACE_ROOT" --config "$CONFIG" --platform ios --project "$PROJECT_ID"
|
|
43
|
+
if [ -z "$PROJECT_DIR" ]; then
|
|
44
|
+
PROJECT_DIR="$("$PYTHON_BIN" "$HELPER" resolve --config "$CONFIG" --platform ios)"
|
|
45
|
+
fi
|
|
61
46
|
|
|
62
47
|
IOS_DIR="$WORKSPACE_ROOT/$PROJECT_DIR"
|
|
63
48
|
GENERATED_DIR="$IOS_DIR/.supersdk/generated"
|
|
@@ -106,7 +91,8 @@ simple_config = generated_dir / "SimpleConfig.swift"
|
|
|
106
91
|
|
|
107
92
|
if not managed_path.is_file():
|
|
108
93
|
print(
|
|
109
|
-
f"ios managed config missing
|
|
94
|
+
f"ios managed config missing; run scripts/supersdk_template.py inject --platform ios --project {project_dir} "
|
|
95
|
+
"or ./super_build.sh --platform ios --build",
|
|
110
96
|
file=sys.stderr,
|
|
111
97
|
)
|
|
112
98
|
sys.exit(1)
|
|
@@ -311,21 +297,3 @@ xcodebuild \
|
|
|
311
297
|
-destination "$SIMULATOR_DESTINATION" \
|
|
312
298
|
CODE_SIGNING_ALLOWED=NO \
|
|
313
299
|
test
|
|
314
|
-
|
|
315
|
-
mkdir -p "$OUTPUT_DIR" "$(dirname "$EVIDENCE_PATH")"
|
|
316
|
-
tar -cf "$OUTPUT_DIR/ios-simulator-build.tar" -C "$IOS_DIR" .supersdk/generated
|
|
317
|
-
"$PYTHON_BIN" - "$EVIDENCE_PATH" "$PROJECT_ID" "$PROJECT_DIR" "$SIMULATOR_DESTINATION" <<'PY'
|
|
318
|
-
import json
|
|
319
|
-
import sys
|
|
320
|
-
from pathlib import Path
|
|
321
|
-
|
|
322
|
-
path, project_id, project_dir, destination = sys.argv[1:]
|
|
323
|
-
Path(path).write_text(json.dumps({
|
|
324
|
-
"schemaVersion": 1,
|
|
325
|
-
"projectId": project_id,
|
|
326
|
-
"type": "ios",
|
|
327
|
-
"status": "success",
|
|
328
|
-
"projectDir": project_dir,
|
|
329
|
-
"destination": destination,
|
|
330
|
-
}, indent=2, sort_keys=True) + "\n", encoding="utf-8")
|
|
331
|
-
PY
|
|
@@ -7,51 +7,37 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
|
7
7
|
WORKSPACE_ROOT="$(supersdk_require_workspace_root "$SCRIPT_DIR")"
|
|
8
8
|
PYTHON_BIN="${PYTHON_BIN:-python3}"
|
|
9
9
|
HELPER="$WORKSPACE_ROOT/scripts/supersdk_template.py"
|
|
10
|
-
CONFIG="$WORKSPACE_ROOT/
|
|
11
|
-
|
|
12
|
-
OUTPUT_DIR=""
|
|
13
|
-
EVIDENCE_PATH=""
|
|
10
|
+
CONFIG="$WORKSPACE_ROOT/supersdk.json"
|
|
11
|
+
PROJECT_DIR=""
|
|
14
12
|
|
|
15
|
-
usage() { echo "Usage: scripts/build_site.sh --build --config PATH --project-id ID --output-dir DIR --evidence FILE" >&2; }
|
|
16
13
|
build_seen=false
|
|
17
14
|
while [ "$#" -gt 0 ]; do
|
|
18
15
|
case "$1" in
|
|
19
|
-
--build)
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
16
|
+
--build)
|
|
17
|
+
if [ "$build_seen" = true ]; then
|
|
18
|
+
echo "error: expected --build" >&2
|
|
19
|
+
exit 2
|
|
20
|
+
fi
|
|
21
|
+
build_seen=true
|
|
22
|
+
shift
|
|
23
|
+
;;
|
|
24
|
+
--project)
|
|
25
|
+
if [ "$#" -lt 2 ]; then
|
|
26
|
+
echo "error: --project requires a value" >&2
|
|
27
|
+
exit 2
|
|
28
|
+
fi
|
|
29
|
+
PROJECT_DIR="$2"
|
|
30
|
+
shift 2
|
|
31
|
+
;;
|
|
32
|
+
*)
|
|
33
|
+
echo "error: expected --build" >&2
|
|
34
|
+
exit 2
|
|
35
|
+
;;
|
|
25
36
|
esac
|
|
26
37
|
done
|
|
27
|
-
if [ "$build_seen" = false ]; then usage; exit 2; fi
|
|
28
|
-
if [ -z "$PROJECT_ID" ]; then PROJECT_ID="web"; fi
|
|
29
38
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
"$PYTHON_BIN" "$HELPER" inject --root "$WORKSPACE_ROOT" --config "$CONFIG" --platform site --project "$PROJECT_ID"
|
|
34
|
-
package_json="$("$PYTHON_BIN" "$WORKSPACE_ROOT/scripts/web_package.py" package-managed --root "$WORKSPACE_ROOT" --project "$PROJECT_DIR")"
|
|
35
|
-
printf '%s\n' "$package_json"
|
|
36
|
-
mkdir -p "$OUTPUT_DIR" "$(dirname "$EVIDENCE_PATH")"
|
|
37
|
-
"$PYTHON_BIN" - "$package_json" "$OUTPUT_DIR" "$EVIDENCE_PATH" "$PROJECT_ID" "$PROJECT_DIR" <<'PY'
|
|
38
|
-
import json
|
|
39
|
-
import shutil
|
|
40
|
-
import sys
|
|
41
|
-
from pathlib import Path
|
|
39
|
+
if [ -z "$PROJECT_DIR" ]; then
|
|
40
|
+
PROJECT_DIR="$("$PYTHON_BIN" "$HELPER" resolve --config "$CONFIG" --platform site)"
|
|
41
|
+
fi
|
|
42
42
|
|
|
43
|
-
|
|
44
|
-
output, evidence, project_id, project_dir = Path(sys.argv[2]), Path(sys.argv[3]), sys.argv[4], sys.argv[5]
|
|
45
|
-
shutil.copytree(Path(result["dist"]), output / "dist")
|
|
46
|
-
zip_path = result.get("zip")
|
|
47
|
-
if zip_path:
|
|
48
|
-
shutil.copy2(zip_path, output / Path(zip_path).name)
|
|
49
|
-
evidence.write_text(json.dumps({
|
|
50
|
-
"schemaVersion": 1,
|
|
51
|
-
"projectId": project_id,
|
|
52
|
-
"type": "site",
|
|
53
|
-
"status": "success",
|
|
54
|
-
"projectDir": project_dir,
|
|
55
|
-
"offline": {"host": result.get("host"), "skipped": bool(result.get("offline_skipped"))},
|
|
56
|
-
}, indent=2, sort_keys=True) + "\n", encoding="utf-8")
|
|
57
|
-
PY
|
|
43
|
+
exec "$PYTHON_BIN" "$WORKSPACE_ROOT/scripts/web_package.py" package-managed --root "$WORKSPACE_ROOT" --project "$PROJECT_DIR"
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
#!/usr/bin/env bash
|
|
2
2
|
# 工作空间定位的单一实现,被 super_build.sh 与所有 build_<type>.sh 复用。
|
|
3
3
|
#
|
|
4
|
-
# 🔴 为什么不能再用 `APP_ROOT="$(dirname "$0")/.."`:项目目录由用户在
|
|
4
|
+
# 🔴 为什么不能再用 `APP_ROOT="$(dirname "$0")/.."`:项目目录由用户在 supersdk.json 的
|
|
5
5
|
# `projects[].dir` 里指定,深度不定(`android`、`apps/android`、`clients/mobile/android`…)。
|
|
6
6
|
# 任何「固定层级」的反推都会在第一个非默认布局上算错根目录,而且是**静默**算错 ——
|
|
7
7
|
# 注入会写到一个不存在的地方,构建照样退出 0。
|
|
8
8
|
#
|
|
9
|
-
# 定位语义与 CLI 侧一致:向上查找 `
|
|
9
|
+
# 定位语义与 CLI 侧一致:向上查找 `supersdk.json`,它所在的目录就是工作空间根。
|
|
10
10
|
# `scripts/` 与 `super_build.sh` 是工作空间级共享物,所以脚本自身位置永远在根之下。
|
|
11
11
|
|
|
12
12
|
supersdk_find_workspace_root() {
|
|
13
13
|
dir="$1"
|
|
14
14
|
while :; do
|
|
15
|
-
if [ -f "$dir/
|
|
15
|
+
if [ -f "$dir/supersdk.json" ]; then
|
|
16
16
|
printf '%s\n' "$dir"
|
|
17
17
|
return 0
|
|
18
18
|
fi
|
|
@@ -36,7 +36,7 @@ supersdk_workspace_root() {
|
|
|
36
36
|
supersdk_require_workspace_root() {
|
|
37
37
|
root="$(supersdk_workspace_root "$1" || true)"
|
|
38
38
|
if [ -z "$root" ]; then
|
|
39
|
-
echo "error: no
|
|
39
|
+
echo "error: no supersdk.json found at or above $1; run this script from inside a SuperSDK workspace" >&2
|
|
40
40
|
exit 1
|
|
41
41
|
fi
|
|
42
42
|
printf '%s\n' "$root"
|
|
@@ -11,13 +11,15 @@ import supersdk_template
|
|
|
11
11
|
|
|
12
12
|
def resolve_site_dir(root, project):
|
|
13
13
|
"""站点目录来自配置,不是写死的 `web/`。"""
|
|
14
|
-
|
|
14
|
+
if project:
|
|
15
|
+
return project
|
|
16
|
+
return supersdk_template.resolve_single(Path(root) / supersdk_template.CONFIG_FILENAME, "site", None)
|
|
15
17
|
|
|
16
18
|
|
|
17
19
|
def main(argv=None):
|
|
18
20
|
parser = argparse.ArgumentParser(description="Serve a SuperSDK site project for local HTTP debugging")
|
|
19
21
|
parser.add_argument("--root", default=Path(__file__).resolve().parents[1], type=Path)
|
|
20
|
-
parser.add_argument("--project", default=None, help="
|
|
22
|
+
parser.add_argument("--project", default=None, help="Site project directory; resolved from supersdk.json when omitted.")
|
|
21
23
|
parser.add_argument(
|
|
22
24
|
"--host",
|
|
23
25
|
default="127.0.0.1",
|