Compare commits

...

52 Commits

Author SHA1 Message Date
b01b7d23df 2.2.5 2025-01-29 18:33:30 +01:00
45c4472c53 fix(mod_assets): Fix async handling in asset processing 2025-01-29 18:33:29 +01:00
337bee3272 2.2.4 2025-01-29 18:27:14 +01:00
709a67fe82 fix(mod_assets): Fix logging message in ensureAssetsDir to correctly state when directory is created 2025-01-29 18:27:13 +01:00
37082bd8f4 2.2.3 2025-01-29 18:25:06 +01:00
2c8623ab58 fix(mod_assets): Fix issue with asset directory copy 2025-01-29 18:25:05 +01:00
126fb5449b 2.2.2 2025-01-29 18:15:00 +01:00
8a0095f90a fix(dependencies): Update smartfile dependency and fix spacing issue in assets module 2025-01-29 18:14:59 +01:00
704a3d1948 2.2.1 2025-01-29 13:18:04 +01:00
0538ed44af fix(index): Export mod_assets for programmatic use 2025-01-29 13:18:04 +01:00
3fa8b0ca3b 2.2.0 2025-01-29 13:12:01 +01:00
10af586f28 feat(AssetsHandler): Add asset handling to the CLI workflow 2025-01-29 13:12:01 +01:00
230e217368 2.1.1 2025-01-28 12:11:40 +01:00
f5d6ec81ff fix(core): Update dependencies and remove GitLab CI configuration. 2025-01-28 12:11:40 +01:00
56f32136c5 2.1.0 2024-10-27 18:36:36 +01:00
84854b0b40 feat(mod_esbuild): Add alias support to esbuild bundling process 2024-10-27 18:36:36 +01:00
32b0781d72 2.0.15 2024-01-10 05:07:09 +01:00
e47ba642f2 fix(core): update 2024-01-10 05:07:08 +01:00
49ecf9d4ca 2.0.14 2024-01-09 16:54:30 +01:00
7bd0032007 fix(core): update 2024-01-09 16:54:29 +01:00
866c203856 2.0.13 2024-01-08 16:48:12 +01:00
3e673bca6b fix(core): update 2024-01-08 16:48:11 +01:00
5c3dfe0920 2.0.12 2024-01-08 16:28:23 +01:00
c08a9065a1 fix(core): update 2024-01-08 16:28:22 +01:00
f4071f0b64 2.0.11 2024-01-08 16:24:52 +01:00
335cc19211 fix(core): update 2024-01-08 16:24:52 +01:00
25851c2b64 2.0.10 2023-10-03 19:12:49 +02:00
73a6ce2786 fix(core): update 2023-10-03 19:12:49 +02:00
8bd279637b 2.0.9 2023-08-26 15:08:23 +02:00
1e37857c26 fix(core): update 2023-08-26 15:08:23 +02:00
93a1052bf5 2.0.8 2023-06-03 17:33:32 +02:00
6e6452df61 fix(core): update 2023-06-03 17:33:32 +02:00
3de5a91885 2.0.7 2022-08-03 19:43:18 +02:00
f7ca1b2135 fix(core): update 2022-08-03 19:43:18 +02:00
3076e13179 2.0.6 2022-07-24 15:51:55 +02:00
f3b50d384a fix(core): update 2022-07-24 15:51:55 +02:00
6dcb3f7c2a 2.0.5 2022-06-02 01:00:49 +02:00
daba025307 fix(core): update 2022-06-02 01:00:49 +02:00
00383171ff 2.0.4 2022-05-25 11:56:11 +02:00
2ce9b08911 fix(core): update 2022-05-25 11:56:10 +02:00
d603baf65e 2.0.3 2022-05-04 18:51:15 +02:00
50e4909984 fix(core): update 2022-05-04 18:51:15 +02:00
7208274156 2.0.2 2022-05-04 17:39:00 +02:00
41ec42d068 fix(core): update 2022-05-04 17:39:00 +02:00
d159b9a6a8 2.0.1 2022-05-04 17:20:28 +02:00
45d0d74559 fix(core): update 2022-05-04 17:20:28 +02:00
661fdf75cf 2.0.0 2022-05-04 17:14:39 +02:00
6f17a76b6e BREAKING CHANGE(core): remove parcel and rollup 2022-05-04 17:14:38 +02:00
324ef71b6f 1.0.104 2022-05-04 17:13:52 +02:00
58a7dca142 fix(core): update 2022-05-04 17:13:52 +02:00
e243e17acb 1.0.103 2022-05-02 18:23:37 +02:00
d788bdc78b fix(core): update 2022-05-02 18:23:36 +02:00
28 changed files with 10054 additions and 18603 deletions

