From a4ce7ea67e807a5aada07987278ba96c67438854 Mon Sep 17 00:00:00 2001 From: shmyga Date: Tue, 13 Oct 2026 20:41:09 +0300 Subject: [PATCH] build(gulp): update gulp-haxetool --- Dockerfile | 1 - config.example.json | 4 +- gulp | 3 - gulpfile.js | 152 ----- gulpfile.ts | 8 + haxetool.json | 58 ++ package-lock.json | 612 ++------------------ package.json | 9 +- src/server/haxe/ru/m/puzzlez/GameSession.hx | 4 +- tasks/gulp-publish.js | 134 ----- 10 files changed, 120 insertions(+), 865 deletions(-) delete mode 100755 gulp delete mode 100644 gulpfile.js create mode 100644 gulpfile.ts create mode 100644 haxetool.json delete mode 100755 tasks/gulp-publish.js diff --git a/Dockerfile b/Dockerfile index 5ce1a4b..fdc2922 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,6 @@ COPY package.json package-lock.json ./ RUN --mount=type=cache,target=/root/.npm \ npm ci COPY gulpfile.js protohx.json ./ -COPY tasks ./tasks COPY config.example.json ./config.example.json RUN --mount=type=secret,id=KEY_STORE \ cat /run/secrets/KEY_STORE > ./key.jks diff --git a/config.example.json b/config.example.json index 41316a7..3e23f03 100644 --- a/config.example.json +++ b/config.example.json @@ -1,9 +1,7 @@ { "SdkDir": "$HOME/sdk", - "BuildDir": null, - "PublishDir": "$HOME/public/puzzlez", - "PublishUrl": "https://shmyga.ru/repo/puzzlez", "Develop": false, + "UseRuffle": true, "Key": { "store": "keystore.jks", "pass": null diff --git a/gulp b/gulp deleted file mode 100755 index f4b80cc..0000000 --- a/gulp +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env node - -require('gulp-cli')(); diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index 5880426..0000000 --- a/gulpfile.js +++ /dev/null @@ -1,152 +0,0 @@ -const gulp = require("gulp"); -const gulpClean = require("gulp-clean"); -const Config = require("./config.json"); -const packageInfo = require("./package.json"); -const { System, Sdk, Haxe, Project } = require("gulp-haxetool"); -const dateformat = require("dateformat"); -const argv = require("yargs").argv; -const publish = require("./tasks/gulp-publish"); -const os = require("os"); - -const resolvePath = (path) => path.replace("$HOME", os.homedir()); - -Project.useRuffle(); - -if (packageInfo.haxe) { - Haxe.VERSION = packageInfo.haxe; -} - -if (Config.SdkDir) { - Sdk.dir = resolvePath(Config.SdkDir); -} - -if (Config.BuildDir) { - Haxe.buildDir = resolvePath(Config.BuildDir); -} - -exports.clean = function clean() { - return gulp.src("target/*", { read: false }).pipe(gulpClean()); -}; - -exports.setup = function setup() { - const builder = Project.Builder.new( - app.config, - Project.Platform.ANDROID, - app.buildSystem, - ); - return builder.prepare(); -}; - -exports.generate = function generate() { - return exports.setup().then(() => - new Haxe() - .haxelib(["run", "protohx", "generate", "protohx.json"]) - .then(({ stdout }) => { - if (stdout.indexOf("FAIL") > -1) { - throw stdout; - } - }), - ); -}; - -const config = new Project.Config({ - meta: { - title: "Puzzle'z", - filename: "puzzlez", - icon: "src/app/resources/icon.png", - pack: "ru.m.puzzlez", - author: "shmyga ", - company: "MegaLoMania", - version: packageInfo.version + (Config.Develop ? "-SNAPSHOT" : ""), - }, - key: Config.Key, - libs: packageInfo.haxeDependencies, - macros: [ - `CompilationOption.set('build','${dateformat(new Date(), "yyyy-mm-dd HH:MM:ss")}')`, - `CompilationOption.set('UNSPLASH_KEY','${Config.UnsplashKey}')`, - `CompilationOption.set('PIXABAY_KEY','${Config.PixabayKey}')`, - ], - flags: ["proto_debug"], -}); - -const host = argv.host || "localhost"; -const port = argv.port || 5000; - -const app = new Project( - Project.BuildSystem.OPENFL, - [ - Project.Platform.FLASH, - Project.Platform.HTML5, - Project.Platform.LINUX, - Project.Platform.WINDOWS, - Project.Platform.ANDROID, - ], - config.branch({ - name: "app", - sources: ["src-gen/haxe", "src/common/haxe", "src/app/haxe"], - android: [ - { - path: "dependencies/android", - extensions: ["ru.m.android.FileUtil"], - }, - ], - assets: ["src/app/resources"], - main: "ru.m.puzzlez.PuzzlezApp", - meta: { - width: 1280, - height: 768, - }, - macros: [ - `CompilationOption.set('host','${host}')`, - `CompilationOption.set('port',${port})`, - ], - flags: ["app"], - }), -).bind(module, gulp); - -const server = new Project( - Project.BuildSystem.HAXE, - [Project.Platform.NEKO, Project.Platform.CPP], - config.branch({ - name: "server", - sources: ["src-gen/haxe", "src/common/haxe", "src/server/haxe"], - main: "ru.m.puzzlez.PuzzlezServer", - }), -).bind(module, gulp); - -module.exports.publish = publish( - packageInfo.name, - packageInfo.version, - resolvePath(Config.PublishDir), - Config.PublishUrl, -); - -const defaultSeries = [ - exports.clean, - exports.generate, - module.exports["app:flash:build"], - module.exports["app:flash:html"], - module.exports["app:html5:build"], -]; - -if (System.isLinux) { - defaultSeries.push( - module.exports["app:linux:build"], - module.exports["app:linux:archive"], - module.exports["app:linux:deb"], - - module.exports["app:android:build"], - ); -} - -if (System.isWindows) { - defaultSeries.push( - module.exports["app:windows:build"], - module.exports["app:windows:archive"], - module.exports["app:windows:installer"], - ); -} - -defaultSeries.push(exports.publish); - -module.exports.default = gulp.series(defaultSeries); diff --git a/gulpfile.ts b/gulpfile.ts new file mode 100644 index 0000000..b45a295 --- /dev/null +++ b/gulpfile.ts @@ -0,0 +1,8 @@ +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); diff --git a/haxetool.json b/haxetool.json new file mode 100644 index 0000000..339b5b0 --- /dev/null +++ b/haxetool.json @@ -0,0 +1,58 @@ +{ + "default": { + "config": { + "meta": { + "title": "Puzzle'z", + "filename": "puzzlez", + "icon": "src/app/resources/icon.png", + "pack": "ru.m.puzzlez", + "author": "shmyga ", + "company": "MegaLoMania", + "version": "<%=package.version%>" + }, + "sources": ["src-gen/haxe", "src/common/haxe"], + "key": { + "store": "<%=config.Key.store%>", + "pass": "<%=config.Key.pass%>" + }, + "macros": [ + "CompilationOption.set('build','<%=dateformat(Date.now(), 'yyyy-mm-dd HH:MM:ss')%>')", + "CompilationOption.set('UNSPLASH_KEY','<%=config.UnsplashKey%>')", + "CompilationOption.set('PIXABAY_KEY','<%=config.PixabayKey%>')" + ], + "flags": ["proto_debug"] + } + }, + "app": { + "buildSystem": "openfl", + "platforms": ["flash", "html5", "linux", "windows", "android"], + "config": { + "sources": ["src/app/haxe"], + "android": [ + { + "path": "dependencies/android", + "extensions": ["ru.m.android.FileUtil"] + } + ], + "assets": ["src/app/resources"], + "main": "ru.m.puzzlez.PuzzlezApp", + "meta": { + "width": 1280, + "height": 768 + }, + "macros": [ + "CompilationOption.set('host','<%=env.HOST || '0.0.0.0'%>')", + "CompilationOption.set('port',<%=env.PORT || '5000'%>)" + ], + "flags": ["app"] + } + }, + "server": { + "buildSystem": "haxe", + "platforms": ["cpp"], + "config": { + "sources": ["src/server/haxe"], + "main": "ru.m.puzzlez.PuzzlezServer" + } + } +} diff --git a/package-lock.json b/package-lock.json index eb619b9..5ee9587 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,14 +8,8 @@ "name": "puzzlez", "version": "0.6.2", "devDependencies": { - "dateformat": "^3.0.3", - "fs-extra": "^10.1.0", - "gulp": "^4.0.0", - "gulp-add": "0.0.2", - "gulp-clean": "^0.4.0", "gulp-cli": "^2.2.0", - "gulp-haxetool": "^0.2.2", - "yargs": "^13.2.4" + "gulp-haxetool": "^1.1.1" } }, "../gulp-haxetool": { @@ -99,8 +93,9 @@ "node_modules/ansi-cyan": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", - "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=", + "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-wrap": "0.1.0" }, @@ -123,8 +118,9 @@ "node_modules/ansi-red": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz", - "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=", + "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==", "dev": true, + "license": "MIT", "dependencies": { "ansi-wrap": "0.1.0" }, @@ -1230,21 +1226,6 @@ "node": ">=0.10.0" } }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, "node_modules/color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", @@ -1449,12 +1430,13 @@ } }, "node_modules/dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-5.0.4.tgz", + "integrity": "sha512-DnMqBsxDYMXnJ1c6TY8AgalunEVV5LBm1INpkod2A60Ldw/bopC/MGH0bEoK0S+I66Juezz36snGuWrEp9FmNg==", "dev": true, + "license": "MIT", "engines": { - "node": "*" + "node": ">=12.20" } }, "node_modules/debug": { @@ -1692,12 +1674,6 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, - "node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -2164,21 +2140,6 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "dev": true }, - "node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/fs-minipass": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", @@ -3149,24 +3110,12 @@ "node": ">= 0.10" } }, - "node_modules/gulp-add": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/gulp-add/-/gulp-add-0.0.2.tgz", - "integrity": "sha1-Qy7eaxb8zJN2qR6oP5mX1L5A2vc=", - "dev": true, - "dependencies": { - "gulp-util": "~2.2.14", - "through": "~2.3.4" - }, - "engines": { - "node": ">=0.10" - } - }, "node_modules/gulp-clean": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.4.0.tgz", "integrity": "sha512-DARK8rNMo4lHOFLGTiHEJdf19GuoBDHqGUaypz+fOhrvOs3iFO7ntdYtdpNxv+AzSJBx/JfypF0yEj9ks1IStQ==", "dev": true, + "license": "MIT", "dependencies": { "fancy-log": "^1.3.2", "plugin-error": "^0.1.2", @@ -3496,19 +3445,21 @@ } }, "node_modules/gulp-haxetool": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/gulp-haxetool/-/gulp-haxetool-0.2.2.tgz", - "integrity": "sha512-ibrvHeSs3ceTdCFvog+p3sy7o0etsdIzevqQOVmaSW+GB+hyZCPV06/0THot2HPRlX60bRSGr1Nr2bBIIF/4zg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/gulp-haxetool/-/gulp-haxetool-1.1.1.tgz", + "integrity": "sha512-40uuWFCCw0yYez9pDg/MYhzcMZkfcWdR0KuUmqzu6nOA5E5UhhPiamYAg2HTccjh3cb+8hjg1ZgU3YhpztkqNg==", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { "ansi-colors": "^1.1.0", "async": "^2.6.0", "cli-progress": "^3.0.0", + "dateformat": "^5.0.4", "fancy-log": "^1.3.2", "fs-extra": "^5.0.0", "got": "^9.6.0", "gulp": "^4.0.0", + "gulp-clean": "^0.4.0", "gulp-debian": "^0.1.9", "gulp-gzip": "^1.4.2", "gulp-rename": "^1.2.2", @@ -3523,6 +3474,7 @@ "tail": "^1.2.3", "tar": "^4.4.10", "through2": "^2.0.3", + "time-stamp": "^1.1.0", "tmp-file": "^2.0.1", "unzip-stream": "^0.3.0", "vinyl": "^2.1.0", @@ -4468,18 +4420,6 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, - "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, "node_modules/just-debounce": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", @@ -4588,28 +4528,6 @@ "node": ">=0.10.0" } }, - "node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/locate-path/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -5488,39 +5406,6 @@ "node": ">=6" } }, - "node_modules/p-limit": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", - "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/parse-filepath": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", @@ -5711,8 +5596,9 @@ "node_modules/plugin-error": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", - "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", + "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==", "dev": true, + "license": "MIT", "dependencies": { "ansi-cyan": "^0.1.1", "ansi-red": "^0.1.1", @@ -5727,8 +5613,9 @@ "node_modules/plugin-error/node_modules/arr-diff": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", - "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", + "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==", "dev": true, + "license": "MIT", "dependencies": { "arr-flatten": "^1.0.1", "array-slice": "^0.2.3" @@ -5740,8 +5627,9 @@ "node_modules/plugin-error/node_modules/arr-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", - "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", + "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5749,8 +5637,9 @@ "node_modules/plugin-error/node_modules/array-slice": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5758,8 +5647,9 @@ "node_modules/plugin-error/node_modules/extend-shallow": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", - "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", + "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==", "dev": true, + "license": "MIT", "dependencies": { "kind-of": "^1.1.0" }, @@ -5770,8 +5660,9 @@ "node_modules/plugin-error/node_modules/kind-of": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", - "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", + "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -6151,7 +6042,9 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "glob": "^7.1.3" }, @@ -6742,12 +6635,6 @@ "node": ">= 6" } }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, "node_modules/through2": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", @@ -7058,15 +6945,6 @@ "through2-filter": "^3.0.0" } }, - "node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -7376,24 +7254,6 @@ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, - "node_modules/yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", - "dev": true, - "dependencies": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" - } - }, "node_modules/yargs-parser": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", @@ -7403,145 +7263,6 @@ "camelcase": "^3.0.0" } }, - "node_modules/yargs/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/yargs/node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "dependencies": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "node_modules/yargs/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/yargs/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/yargs/node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "node_modules/yargs/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "node_modules/yargs/node_modules/wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true - }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, "node_modules/yazl": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz", @@ -7618,7 +7339,7 @@ "ansi-cyan": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", - "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=", + "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==", "dev": true, "requires": { "ansi-wrap": "0.1.0" @@ -7636,7 +7357,7 @@ "ansi-red": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz", - "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=", + "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==", "dev": true, "requires": { "ansi-wrap": "0.1.0" @@ -8518,21 +8239,6 @@ "object-visit": "^1.0.0" } }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, "color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", @@ -8707,9 +8413,9 @@ } }, "dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-5.0.4.tgz", + "integrity": "sha512-DnMqBsxDYMXnJ1c6TY8AgalunEVV5LBm1INpkod2A60Ldw/bopC/MGH0bEoK0S+I66Juezz36snGuWrEp9FmNg==", "dev": true }, "debug": { @@ -8914,12 +8620,6 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -9312,17 +9012,6 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "dev": true }, - "fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, "fs-minipass": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", @@ -10098,16 +9787,6 @@ "vinyl-fs": "^3.0.0" } }, - "gulp-add": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/gulp-add/-/gulp-add-0.0.2.tgz", - "integrity": "sha1-Qy7eaxb8zJN2qR6oP5mX1L5A2vc=", - "dev": true, - "requires": { - "gulp-util": "~2.2.14", - "through": "~2.3.4" - } - }, "gulp-clean": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.4.0.tgz", @@ -10399,18 +10078,20 @@ } }, "gulp-haxetool": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/gulp-haxetool/-/gulp-haxetool-0.2.2.tgz", - "integrity": "sha512-ibrvHeSs3ceTdCFvog+p3sy7o0etsdIzevqQOVmaSW+GB+hyZCPV06/0THot2HPRlX60bRSGr1Nr2bBIIF/4zg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/gulp-haxetool/-/gulp-haxetool-1.1.1.tgz", + "integrity": "sha512-40uuWFCCw0yYez9pDg/MYhzcMZkfcWdR0KuUmqzu6nOA5E5UhhPiamYAg2HTccjh3cb+8hjg1ZgU3YhpztkqNg==", "dev": true, "requires": { "ansi-colors": "^1.1.0", "async": "^2.6.0", "cli-progress": "^3.0.0", + "dateformat": "^5.0.4", "fancy-log": "^1.3.2", "fs-extra": "^5.0.0", "got": "^9.6.0", "gulp": "^4.0.0", + "gulp-clean": "^0.4.0", "gulp-debian": "^0.1.9", "gulp-gzip": "^1.4.2", "gulp-rename": "^1.2.2", @@ -10425,6 +10106,7 @@ "tail": "^1.2.3", "tar": "^4.4.10", "through2": "^2.0.3", + "time-stamp": "^1.1.0", "tmp-file": "^2.0.1", "unzip-stream": "^0.3.0", "vinyl": "^2.1.0", @@ -11195,16 +10877,6 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, - "jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, "just-debounce": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", @@ -11292,24 +10964,6 @@ "strip-bom": "^2.0.0" } }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - } - } - }, "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -12066,30 +11720,6 @@ "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", "dev": true }, - "p-limit": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", - "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, "parse-filepath": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", @@ -12234,7 +11864,7 @@ "plugin-error": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", - "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", + "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==", "dev": true, "requires": { "ansi-cyan": "^0.1.1", @@ -12247,7 +11877,7 @@ "arr-diff": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", - "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", + "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==", "dev": true, "requires": { "arr-flatten": "^1.0.1", @@ -12257,19 +11887,19 @@ "arr-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", - "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", + "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==", "dev": true }, "array-slice": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==", "dev": true }, "extend-shallow": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", - "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", + "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==", "dev": true, "requires": { "kind-of": "^1.1.0" @@ -12278,7 +11908,7 @@ "kind-of": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", - "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", + "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==", "dev": true } } @@ -13079,12 +12709,6 @@ } } }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, "through2": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", @@ -13336,12 +12960,6 @@ "through2-filter": "^3.0.0" } }, - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true - }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -13594,138 +13212,6 @@ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, - "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } - }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true - }, - "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - } - }, "yargs-parser": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", diff --git a/package.json b/package.json index 4f472ea..612dd7f 100644 --- a/package.json +++ b/package.json @@ -1,19 +1,14 @@ { "name": "puzzlez", + "type": "module", "version": "0.6.2", "scripts": { "build": "gulp", "dev": "gulp app:flash:test" }, "devDependencies": { - "dateformat": "^3.0.3", - "fs-extra": "^10.1.0", - "gulp": "^4.0.0", - "gulp-add": "0.0.2", - "gulp-clean": "^0.4.0", "gulp-cli": "^2.2.0", - "gulp-haxetool": "^0.2.2", - "yargs": "^13.2.4" + "gulp-haxetool": "^1.1.1" }, "haxeDependencies": { "haxework": "2.1.0", diff --git a/src/server/haxe/ru/m/puzzlez/GameSession.hx b/src/server/haxe/ru/m/puzzlez/GameSession.hx index aff4a49..0ceba9e 100644 --- a/src/server/haxe/ru/m/puzzlez/GameSession.hx +++ b/src/server/haxe/ru/m/puzzlez/GameSession.hx @@ -5,8 +5,8 @@ import ru.m.puzzlez.proto.pack.GameListResponse; import ru.m.puzzlez.proto.pack.GameListRequest; import hw.connect.session.ProtoSession; import hw.log.BaseLogger.LoggerUtil; -import ru.m.puzzlez.image.Game; -import ru.m.puzzlez.image.GameUtil; +import ru.m.puzzlez.game.Game; +import ru.m.puzzlez.game.GameUtil; import ru.m.puzzlez.proto.core.User; import ru.m.puzzlez.proto.event.GameAction; import ru.m.puzzlez.proto.event.GameEvent; diff --git a/tasks/gulp-publish.js b/tasks/gulp-publish.js deleted file mode 100755 index 0b1c729..0000000 --- a/tasks/gulp-publish.js +++ /dev/null @@ -1,134 +0,0 @@ -const gulp = require("gulp"); -const fs = require("fs"); -const fse = require("fs-extra"); -const path = require("path"); -const through = require("through2"); - -class Package { - constructor(platform, type, version, versionInt) { - this.platform = platform; - this.type = type; - this.version = version; - this.versionInt = versionInt; - } - - get key() { - return [this.platform, this.type].join(":"); - } - - static getPlatform(filename) { - for (const [platform, r] of [ - ["android", /^.*?\.apk$/], - ["linux", /^.*?\.deb$/], - ["linux", /^.*?linux\.tar\.gz$/], - ["windows", /^.*?win\.zip$/], - ["windows", /^.*?\.exe$/], - ]) { - if (r.test(filename)) { - return platform; - } - } - return null; - } - - static getType(filename) { - for (const [type, r] of [ - ["apk", /^.*?\.apk$/], - ["deb", /^.*?\.deb$/], - ["archive", /^.*?\.tar\.gz$/], - ["archive", /^.*?\.zip$/], - ["exe", /^.*?\.exe$/], - ]) { - if (r.test(filename)) { - return type; - } - } - return null; - } - - static getVersion(filename) { - const m = /(\d+)\.(\d+)\.(\d+)/.exec(filename); - if (m) { - return [ - m[0], - parseInt(m[1]) * 10000 + parseInt(m[2]) * 100 + parseInt(m[3]), - ]; - } - return null; - } - - static parseFilename(filename) { - const platform = this.getPlatform(filename); - const type = this.getType(filename); - const version = this.getVersion(filename); - if (platform && type && version) { - return new Package(platform, type, version[0], version[1]); - } - return null; - } -} - -module.exports = (name, version, publishDir, publishUrl) => - function publish(cb) { - const packages = {}; - fse.ensureDirSync(publishDir); - return gulp.series([ - function copy() { - return gulp - .src("target/app/@(android|archive|debian|installer)/*") - .pipe( - through.obj(function (file, enc, cb) { - const pack = Package.parseFilename(file.path); - if (pack) { - this.push(file); - } - cb(null); - }) - ) - .pipe(gulp.dest(publishDir)); - }, - function generate() { - return gulp - .src(`${publishDir}/*/*`) - .pipe( - through.obj(function (file, enc, cb) { - const basepath = file.path.replace(file.base + path.sep, ""); - const pack = Package.parseFilename(file.path); - if (pack) { - if ( - !packages[pack.key] || - packages[pack.key].versionInt < pack.versionInt - ) { - packages[pack.key] = { - platform: pack.platform, - type: pack.type, - version: pack.version, - versionInt: pack.versionInt, - path: basepath, - filename: basepath.split(path.sep).pop(), - url: `${publishUrl}/${basepath.replace(path.sep, "/")}`, - }; - } - } - cb(null); - }) - ) - .on("end", function () { - fs.writeFileSync( - path.join(publishDir, "packages.json"), - JSON.stringify( - { - name: name, - version: version, - packages: Object.values(packages), - }, - null, - 4 - ) - ); - }); - }, - ])(cb); - }; - -module.exports.Package = Package;