build(npm): update gulp-haxetoolt
This commit is contained in:
@@ -1,13 +1,5 @@
|
|||||||
modules = ["."]
|
modules = ["."]
|
||||||
|
|
||||||
#[presets.haxe]
|
|
||||||
#variables.haxe_sources = [
|
|
||||||
# "./src/common/haxe",
|
|
||||||
# "./src/app/haxe",
|
|
||||||
# "./src/server/haxe",
|
|
||||||
#]
|
|
||||||
#tasks = {}
|
|
||||||
|
|
||||||
[presets.docker]
|
[presets.docker]
|
||||||
variables.docker_target = "web"
|
variables.docker_target = "web"
|
||||||
variables.docker_build_args = { PROJECT_NAME = "{{ project_name }}" }
|
variables.docker_build_args = { PROJECT_NAME = "{{ project_name }}" }
|
||||||
@@ -16,12 +8,11 @@ variables.docker_name = "{{ project_name }}-web"
|
|||||||
[presets.docker.tasks.build.compose]
|
[presets.docker.tasks.build.compose]
|
||||||
priority = 1
|
priority = 1
|
||||||
variables.sdk_path = "{{ 'SDK_PATH' | env('$HOME/sdk') }}"
|
variables.sdk_path = "{{ 'SDK_PATH' | env('$HOME/sdk') }}"
|
||||||
variables.publish_path = "{{ 'PUBLISH_PATH' | env('$HOME/public/' + project_name) }}"
|
|
||||||
variables.build_path = "{{ 'BUILD_PATH' | env('./build') }}"
|
variables.build_path = "{{ 'BUILD_PATH' | env('./build') }}"
|
||||||
variables.target_path = "{{ 'TARGET_PATH' | env('./target') }}"
|
variables.target_path = "{{ 'TARGET_PATH' | env('./target') }}"
|
||||||
commands = [
|
commands = [
|
||||||
"mkdir -p \"{{ sdk_path }}\" \"{{ publish_path }}\" \"{{ build_path }}\" \"{{ target_path }}\" \"src-gen\"",
|
"mkdir -p \"{{ sdk_path }}\" \"{{ build_path }}\" \"{{ target_path }}\" \"src-gen\"",
|
||||||
"PROJECT={{ project_name }} SDK_PATH={{ sdk_path }} BUILD_PATH={{ build_path }} TARGET_PATH={{ target_path }} PUBLISH_PATH={{ publish_path }} docker compose run --rm --user $(id -u):$(id -g) --build --remove-orphans builder",
|
"PROJECT={{ project_name }} SDK_PATH={{ sdk_path }} BUILD_PATH={{ build_path }} TARGET_PATH={{ target_path }} docker compose run --rm --user $(id -u):$(id -g) --build --remove-orphans builder",
|
||||||
]
|
]
|
||||||
|
|
||||||
[presets.gitea]
|
[presets.gitea]
|
||||||
|
|||||||
+6
-6
@@ -1,8 +1,8 @@
|
|||||||
FROM ubuntu:noble AS base
|
FROM ubuntu:resolute AS base
|
||||||
RUN apt update && apt install -y \
|
RUN apt update && apt install -y \
|
||||||
nodejs \
|
nodejs \
|
||||||
npm \
|
npm \
|
||||||
openjdk-11-jre \
|
openjdk-17-jre \
|
||||||
protobuf-compiler \
|
protobuf-compiler \
|
||||||
jq
|
jq
|
||||||
RUN node -v
|
RUN node -v
|
||||||
@@ -14,18 +14,18 @@ WORKDIR /app
|
|||||||
COPY package.json package-lock.json ./
|
COPY package.json package-lock.json ./
|
||||||
RUN --mount=type=cache,target=/root/.npm \
|
RUN --mount=type=cache,target=/root/.npm \
|
||||||
npm ci
|
npm ci
|
||||||
COPY gulpfile.ts protohx.json ./
|
COPY haxetool.json protohx.json ./
|
||||||
COPY config.example.json ./config.example.json
|
COPY config.example.json ./config.example.json
|
||||||
RUN --mount=type=secret,id=KEY_STORE \
|
RUN --mount=type=secret,id=KEY_STORE \
|
||||||
cat /run/secrets/KEY_STORE > ./key.jks
|
cat /run/secrets/KEY_STORE > ./key.jks
|
||||||
RUN --mount=type=secret,id=KEY_PASS \
|
RUN --mount=type=secret,id=KEY_PASS \
|
||||||
jq --arg key_pass "$(cat /run/secrets/KEY_PASS)" \
|
jq --arg key_pass "$(cat /run/secrets/KEY_PASS)" \
|
||||||
'.SdkDir = "/sdk" | .PublishDir = "/app/publish" | .Key.store = "key.jks" | .Key.pass = $key_pass' \
|
'.SdkDir = "/sdk" | .Key.store = "key.jks" | .Key.pass = $key_pass' \
|
||||||
config.example.json > config.json
|
config.example.json > config.json
|
||||||
COPY src ./src
|
COPY src ./src
|
||||||
COPY dependencies ./dependencies
|
COPY dependencies ./dependencies
|
||||||
VOLUME ["/sdk", "/app/build", "/app/target", "/app/publish", "/app/src-gen"]
|
VOLUME ["/sdk", "/app/build", "/app/target", "/app/src-gen"]
|
||||||
CMD ["npx", "gulp", "default"]
|
CMD ["npm", "run", "build"]
|
||||||
|
|
||||||
FROM hello-world AS web
|
FROM hello-world AS web
|
||||||
ARG PROJECT_NAME
|
ARG PROJECT_NAME
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ services:
|
|||||||
- ${SDK_PATH}:/sdk
|
- ${SDK_PATH}:/sdk
|
||||||
- ${BUILD_PATH}:/app/build
|
- ${BUILD_PATH}:/app/build
|
||||||
- ${TARGET_PATH}:/app/target
|
- ${TARGET_PATH}:/app/target
|
||||||
- ${PUBLISH_PATH}:/app/publish
|
|
||||||
- ./src-gen:/app/src-gen
|
- ./src-gen:/app/src-gen
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
import gulp from "gulp";
|
|
||||||
import { Preset } from "gulp-haxetool";
|
|
||||||
import config from "./config.json" with { type: "json" };
|
|
||||||
import presetData from "./haxetool.json" with { type: "json" };
|
|
||||||
import packageInfo from "./package.json" with { type: "json" };
|
|
||||||
|
|
||||||
const preset = new Preset(presetData, config, packageInfo);
|
|
||||||
export default preset.register(gulp);
|
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
"excludes": ["src-gen"],
|
||||||
"indentation": {
|
"indentation": {
|
||||||
"character": " "
|
"character": " "
|
||||||
},
|
},
|
||||||
|
|||||||
Generated
+89
-1441
File diff suppressed because it is too large
Load Diff
+4
-2
@@ -4,9 +4,11 @@
|
|||||||
"version": "0.6.2",
|
"version": "0.6.2",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "hxt default",
|
"build": "hxt default",
|
||||||
"dev": "hxt app:flash:test"
|
"dev": "hxt app:flash:test",
|
||||||
|
"lint": "hxt check --verbose",
|
||||||
|
"format": "hxt format"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"gulp-haxetool": "^2.0.3"
|
"gulp-haxetool": "^2.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
{
|
{
|
||||||
"args": ["${input:target}"],
|
"args": ["${input:target}"],
|
||||||
"name": "${input:target}",
|
"name": "${input:target}",
|
||||||
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
|
"program": "${workspaceFolder}/node_modules/.bin/hxt",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"skipFiles": ["<node_internals>/**"],
|
"skipFiles": ["<node_internals>/**"],
|
||||||
"type": "node",
|
"type": "node",
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
cd "$(dirname $(dirname "$0"))" || exit
|
|
||||||
source .env
|
|
||||||
|
|
||||||
mkdir -p "$SDK_PATH" "$PUBLISH_PATH" "$BUILD_PATH" "$TARGET_PATH" "src-gen"
|
|
||||||
docker compose run --rm --user $(id -u):$(id -g) --build --remove-orphans builder
|
|
||||||
|
|
||||||
./scripts/docker-action
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
cd "$(dirname $(dirname "$0"))" || exit
|
|
||||||
|
|
||||||
. .env
|
|
||||||
|
|
||||||
build () {
|
|
||||||
echo "build: $1"
|
|
||||||
. "$1/.env"
|
|
||||||
for PROJECT in "${DOCKER_PROJECTS[@]}"; do
|
|
||||||
IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT"
|
|
||||||
ARGS=("build")
|
|
||||||
for ARG in ${DOCKER_ARGS[@]}; do
|
|
||||||
ARGS+=("--build-arg" "$ARG")
|
|
||||||
done
|
|
||||||
if [ -n "$PROJECT_TARGET" ]; then
|
|
||||||
ARGS+=("--target" "$PROJECT_TARGET")
|
|
||||||
fi
|
|
||||||
ARGS+=("-t" "$DOCKER_GROUP/$PROJECT_NAME" ".")
|
|
||||||
ARGS+=("-f" "$1/Dockerfile")
|
|
||||||
echo "${ARGS[@]}"
|
|
||||||
docker "${ARGS[@]}"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
publish () {
|
|
||||||
echo "publish: $1"
|
|
||||||
. "$1/.env"
|
|
||||||
for PROJECT in "${DOCKER_PROJECTS[@]}"; do
|
|
||||||
IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT"
|
|
||||||
docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:$VERSION
|
|
||||||
docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:latest
|
|
||||||
docker push $DOCKER_ROOT/$PROJECT_NAME:$VERSION
|
|
||||||
docker push $DOCKER_ROOT/$PROJECT_NAME:latest
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
DEFAULT_TARGETS="."
|
|
||||||
TARGETS="${@-$DEFAULT_TARGETS}"
|
|
||||||
|
|
||||||
DOCKER_ACTION="${DOCKER_ACTION-build}"
|
|
||||||
|
|
||||||
for TARGET in $TARGETS; do
|
|
||||||
$DOCKER_ACTION "$TARGET"
|
|
||||||
done
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
cd "$(dirname $(dirname "$0"))" || exit
|
|
||||||
source .env
|
|
||||||
|
|
||||||
PACKAGES=(
|
|
||||||
"android/${PROJECT}_${VERSION}.apk"
|
|
||||||
"debian/${PROJECT}_${VERSION}_all.deb"
|
|
||||||
"archive/${PROJECT}_${VERSION}_linux.tar.gz"
|
|
||||||
"archive/${PROJECT}_${VERSION}_win.zip"
|
|
||||||
"installer/${PROJECT}_${VERSION}.exe"
|
|
||||||
)
|
|
||||||
|
|
||||||
for PACKAGE in "${PACKAGES[@]}"
|
|
||||||
do
|
|
||||||
if [ -f "${PUBLISH_PATH}/${PACKAGE}" ]; then
|
|
||||||
PACKAGE_NAME=$(basename "$PACKAGE")
|
|
||||||
echo "publish: $PACKAGE"
|
|
||||||
curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" -X DELETE \
|
|
||||||
"${REPO}/generic/${PROJECT}/${VERSION}/${PACKAGE_NAME}"
|
|
||||||
curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" \
|
|
||||||
--upload-file "${PUBLISH_PATH}/${PACKAGE}" \
|
|
||||||
"${REPO}/generic/${PROJECT}/${VERSION}/${PACKAGE_NAME}"
|
|
||||||
|
|
||||||
if [[ "$PACKAGE" == *.deb ]]; then
|
|
||||||
curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" -X DELETE \
|
|
||||||
"${REPO}/debian/pool/noble/main/${PROJECT}/${VERSION}/all"
|
|
||||||
curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" \
|
|
||||||
--upload-file "${PUBLISH_PATH}/${PACKAGE}" \
|
|
||||||
"${REPO}/debian/pool/noble/main/upload"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
DOCKER_ACTION=publish ./scripts/docker-action
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
cd "$(dirname $(dirname "$0"))" || exit
|
|
||||||
|
|
||||||
npm ci
|
|
||||||
@@ -16,23 +16,8 @@ import ru.m.puzzlez.render.Background;
|
|||||||
|
|
||||||
@:singleton @:template class BackgroundPopup extends PopupView<Background> {
|
@:singleton @:template class BackgroundPopup extends PopupView<Background> {
|
||||||
private static var colorsList:Array<Color> = [
|
private static var colorsList:Array<Color> = [
|
||||||
'#FFFFFF',
|
'#FFFFFF', '#001f3f', '#0074D9', '#7FDBFF', '#39CCCC', '#3D9970', '#2ECC40', '#01FF70', '#FFDC00', '#FF851B',
|
||||||
'#001f3f',
|
'#FF4136', '#85144b', '#F012BE', '#B10DC9', '#111111', '#AAAAAA', '#DDDDDD',
|
||||||
'#0074D9',
|
|
||||||
'#7FDBFF',
|
|
||||||
'#39CCCC',
|
|
||||||
'#3D9970',
|
|
||||||
'#2ECC40',
|
|
||||||
'#01FF70',
|
|
||||||
'#FFDC00',
|
|
||||||
'#FF851B',
|
|
||||||
'#FF4136',
|
|
||||||
'#85144b',
|
|
||||||
'#F012BE',
|
|
||||||
'#B10DC9',
|
|
||||||
'#111111',
|
|
||||||
'#AAAAAA',
|
|
||||||
'#DDDDDD',
|
|
||||||
];
|
];
|
||||||
|
|
||||||
@:view("selected") var selectedView:SpriteView;
|
@:view("selected") var selectedView:SpriteView;
|
||||||
|
|||||||
Reference in New Issue
Block a user