View File

@ -1,141 +0,0 @@
# 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

11
assets/tsconfig.json Normal file
View File

@ -0,0 +1,11 @@
{
"compilerOptions": {
"experimentalDecorators": true,
"target": "ES2020",
"module": "ES2020",
"moduleResolution": "node12",
"useDefineForClassFields": false,
"preserveValueImports": true,
"esModuleInterop": true
}
}

64
changelog.md Normal file
View File

@ -0,0 +1,64 @@
# 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 '@gitzone/tsrun'; import * as tsrun from '@git.zone/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": "@gitzone/tsbundle", "npmPackagename": "@git.zone/tsbundle",
"license": "MIT", "license": "MIT",
"projectDomain": "git.zone" "projectDomain": "git.zone"
} }

18045
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "@gitzone/tsbundle", "name": "@git.zone/tsbundle",
"version": "1.0.102", "version": "2.2.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,42 +16,26 @@
"tsbundle": "cli.js" "tsbundle": "cli.js"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.59", "@git.zone/tsbuild": "^2.2.1",
"@gitzone/tsrun": "^1.2.31", "@git.zone/tsrun": "^1.3.3",
"@gitzone/tstest": "^1.0.69", "@git.zone/tstest": "^1.0.96",
"@pushrocks/tapbundle": "^5.0.2", "@push.rocks/tapbundle": "^5.5.6",
"tslint": "^6.1.3", "@types/node": "^22.12.0"
"tslint-config-prettier": "^1.15.0"
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.17.7", "@push.rocks/early": "^4.0.4",
"@babel/plugin-proposal-class-properties": "^7.16.7", "@push.rocks/smartcli": "^4.0.11",
"@babel/plugin-proposal-decorators": "^7.17.2", "@push.rocks/smartdelay": "^3.0.5",
"@babel/plugin-transform-runtime": "^7.17.0", "@push.rocks/smartfile": "^11.2.0",
"@babel/preset-env": "^7.16.11", "@push.rocks/smartlog": "^3.0.7",
"@babel/runtime": "^7.17.7", "@push.rocks/smartlog-destination-local": "^9.0.2",
"@pushrocks/early": "^3.0.6", "@push.rocks/smartpath": "^5.0.18",
"@pushrocks/smartcli": "^3.0.14", "@push.rocks/smartpromise": "^4.2.2",
"@pushrocks/smartfile": "^9.0.6", "@push.rocks/smartspawn": "^3.0.3",
"@pushrocks/smartlog": "^2.0.44", "@types/html-minifier": "^4.0.5",
"@pushrocks/smartlog-destination-local": "^8.0.8", "esbuild": "^0.24.2",
"@pushrocks/smartparcel": "^1.0.13",
"@pushrocks/smartpath": "^5.0.5",
"@pushrocks/smartpromise": "^3.1.7",
"@pushrocks/smartspawn": "^2.0.9",
"@rollup/plugin-commonjs": "^21.0.2",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.1.3",
"@rollup/plugin-typescript": "^8.3.1",
"@types/html-minifier": "^4.0.2",
"@types/node": "^17.0.21",
"esbuild": "^0.14.27",
"html-minifier": "^4.0.0", "html-minifier": "^4.0.0",
"rollup": "^2.70.1", "typescript": "5.7.3"
"rollup-plugin-babel": "^4.4.0",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-terser": "^7.0.2",
"typescript": "4.7.0"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",

