Compare commits
No commits in common. "master" and "v2.0.5" have entirely different histories.
141
.gitlab-ci.yml
Normal file
141
.gitlab-ci.yml
Normal 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
|
||||
64
changelog.md
64
changelog.md
@ -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
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env node
|
||||
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);
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
"gitscope": "gitzone",
|
||||
"gitrepo": "tsbundle",
|
||||
"description": "a bundler using rollup for painless bundling of web projects",
|
||||
"npmPackagename": "@git.zone/tsbundle",
|
||||
"npmPackagename": "@gitzone/tsbundle",
|
||||
"license": "MIT",
|
||||
"projectDomain": "git.zone"
|
||||
}
|
||||
|
||||
9600
package-lock.json
generated
Normal file
9600
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
37
package.json
37
package.json
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@git.zone/tsbundle",
|
||||
"version": "2.2.5",
|
||||
"name": "@gitzone/tsbundle",
|
||||
"version": "2.0.5",
|
||||
"private": false,
|
||||
"description": "a bundler using rollup for painless bundling of web projects",
|
||||
"main": "dist_ts/index.js",
|
||||
@ -16,26 +16,25 @@
|
||||
"tsbundle": "cli.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@git.zone/tsbuild": "^2.2.1",
|
||||
"@git.zone/tsrun": "^1.3.3",
|
||||
"@git.zone/tstest": "^1.0.96",
|
||||
"@push.rocks/tapbundle": "^5.5.6",
|
||||
"@types/node": "^22.12.0"
|
||||
"@gitzone/tsbuild": "^2.1.63",
|
||||
"@gitzone/tsrun": "^1.2.35",
|
||||
"@gitzone/tstest": "^1.0.71",
|
||||
"@pushrocks/tapbundle": "^5.0.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@push.rocks/early": "^4.0.4",
|
||||
"@push.rocks/smartcli": "^4.0.11",
|
||||
"@push.rocks/smartdelay": "^3.0.5",
|
||||
"@push.rocks/smartfile": "^11.2.0",
|
||||
"@push.rocks/smartlog": "^3.0.7",
|
||||
"@push.rocks/smartlog-destination-local": "^9.0.2",
|
||||
"@push.rocks/smartpath": "^5.0.18",
|
||||
"@push.rocks/smartpromise": "^4.2.2",
|
||||
"@push.rocks/smartspawn": "^3.0.3",
|
||||
"@types/html-minifier": "^4.0.5",
|
||||
"esbuild": "^0.24.2",
|
||||
"@pushrocks/early": "^4.0.3",
|
||||
"@pushrocks/smartcli": "^3.0.14",
|
||||
"@pushrocks/smartfile": "^9.0.6",
|
||||
"@pushrocks/smartlog": "^2.0.44",
|
||||
"@pushrocks/smartlog-destination-local": "^8.0.8",
|
||||
"@pushrocks/smartpath": "^5.0.5",
|
||||
"@pushrocks/smartpromise": "^3.1.7",
|
||||
"@pushrocks/smartspawn": "^2.0.9",
|
||||
"@types/html-minifier": "^4.0.2",
|
||||
"@types/node": "^17.0.38",
|
||||
"esbuild": "0.14.27",
|
||||
"html-minifier": "^4.0.0",
|
||||
"typescript": "5.7.3"
|
||||
"typescript": "^4.7.2"
|
||||
},
|
||||
"files": [
|
||||
"ts/**/*",
|
||||
|
||||
9787
pnpm-lock.yaml
generated
9787
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
16
readme.md
16
readme.md
@ -1,8 +1,8 @@
|
||||
# @git.zone/tsbundle
|
||||
# @gitzone/tsbundle
|
||||
a bundler using rollup for painless bundling of web projects
|
||||
|
||||
## 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)
|
||||
* [github.com (source mirror)](https://github.com/gitzone/tsbundle)
|
||||
* [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/)
|
||||
@ -13,14 +13,14 @@ Status Category | Status Badge
|
||||
-- | --
|
||||
GitLab Pipelines | [](https://lossless.cloud)
|
||||
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||
npm | [](https://lossless.cloud)
|
||||
npm | [](https://lossless.cloud)
|
||||
Snyk | [](https://lossless.cloud)
|
||||
TypeScript Support | [](https://lossless.cloud)
|
||||
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||
Code Style | [](https://lossless.cloud)
|
||||
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||
Platform support | [](https://lossless.cloud) [](https://lossless.cloud)
|
||||
|
||||
## Usage
|
||||
@ -38,10 +38,10 @@ tsbundle supports two modes of usage: CLI and API usage.
|
||||
# Install the tool for cli usage
|
||||
|
||||
# Globally
|
||||
npm install -g @git.zone/tsbundle
|
||||
npm install -g @gitzone/tsbundle
|
||||
|
||||
# Locally for use in your pacakge.json
|
||||
npm install --save-dev @git.zone/tsbundle
|
||||
npm install --save-dev @gitzone/tsbundle
|
||||
|
||||
# then use it
|
||||
tsbundle --from="./ts/index.ts" --to="dist/bundle.js"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { expect, tap } from '@push.rocks/tapbundle';
|
||||
import { expect, tap } from '@pushrocks/tapbundle';
|
||||
import * as tsbundle from '../ts/index.js';
|
||||
|
||||
tap.test('should bundle with esbuild', async () => {
|
||||
|
||||
@ -1,9 +1,5 @@
|
||||
import * as smartdelay from '@push.rocks/smartdelay';
|
||||
|
||||
const myConst: string = 'hello';
|
||||
|
||||
await smartdelay.delayFor(1000);
|
||||
|
||||
function sealed(constructor: Function) {
|
||||
Object.seal(constructor);
|
||||
Object.seal(constructor.prototype);
|
||||
@ -19,6 +15,4 @@ class BugReport {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
console.log(myConst);
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
/**
|
||||
* autocreated commitinfo by @push.rocks/commitinfo
|
||||
* autocreated commitinfo by @pushrocks/commitinfo
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@git.zone/tsbundle',
|
||||
version: '2.2.5',
|
||||
name: '@gitzone/tsbundle',
|
||||
version: '2.0.5',
|
||||
description: 'a bundler using rollup for painless bundling of web projects'
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import * as early from '@push.rocks/early';
|
||||
import * as early from '@pushrocks/early';
|
||||
early.start('tsbundle');
|
||||
// lets import all plugins beforehand
|
||||
import './plugins.js';
|
||||
@ -9,6 +9,5 @@ early.stop();
|
||||
|
||||
// lets make this usable programmatically
|
||||
export * from './tsbundle.class.tsbundle.js';
|
||||
export * from './mod_assets/index.js';
|
||||
export * from './mod_html/index.js';
|
||||
export { runCli };
|
||||
|
||||
@ -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,
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
export * from '../plugins.js';
|
||||
@ -4,91 +4,73 @@ import * as interfaces from '../interfaces/index.js';
|
||||
import { logger } from '../tsbundle.logging.js';
|
||||
|
||||
export class TsBundleProcess {
|
||||
|
||||
constructor() {
|
||||
// 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
|
||||
*/
|
||||
public async buildTest(fromArg: string, toArg: string, argvArg: any) {
|
||||
public async buildTest(
|
||||
fromArg: string,
|
||||
toArg: string,
|
||||
argvArg: any
|
||||
) {
|
||||
// create a bundle
|
||||
const esbuild = await plugins.esbuild.build({
|
||||
entryPoints: [fromArg],
|
||||
bundle: true,
|
||||
sourcemap: true,
|
||||
format: 'esm',
|
||||
target: 'es2022',
|
||||
entryNames: plugins.path.parse(toArg).name,
|
||||
outdir: plugins.path.parse(toArg).dir,
|
||||
// splitting: true,
|
||||
tsconfig: paths.tsconfigPath,
|
||||
alias: await this.getAliases(),
|
||||
target: 'es2020',
|
||||
outfile: toArg,
|
||||
tsconfig: paths.tsconfigPath
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
console.log('esbuild specific:');
|
||||
console.log(`from: ${fromArg}`);
|
||||
console.log(`to: ${toArg}`);
|
||||
console.log((`to: ${toArg}`));
|
||||
const esbuild = await plugins.esbuild.build({
|
||||
entryPoints: [fromArg],
|
||||
bundle: true,
|
||||
sourcemap: true,
|
||||
format: 'esm',
|
||||
target: 'es2022',
|
||||
target: 'es2020',
|
||||
minify: true,
|
||||
entryNames: 'bundle',
|
||||
outdir: plugins.path.parse(toArg).dir,
|
||||
tsconfig: paths.tsconfigPath,
|
||||
// splitting: true,
|
||||
chunkNames: 'chunks/[name]-[hash]',
|
||||
alias: await this.getAliases(),
|
||||
outfile: toArg,
|
||||
tsconfig: paths.tsconfigPath
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
const run = async () => {
|
||||
console.log('running spawned compilation process');
|
||||
const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(
|
||||
process.env.transportOptions
|
||||
);
|
||||
const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(process.env.transportOptions);
|
||||
console.log('=======> ESBUILD');
|
||||
console.log(transportOptions);
|
||||
process.chdir(transportOptions.cwd);
|
||||
console.log(`switched to ${process.cwd()}`);
|
||||
const tsbundleProcessInstance = new TsBundleProcess();
|
||||
if (transportOptions.mode === 'test') {
|
||||
console.log('building for test:');
|
||||
console.log('building for test:')
|
||||
tsbundleProcessInstance.buildTest(
|
||||
plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
|
||||
plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),
|
||||
transportOptions.argv
|
||||
);
|
||||
} else {
|
||||
console.log('building for production:');
|
||||
console.log('building for production:')
|
||||
tsbundleProcessInstance.buildProduction(
|
||||
plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
|
||||
plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),
|
||||
|
||||
@ -10,27 +10,25 @@ export class HtmlHandler {
|
||||
}
|
||||
|
||||
// copies the html
|
||||
public async processHtml(optionsArg: {
|
||||
from?: string;
|
||||
to?: string;
|
||||
minify?: boolean;
|
||||
}) {
|
||||
optionsArg = {
|
||||
... {
|
||||
from: this.defaultFromPath,
|
||||
to: this.defaultToPath,
|
||||
minify: false,
|
||||
},
|
||||
...optionsArg
|
||||
}
|
||||
public async copyHtml(fromArg: string = this.defaultFromPath, toArg: string = this.defaultToPath) {
|
||||
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;
|
||||
optionsArg.to = plugins.smartpath.transform.toAbsolute(optionsArg.to, paths.cwd) as string;
|
||||
let fileString = plugins.smartfile.fs.toStringSync(optionsArg.from);
|
||||
if (optionsArg.minify) {
|
||||
fileString = plugins.htmlMinifier.minify(fileString, {
|
||||
fromArg = plugins.smartpath.transform.toAbsolute(fromArg, paths.cwd) as string;
|
||||
toArg = plugins.smartpath.transform.toAbsolute(toArg, paths.cwd) as string;
|
||||
await plugins.smartfile.fs.copy(fromArg, toArg);
|
||||
console.log(`html copy succeeded!`);
|
||||
}
|
||||
|
||||
// copies and minifies the html
|
||||
public async minifyHtml(fromArg: string = this.defaultFromPath, toArg: string = this.defaultToPath) {
|
||||
if (await this.checkIfExists()) {
|
||||
console.log(`${fromArg} replaces file at ${toArg}`);
|
||||
}
|
||||
fromArg = plugins.smartpath.transform.toAbsolute(fromArg, paths.cwd) as string;
|
||||
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,
|
||||
@ -40,8 +38,7 @@ export class HtmlHandler {
|
||||
collapseInlineTagWhitespace: true,
|
||||
removeComments: true,
|
||||
});
|
||||
}
|
||||
await plugins.smartfile.memory.toFs(fileString, optionsArg.to);
|
||||
console.log(`html processing succeeded!`);
|
||||
await plugins.smartfile.memory.toFs(minifiedHtml, toArg);
|
||||
console.log(`html minification succeeded!`);
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,13 +4,13 @@ import * as path from 'path';
|
||||
export { path };
|
||||
|
||||
// pushrocks scope
|
||||
import * as smartcli from '@push.rocks/smartcli';
|
||||
import * as smartfile from '@push.rocks/smartfile';
|
||||
import * as smartlog from '@push.rocks/smartlog';
|
||||
import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
|
||||
import * as smartpath from '@push.rocks/smartpath';
|
||||
import * as smartpromise from '@push.rocks/smartpromise';
|
||||
import * as smartspawn from '@push.rocks/smartspawn';
|
||||
import * as smartcli from '@pushrocks/smartcli';
|
||||
import * as smartfile from '@pushrocks/smartfile';
|
||||
import * as smartlog from '@pushrocks/smartlog';
|
||||
import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
|
||||
import * as smartpath from '@pushrocks/smartpath';
|
||||
import * as smartpromise from '@pushrocks/smartpromise';
|
||||
import * as smartspawn from '@pushrocks/smartspawn';
|
||||
|
||||
export {
|
||||
smartcli,
|
||||
|
||||
@ -2,11 +2,10 @@ import * as plugins from './plugins.js';
|
||||
import { TsBundle } from './tsbundle.class.tsbundle.js';
|
||||
import { HtmlHandler } from './mod_html/index.js';
|
||||
import { logger } from './tsbundle.logging.js';
|
||||
import { AssetsHandler } from './mod_assets/index.js';
|
||||
|
||||
export const runCli = async () => {
|
||||
const tsBundleCli = new plugins.smartcli.Smartcli();
|
||||
tsBundleCli.standardCommand().subscribe(async (argvArg) => {
|
||||
tsBundleCli.standardTask().subscribe(async (argvArg) => {
|
||||
const tsbundle = new TsBundle();
|
||||
await tsbundle.build(process.cwd(), argvArg.from, argvArg.to, argvArg);
|
||||
return;
|
||||
@ -14,6 +13,8 @@ export const runCli = async () => {
|
||||
|
||||
tsBundleCli.addCommand('element').subscribe(async (argvArg) => {
|
||||
const tsbundle = new TsBundle();
|
||||
const htmlHandler = new HtmlHandler();
|
||||
// const htmlHandler = new HtmlHandler();
|
||||
await tsbundle.build(
|
||||
process.cwd(),
|
||||
'./ts_web/index.ts',
|
||||
@ -35,8 +36,6 @@ export const runCli = async () => {
|
||||
|
||||
tsBundleCli.addCommand('website').subscribe(async (argvArg) => {
|
||||
const tsbundle = new TsBundle();
|
||||
|
||||
// lets deal with the html
|
||||
const htmlHandler = new HtmlHandler();
|
||||
await tsbundle.build(
|
||||
process.cwd(),
|
||||
@ -44,18 +43,7 @@ export const runCli = async () => {
|
||||
'./dist_serve/bundle.js',
|
||||
argvArg
|
||||
);
|
||||
const htmlFiles = await plugins.smartfile.fs.listFiles('./html', /\.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();
|
||||
await htmlHandler.minifyHtml('./html/index.html', './dist_serve/index.html')
|
||||
});
|
||||
|
||||
tsBundleCli.startParse();
|
||||
|
||||
@ -3,12 +3,7 @@
|
||||
"experimentalDecorators": true,
|
||||
"useDefineForClassFields": false,
|
||||
"target": "ES2022",
|
||||
"module": "NodeNext",
|
||||
"moduleResolution": "NodeNext",
|
||||
"esModuleInterop": true,
|
||||
"verbatimModuleSyntax": true
|
||||
},
|
||||
"exclude": [
|
||||
"dist_*/**/*.d.ts"
|
||||
]
|
||||
"module": "ES2022",
|
||||
"moduleResolution": "nodenext"
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user