Compare commits

..

No commits in common. "master" and "v2.0.5" have entirely different histories.

20 changed files with 9836 additions and 10033 deletions

141
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,141 @@
# gitzone ci_default
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
cache:
paths:
- .npmci_cache/
key: '$CI_BUILD_STAGE'
stages:
- security
- test
- release
- metadata
before_script:
- npm install -g @shipzone/npmci
# ====================
# security stage
# ====================
mirror:
stage: security
script:
- npmci git mirror
only:
- tags
tags:
- lossless
- docker
- notpriv
auditProductionDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security
script:
- npmci npm prepare
- npmci command npm install --production --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high --only=prod --production
tags:
- docker
allow_failure: true
auditDevDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security
script:
- npmci npm prepare
- npmci command npm install --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high --only=dev
tags:
- docker
allow_failure: true
# ====================
# test stage
# ====================
testStable:
stage: test
script:
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
testBuild:
stage: test
script:
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci command npm run build
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
release:
stage: release
script:
- npmci node install stable
- npmci npm publish
only:
- tags
tags:
- lossless
- docker
- notpriv
# ====================
# metadata stage
# ====================
codequality:
stage: metadata
allow_failure: true
only:
- tags
script:
- npmci command npm install -g tslint typescript
- npmci npm prepare
- npmci npm install
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
tags:
- lossless
- docker
- priv
trigger:
stage: metadata
script:
- npmci trigger
only:
- tags
tags:
- lossless
- docker
- notpriv
pages:
stage: metadata
script:
- npmci node install lts
- npmci command npm install -g @gitzone/tsdoc
- npmci npm prepare
- npmci npm install
- npmci command tsdoc
tags:
- lossless
- docker
- notpriv
only:
- tags
artifacts:
expire_in: 1 week
paths:
- public
allow_failure: true

View File

@ -1,64 +0,0 @@
# Changelog
## 2025-01-29 - 2.2.5 - fix(mod_assets)
Fix async handling in asset processing
- Ensured that the empty directory operation is awaited in the asset processing workflow.
## 2025-01-29 - 2.2.4 - fix(mod_assets)
Fix logging message in ensureAssetsDir to correctly state when directory is created
- Corrected logging output in ensureAssetsDir method to indicate directory creation.
## 2025-01-29 - 2.2.3 - fix(mod_assets)
Fix issue with asset directory copy
- Updated dependency '@push.rocks/smartfile' to version '^11.2.0'
- Ensure target directory is properly replaced when copying assets
## 2025-01-29 - 2.2.2 - fix(dependencies)
Update smartfile dependency and fix spacing issue in assets module
- Updated @push.rocks/smartfile from ^11.1.6 to ^11.1.8
- Fixed a spacing issue in the processAssets function within the assets module
## 2025-01-29 - 2.2.1 - fix(index)
Export mod_assets for programmatic use
- Added export for mod_assets/index in ts/index.ts to make it usable programmatically.
## 2025-01-29 - 2.2.0 - feat(AssetsHandler)
Add asset handling to the CLI workflow
- Introduced AssetsHandler class for managing asset directories and files.
- Updated tsbundle.cli.ts to include asset processing in the 'website' command.
## 2025-01-28 - 2.1.1 - fix(core)
Update dependencies and remove GitLab CI configuration.
- Updated several devDependencies to newer versions for improved stability and performance.
- Updated core dependencies including esbuild and TypeScript.
- Removed the .gitlab-ci.yml file, which could suggest a change in continuous integration setup.
## 2024-10-27 - 2.1.0 - feat(mod_esbuild)
Add alias support to esbuild bundling process
- Updated dependencies in package.json to latest versions.
- Improved build process by adding alias resolution based on tsconfig.json settings in esbuild.
## 2022-05-04 - 2.0.0-2.0.1 - Breaking and Fix Changes
Released version 2.0.0 with breaking changes and subsequent fixes.
- BREAKING CHANGE(core): Removed parcel and rollup
- fix(core): Addressed initial issues in new major version
## 2023-10-03 - 2.0.10 - Fix Updates
Ongoing updates and improvements.
- fix(core): General updates and enhancements
## 2024-01-10 - 2.0.11-2.0.15 - Minor Fixes
Cumulative fixes and updates from recent releases.
- fix(core): Continuous improvement cycle across versions