9787
pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load Diff

0
readme.hints.md Normal file
View File

View File

@ -1,8 +1,8 @@
# @gitzone/tsbundle # @git.zone/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/@gitzone/tsbundle) * [npmjs.org (npm package)](https://www.npmjs.com/package/@git.zone/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/@gitzone/tsbundle)](https://lossless.cloud) npm | [![npm downloads per month](https://badgen.net/npm/dy/@git.zone/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/@gitzone/tsbundle)](https://lossless.cloud) PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@git.zone/tsbundle)](https://lossless.cloud)
PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tsbundle)](https://lossless.cloud) PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@git.zone/tsbundle)](https://lossless.cloud)
BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@gitzone/tsbundle)](https://lossless.cloud) BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@git.zone/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 @gitzone/tsbundle npm install -g @git.zone/tsbundle
# Locally for use in your pacakge.json # Locally for use in your pacakge.json
npm install --save-dev @gitzone/tsbundle npm install --save-dev @git.zone/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,8 +1,6 @@
import { expect, tap } from '@pushrocks/tapbundle'; import { expect, tap } from '@push.rocks/tapbundle';
import * as tsbundle from '../ts/index.js'; import * as tsbundle from '../ts/index.js';
import * as path from 'path';
tap.test('should bundle with esbuild', async () => { tap.test('should bundle with esbuild', async () => {
const tsbundleInstance = new tsbundle.TsBundle(); const tsbundleInstance = new tsbundle.TsBundle();
await tsbundleInstance.build( await tsbundleInstance.build(
@ -15,26 +13,5 @@ tap.test('should bundle with esbuild', async () => {
); );
}); });
tap.test('should bundle with parcel', async () => {
const tsbundleInstance = new tsbundle.TsBundle();
await tsbundleInstance.build(
process.cwd() + '/test',
'./ts_web/index.ts',
'./dist_manual/test.js',
{
bundler: 'parcel'
}
);
});
tap.test('should bundle with rollup', async () => {
const tsbundleInstance = new tsbundle.TsBundle();
await tsbundleInstance.build(
process.cwd(),
'./test/ts_web/index.ts',
'./test/dist_manual/production.js',
{bundler: 'rollup'}
);
});
tap.start(); tap.start();

View File

@ -1,5 +1,9 @@
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);
@ -15,4 +19,6 @@ class BugReport {
} }
} }
console.log(myConst); console.log(myConst);

8
ts/00_commitinfo_data.ts Normal file
View File

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

View File

@ -1,4 +1,4 @@
import * as early from '@pushrocks/early'; import * as early from '@push.rocks/early';
early.start('tsbundle'); early.start('tsbundle');
// lets import all plugins beforehand // lets import all plugins beforehand
import './plugins.js'; import './plugins.js';
@ -9,5 +9,6 @@ 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 };

40
ts/mod_assets/index.ts Normal file
View File

@ -0,0 +1,40 @@
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
ts/mod_assets/plugins.ts Normal file
View File

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

View File

