From e80dde368e57641ef01be92597c69fb76bd91699 Mon Sep 17 00:00:00 2001 From: Lars van Vianen Date: Thu, 4 Jan 2024 08:56:06 +0100 Subject: [PATCH] v0.0.30 --- .gitignore | 10 +++------- .prettierrc | 10 ---------- CHANGELOG.md | 0 VERSION | 2 +- {script => bin}/js/index.d.ts | 0 {script => bin}/js/index.js | 26 +++++++++++++++----------- bin/js/index.js.map | 1 + {script => bin}/ts/index.ts | 4 +--- {script => bin}/tsconfig.json | 0 dist/package.json | 2 +- package-lock.json | 14 ++++++++------ package.json | 8 ++++---- script/js/index.js.map | 1 - tsconfig.json | 4 ++-- 14 files changed, 36 insertions(+), 46 deletions(-) delete mode 100644 .prettierrc delete mode 100644 CHANGELOG.md rename {script => bin}/js/index.d.ts (100%) rename {script => bin}/js/index.js (89%) create mode 100644 bin/js/index.js.map rename {script => bin}/ts/index.ts (98%) rename {script => bin}/tsconfig.json (100%) delete mode 100644 script/js/index.js.map diff --git a/.gitignore b/.gitignore index 1506e43..1cf6da2 100644 --- a/.gitignore +++ b/.gitignore @@ -492,7 +492,7 @@ OpenCover/ ASALocalRun/ # MSBuild Binary and Structured Log -*.binlog +# *.binlog # NVidia Nsight GPU debugger configuration file *.nvuser @@ -557,7 +557,7 @@ xcuserdata/ # ============================================================================= .metadata -bin/ +# bin/ tmp/ *.tmp *.bak @@ -728,8 +728,6 @@ tags # Python # ============================================================================= - - # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] @@ -1310,7 +1308,7 @@ sysinfo.txt crashlytics-build.properties # Packed Addressables -/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin* +# /[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin* # Temporary auto-generated Android Assets /[Aa]ssets/[Ss]treamingAssets/aa.meta @@ -1399,5 +1397,3 @@ _book *.rdb - - diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 3655083..0000000 --- a/.prettierrc +++ /dev/null @@ -1,10 +0,0 @@ -{ - "singleQuote": true, - "tabWidth": 4, - "useTabs": false, - "bracketSpacing": true, - "semi": false, - "trailingComma": "all", - "arrowParens": "always", - "printWidth": 100 -} diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index e69de29..0000000 diff --git a/VERSION b/VERSION index 329ee9f..8db6c8a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.28 \ No newline at end of file +0.0.30 \ No newline at end of file diff --git a/script/js/index.d.ts b/bin/js/index.d.ts similarity index 100% rename from script/js/index.d.ts rename to bin/js/index.d.ts diff --git a/script/js/index.js b/bin/js/index.js similarity index 89% rename from script/js/index.js rename to bin/js/index.js index c76b112..2929123 100644 --- a/script/js/index.js +++ b/bin/js/index.js @@ -1,6 +1,6 @@ import { __awaiter, __generator } from "tslib"; import path from 'path'; -import { DirectoryCleaner, DirectoryCopier, FileCopier, PackageCreator, VersionWriter, TypeScriptCompiler, JavaScriptMinifier, StylizedLogger, readPackageJson, } from 'pack.gl'; +import { DirectoryCleaner, DirectoryCopier, FileCopier, PackageCreator, VersionWriter, TypeScriptCompiler, JavaScriptMinifier, StylizedLogger, gl_installer, readPackageJson, } from 'pack.gl'; var CONFIG = { path: { src: './src', @@ -17,14 +17,18 @@ function main() { return __generator(this, function (_a) { switch (_a.label) { case 0: - _a.trys.push([0, 6, , 7]); + _a.trys.push([0, 7, , 8]); logger = new StylizedLogger(); + logger.header('Install .gl libraries'); + return [4, gl_installer()]; + case 1: + _a.sent(); directoryCleaner = new DirectoryCleaner(); logger.header('Clean Directories'); directoryCleaner.cleanDirectory(CONFIG.path.dist); logger.body("Directory cleaned: ".concat(CONFIG.path.dist)); return [4, readPackageJson('./package.json')]; - case 1: + case 2: localPackageConfig = _a.sent(); packageCreator = new PackageCreator(localPackageConfig); packageConfig = packageCreator.config; @@ -34,12 +38,12 @@ function main() { fileCopier.copyFileToDirectory(path.join('.', 'LICENSE'), CONFIG.path.dist); directoryCopier = new DirectoryCopier(); return [4, directoryCopier.recursiveCopy(CONFIG.path.ts_input, CONFIG.path.ts_output)]; - case 2: + case 3: _a.sent(); console.log('Files copied successfully.'); versionWriter = new VersionWriter(); return [4, versionWriter.writeVersionToFile('VERSION', packageConfig.version)]; - case 3: + case 4: _a.sent(); tsCompiler = new TypeScriptCompiler(); tsFiles = [ @@ -47,20 +51,20 @@ function main() { ]; outputDir = './dist/js'; return [4, tsCompiler.compile(tsFiles, outputDir)]; - case 4: + case 5: _a.sent(); jsMinifier = new JavaScriptMinifier(); return [4, jsMinifier.minifyFile(path.join(CONFIG.path.js_output, 'index.js'), path.join(CONFIG.path.js_output, "".concat(packageConfig.name, ".min.js"))) .then(function () { return console.log('JavaScript minification completed.'); }) .catch(console.error)]; - case 5: - _a.sent(); - return [3, 7]; case 6: + _a.sent(); + return [3, 8]; + case 7: error_1 = _a.sent(); console.error('An error occurred:', error_1); - return [3, 7]; - case 7: return [2]; + return [3, 8]; + case 8: return [2]; } }); }); diff --git a/bin/js/index.js.map b/bin/js/index.js.map new file mode 100644 index 0000000..56d29f7 --- /dev/null +++ b/bin/js/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/script/ts/index.ts b/bin/ts/index.ts similarity index 98% rename from script/ts/index.ts rename to bin/ts/index.ts index 12b0945..319d41b 100644 --- a/script/ts/index.ts +++ b/bin/ts/index.ts @@ -73,9 +73,7 @@ async function main() { // Install .gl libraries // -------------------------------------------------------------------- - - // logger.header('Install .gl libraries'); - // await gl_installer(); + await gl_installer(); // Dirs Clean diff --git a/script/tsconfig.json b/bin/tsconfig.json similarity index 100% rename from script/tsconfig.json rename to bin/tsconfig.json diff --git a/dist/package.json b/dist/package.json index 33fb333..c38d8a9 100644 --- a/dist/package.json +++ b/dist/package.json @@ -1,6 +1,6 @@ { "name": "pack.gl", - "version": "0.0.28", + "version": "0.0.30", "description": "Package Builder.", "keywords": [ "pack.gl", diff --git a/package-lock.json b/package-lock.json index 854f241..de3cdb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pack.gl", - "version": "0.0.27", + "version": "0.0.30", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pack.gl", - "version": "0.0.27", + "version": "0.0.30", "funding": [ { "type": "github", @@ -48,7 +48,7 @@ "hue.gl": "^0.0.7", "icon.gl": "^0.0.4", "loop.gl": "^0.0.1", - "pack.gl": "^0.0.24", + "pack.gl": "^0.0.28", "page.gl": "^0.0.3", "postcss-preset-env": "^9.1.2", "prettier": "^3.0.3", @@ -7327,16 +7327,18 @@ } }, "node_modules/pack.gl": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/pack.gl/-/pack.gl-0.0.24.tgz", - "integrity": "sha512-bIhYvi6iACV+0Yy9B0Qo6GULCk9/vmthUXpAHEI3Z+QpzcO4a4UTcAc5JHVsY6JnCK9RZ1/zBFQdjVQi4j8n9w==", + "version": "0.0.28", + "resolved": "https://registry.npmjs.org/pack.gl/-/pack.gl-0.0.28.tgz", + "integrity": "sha512-B7Syjdqq+u1DU7Y0+C9CmX/oGc8BR6n0p9/M6MQEc4dmxIpKUP6bnTTQTCkE8f4SXhKxSpiph8VYFfg8yMYKKw==", "dev": true, "dependencies": { "@types/fs-extra": "^11.0.4", "@types/glob": "^8.1.0", + "@types/jsdom": "^21.1.6", "@types/nunjucks": "^3.2.6", "@types/svg-sprite": "^0.0.38", "autoprefixer": "^10.4.15", + "cssnano": "^6.0.3", "del": "^7.1.0", "fantasticon": "^2.0.0", "fs-extra": "^11.2.0", diff --git a/package.json b/package.json index ae8e411..14d9835 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pack.gl", "description": "Package Builder.", - "version": "0.0.28", + "version": "0.0.30", "config": { "version_short": "0.0" }, @@ -44,8 +44,8 @@ "lint": "eslint 'src/**/*.ts' || true", "prettify": "prettier --write 'src/**/*.ts'", "build": "npm run build-compile && npm run build-process", - "build-compile": "tsc -p script/tsconfig.json", - "build-process": "node script/js/index.js" + "build-compile": "tsc -p bin/tsconfig.json", + "build-process": "node bin/js/index.js" }, "dependencies": { "@types/fs-extra": "^11.0.4", @@ -81,7 +81,7 @@ "hue.gl": "^0.0.7", "icon.gl": "^0.0.4", "loop.gl": "^0.0.1", - "pack.gl": "^0.0.24", + "pack.gl": "^0.0.28", "page.gl": "^0.0.3", "postcss-preset-env": "^9.1.2", "prettier": "^3.0.3", diff --git a/script/js/index.js.map b/script/js/index.js.map deleted file mode 100644 index 8e2683f..0000000 --- a/script/js/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 74dd8ed..1c4f108 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -125,11 +125,11 @@ "include": [ "src/**/*", "src/**/*.ts", - "script/**/*", + "bin/**/*", "src/index.ts.xxx", "src/index.ts.xxx", // "script/release.ts", - "./script/**/*.ts", "tmp/SvgOptimizer.ts", "tmp/ModulePackager.ts", "tmp/FileCopier.ts", + "bin/**/*.ts", "tmp/SvgOptimizer.ts", "tmp/ModulePackager.ts", "tmp/FileCopier.ts", ],