View File

@ -1,5 +1,5 @@
#!/usr/bin/env node #!/usr/bin/env node
process.env.CLI_CALL = 'true'; process.env.CLI_CALL = 'true';
import * as tsrun from '@git.zone/tsrun'; import * as tsrun from '@gitzone/tsrun';
tsrun.runPath('./cli.child.js', import.meta.url); tsrun.runPath('./cli.child.js', import.meta.url);

View File

@ -6,7 +6,7 @@
"gitscope": "gitzone", "gitscope": "gitzone",
"gitrepo": "tsbundle", "gitrepo": "tsbundle",
"description": "a bundler using rollup for painless bundling of web projects", "description": "a bundler using rollup for painless bundling of web projects",
"npmPackagename": "@git.zone/tsbundle", "npmPackagename": "@gitzone/tsbundle",
"license": "MIT", "license": "MIT",
"projectDomain": "git.zone" "projectDomain": "git.zone"
} }

9600
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "@git.zone/tsbundle", "name": "@gitzone/tsbundle",
"version": "2.2.5", "version": "2.0.5",
"private": false, "private": false,
"description": "a bundler using rollup for painless bundling of web projects", "description": "a bundler using rollup for painless bundling of web projects",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",
@ -16,26 +16,25 @@
"tsbundle": "cli.js" "tsbundle": "cli.js"
}, },
"devDependencies": { "devDependencies": {
"@git.zone/tsbuild": "^2.2.1", "@gitzone/tsbuild": "^2.1.63",
"@git.zone/tsrun": "^1.3.3", "@gitzone/tsrun": "^1.2.35",
"@git.zone/tstest": "^1.0.96", "@gitzone/tstest": "^1.0.71",
"@push.rocks/tapbundle": "^5.5.6", "@pushrocks/tapbundle": "^5.0.3"
"@types/node": "^22.12.0"
}, },
"dependencies": { "dependencies": {
"@push.rocks/early": "^4.0.4", "@pushrocks/early": "^4.0.3",
"@push.rocks/smartcli": "^4.0.11", "@pushrocks/smartcli": "^3.0.14",
"@push.rocks/smartdelay": "^3.0.5", "@pushrocks/smartfile": "^9.0.6",
"@push.rocks/smartfile": "^11.2.0", "@pushrocks/smartlog": "^2.0.44",
"@push.rocks/smartlog": "^3.0.7", "@pushrocks/smartlog-destination-local": "^8.0.8",
"@push.rocks/smartlog-destination-local": "^9.0.2", "@pushrocks/smartpath": "^5.0.5",
"@push.rocks/smartpath": "^5.0.18", "@pushrocks/smartpromise": "^3.1.7",
"@push.rocks/smartpromise": "^4.2.2", "@pushrocks/smartspawn": "^2.0.9",
"@push.rocks/smartspawn": "^3.0.3", "@types/html-minifier": "^4.0.2",
"@types/html-minifier": "^4.0.5", "@types/node": "^17.0.38",
"esbuild": "^0.24.2", "esbuild": "0.14.27",
"html-minifier": "^4.0.0", "html-minifier": "^4.0.0",
"typescript": "5.7.3" "typescript": "^4.7.2"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",

9787
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

View File

@ -1,8 +1,8 @@
# @git.zone/tsbundle # @gitzone/tsbundle
a bundler using rollup for painless bundling of web projects a bundler using rollup for painless bundling of web projects
## Availabililty and Links ## Availabililty and Links
* [npmjs.org (npm package)](https://www.npmjs.com/package/@git.zone/tsbundle) * [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/tsbundle)
* [gitlab.com (source)](https://gitlab.com/gitzone/tsbundle) * [gitlab.com (source)](https://gitlab.com/gitzone/tsbundle)
* [github.com (source mirror)](https://github.com/gitzone/tsbundle) * [github.com (source mirror)](https://github.com/gitzone/tsbundle)
* [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/) * [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/)
@ -13,14 +13,14 @@ Status Category | Status Badge
-- | -- -- | --
GitLab Pipelines | [![pipeline status](https://gitlab.com/gitzone/tsbundle/badges/master/pipeline.svg)](https://lossless.cloud) GitLab Pipelines | [![pipeline status](https://gitlab.com/gitzone/tsbundle/badges/master/pipeline.svg)](https://lossless.cloud)
GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/gitzone/tsbundle/badges/master/coverage.svg)](https://lossless.cloud) GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/gitzone/tsbundle/badges/master/coverage.svg)](https://lossless.cloud)
npm | [![npm downloads per month](https://badgen.net/npm/dy/@git.zone/tsbundle)](https://lossless.cloud) npm | [![npm downloads per month](https://badgen.net/npm/dy/@gitzone/tsbundle)](https://lossless.cloud)
Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/gitzone/tsbundle)](https://lossless.cloud) Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/gitzone/tsbundle)](https://lossless.cloud)
TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud) TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud) Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@git.zone/tsbundle)](https://lossless.cloud) PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@gitzone/tsbundle)](https://lossless.cloud)
PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@git.zone/tsbundle)](https://lossless.cloud) PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tsbundle)](https://lossless.cloud)
BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@git.zone/tsbundle)](https://lossless.cloud) BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@gitzone/tsbundle)](https://lossless.cloud)
Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud) Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
## Usage ## Usage
@ -38,10 +38,10 @@ tsbundle supports two modes of usage: CLI and API usage.
# Install the tool for cli usage # Install the tool for cli usage
# Globally # Globally
npm install -g @git.zone/tsbundle npm install -g @gitzone/tsbundle
# Locally for use in your pacakge.json # Locally for use in your pacakge.json
npm install --save-dev @git.zone/tsbundle npm install --save-dev @gitzone/tsbundle
# then use it # then use it
tsbundle --from="./ts/index.ts" --to="dist/bundle.js" tsbundle --from="./ts/index.ts" --to="dist/bundle.js"

View File

@ -1,4 +1,4 @@
import { expect, tap } from '@push.rocks/tapbundle'; import { expect, tap } from '@pushrocks/tapbundle';
import * as tsbundle from '../ts/index.js'; import * as tsbundle from '../ts/index.js';
tap.test('should bundle with esbuild', async () => { tap.test('should bundle with esbuild', async () => {

View File

@ -1,9 +1,5 @@
import * as smartdelay from '@push.rocks/smartdelay';
const myConst: string = 'hello'; const myConst: string = 'hello';
await smartdelay.delayFor(1000);
function sealed(constructor: Function) { function sealed(constructor: Function) {
Object.seal(constructor); Object.seal(constructor);
Object.seal(constructor.prototype); Object.seal(constructor.prototype);
@ -19,6 +15,4 @@ class BugReport {
} }
} }
console.log(myConst); console.log(myConst);

View File

@ -1,8 +1,8 @@
/** /**
* autocreated commitinfo by @push.rocks/commitinfo * autocreated commitinfo by @pushrocks/commitinfo
*/ */
export const commitinfo = { export const commitinfo = {
name: '@git.zone/tsbundle', name: '@gitzone/tsbundle',
version: '2.2.5', version: '2.0.5',
description: 'a bundler using rollup for painless bundling of web projects' description: 'a bundler using rollup for painless bundling of web projects'
} }

View File

@ -1,4 +1,4 @@
import * as early from '@push.rocks/early'; import * as early from '@pushrocks/early';
early.start('tsbundle'); early.start('tsbundle');
// lets import all plugins beforehand // lets import all plugins beforehand
import './plugins.js'; import './plugins.js';
@ -9,6 +9,5 @@ early.stop();
// lets make this usable programmatically // lets make this usable programmatically
export * from './tsbundle.class.tsbundle.js'; export * from './tsbundle.class.tsbundle.js';
export * from './mod_assets/index.js';
export * from './mod_html/index.js'; export * from './mod_html/index.js';
export { runCli }; export { runCli };

View File

@ -1,40 +0,0 @@
import * as plugins from './plugins.js';
import * as paths from '../paths.js';
export class AssetsHandler {
public defaultFromDirPath: string = plugins.path.join(paths.cwd, './assets');
public defaultToDirPath: string = plugins.path.join(paths.cwd, './dist_serve/assets');
public async ensureAssetsDir() {
const assetsDirExists = await plugins.smartfile.fs.isDirectory(this.defaultFromDirPath);
if (!assetsDirExists) {
await plugins.smartfile.fs.ensureDir(this.defaultFromDirPath);
console.log(`created assets directory at ${this.defaultFromDirPath}`);
}
}
// copies the html
public async processAssets(optionsArg?: {
from?: string;
to?: string;
}) {
// lets assemble the options
optionsArg = {
... {
from: this.defaultFromDirPath,
to: this.defaultToDirPath,
},
...(optionsArg || {})
}
await this.ensureAssetsDir()
optionsArg.from = plugins.smartpath.transform.toAbsolute(optionsArg.from, paths.cwd) as string;
optionsArg.to = plugins.smartpath.transform.toAbsolute(optionsArg.to, paths.cwd) as string;
// lets clean theh target directory
await plugins.smartfile.fs.ensureEmptyDir(optionsArg.to);
plugins.smartfile.fs.copySync(optionsArg.from, optionsArg.to, {
replaceTargetDir: true,
});
}
}

View File

@ -1 +0,0 @@
export * from '../plugins.js';

View File

@ -4,91 +4,73 @@ import * as interfaces from '../interfaces/index.js';
import { logger } from '../tsbundle.logging.js'; import { logger } from '../tsbundle.logging.js';
export class TsBundleProcess { export class TsBundleProcess {
constructor() { constructor() {
// Nothing here // Nothing here
} }
public async getAliases() {
try {
const aliasObject: Record<string, string> = {};
const localTsConfig = plugins.smartfile.fs.toObjectSync(
plugins.path.join(paths.cwd, 'tsconfig.json')
);
if (localTsConfig.compilerOptions && localTsConfig.compilerOptions.paths) {
for (const alias of Object.keys(localTsConfig.compilerOptions.paths)) {
const aliasPath = localTsConfig.compilerOptions.paths[alias][0];
aliasObject[alias] = aliasPath;
}
}
return aliasObject;
} catch (error) {
return {};
}
}
/** /**
* creates a bundle for the test enviroment * creates a bundle for the test enviroment
*/ */
public async buildTest(fromArg: string, toArg: string, argvArg: any) { public async buildTest(
fromArg: string,
toArg: string,
argvArg: any
) {
// create a bundle // create a bundle
const esbuild = await plugins.esbuild.build({ const esbuild = await plugins.esbuild.build({
entryPoints: [fromArg], entryPoints: [fromArg],
bundle: true, bundle: true,
sourcemap: true, sourcemap: true,
format: 'esm', format: 'esm',
target: 'es2022', target: 'es2020',
entryNames: plugins.path.parse(toArg).name, outfile: toArg,
outdir: plugins.path.parse(toArg).dir, tsconfig: paths.tsconfigPath
// splitting: true,
tsconfig: paths.tsconfigPath,
alias: await this.getAliases(),
}); });
} }
/** /**
* creates a bundle for the production environment * creates a bundle for the production environment
*/ */
public async buildProduction(fromArg: string, toArg: string, argvArg: any) { public async buildProduction(
fromArg: string,
toArg: string,
argvArg: any
) {
// create a bundle // create a bundle
console.log('esbuild specific:'); console.log('esbuild specific:');
console.log(`from: ${fromArg}`); console.log(`from: ${fromArg}`);
console.log(`to: ${toArg}`); console.log((`to: ${toArg}`));
const esbuild = await plugins.esbuild.build({ const esbuild = await plugins.esbuild.build({
entryPoints: [fromArg], entryPoints: [fromArg],
bundle: true, bundle: true,
sourcemap: true, sourcemap: true,
format: 'esm', format: 'esm',
target: 'es2022', target: 'es2020',
minify: true, minify: true,
entryNames: 'bundle', outfile: toArg,
outdir: plugins.path.parse(toArg).dir, tsconfig: paths.tsconfigPath
tsconfig: paths.tsconfigPath,
// splitting: true,
chunkNames: 'chunks/[name]-[hash]',
alias: await this.getAliases(),
}); });
} }
} }
const run = async () => { const run = async () => {
console.log('running spawned compilation process'); console.log('running spawned compilation process');
const transportOptions: interfaces.IEnvTransportOptions = JSON.parse( const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(process.env.transportOptions);
process.env.transportOptions
);
console.log('=======> ESBUILD'); console.log('=======> ESBUILD');
console.log(transportOptions); console.log(transportOptions);
process.chdir(transportOptions.cwd); process.chdir(transportOptions.cwd);
console.log(`switched to ${process.cwd()}`); console.log(`switched to ${process.cwd()}`);
const tsbundleProcessInstance = new TsBundleProcess(); const tsbundleProcessInstance = new TsBundleProcess();
if (transportOptions.mode === 'test') { if (transportOptions.mode === 'test') {
console.log('building for test:'); console.log('building for test:')
tsbundleProcessInstance.buildTest( tsbundleProcessInstance.buildTest(
plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()), plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()), plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),
transportOptions.argv transportOptions.argv
); );
} else { } else {
console.log('building for production:'); console.log('building for production:')
tsbundleProcessInstance.buildProduction( tsbundleProcessInstance.buildProduction(
plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()), plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()), plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),

View File

@ -10,38 +10,35 @@ export class HtmlHandler {
} }
// copies the html // copies the html
public async processHtml(optionsArg: { public async copyHtml(fromArg: string = this.defaultFromPath, toArg: string = this.defaultToPath) {
from?: string;
to?: string;
minify?: boolean;
}) {
optionsArg = {
... {
from: this.defaultFromPath,
to: this.defaultToPath,
minify: false,
},
...optionsArg
}
if (await this.checkIfExists()) { if (await this.checkIfExists()) {
console.log(`${optionsArg.from} replaces file at ${optionsArg.to}`); console.log(`${fromArg} replaces file at ${toArg}`);
} }
optionsArg.from = plugins.smartpath.transform.toAbsolute(optionsArg.from, paths.cwd) as string; fromArg = plugins.smartpath.transform.toAbsolute(fromArg, paths.cwd) as string;
optionsArg.to = plugins.smartpath.transform.toAbsolute(optionsArg.to, paths.cwd) as string; toArg = plugins.smartpath.transform.toAbsolute(toArg, paths.cwd) as string;
let fileString = plugins.smartfile.fs.toStringSync(optionsArg.from); await plugins.smartfile.fs.copy(fromArg, toArg);
if (optionsArg.minify) { console.log(`html copy succeeded!`);
fileString = plugins.htmlMinifier.minify(fileString, { }
minifyCSS: true,
minifyJS: true, // copies and minifies the html
sortAttributes: true, public async minifyHtml(fromArg: string = this.defaultFromPath, toArg: string = this.defaultToPath) {
sortClassName: true, if (await this.checkIfExists()) {
removeAttributeQuotes: true, console.log(`${fromArg} replaces file at ${toArg}`);
collapseWhitespace: true,
collapseInlineTagWhitespace: true,
removeComments: true,
});
} }
await plugins.smartfile.memory.toFs(fileString, optionsArg.to); fromArg = plugins.smartpath.transform.toAbsolute(fromArg, paths.cwd) as string;
console.log(`html processing succeeded!`); toArg = plugins.smartpath.transform.toAbsolute(toArg, paths.cwd) as string;
const fileString = plugins.smartfile.fs.toStringSync(fromArg);
const minifiedHtml = plugins.htmlMinifier.minify(fileString, {
minifyCSS: true,
minifyJS: true,
sortAttributes: true,
sortClassName: true,
removeAttributeQuotes: true,
collapseWhitespace: true,
collapseInlineTagWhitespace: true,
removeComments: true,
});
await plugins.smartfile.memory.toFs(minifiedHtml, toArg);
console.log(`html minification succeeded!`);
} }
} }

View File

@ -4,13 +4,13 @@ import * as path from 'path';
export { path }; export { path };
// pushrocks scope // pushrocks scope
import * as smartcli from '@push.rocks/smartcli'; import * as smartcli from '@pushrocks/smartcli';
import * as smartfile from '@push.rocks/smartfile'; import * as smartfile from '@pushrocks/smartfile';
import * as smartlog from '@push.rocks/smartlog'; import * as smartlog from '@pushrocks/smartlog';
import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local'; import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
import * as smartpath from '@push.rocks/smartpath'; import * as smartpath from '@pushrocks/smartpath';
import * as smartpromise from '@push.rocks/smartpromise'; import * as smartpromise from '@pushrocks/smartpromise';
import * as smartspawn from '@push.rocks/smartspawn'; import * as smartspawn from '@pushrocks/smartspawn';
export { export {
smartcli, smartcli,

View File

@ -2,11 +2,10 @@ import * as plugins from './plugins.js';
import { TsBundle } from './tsbundle.class.tsbundle.js'; import { TsBundle } from './tsbundle.class.tsbundle.js';
import { HtmlHandler } from './mod_html/index.js'; import { HtmlHandler } from './mod_html/index.js';
import { logger } from './tsbundle.logging.js'; import { logger } from './tsbundle.logging.js';
import { AssetsHandler } from './mod_assets/index.js';
export const runCli = async () => { export const runCli = async () => {
const tsBundleCli = new plugins.smartcli.Smartcli(); const tsBundleCli = new plugins.smartcli.Smartcli();
tsBundleCli.standardCommand().subscribe(async (argvArg) => { tsBundleCli.standardTask().subscribe(async (argvArg) => {
const tsbundle = new TsBundle(); const tsbundle = new TsBundle();
await tsbundle.build(process.cwd(), argvArg.from, argvArg.to, argvArg); await tsbundle.build(process.cwd(), argvArg.from, argvArg.to, argvArg);
return; return;
@ -14,6 +13,8 @@ export const runCli = async () => {
tsBundleCli.addCommand('element').subscribe(async (argvArg) => { tsBundleCli.addCommand('element').subscribe(async (argvArg) => {
const tsbundle = new TsBundle(); const tsbundle = new TsBundle();
const htmlHandler = new HtmlHandler();
// const htmlHandler = new HtmlHandler();
await tsbundle.build( await tsbundle.build(
process.cwd(), process.cwd(),
'./ts_web/index.ts', './ts_web/index.ts',
@ -35,8 +36,6 @@ export const runCli = async () => {
tsBundleCli.addCommand('website').subscribe(async (argvArg) => { tsBundleCli.addCommand('website').subscribe(async (argvArg) => {
const tsbundle = new TsBundle(); const tsbundle = new TsBundle();
// lets deal with the html
const htmlHandler = new HtmlHandler(); const htmlHandler = new HtmlHandler();
await tsbundle.build( await tsbundle.build(
process.cwd(), process.cwd(),
@ -44,18 +43,7 @@ export const runCli = async () => {
'./dist_serve/bundle.js', './dist_serve/bundle.js',
argvArg argvArg
); );
const htmlFiles = await plugins.smartfile.fs.listFiles('./html', /\.html/); await htmlHandler.minifyHtml('./html/index.html', './dist_serve/index.html')
for (const htmlFile of htmlFiles) {
await htmlHandler.processHtml({
from: `./html/${htmlFile}`,
to: `./dist_serve/${htmlFile}`,
minify: true,
});
}
// lets deal with the assets
const assetsHandler = new AssetsHandler();
await assetsHandler.processAssets();
}); });
tsBundleCli.startParse(); tsBundleCli.startParse();

View File

@ -3,12 +3,7 @@
"experimentalDecorators": true, "experimentalDecorators": true,
"useDefineForClassFields": false, "useDefineForClassFields": false,
"target": "ES2022", "target": "ES2022",
"module": "NodeNext", "module": "ES2022",
"moduleResolution": "NodeNext", "moduleResolution": "nodenext"
"esModuleInterop": true, }
"verbatimModuleSyntax": true
},
"exclude": [
"dist_*/**/*.d.ts"
]
} }