@ -1,73 +1,94 @@
import * as plugins from './plugins.js'; import * as plugins from './plugins.js';
import * as paths from '../paths.js';
import * as interfaces from '../interfaces/index.js'; 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( public async buildTest(fromArg: string, toArg: string, argvArg: any) {
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: 'es2020', target: 'es2022',
outfile: toArg entryNames: plugins.path.parse(toArg).name,
outdir: plugins.path.parse(toArg).dir,
// 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( public async buildProduction(fromArg: string, toArg: string, argvArg: any) {
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: 'es2020', target: 'es2022',
minify: true, minify: true,
outfile: toArg entryNames: 'bundle',
outdir: plugins.path.parse(toArg).dir,
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(process.env.transportOptions); const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(
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,35 +10,38 @@ export class HtmlHandler {
} }
// copies the html // copies the html
public async copyHtml(fromArg: string = this.defaultFromPath, toArg: string = this.defaultToPath) { public async processHtml(optionsArg: {
if (await this.checkIfExists()) { from?: string;
console.log(`${fromArg} replaces file at ${toArg}`); to?: string;
minify?: boolean;
}) {
optionsArg = {
... {
from: this.defaultFromPath,
to: this.defaultToPath,
minify: false,
},
...optionsArg
} }
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()) { if (await this.checkIfExists()) {
console.log(`${fromArg} replaces file at ${toArg}`); console.log(`${optionsArg.from} replaces file at ${optionsArg.to}`);
} }
fromArg = plugins.smartpath.transform.toAbsolute(fromArg, paths.cwd) as string; optionsArg.from = plugins.smartpath.transform.toAbsolute(optionsArg.from, paths.cwd) as string;
toArg = plugins.smartpath.transform.toAbsolute(toArg, paths.cwd) as string; optionsArg.to = plugins.smartpath.transform.toAbsolute(optionsArg.to, paths.cwd) as string;
const fileString = plugins.smartfile.fs.toStringSync(fromArg); let fileString = plugins.smartfile.fs.toStringSync(optionsArg.from);
const minifiedHtml = plugins.htmlMinifier.minify(fileString, { if (optionsArg.minify) {
minifyCSS: true, fileString = plugins.htmlMinifier.minify(fileString, {
minifyJS: true, minifyCSS: true,
sortAttributes: true, minifyJS: true,
sortClassName: true, sortAttributes: true,
removeAttributeQuotes: true, sortClassName: true,
collapseWhitespace: true, removeAttributeQuotes: true,
collapseInlineTagWhitespace: true, collapseWhitespace: true,
removeComments: true, collapseInlineTagWhitespace: true,
}); removeComments: true,
await plugins.smartfile.memory.toFs(minifiedHtml, toArg); });
console.log(`html minification succeeded!`); }
await plugins.smartfile.memory.toFs(fileString, optionsArg.to);
console.log(`html processing succeeded!`);
} }
} }

View File

@ -1,70 +0,0 @@
import * as plugins from './plugins.js';
import * as interfaces from '../interfaces/index.js';
import { logger } from '../tsbundle.logging.js';
export class TsBundleProcess {
constructor() {
// Nothing here
}
/**
* creates a bundle for the test enviroment
*/
public async buildTest (
fromArg: string,
toArg: string,
argvArg: any
) {
const parsedPath = plugins.path.parse(toArg);
const parcelInstance = new plugins.smartparcel.Parcel(
fromArg,
parsedPath.dir,
parsedPath.base
);
await parcelInstance.build();
}
/**
* creates a bundle for the production environment
*/
public async buildProduction (
fromArg: string,
toArg: string,
argvArg: any
) {
// create a bundle
const parsedPath = plugins.path.parse(toArg);
const parcelInstance = new plugins.smartparcel.Parcel(
fromArg,
parsedPath.dir,
parsedPath.base
);
await parcelInstance.build();
}
}
const run = async () => {
console.log('running spawned compilation process');
const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(process.env.transportOptions);
console.log('bundling with parcel:');
console.log(transportOptions);
process.chdir(transportOptions.cwd);
console.log(`switched to ${process.cwd()}`);
const tsbundleProcessInstance = new TsBundleProcess();
if (transportOptions.mode === 'test') {
tsbundleProcessInstance.buildTest(
transportOptions.from,
transportOptions.to,
transportOptions.argv
);
} else {
tsbundleProcessInstance.buildProduction(
transportOptions.from,
transportOptions.to,
transportOptions.argv
);
}
};
run();

View File

