From 842d071800c2e523496dc7379d84632accc44246 Mon Sep 17 00:00:00 2001 From: Hedgehog Fog Date: Thu, 29 Dec 2022 14:26:54 +0200 Subject: [PATCH] update ci configuration --- .amxxpack.json | 11 +- .github/workflows/build.yml | 80 +++++-------- .vscode/extensions.json | 3 +- .vscode/settings.json | 7 +- gulpfile.js | 134 +++++++++++++++++----- helpers/bundle-readme.generator.js | 26 ----- package-lock.json | 176 +++++++++++++++-------------- package.json | 2 +- 8 files changed, 235 insertions(+), 204 deletions(-) delete mode 100644 helpers/bundle-readme.generator.js diff --git a/.amxxpack.json b/.amxxpack.json index 4b236efc..a9dfe28c 100644 --- a/.amxxpack.json +++ b/.amxxpack.json @@ -1,7 +1,6 @@ { "compiler": { - "version": "1.9.0-git5294", - "dev": true, + "version": "1.9", "addons": ["cstrike"] }, "include": [ @@ -22,10 +21,10 @@ "assets": "./assets" }, "output": { - "plugins": "./dist/reapi/addons/amxmodx/plugins", - "scripts": "./dist/reapi/addons/amxmodx/scripting", - "include": "./dist/reapi/addons/amxmodx/scripting/include", - "assets": "./dist/reapi" + "plugins": "./dist/build/addons/amxmodx/plugins", + "scripts": "./dist/build/addons/amxmodx/scripting", + "include": "./dist/build/addons/amxmodx/scripting/include", + "assets": "./dist/build" }, "rules": { "flatCompilation": true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6a40dff..b130db47 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,79 +17,51 @@ uses: actions/setup-node@v1 with: node-version: 12 - - name: Setup Build Variables - id: buildvars - uses: actions/github-script@v3 + - name: Install Dependencies + run: npm install + - name: Build project + run: npm run build + - name: Pack bundles + run: npm run pack + - name: Setup Release Variables + id: release_vars + uses: actions/github-script@v6 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | try { const package = require(`${process.env.GITHUB_WORKSPACE}/package.json`); - ['name', 'version', 'description', 'author'] - .forEach(k => core.setOutput(k, package[k])); + ['name', 'version', 'description', 'author'].forEach(k => core.setOutput(k, package[k])); const tagVersion = package.version.replace(/\./g, ''); core.setOutput('tagversion', tagVersion); + core.setOutput('bundlename', `${package.name}-${tagVersion}`); core.setOutput('tagname', `${package.name}-${tagVersion}`); core.setOutput('releasename', `${package.description} Release v${package.version}`); + + const bundles_metadata = require(`${process.env.GITHUB_WORKSPACE}/dist/bundles/files.json`); + core.setOutput('srcArchive', bundles_metadata.srcArchive); + core.setOutput('buildArchive', bundles_metadata.buildArchive); + core.setOutput('resourcesArchive', bundles_metadata.resourcesArchive); + core.setOutput('sdkArchive', bundles_metadata.sdkArchive); + } catch (err) { core.setFailed(err.message); } - - name: Install Dependencies - run: npm install - - name: Build project - run: npm run build - - name: Pack bundles - run: npm run pack - name: Create Release id: create_release - uses: actions/create-release@v1 + uses: softprops/action-gh-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ steps.buildvars.outputs.tagname }} - release_name: ${{ steps.buildvars.outputs.releasename }} + name: ${{ steps.release_vars.outputs.releasename }} + tag_name: ${{ steps.release_vars.outputs.tagname }} draft: false prerelease: false - - name: Upload Release Addons Src - id: upload-release-addons-src - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./dist/bundles/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-addons-src.zip - asset_name: zombiepanic-${{ steps.buildvars.outputs.tagversion }}-addons-src.zip - asset_content_type: application/zip - - name: Upload Release Build - id: upload-release-addons-reapi - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./dist/bundles/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-addons-build.zip - asset_name: zombiepanic-${{ steps.buildvars.outputs.tagversion }}-addons-build.zip - asset_content_type: application/zip - - name: Upload Release Resources - id: upload-release-resources - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./dist/bundles/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-resources.zip - asset_name: zombiepanic-${{ steps.buildvars.outputs.tagversion }}-resources.zip - asset_content_type: application/zip - - name: Upload Release SDK - id: upload-release-sdk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./dist/bundles/zombiepanic-${{ steps.buildvars.outputs.tagversion }}-sdk.zip - asset_name: zombiepanic-${{ steps.buildvars.outputs.tagversion }}-sdk.zip - asset_content_type: application/zip + files: | + ./dist/bundles/${{ steps.release_vars.outputs.srcArchive }} + ./dist/bundles/${{ steps.release_vars.outputs.buildArchive }} + ./dist/bundles/${{ steps.release_vars.outputs.resourcesArchive }} + ./dist/bundles/${{ steps.release_vars.outputs.sdkArchive }} - name: Cleanup run: | rm -rf ./.compiler diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 72b6c503..d4300e3b 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,5 @@ { "recommendations": [ - "klippy.amxxpawn-language", - "exodiusstudios.comment-anchors" + "klippy.amxxpawn-language" ] } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 09f52e0f..6e417264 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,10 +1,9 @@ { "editor.tabSize": 4, "editor.insertSpaces": true, - "amxxpawn.compiler.executablePath": "${workspaceRoot}/compiler/amxxpc.exe", "amxxpawn.compiler.includePaths": [ - "${workspaceRoot}/compiler/include", - "${workspaceRoot}/src/include", - "${workspaceRoot}/thirdparty/reapi/addons/amxmodx/scripting/include" + "${workspaceRoot}/src/include", + "${workspaceRoot}/.compiler/include", + "${workspaceRoot}/.thirdparty/reapi/addons/amxmodx/scripting/include" ] } \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 022fdf1d..dec01c3e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,53 +6,127 @@ const file = require('gulp-file'); const merge2 = require('merge2'); const package = require('./package.json'); -const generateReadme = require('./helpers/bundle-readme.generator'); +const README_INDENT = ' '; +const README_INSTALLATION_TEXT = 'Extract addons and resources to cstrike folder'; const WORK_DIR = process.cwd(); const DIST_DIR = path.join(WORK_DIR, './dist'); +const DIST_BUILD_DIR = path.join(DIST_DIR, 'build'); const BUILD_DIR = path.join(DIST_DIR, 'bundles'); -const REAPI_DIST_DIR = path.join(DIST_DIR, 'reapi'); +const BUILD_METADATA_FILE = path.join(DIST_DIR, 'bundles', 'files.json'); +const SDK_DIR = path.join(WORK_DIR, 'sdk'); +const ASSETS_DIR = path.join(WORK_DIR, 'assets'); -if (!fs.existsSync(REAPI_DIST_DIR)) { - throw new Error('Build ReAPI project before packing'); +if (!fs.existsSync(DIST_BUILD_DIR)) { + throw new Error('Build project before packing'); +} + +function isDirEmpty(dir) { + if (!fs.existsSync(dir)) { + return true; + } + + const files = fs.readdirSync(dir); + + return !files.length; +} + +function generateReadme(files) { + const filesArr = Object.keys(files).map(key => { + const { name, description } = files[key]; + return { key, name, description }; + }); + + const fileMaxLength = Math.max( + ...filesArr.map(file => file.name.length) + ); + + const resolvedFiles = filesArr.map(file => { + const { name, description } = file; + + if (!description) { + return; + } + + const spacesNum = Math.max(fileMaxLength - name.length, 0); + const spaces = ' '.repeat(spacesNum); + + return `${README_INDENT}${name}${spaces} - ${description}` + }).filter(Boolean).join('\n'); + + return [ + '[INSTALLATION]', + `${README_INDENT}${README_INSTALLATION_TEXT}`, + '', + '[FILES]', + resolvedFiles + ].join('\n'); } const resolveArchiveName = (sufix) => `${package.name}-${package.version.replace(/\./g, '')}-${sufix}.zip`; const FILES = { - bundleArchive: resolveArchiveName('bundle'), srcArchive: resolveArchiveName('addons-src'), - addonsArchive: resolveArchiveName('addons-build'), - resourcesArchive: resolveArchiveName('resources'), - sdkArchive: resolveArchiveName('sdk'), - readme: 'README.TXT' + buildArchive: resolveArchiveName('addons-build'), + resourcesArchive: !isDirEmpty(ASSETS_DIR) ? resolveArchiveName('resources') : null, + sdkArchive: !isDirEmpty(SDK_DIR) ? resolveArchiveName('sdk') : null, + readme: 'README.TXT', + bundleArchive: resolveArchiveName('bundle') }; const BUNDLE_FILES = [ - { name: FILES.addonsArchive, description: 'compiled plugins and source code' }, - { name: FILES.resourcesArchive, description: 'mod resources' }, - { name: FILES.sdkArchive, description: 'mod sdk' } + { name: FILES.buildArchive, description: 'compiled plugins and source code' } ]; +if (FILES.resourcesArchive) { + BUNDLE_FILES.push({ name: FILES.resourcesArchive, description: 'mod resources' }); +} + +if (FILES.sdkArchive) { + BUNDLE_FILES.push({ name: FILES.sdkArchive, description: 'mod sdk' }); +} + gulp.task('pack:bundles', () => { const dirPatterns = { - all: REAPI_DIST_DIR + '/**', - addons: REAPI_DIST_DIR + '/addons{,/**}', - plugins: REAPI_DIST_DIR + '/addons/amxmodx/plugins{,/**}', - modules: REAPI_DIST_DIR + '/addons/amxmodx/modules{,/**}', - sdk: WORK_DIR + '/sdk/**' + all: DIST_BUILD_DIR + '/**', + addons: DIST_BUILD_DIR + '/addons{,/**}', + plugins: DIST_BUILD_DIR + '/addons/amxmodx/plugins{,/**}', + modules: DIST_BUILD_DIR + '/addons/amxmodx/modules{,/**}', + sdk: SDK_DIR + '/**' }; + const zipTasks = [ + ( + gulp + .src([dirPatterns.addons, '!' + dirPatterns.plugins, '!' + dirPatterns.modules]) + .pipe(zip(FILES.srcArchive)) + ), + ( + gulp + .src([dirPatterns.addons]) + .pipe(zip(FILES.buildArchive)) + ) + ]; + + if (FILES.resourcesArchive) { + zipTasks.push( + gulp + .src([dirPatterns.all, '!' + dirPatterns.addons]) + .pipe(zip(FILES.resourcesArchive)) + ); + } + + if(FILES.sdkArchive) { + zipTasks.push( + gulp + .src([dirPatterns.sdk]) + .pipe(zip(FILES.sdkArchive)) + ); + } + return merge2([ - gulp.src([dirPatterns.addons, '!' + dirPatterns.plugins, '!' + dirPatterns.modules]) - .pipe(zip(FILES.srcArchive)), - gulp.src([dirPatterns.addons]) - .pipe(zip(FILES.addonsArchive)), - gulp.src([dirPatterns.all, '!' + dirPatterns.addons]) - .pipe(zip(FILES.resourcesArchive)), - gulp.src([dirPatterns.sdk]) - .pipe(zip(FILES.sdkArchive)), - file(FILES.readme, generateReadme(BUNDLE_FILES), {src: true}) + ...zipTasks, + file(FILES.readme, generateReadme(BUNDLE_FILES), { src: true }) ]).pipe(gulp.dest(BUILD_DIR)); }); @@ -62,6 +136,10 @@ gulp.task('pack:full', () => { return gulp.src(bundleFiles) .pipe(zip(FILES.bundleArchive)) .pipe(gulp.dest(BUILD_DIR)) -}) +}); + +gulp.task('pack:metadata', cb => { + fs.writeFile(BUILD_METADATA_FILE, JSON.stringify(FILES), cb); +}); -gulp.task('default', gulp.series('pack:bundles', 'pack:full')); +gulp.task('default', gulp.series('pack:bundles', 'pack:full', 'pack:metadata')); diff --git a/helpers/bundle-readme.generator.js b/helpers/bundle-readme.generator.js deleted file mode 100644 index 64230a18..00000000 --- a/helpers/bundle-readme.generator.js +++ /dev/null @@ -1,26 +0,0 @@ -const ARCHIVE_NAME_MAXLEN = 32; -const JOIN_STR = '\r\n'; -const INDENT = ' '; -const INSTALLATION_TEXT = 'Extract addons and resources to cstrike folder'; - -function getFilesList(prefix, files) { - return Object.keys(files).map(key => { - const { name, description } = files[key]; - - if (!description) { - return; - } - - const spaces = ' '.repeat(ARCHIVE_NAME_MAXLEN - name.length); - - return `${prefix}${name}${spaces} - ${description}` - }).filter(str => !!str).join(JOIN_STR); -} - -module.exports = (files) => [ - '[INSTALLATION]', - `${INDENT}${INSTALLATION_TEXT}`, - '', - '[FILES]', - getFilesList(INDENT, files) -].join(JOIN_STR); diff --git a/package-lock.json b/package-lock.json index a90b61b5..c87b98d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "MIT", "devDependencies": { - "amxxpack": "^1.0.1", + "amxxpack": "^1.3.3", "gulp": "^4.0.2", "gulp-file": "^0.4.0", "gulp-zip": "^5.0.2", @@ -27,32 +27,10 @@ "node": ">=4" } }, - "node_modules/@types/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", - "dev": true, - "dependencies": { - "@types/minimatch": "*", - "@types/node": "*" - } - }, - "node_modules/@types/minimatch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", - "dev": true - }, - "node_modules/@types/node": { - "version": "17.0.19", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.19.tgz", - "integrity": "sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA==", - "dev": true - }, "node_modules/amxxpack": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amxxpack/-/amxxpack-1.0.1.tgz", - "integrity": "sha512-IYieIic7fLOcJKOz1CxsUmwNI6hoEhmPLmxyYnecRddIB5sCPvimNbQ8pRjB3eMrNwQ4YcwOLit1PLHt7UW6OQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/amxxpack/-/amxxpack-1.3.3.tgz", + "integrity": "sha512-nu/3uX4Sj6tdls4JC1m0TY0Q1LGCwbVYVIjaqCVORkdYp58K1lyo+hYmBKVWIHG5ELIs+NpeJm20RLl79Im02w==", "dev": true, "dependencies": { "chokidar": "^3.5.3", @@ -60,10 +38,10 @@ "commander": "^9.0.0", "decompress": "^4.2.1", "download": "^8.0.0", - "glob": "^7.2.0", - "glob-promise": "^4.2.2", + "globule": "^1.3.4", "lodash": "^4.17.21", "mkdirp": "^1.0.4", + "node-cache": "^5.1.2", "normalize-path": "^3.0.0" }, "bin": { @@ -2111,25 +2089,6 @@ "node": ">=0.10.0" } }, - "node_modules/glob-promise": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-4.2.2.tgz", - "integrity": "sha512-xcUzJ8NWN5bktoTIX7eOclO1Npxd/dyVqUJxlLIDasT4C7KZyqlPIwkdJ0Ypiy3p2ZKahTjK4M9uC3sNSfNMzw==", - "dev": true, - "dependencies": { - "@types/glob": "^7.1.3" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "type": "individual", - "url": "https://github.com/sponsors/ahmadnassri" - }, - "peerDependencies": { - "glob": "^7.1.6" - } - }, "node_modules/glob-stream": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", @@ -2199,6 +2158,40 @@ "node": ">=0.10.0" } }, + "node_modules/globule": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz", + "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==", + "dev": true, + "dependencies": { + "glob": "~7.1.1", + "lodash": "^4.17.21", + "minimatch": "~3.0.2" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/globule/node_modules/glob": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/glogg": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", @@ -3384,6 +3377,18 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "node_modules/node-cache": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz", + "integrity": "sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==", + "dev": true, + "dependencies": { + "clone": "2.x" + }, + "engines": { + "node": ">= 8.0.0" + } + }, "node_modules/normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -5245,32 +5250,10 @@ "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", "dev": true }, - "@types/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", - "dev": true, - "requires": { - "@types/minimatch": "*", - "@types/node": "*" - } - }, - "@types/minimatch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", - "dev": true - }, - "@types/node": { - "version": "17.0.19", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.19.tgz", - "integrity": "sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA==", - "dev": true - }, "amxxpack": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amxxpack/-/amxxpack-1.0.1.tgz", - "integrity": "sha512-IYieIic7fLOcJKOz1CxsUmwNI6hoEhmPLmxyYnecRddIB5sCPvimNbQ8pRjB3eMrNwQ4YcwOLit1PLHt7UW6OQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/amxxpack/-/amxxpack-1.3.3.tgz", + "integrity": "sha512-nu/3uX4Sj6tdls4JC1m0TY0Q1LGCwbVYVIjaqCVORkdYp58K1lyo+hYmBKVWIHG5ELIs+NpeJm20RLl79Im02w==", "dev": true, "requires": { "chokidar": "^3.5.3", @@ -5278,10 +5261,10 @@ "commander": "^9.0.0", "decompress": "^4.2.1", "download": "^8.0.0", - "glob": "^7.2.0", - "glob-promise": "^4.2.2", + "globule": "^1.3.4", "lodash": "^4.17.21", "mkdirp": "^1.0.4", + "node-cache": "^5.1.2", "normalize-path": "^3.0.0" }, "dependencies": { @@ -6917,15 +6900,6 @@ } } }, - "glob-promise": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-4.2.2.tgz", - "integrity": "sha512-xcUzJ8NWN5bktoTIX7eOclO1Npxd/dyVqUJxlLIDasT4C7KZyqlPIwkdJ0Ypiy3p2ZKahTjK4M9uC3sNSfNMzw==", - "dev": true, - "requires": { - "@types/glob": "^7.1.3" - } - }, "glob-stream": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", @@ -6983,6 +6957,33 @@ "which": "^1.2.14" } }, + "globule": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz", + "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==", + "dev": true, + "requires": { + "glob": "~7.1.1", + "lodash": "^4.17.21", + "minimatch": "~3.0.2" + }, + "dependencies": { + "glob": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } + } + }, "glogg": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", @@ -7908,6 +7909,15 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "node-cache": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz", + "integrity": "sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==", + "dev": true, + "requires": { + "clone": "2.x" + } + }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", diff --git a/package.json b/package.json index fb4abadd..4bd099ef 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "author": "Hedgehog Fog", "license": "MIT", "devDependencies": { - "amxxpack": "^1.0.1", + "amxxpack": "^1.3.3", "gulp": "^4.0.2", "gulp-file": "^0.4.0", "gulp-zip": "^5.0.2",