Compare commits
61 Commits
Author | SHA1 | Date | |
---|---|---|---|
2bc219e3bc | |||
2a808cc186 | |||
09a470d409 | |||
c0f23deab8 | |||
e92758586f | |||
8603206c85 | |||
60bcfd501f | |||
b01b7d23df | |||
45c4472c53 | |||
337bee3272 | |||
709a67fe82 | |||
37082bd8f4 | |||
2c8623ab58 | |||
126fb5449b | |||
8a0095f90a | |||
704a3d1948 | |||
0538ed44af | |||
3fa8b0ca3b | |||
10af586f28 | |||
230e217368 | |||
f5d6ec81ff | |||
56f32136c5 | |||
84854b0b40 | |||
32b0781d72 | |||
e47ba642f2 | |||
49ecf9d4ca | |||
7bd0032007 | |||
866c203856 | |||
3e673bca6b | |||
5c3dfe0920 | |||
c08a9065a1 | |||
f4071f0b64 | |||
335cc19211 | |||
25851c2b64 | |||
73a6ce2786 | |||
8bd279637b | |||
1e37857c26 | |||
93a1052bf5 | |||
6e6452df61 | |||
3de5a91885 | |||
f7ca1b2135 | |||
3076e13179 | |||
f3b50d384a | |||
6dcb3f7c2a | |||
daba025307 | |||
00383171ff | |||
2ce9b08911 | |||
d603baf65e | |||
50e4909984 | |||
7208274156 | |||
41ec42d068 | |||
d159b9a6a8 | |||
45d0d74559 | |||
661fdf75cf | |||
6f17a76b6e | |||
324ef71b6f | |||
58a7dca142 | |||
e243e17acb | |||
d788bdc78b | |||
3ef8a145a5 | |||
3377554969 |
141
.gitlab-ci.yml
141
.gitlab-ci.yml
@ -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
11
assets/tsconfig.json
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"target": "ES2020",
|
||||||
|
"module": "ES2020",
|
||||||
|
"moduleResolution": "node12",
|
||||||
|
"useDefineForClassFields": false,
|
||||||
|
"preserveValueImports": true,
|
||||||
|
"esModuleInterop": true
|
||||||
|
}
|
||||||
|
}
|
73
changelog.md
Normal file
73
changelog.md
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
## 2025-06-19 - 2.3.0 - feat(bundler)
|
||||||
|
Integrate rolldown bundler support and update bundler selection logic
|
||||||
|
|
||||||
|
- Added rolldown dependency to package.json
|
||||||
|
- Extended ICliOptions to include 'rolldown' as a valid bundler option
|
||||||
|
- Created ts/mod_rolldown module with buildTest and buildProduction implementations
|
||||||
|
- Updated getBundlerPath in tsbundle.class.tsbundle.ts to route to new rolldown module
|
||||||
|
- Revised readme and hints documentation for rolldown usage
|
||||||
|
|
||||||
|
## 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
|
#!/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);
|
||||||
|
@ -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
18045
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
58
package.json
58
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@gitzone/tsbundle",
|
"name": "@git.zone/tsbundle",
|
||||||
"version": "1.0.101",
|
"version": "2.3.0",
|
||||||
"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,27 @@
|
|||||||
"tsbundle": "cli.js"
|
"tsbundle": "cli.js"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.59",
|
"@git.zone/tsbuild": "^2.6.4",
|
||||||
"@gitzone/tsrun": "^1.2.31",
|
"@git.zone/tsrun": "^1.3.3",
|
||||||
"@gitzone/tstest": "^1.0.69",
|
"@git.zone/tstest": "^2.3.1",
|
||||||
"@pushrocks/tapbundle": "^5.0.2",
|
"@push.rocks/tapbundle": "^6.0.3",
|
||||||
"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.5",
|
||||||
"@babel/preset-env": "^7.16.11",
|
"@push.rocks/smartlog": "^3.1.8",
|
||||||
"@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.3",
|
||||||
"@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.25.5",
|
||||||
"@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",
|
"rolldown": "^1.0.0-beta.18",
|
||||||
"rollup-plugin-babel": "^4.4.0",
|
"typescript": "5.8.3"
|
||||||
"rollup-plugin-sourcemaps": "^0.6.3",
|
|
||||||
"rollup-plugin-terser": "^7.0.2",
|
|
||||||
"typescript": "4.7.0"
|
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"ts/**/*",
|
"ts/**/*",
|
||||||
@ -67,5 +52,6 @@
|
|||||||
],
|
],
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
"last 1 chrome versions"
|
"last 1 chrome versions"
|
||||||
]
|
],
|
||||||
|
"packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977"
|
||||||
}
|
}
|
||||||
|
10518
pnpm-lock.yaml
generated
Normal file
10518
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
38
readme.hints.md
Normal file
38
readme.hints.md
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
# tsbundle Hints and Findings
|
||||||
|
|
||||||
|
## Bundler Architecture
|
||||||
|
- tsbundle uses a child process architecture where each bundler runs in a separate process
|
||||||
|
- Configuration is passed via environment variables as JSON (IEnvTransportOptions)
|
||||||
|
- The main class `TsBundle` spawns child processes using `smartspawn.ThreadSimple`
|
||||||
|
|
||||||
|
## Bundler Implementations
|
||||||
|
- **esbuild** (default): Fully implemented, production ready
|
||||||
|
- **rolldown**: Implemented and working (beta), produces smaller bundles than esbuild
|
||||||
|
- **rollup**: Empty module directory exists but not implemented
|
||||||
|
- **parcel**: Empty module directory exists but not implemented
|
||||||
|
|
||||||
|
## Adding New Bundlers
|
||||||
|
To add a new bundler, you need:
|
||||||
|
1. Update `ICliOptions` interface to include the bundler name
|
||||||
|
2. Add case in `getBundlerPath()` switch statement
|
||||||
|
3. Create `mod_<bundler>/` directory with:
|
||||||
|
- `plugins.ts`: Import and re-export the bundler
|
||||||
|
- `index.child.ts`: Implement TsBundleProcess class with buildTest() and buildProduction()
|
||||||
|
4. Add bundler to package.json dependencies
|
||||||
|
|
||||||
|
## Rolldown Specific Notes
|
||||||
|
- Rolldown is in beta (v1.0.0-beta.18) but working well
|
||||||
|
- API: Use `rolldown()` function directly, not `rolldown.rolldown()`
|
||||||
|
- Output options go in the `write()` method, not the initial config
|
||||||
|
- Produces smaller minified bundles than esbuild (1.5K vs 2.2K in tests)
|
||||||
|
- Supports TypeScript via `resolve.tsconfigFilename`
|
||||||
|
|
||||||
|
## CLI Usage
|
||||||
|
- Default bundler: `tsbundle`
|
||||||
|
- Specify bundler: `tsbundle --bundler=rolldown`
|
||||||
|
- Production mode: `tsbundle --production`
|
||||||
|
- Combined: `tsbundle --bundler=rolldown --production`
|
||||||
|
|
||||||
|
## Known Issues
|
||||||
|
- esbuild recently had splitting and tree-shaking disabled due to issues
|
||||||
|
- The README still mentions "a bundler using rollup" but uses esbuild by default
|
16
readme.md
16
readme.md
@ -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 | [](https://lossless.cloud)
|
GitLab Pipelines | [](https://lossless.cloud)
|
||||||
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||||
npm | [](https://lossless.cloud)
|
npm | [](https://lossless.cloud)
|
||||||
Snyk | [](https://lossless.cloud)
|
Snyk | [](https://lossless.cloud)
|
||||||
TypeScript Support | [](https://lossless.cloud)
|
TypeScript Support | [](https://lossless.cloud)
|
||||||
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||||
Code Style | [](https://lossless.cloud)
|
Code Style | [](https://lossless.cloud)
|
||||||
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||||
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||||
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||||
Platform support | [](https://lossless.cloud) [](https://lossless.cloud)
|
Platform support | [](https://lossless.cloud) [](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"
|
||||||
|
112
readme.plan.md
Normal file
112
readme.plan.md
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
# tsbundle Rolldown Integration Plan
|
||||||
|
|
||||||
|
**Command to reread CLAUDE.md**: `cat ~/.claude/CLAUDE.md`
|
||||||
|
|
||||||
|
## Objective
|
||||||
|
Add Rolldown as an optional bundler to tsbundle while keeping esbuild as the default bundler. This allows users to experiment with Rolldown using `--bundler=rolldown` flag.
|
||||||
|
|
||||||
|
## Current State
|
||||||
|
- tsbundle currently only uses esbuild despite having interfaces for multiple bundlers
|
||||||
|
- The bundler selection logic exists but always returns esbuild
|
||||||
|
- mod_rollup and mod_parcel directories exist but are empty
|
||||||
|
- Recent commits disabled splitting and tree-shaking in esbuild due to issues
|
||||||
|
|
||||||
|
## Implementation Tasks
|
||||||
|
|
||||||
|
### Phase 1: Core Infrastructure
|
||||||
|
- [x] Update `ts/interfaces/index.ts` to include 'rolldown' in bundler union type
|
||||||
|
- [x] Fix `getBundlerPath()` in `ts/tsbundle.class.tsbundle.ts` to properly route bundlers
|
||||||
|
- [x] Remove hardcoded `bundler: 'esbuild'` from transportOptions (line 26)
|
||||||
|
- [x] Add rolldown dependency to package.json: `"rolldown": "^1.0.0-beta.18"`
|
||||||
|
|
||||||
|
### Phase 2: CLI Support
|
||||||
|
- [x] Check if `ts/tsbundle.cli.ts` already parses --bundler option
|
||||||
|
- [x] Ensure default bundler is 'esbuild' when not specified
|
||||||
|
- [x] Verify CLI passes bundler option correctly to TsBundle class
|
||||||
|
|
||||||
|
### Phase 3: Rolldown Module Implementation
|
||||||
|
- [x] Create `ts/mod_rolldown/` directory
|
||||||
|
- [x] Create `ts/mod_rolldown/plugins.ts`:
|
||||||
|
```typescript
|
||||||
|
export * from '../plugins.js';
|
||||||
|
import { rolldown } from 'rolldown';
|
||||||
|
export { rolldown }
|
||||||
|
```
|
||||||
|
- [x] Create `ts/mod_rolldown/index.child.ts` with:
|
||||||
|
- TsBundleProcess class
|
||||||
|
- getAliases() method for tsconfig path resolution
|
||||||
|
- buildTest() method (sourcemaps, no minification)
|
||||||
|
- buildProduction() method (minified output)
|
||||||
|
- run() function to read transportOptions and execute
|
||||||
|
|
||||||
|
### Phase 4: Feature Parity
|
||||||
|
- [x] Implement TypeScript compilation via rolldown
|
||||||
|
- [x] Ensure source map generation works
|
||||||
|
- [x] Support tsconfig path aliases
|
||||||
|
- [x] Match esbuild's ESM output format
|
||||||
|
- [x] Implement minification for production builds
|
||||||
|
- [x] Handle bundle: true behavior
|
||||||
|
|
||||||
|
### Phase 5: Testing
|
||||||
|
- [x] Test default behavior (should use esbuild)
|
||||||
|
- [x] Test `--bundler=esbuild` explicit selection
|
||||||
|
- [x] Test `--bundler=rolldown` selection
|
||||||
|
- [x] Compare output between esbuild and rolldown
|
||||||
|
- [ ] Verify all existing tests pass with both bundlers
|
||||||
|
|
||||||
|
## Technical Specifications
|
||||||
|
|
||||||
|
### Rolldown Configuration Mapping
|
||||||
|
| esbuild option | rolldown equivalent |
|
||||||
|
|----------------|-------------------|
|
||||||
|
| bundle: true | bundle: true |
|
||||||
|
| sourcemap: true | sourcemap: true |
|
||||||
|
| format: 'esm' | format: 'es' |
|
||||||
|
| target: 'es2022' | (use default, no direct equivalent) |
|
||||||
|
| minify: true | minify: true |
|
||||||
|
| entryPoints | input |
|
||||||
|
| outfile | output.file |
|
||||||
|
| tsconfig | resolve.tsconfigFilename |
|
||||||
|
| alias | resolve.alias |
|
||||||
|
|
||||||
|
### CLI Usage
|
||||||
|
```bash
|
||||||
|
# Default (uses esbuild)
|
||||||
|
tsbundle
|
||||||
|
|
||||||
|
# Use rolldown
|
||||||
|
tsbundle --bundler=rolldown
|
||||||
|
|
||||||
|
# Production build with rolldown
|
||||||
|
tsbundle --production --bundler=rolldown
|
||||||
|
```
|
||||||
|
|
||||||
|
## Risks and Mitigation
|
||||||
|
1. **Rolldown is beta** - Keep esbuild as default, mark rolldown as experimental
|
||||||
|
2. **API differences** - Abstract common interface, handle bundler-specific logic
|
||||||
|
3. **Missing features** - Document any limitations in README
|
||||||
|
4. **Breaking changes** - None, as esbuild remains default
|
||||||
|
|
||||||
|
## Success Criteria
|
||||||
|
- [x] Can build with esbuild (default behavior unchanged)
|
||||||
|
- [x] Can build with rolldown via --bundler flag
|
||||||
|
- [x] Both bundlers produce working ESM output
|
||||||
|
- [x] Source maps work with both bundlers
|
||||||
|
- [x] TypeScript compilation works with both
|
||||||
|
- [ ] All existing tests pass
|
||||||
|
|
||||||
|
## Implementation Status
|
||||||
|
✅ **COMPLETED** - Rolldown has been successfully integrated as an optional bundler.
|
||||||
|
|
||||||
|
### Test Results:
|
||||||
|
- esbuild (default): Working correctly, 2.2K minified
|
||||||
|
- rolldown: Working correctly, 1.5K minified (better compression!)
|
||||||
|
- Both bundlers support all required features
|
||||||
|
- CLI properly routes to selected bundler
|
||||||
|
- Production and test modes work for both
|
||||||
|
|
||||||
|
## Future Considerations
|
||||||
|
- Once Rolldown reaches v1.0.0 stable, consider making it default
|
||||||
|
- Implement rollup and parcel modules using same pattern
|
||||||
|
- Add performance benchmarks comparing bundlers
|
||||||
|
- Consider adding --watch mode support
|
25
test/test.ts
25
test/test.ts
@ -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();
|
||||||
|
@ -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
8
ts/00_commitinfo_data.ts
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
/**
|
||||||
|
* autocreated commitinfo by @push.rocks/commitinfo
|
||||||
|
*/
|
||||||
|
export const commitinfo = {
|
||||||
|
name: '@git.zone/tsbundle',
|
||||||
|
version: '2.3.0',
|
||||||
|
description: 'a bundler using rollup for painless bundling of web projects'
|
||||||
|
}
|
@ -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 };
|
||||||
|
@ -2,7 +2,7 @@ export interface ICliOptions {
|
|||||||
commonjs?: boolean;
|
commonjs?: boolean;
|
||||||
skiplibcheck?: boolean;
|
skiplibcheck?: boolean;
|
||||||
production?: boolean;
|
production?: boolean;
|
||||||
bundler: 'parcel' | 'esbuild' | 'rollup'
|
bundler: 'parcel' | 'esbuild' | 'rollup' | 'rolldown'
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IEnvTransportOptions {
|
export interface IEnvTransportOptions {
|
||||||
|
40
ts/mod_assets/index.ts
Normal file
40
ts/mod_assets/index.ts
Normal 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
1
ts/mod_assets/plugins.ts
Normal file
@ -0,0 +1 @@
|
|||||||
|
export * from '../plugins.js';
|
@ -1,71 +1,96 @@
|
|||||||
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',
|
||||||
outfile: toArg
|
target: 'es2022',
|
||||||
|
entryNames: plugins.path.parse(toArg).name,
|
||||||
|
outdir: plugins.path.parse(toArg).dir,
|
||||||
|
splitting: false,
|
||||||
|
treeShaking: false,
|
||||||
|
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: 'es2022',
|
||||||
minify: true,
|
minify: true,
|
||||||
outfile: toArg
|
entryNames: 'bundle',
|
||||||
|
outdir: plugins.path.parse(toArg).dir,
|
||||||
|
tsconfig: paths.tsconfigPath,
|
||||||
|
splitting: false,
|
||||||
|
treeShaking: false,
|
||||||
|
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()),
|
||||||
|
@ -10,25 +10,27 @@ export class HtmlHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// copies the html
|
// copies the html
|
||||||
public async copyHtml(fromArg: string = this.defaultFromPath, toArg: string = this.defaultToPath) {
|
public async processHtml(optionsArg: {
|
||||||
|
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(`${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;
|
||||||
await plugins.smartfile.fs.copy(fromArg, toArg);
|
let fileString = plugins.smartfile.fs.toStringSync(optionsArg.from);
|
||||||
console.log(`html copy succeeded!`);
|
if (optionsArg.minify) {
|
||||||
}
|
fileString = plugins.htmlMinifier.minify(fileString, {
|
||||||
|
|
||||||
// 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,
|
minifyCSS: true,
|
||||||
minifyJS: true,
|
minifyJS: true,
|
||||||
sortAttributes: true,
|
sortAttributes: true,
|
||||||
@ -38,7 +40,8 @@ export class HtmlHandler {
|
|||||||
collapseInlineTagWhitespace: true,
|
collapseInlineTagWhitespace: true,
|
||||||
removeComments: 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!`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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();
|
|
@ -1,7 +0,0 @@
|
|||||||
export * from '../plugins.js'
|
|
||||||
|
|
||||||
import * as smartparcel from '@pushrocks/smartparcel';
|
|
||||||
|
|
||||||
export {
|
|
||||||
smartparcel
|
|
||||||
}
|
|
105
ts/mod_rolldown/index.child.ts
Normal file
105
ts/mod_rolldown/index.child.ts
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
import * as plugins from './plugins.js';
|
||||||
|
import * as paths from '../paths.js';
|
||||||
|
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) {
|
||||||
|
// create a bundle
|
||||||
|
const result = await plugins.rolldown({
|
||||||
|
input: fromArg,
|
||||||
|
resolve: {
|
||||||
|
alias: await this.getAliases(),
|
||||||
|
tsconfigFilename: paths.tsconfigPath,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await result.write({
|
||||||
|
file: toArg,
|
||||||
|
format: 'es',
|
||||||
|
sourcemap: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* creates a bundle for the production environment
|
||||||
|
*/
|
||||||
|
public async buildProduction(fromArg: string, toArg: string, argvArg: any) {
|
||||||
|
// create a bundle
|
||||||
|
console.log('rolldown specific:');
|
||||||
|
console.log(`from: ${fromArg}`);
|
||||||
|
console.log(`to: ${toArg}`);
|
||||||
|
|
||||||
|
const result = await plugins.rolldown({
|
||||||
|
input: fromArg,
|
||||||
|
resolve: {
|
||||||
|
alias: await this.getAliases(),
|
||||||
|
tsconfigFilename: paths.tsconfigPath,
|
||||||
|
},
|
||||||
|
experimental: {
|
||||||
|
enableComposingJsPlugins: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await result.write({
|
||||||
|
file: toArg,
|
||||||
|
format: 'es',
|
||||||
|
sourcemap: true,
|
||||||
|
minify: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const run = async () => {
|
||||||
|
console.log('running spawned compilation process');
|
||||||
|
const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(
|
||||||
|
process.env.transportOptions
|
||||||
|
);
|
||||||
|
console.log('=======> ROLLDOWN');
|
||||||
|
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:');
|
||||||
|
await 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:');
|
||||||
|
await tsbundleProcessInstance.buildProduction(
|
||||||
|
plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
|
||||||
|
plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),
|
||||||
|
transportOptions.argv
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
run();
|
5
ts/mod_rolldown/plugins.ts
Normal file
5
ts/mod_rolldown/plugins.ts
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
export * from '../plugins.js';
|
||||||
|
|
||||||
|
import { rolldown } from 'rolldown';
|
||||||
|
|
||||||
|
export { rolldown }
|
@ -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();
|
|
@ -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,
|
|
||||||
};
|
|
@ -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');
|
||||||
|
@ -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,
|
||||||
|
@ -12,16 +12,17 @@ export class TsBundle {
|
|||||||
) {
|
) {
|
||||||
const done = plugins.smartpromise.defer();
|
const done = plugins.smartpromise.defer();
|
||||||
const getBundlerPath = () => {
|
const getBundlerPath = () => {
|
||||||
if (argvArg.bundler === 'esbuild') {
|
switch (argvArg.bundler) {
|
||||||
return './mod_esbuild/index.child.js'
|
case 'rolldown':
|
||||||
|
return './mod_rolldown/index.child.js';
|
||||||
|
case 'rollup':
|
||||||
|
return './mod_rollup/index.child.js';
|
||||||
|
case 'parcel':
|
||||||
|
return './mod_parcel/index.child.js';
|
||||||
|
case 'esbuild':
|
||||||
|
default:
|
||||||
|
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'
|
|
||||||
}
|
}
|
||||||
const transportOptions: interfaces.IEnvTransportOptions = {
|
const transportOptions: interfaces.IEnvTransportOptions = {
|
||||||
cwd: cwdArg,
|
cwd: cwdArg,
|
||||||
@ -29,7 +30,6 @@ export class TsBundle {
|
|||||||
to: toArg,
|
to: toArg,
|
||||||
mode: argvArg && argvArg.production ? 'production' : 'test',
|
mode: argvArg && argvArg.production ? 'production' : 'test',
|
||||||
argv: {
|
argv: {
|
||||||
bundler: 'esbuild',
|
|
||||||
...argvArg
|
...argvArg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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();
|
||||||
|
@ -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"
|
||||||
|
]
|
||||||
}
|
}
|
17
tslint.json
17
tslint.json
@ -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"
|
|
||||||
}
|
|
Reference in New Issue
Block a user