@ -1,7 +0,0 @@
export * from '../plugins.js'
import * as smartparcel from '@pushrocks/smartparcel';
export {
smartparcel
}

View File

@ -1,162 +0,0 @@
import * as plugins from './plugins.js';
import * as interfaces from '../interfaces/index.js';
import { logger } from '../tsbundle.logging.js';
export class TsBundleProcess {
/**
* the basic default options for rollup
*/
public getBaseOptions(
fromArg: string = `ts_web/index.ts`,
toArg: string = 'dist_bundle/bundle.js',
argvArg: any
) {
logger.log('info', `from: ${fromArg}`);
logger.log('info', `to: ${toArg}`);
const baseOptions: plugins.rollup.RollupOptions = {
input: fromArg,
output: {
name: 'tsbundle',
file: toArg,
format: 'iife',
sourcemap: true,
},
// Indicate here external modules you don't wanna include in your bundle (i.e.: 'lodash')
external: [],
watch: {
include: ['src/**'],
},
plugins: [
// Compile TypeScript files
(plugins.rollupTypescript as any)({
include: plugins.path.parse(fromArg).dir
? plugins.path.parse(fromArg).dir + '/**/*.ts'
: '**/*.ts',
declaration: false,
emitDecoratorMetadata: true,
experimentalDecorators: true,
inlineSourceMap: true,
noEmitOnError: true,
lib: ['dom'],
noImplicitAny: false,
target: 'es2020',
module: 'es2020',
moduleResolution: 'node12',
allowSyntheticDefaultImports: true,
importsNotUsedAsValues: 'preserve',
...(argvArg && argvArg.skiplibcheck
? {
skipLibCheck: true,
}
: {}),
...(argvArg && argvArg.allowimplicitany
? {
noImplicitAny: false,
}
: {}),
...(argvArg && argvArg.commonjs
? {
module: 'commonjs',
moduleResolution: 'node',
}
: {}),
}),
(plugins.rollupJson as any)(),
// Allow node_modules resolution, so you can use 'external' to control
// which external modules to include in the bundle
// https://github.com/rollup/rollup-plugin-node-resolve#usage
plugins.rollupResolve(),
(plugins.rollupCommonjs as any)({}),
// Resolve source maps to the original source
plugins.rollupSourceMaps(),
],
};
return baseOptions;
}
public getOptionsTest(
fromArg: string,
toArg: string,
argvArg: any
): plugins.rollup.RollupOptions {
return this.getBaseOptions(fromArg, toArg, argvArg);
}
public getOptionsProduction(
fromArg: string,
toArg: string,
argvArg: any
): plugins.rollup.RollupOptions {
const productionOptions = this.getBaseOptions(fromArg, toArg, argvArg);
productionOptions.plugins.push(
plugins.rollupTerser({
compress: true,
mangle: true,
})
);
return productionOptions;
}
constructor() {
// Nothing here
}
/**
* creates a bundle for the test enviroment
*/
public async buildTest(
fromArg: string,
toArg: string,
argvArg: any
) {
// create a bundle
logger.log('info', `bundling for TEST!`);
const buildOptions = this.getOptionsTest(fromArg, toArg, argvArg);
const bundle = await plugins.rollup.rollup(buildOptions);
bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
logger.log('ok', `Successfully bundled files!`);
process.exit(0);
}
/**
* creates a bundle for the production environment
*/
public async buildProduction(fromArg: string, toArg: string, argvArg: any) {
// create a bundle
logger.log('info', `bundling for PRODUCTION!`);
const buildOptions = this.getOptionsProduction(fromArg, toArg, argvArg);
const bundle = await plugins.rollup.rollup(buildOptions);
bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
logger.log('ok', `Successfully bundled files!`);
process.exit(0);
}
}
const run = async () => {
console.log('running spawned compilation process');
const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(process.env.transportOptions);
console.log('bundling with rollup:');
console.log(transportOptions);
process.chdir(transportOptions.cwd);
console.log(`switched to ${process.cwd()}`);
const tsbundleProcessInstance = new TsBundleProcess();
if (transportOptions.mode === 'test') {
tsbundleProcessInstance.buildTest(
transportOptions.from,
transportOptions.to,
transportOptions.argv
);
} else {
tsbundleProcessInstance.buildProduction(
transportOptions.from,
transportOptions.to,
transportOptions.argv
);
}
};
run();

View File

@ -1,22 +0,0 @@
export * from '../plugins.js';
// third party scope
import * as rollup from 'rollup';
import rollupBabel from 'rollup-plugin-babel';
import rollupCommonjs from '@rollup/plugin-commonjs';
import rollupJson from '@rollup/plugin-json';
import rollupResolve from '@rollup/plugin-node-resolve';
import rollupSourceMaps from 'rollup-plugin-sourcemaps';
import { terser as rollupTerser } from 'rollup-plugin-terser';
import rollupTypescript from '@rollup/plugin-typescript';
export {
rollup,
rollupBabel,
rollupCommonjs,
rollupJson,
rollupResolve,
rollupSourceMaps,
rollupTerser,
rollupTypescript,
};

View File

@ -8,3 +8,4 @@ export const packageDir = plugins.path.join(
export const htmlDir = plugins.path.join(cwd, './html'); export const htmlDir = plugins.path.join(cwd, './html');
export const distServeDir = plugins.path.join(cwd, './dist_serve'); export const distServeDir = plugins.path.join(cwd, './dist_serve');
export const assetsDir = plugins.path.join(packageDir, 'assets'); export const assetsDir = plugins.path.join(packageDir, 'assets');
export const tsconfigPath = plugins.path.join(assetsDir, './tsconfig.json');

View File

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

View File

@ -15,12 +15,6 @@ export class TsBundle {
if (argvArg.bundler === 'esbuild') { if (argvArg.bundler === 'esbuild') {
return './mod_esbuild/index.child.js' return './mod_esbuild/index.child.js'
} }
if (argvArg.bundler === 'parcel') {
return './mod_parcel/index.child.js'
}
if (argvArg.bundler === 'rollup') {
return './mod_rollup/index.child.js'
}
return './mod_esbuild/index.child.js' return './mod_esbuild/index.child.js'
} }
const transportOptions: interfaces.IEnvTransportOptions = { const transportOptions: interfaces.IEnvTransportOptions = {

View File

@ -2,10 +2,11 @@ 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.standardTask().subscribe(async (argvArg) => { tsBundleCli.standardCommand().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;
@ -13,8 +14,6 @@ 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',
@ -36,6 +35,8 @@ 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(),
@ -43,7 +44,18 @@ export const runCli = async () => {
'./dist_serve/bundle.js', './dist_serve/bundle.js',
argvArg argvArg
); );
await htmlHandler.minifyHtml('./html/index.html', './dist_serve/index.html') 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();
}); });
tsBundleCli.startParse(); tsBundleCli.startParse();

View File

@ -1,9 +1,14 @@
{ {
"compilerOptions": { "compilerOptions": {
"experimentalDecorators": true, "experimentalDecorators": true,
"target": "ES2020", "useDefineForClassFields": false,
"module": "ES2020", "target": "ES2022",
"moduleResolution": "node12", "module": "NodeNext",
"esModuleInterop": true "moduleResolution": "NodeNext",
} "esModuleInterop": true,
} "verbatimModuleSyntax": true
},
"exclude": [
"dist_*/**/*.d.ts"
]
}

View File

@ -1,17 +0,0 @@
{
"extends": ["tslint:latest", "tslint-config-prettier"],
"rules": {
"semicolon": [true, "always"],
"no-console": false,
"ordered-imports": false,
"object-literal-sort-keys": false,
"member-ordering": {
"options":{
"order": [
"static-method"
]
}
}
},
"defaultSeverity": "warning"
}