Compare commits
No commits in common. "master" and "v1.0.62" have entirely different histories.
127
.gitlab-ci.yml
Normal file
127
.gitlab-ci.yml
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
# 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
|
||||||
|
|
||||||
|
# ====================
|
||||||
|
# security stage
|
||||||
|
# ====================
|
||||||
|
mirror:
|
||||||
|
stage: security
|
||||||
|
script:
|
||||||
|
- npmci git mirror
|
||||||
|
tags:
|
||||||
|
- lossless
|
||||||
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
|
audit:
|
||||||
|
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
|
||||||
|
tags:
|
||||||
|
- lossless
|
||||||
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
|
# ====================
|
||||||
|
# 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:
|
||||||
|
- lossless
|
||||||
|
- docker
|
||||||
|
- priv
|
||||||
|
|
||||||
|
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:
|
||||||
|
- lossless
|
||||||
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
|
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
|
||||||
|
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
|
||||||
4
.snyk
Normal file
4
.snyk
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
|
||||||
|
version: v1.13.5
|
||||||
|
ignore: {}
|
||||||
|
patch: {}
|
||||||
24
.vscode/launch.json
vendored
24
.vscode/launch.json
vendored
@ -2,10 +2,28 @@
|
|||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"command": "npm test",
|
"name": "current file",
|
||||||
"name": "Run npm test",
|
"type": "node",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"type": "node-terminal"
|
"args": [
|
||||||
|
"${relativeFile}"
|
||||||
|
],
|
||||||
|
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||||
|
"cwd": "${workspaceRoot}",
|
||||||
|
"protocol": "inspector",
|
||||||
|
"internalConsoleOptions": "openOnSessionStart"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "test.ts",
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"args": [
|
||||||
|
"test/test.ts"
|
||||||
|
],
|
||||||
|
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||||
|
"cwd": "${workspaceRoot}",
|
||||||
|
"protocol": "inspector",
|
||||||
|
"internalConsoleOptions": "openOnSessionStart"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@ -15,7 +15,7 @@
|
|||||||
"properties": {
|
"properties": {
|
||||||
"projectType": {
|
"projectType": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"enum": ["website", "element", "service", "npm", "wcc"]
|
"enum": ["website", "element", "service", "npm"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"experimentalDecorators": true,
|
|
||||||
"target": "ES2020",
|
|
||||||
"module": "ES2020",
|
|
||||||
"moduleResolution": "node12",
|
|
||||||
"useDefineForClassFields": false,
|
|
||||||
"preserveValueImports": true,
|
|
||||||
"esModuleInterop": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
64
changelog.md
64
changelog.md
@ -1,64 +0,0 @@
|
|||||||
# Changelog
|
|
||||||
|
|
||||||
## 2025-01-29 - 2.2.5 - fix(mod_assets)
|
|
||||||
Fix async handling in asset processing
|
|
||||||
|
|
||||||
- Ensured that the empty directory operation is awaited in the asset processing workflow.
|
|
||||||
|
|
||||||
## 2025-01-29 - 2.2.4 - fix(mod_assets)
|
|
||||||
Fix logging message in ensureAssetsDir to correctly state when directory is created
|
|
||||||
|
|
||||||
- Corrected logging output in ensureAssetsDir method to indicate directory creation.
|
|
||||||
|
|
||||||
## 2025-01-29 - 2.2.3 - fix(mod_assets)
|
|
||||||
Fix issue with asset directory copy
|
|
||||||
|
|
||||||
- Updated dependency '@push.rocks/smartfile' to version '^11.2.0'
|
|
||||||
- Ensure target directory is properly replaced when copying assets
|
|
||||||
|
|
||||||
## 2025-01-29 - 2.2.2 - fix(dependencies)
|
|
||||||
Update smartfile dependency and fix spacing issue in assets module
|
|
||||||
|
|
||||||
- Updated @push.rocks/smartfile from ^11.1.6 to ^11.1.8
|
|
||||||
- Fixed a spacing issue in the processAssets function within the assets module
|
|
||||||
|
|
||||||
## 2025-01-29 - 2.2.1 - fix(index)
|
|
||||||
Export mod_assets for programmatic use
|
|
||||||
|
|
||||||
- Added export for mod_assets/index in ts/index.ts to make it usable programmatically.
|
|
||||||
|
|
||||||
## 2025-01-29 - 2.2.0 - feat(AssetsHandler)
|
|
||||||
Add asset handling to the CLI workflow
|
|
||||||
|
|
||||||
- Introduced AssetsHandler class for managing asset directories and files.
|
|
||||||
- Updated tsbundle.cli.ts to include asset processing in the 'website' command.
|
|
||||||
|
|
||||||
## 2025-01-28 - 2.1.1 - fix(core)
|
|
||||||
Update dependencies and remove GitLab CI configuration.
|
|
||||||
|
|
||||||
- Updated several devDependencies to newer versions for improved stability and performance.
|
|
||||||
- Updated core dependencies including esbuild and TypeScript.
|
|
||||||
- Removed the .gitlab-ci.yml file, which could suggest a change in continuous integration setup.
|
|
||||||
|
|
||||||
## 2024-10-27 - 2.1.0 - feat(mod_esbuild)
|
|
||||||
Add alias support to esbuild bundling process
|
|
||||||
|
|
||||||
- Updated dependencies in package.json to latest versions.
|
|
||||||
- Improved build process by adding alias resolution based on tsconfig.json settings in esbuild.
|
|
||||||
|
|
||||||
## 2022-05-04 - 2.0.0-2.0.1 - Breaking and Fix Changes
|
|
||||||
Released version 2.0.0 with breaking changes and subsequent fixes.
|
|
||||||
|
|
||||||
- BREAKING CHANGE(core): Removed parcel and rollup
|
|
||||||
- fix(core): Addressed initial issues in new major version
|
|
||||||
|
|
||||||
## 2023-10-03 - 2.0.10 - Fix Updates
|
|
||||||
Ongoing updates and improvements.
|
|
||||||
|
|
||||||
- fix(core): General updates and enhancements
|
|
||||||
|
|
||||||
## 2024-01-10 - 2.0.11-2.0.15 - Minor Fixes
|
|
||||||
Cumulative fixes and updates from recent releases.
|
|
||||||
|
|
||||||
- fix(core): Continuous improvement cycle across versions
|
|
||||||
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
#!/usr/bin/env node
|
|
||||||
process.env.CLI_CALL = 'true';
|
|
||||||
import * as cliTool from './ts/index.js';
|
|
||||||
cliTool.runCli();
|
|
||||||
2
cli.js
2
cli.js
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
process.env.CLI_CALL = 'true';
|
process.env.CLI_CALL = 'true';
|
||||||
const cliTool = await import('./dist_ts/index.js');
|
const cliTool = require('./dist_ts/index');
|
||||||
cliTool.runCli();
|
cliTool.runCli();
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
process.env.CLI_CALL = 'true';
|
process.env.CLI_CALL = 'true';
|
||||||
|
require('@gitzone/tsrun');
|
||||||
import * as tsrun from '@git.zone/tsrun';
|
const cliTool = require('./ts/index');
|
||||||
tsrun.runPath('./cli.child.js', import.meta.url);
|
cliTool.runCli();
|
||||||
|
|||||||
@ -5,8 +5,8 @@
|
|||||||
"githost": "gitlab.com",
|
"githost": "gitlab.com",
|
||||||
"gitscope": "gitzone",
|
"gitscope": "gitzone",
|
||||||
"gitrepo": "tsbundle",
|
"gitrepo": "tsbundle",
|
||||||
"description": "a bundler using rollup for painless bundling of web projects",
|
"shortDescription": "a bundler using rollup for painless bundling of web projects",
|
||||||
"npmPackagename": "@git.zone/tsbundle",
|
"npmPackagename": "@gitzone/tsbundle",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"projectDomain": "git.zone"
|
"projectDomain": "git.zone"
|
||||||
}
|
}
|
||||||
|
|||||||
2938
package-lock.json
generated
Normal file
2938
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
57
package.json
57
package.json
@ -1,41 +1,51 @@
|
|||||||
{
|
{
|
||||||
"name": "@git.zone/tsbundle",
|
"name": "@gitzone/tsbundle",
|
||||||
"version": "2.2.5",
|
"version": "1.0.62",
|
||||||
"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",
|
||||||
"typings": "dist_ts/index.d.ts",
|
"typings": "dist_ts/index.d.ts",
|
||||||
"type": "module",
|
|
||||||
"author": "Lossless GmbH",
|
"author": "Lossless GmbH",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "npm run build && (tstest test/) && (cd test && node ../cli.js --production)",
|
"test": "cd test && node ../cli.ts.js --production",
|
||||||
"build": "(tsbuild --web --allowimplicitany)"
|
"build": "(tsbuild)",
|
||||||
|
"format": "(gitzone format)"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"tsbundle": "cli.js"
|
"tsbundle": "cli.js"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@git.zone/tsbuild": "^2.2.1",
|
"@gitzone/tsbuild": "^2.1.22",
|
||||||
"@git.zone/tsrun": "^1.3.3",
|
"@gitzone/tsrun": "^1.2.8",
|
||||||
"@git.zone/tstest": "^1.0.96",
|
"@gitzone/tstest": "^1.0.28",
|
||||||
"@push.rocks/tapbundle": "^5.5.6",
|
"@pushrocks/tapbundle": "^3.2.1",
|
||||||
"@types/node": "^22.12.0"
|
"tslint": "^6.1.0",
|
||||||
|
"tslint-config-prettier": "^1.15.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@push.rocks/early": "^4.0.4",
|
"@babel/core": "^7.8.7",
|
||||||
"@push.rocks/smartcli": "^4.0.11",
|
"@babel/plugin-proposal-class-properties": "^7.8.3",
|
||||||
"@push.rocks/smartdelay": "^3.0.5",
|
"@babel/plugin-proposal-decorators": "^7.8.3",
|
||||||
"@push.rocks/smartfile": "^11.2.0",
|
"@babel/plugin-transform-runtime": "^7.8.3",
|
||||||
"@push.rocks/smartlog": "^3.0.7",
|
"@babel/preset-env": "^7.8.7",
|
||||||
"@push.rocks/smartlog-destination-local": "^9.0.2",
|
"@babel/runtime": "^7.8.7",
|
||||||
"@push.rocks/smartpath": "^5.0.18",
|
"@pushrocks/early": "^3.0.3",
|
||||||
"@push.rocks/smartpromise": "^4.2.2",
|
"@pushrocks/smartcli": "^3.0.9",
|
||||||
"@push.rocks/smartspawn": "^3.0.3",
|
"@pushrocks/smartfile": "^7.0.11",
|
||||||
"@types/html-minifier": "^4.0.5",
|
"@pushrocks/smartlog": "^2.0.21",
|
||||||
"esbuild": "^0.24.2",
|
"@pushrocks/smartlog-destination-local": "^8.0.2",
|
||||||
|
"@rollup/plugin-commonjs": "^11.0.2",
|
||||||
|
"@rollup/plugin-node-resolve": "^7.1.1",
|
||||||
|
"@rollup/plugin-typescript": "^4.0.0",
|
||||||
|
"@types/html-minifier": "^3.5.3",
|
||||||
|
"@types/node": "^13.9.1",
|
||||||
"html-minifier": "^4.0.0",
|
"html-minifier": "^4.0.0",
|
||||||
"typescript": "5.7.3"
|
"rollup": "^2.1.0",
|
||||||
|
"rollup-plugin-babel": "^4.4.0",
|
||||||
|
"rollup-plugin-sourcemaps": "^0.5.0",
|
||||||
|
"rollup-plugin-terser": "^5.3.0",
|
||||||
|
"terser": "^4.6.7"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"ts/**/*",
|
"ts/**/*",
|
||||||
@ -48,8 +58,5 @@
|
|||||||
"cli.js",
|
"cli.js",
|
||||||
"npmextra.json",
|
"npmextra.json",
|
||||||
"readme.md"
|
"readme.md"
|
||||||
],
|
|
||||||
"browserslist": [
|
|
||||||
"last 1 chrome versions"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
9787
pnpm-lock.yaml
generated
9787
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
63
readme.md
63
readme.md
@ -1,27 +1,20 @@
|
|||||||
# @git.zone/tsbundle
|
# @gitzone/tsbundle
|
||||||
a bundler using rollup for painless bundling of web projects
|
a bundler using rollup for painless bundling of web projects
|
||||||
|
|
||||||
## Availabililty and Links
|
## Availabililty and Links
|
||||||
* [npmjs.org (npm package)](https://www.npmjs.com/package/@git.zone/tsbundle)
|
* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/tsbundle)
|
||||||
* [gitlab.com (source)](https://gitlab.com/gitzone/tsbundle)
|
* [gitlab.com (source)](https://gitlab.com/gitzone/tsbundle)
|
||||||
* [github.com (source mirror)](https://github.com/gitzone/tsbundle)
|
* [github.com (source mirror)](https://github.com/gitzone/tsbundle)
|
||||||
* [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/)
|
* [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/)
|
||||||
|
|
||||||
## Status for master
|
## Status for master
|
||||||
|
[](https://gitlab.com/gitzone/tsbundle/commits/master)
|
||||||
Status Category | Status Badge
|
[](https://gitlab.com/gitzone/tsbundle/commits/master)
|
||||||
-- | --
|
[](https://www.npmjs.com/package/@gitzone/tsbundle)
|
||||||
GitLab Pipelines | [](https://lossless.cloud)
|
[](https://snyk.io/test/npm/@gitzone/tsbundle)
|
||||||
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||||
npm | [](https://lossless.cloud)
|
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||||
Snyk | [](https://lossless.cloud)
|
[](https://prettier.io/)
|
||||||
TypeScript Support | [](https://lossless.cloud)
|
|
||||||
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
|
||||||
Code Style | [](https://lossless.cloud)
|
|
||||||
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
|
||||||
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
|
||||||
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
|
||||||
Platform support | [](https://lossless.cloud) [](https://lossless.cloud)
|
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
@ -29,42 +22,10 @@ Use TypeScript for best in class intellisense.
|
|||||||
|
|
||||||
tsbundle will bundle modern JavaScript websites in an Google Bot conformant way so things like AdSense do work.
|
tsbundle will bundle modern JavaScript websites in an Google Bot conformant way so things like AdSense do work.
|
||||||
|
|
||||||
tsbundle supports two modes of usage: CLI and API usage.
|
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
||||||
|
> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
|
||||||
|
|
||||||
### CLI
|
[](https://maintainedby.lossless.com)
|
||||||
|
|
||||||
```shell
|
|
||||||
# Note: This is code that belongs into your terminal ;)
|
|
||||||
# Install the tool for cli usage
|
|
||||||
|
|
||||||
# Globally
|
|
||||||
npm install -g @git.zone/tsbundle
|
|
||||||
|
|
||||||
# Locally for use in your pacakge.json
|
|
||||||
npm install --save-dev @git.zone/tsbundle
|
|
||||||
|
|
||||||
# then use it
|
|
||||||
tsbundle --from="./ts/index.ts" --to="dist/bundle.js"
|
|
||||||
|
|
||||||
## note you can call tsbundle without arguments. Default values are --from="./ts_web/index.ts" --to="dist_bundle/bundle.js"
|
|
||||||
## You can use --production to enable minification using terser
|
|
||||||
```
|
|
||||||
|
|
||||||
## API
|
|
||||||
|
|
||||||
You are using TypeScript, aren't you? Most of the stuff is apparent from the IDE intellisense.
|
|
||||||
|
|
||||||
```typescript
|
|
||||||
import { TsBundle } from '@gitozne/tsbundle';
|
|
||||||
|
|
||||||
const myTsBundleInstance = new TsBundle();
|
|
||||||
|
|
||||||
const run = async () => {
|
|
||||||
await myTsBundleInstance.buildTest('./from/my.ts', './to/mybundle.js');
|
|
||||||
// OR
|
|
||||||
await myTsBundleInstance.buildProduction('./from/my.ts', './to/mybundle.js');
|
|
||||||
};
|
|
||||||
```
|
|
||||||
|
|
||||||
## Contribution
|
## Contribution
|
||||||
|
|
||||||
|
|||||||
57
rollup.config.js
Normal file
57
rollup.config.js
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
import resolve from 'rollup-plugin-node-resolve';
|
||||||
|
import commonjs from 'rollup-plugin-commonjs';
|
||||||
|
import sourceMaps from 'rollup-plugin-sourcemaps';
|
||||||
|
import typescript from 'rollup-plugin-typescript2';
|
||||||
|
import json from 'rollup-plugin-json';
|
||||||
|
import babel from 'rollup-plugin-babel';
|
||||||
|
|
||||||
|
const pkg = require('./package.json');
|
||||||
|
|
||||||
|
export default {
|
||||||
|
input: `ts_web/index.ts`,
|
||||||
|
output: {
|
||||||
|
name: 'tsbundle',
|
||||||
|
// file: 'dist_web/bundle.js',
|
||||||
|
file: 'dist_web/bundle.js',
|
||||||
|
format: 'iife',
|
||||||
|
sourcemap: true
|
||||||
|
},
|
||||||
|
// Indicate here external modules you don't wanna include in your bundle (i.e.: 'lodash')
|
||||||
|
external: [],
|
||||||
|
watch: {
|
||||||
|
include: 'src/**'
|
||||||
|
},
|
||||||
|
plugins: [
|
||||||
|
// Allow json resolution
|
||||||
|
json(),
|
||||||
|
// Compile TypeScript files
|
||||||
|
typescript({ useTsconfigDeclarationDir: true, tsconfigOverride: {
|
||||||
|
compilerOptions: {
|
||||||
|
declaration: true,
|
||||||
|
emitDecoratorMetadata: true,
|
||||||
|
experimentalDecorators: true,
|
||||||
|
inlineSourceMap: true,
|
||||||
|
noEmitOnError: true,
|
||||||
|
lib: ['es2016', 'es2017', 'dom'],
|
||||||
|
noImplicitAny: false
|
||||||
|
}
|
||||||
|
} }),
|
||||||
|
// 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
|
||||||
|
resolve(),
|
||||||
|
commonjs({
|
||||||
|
namedExports: {
|
||||||
|
'node_modules/@pushrocks/smartstate/dist/index.js': ['Smartstate']
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
|
||||||
|
// Resolve source maps to the original source
|
||||||
|
sourceMaps(),
|
||||||
|
babel({
|
||||||
|
extensions: ['.js', '.jsx', '.ts', '.tsx'],
|
||||||
|
babelrc: false,
|
||||||
|
presets: [["@babel/preset-env", { modules: false }]]
|
||||||
|
})
|
||||||
|
]
|
||||||
|
};
|
||||||
17
test/test.ts
17
test/test.ts
@ -1,17 +1,8 @@
|
|||||||
import { expect, tap } from '@push.rocks/tapbundle';
|
import { expect, tap } from '@pushrocks/tapbundle';
|
||||||
import * as tsbundle from '../ts/index.js';
|
import * as tsbundle from '../ts/index';
|
||||||
|
|
||||||
tap.test('should bundle with esbuild', async () => {
|
tap.test('first test', async () => {
|
||||||
const tsbundleInstance = new tsbundle.TsBundle();
|
await tsbundle.runCli();
|
||||||
await tsbundleInstance.build(
|
|
||||||
process.cwd() + '/test',
|
|
||||||
'./ts_web/index.ts',
|
|
||||||
'./dist_manual/test.js',
|
|
||||||
{
|
|
||||||
bundler: 'esbuild'
|
|
||||||
}
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
||||||
|
|||||||
@ -1,24 +1,3 @@
|
|||||||
import * as smartdelay from '@push.rocks/smartdelay';
|
const myConst = 'hello';
|
||||||
|
|
||||||
const myConst: string = 'hello';
|
|
||||||
|
|
||||||
await smartdelay.delayFor(1000);
|
|
||||||
|
|
||||||
function sealed(constructor: Function) {
|
|
||||||
Object.seal(constructor);
|
|
||||||
Object.seal(constructor.prototype);
|
|
||||||
}
|
|
||||||
|
|
||||||
@sealed
|
|
||||||
class BugReport {
|
|
||||||
type = 'report';
|
|
||||||
title: string;
|
|
||||||
|
|
||||||
constructor(t: string) {
|
|
||||||
this.title = t;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
console.log(myConst);
|
console.log(myConst);
|
||||||
|
|||||||
@ -1,8 +0,0 @@
|
|||||||
/**
|
|
||||||
* 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'
|
|
||||||
}
|
|
||||||
13
ts/index.ts
13
ts/index.ts
@ -1,14 +1,13 @@
|
|||||||
import * as early from '@push.rocks/early';
|
import * as early from '@pushrocks/early';
|
||||||
early.start('tsbundle');
|
early.start('tsbundle');
|
||||||
// lets import all plugins beforehand
|
// lets import all plugins beforehand
|
||||||
import './plugins.js';
|
import './tsbundle.plugins';
|
||||||
|
|
||||||
import { logger } from './tsbundle.logging.js';
|
import { logger } from './tsbundle.logging';
|
||||||
import { runCli } from './tsbundle.cli.js';
|
import { runCli } from './tsbundle.cli';
|
||||||
early.stop();
|
early.stop();
|
||||||
|
|
||||||
// lets make this usable programmatically
|
// lets make this usable programmatically
|
||||||
export * from './tsbundle.class.tsbundle.js';
|
export * from './tsbundle.class.tsbundle';
|
||||||
export * from './mod_assets/index.js';
|
export * from './tsbundle.htmlhandler';
|
||||||
export * from './mod_html/index.js';
|
|
||||||
export { runCli };
|
export { runCli };
|
||||||
|
|||||||
@ -1,14 +0,0 @@
|
|||||||
export interface ICliOptions {
|
|
||||||
commonjs?: boolean;
|
|
||||||
skiplibcheck?: boolean;
|
|
||||||
production?: boolean;
|
|
||||||
bundler: 'parcel' | 'esbuild' | 'rollup'
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IEnvTransportOptions {
|
|
||||||
cwd: string;
|
|
||||||
from: string;
|
|
||||||
to: string;
|
|
||||||
mode: 'test' | 'production',
|
|
||||||
argv: ICliOptions
|
|
||||||
}
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
import * as plugins from './plugins.js';
|
|
||||||
import * as paths from '../paths.js';
|
|
||||||
|
|
||||||
export class AssetsHandler {
|
|
||||||
public defaultFromDirPath: string = plugins.path.join(paths.cwd, './assets');
|
|
||||||
public defaultToDirPath: string = plugins.path.join(paths.cwd, './dist_serve/assets');
|
|
||||||
|
|
||||||
public async ensureAssetsDir() {
|
|
||||||
const assetsDirExists = await plugins.smartfile.fs.isDirectory(this.defaultFromDirPath);
|
|
||||||
if (!assetsDirExists) {
|
|
||||||
await plugins.smartfile.fs.ensureDir(this.defaultFromDirPath);
|
|
||||||
console.log(`created assets directory at ${this.defaultFromDirPath}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// copies the html
|
|
||||||
public async processAssets(optionsArg?: {
|
|
||||||
from?: string;
|
|
||||||
to?: string;
|
|
||||||
}) {
|
|
||||||
// lets assemble the options
|
|
||||||
optionsArg = {
|
|
||||||
... {
|
|
||||||
from: this.defaultFromDirPath,
|
|
||||||
to: this.defaultToDirPath,
|
|
||||||
},
|
|
||||||
...(optionsArg || {})
|
|
||||||
}
|
|
||||||
await this.ensureAssetsDir()
|
|
||||||
optionsArg.from = plugins.smartpath.transform.toAbsolute(optionsArg.from, paths.cwd) as string;
|
|
||||||
optionsArg.to = plugins.smartpath.transform.toAbsolute(optionsArg.to, paths.cwd) as string;
|
|
||||||
|
|
||||||
// lets clean theh target directory
|
|
||||||
await plugins.smartfile.fs.ensureEmptyDir(optionsArg.to);
|
|
||||||
|
|
||||||
plugins.smartfile.fs.copySync(optionsArg.from, optionsArg.to, {
|
|
||||||
replaceTargetDir: true,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export * from '../plugins.js';
|
|
||||||
@ -1,100 +0,0 @@
|
|||||||
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 esbuild = await plugins.esbuild.build({
|
|
||||||
entryPoints: [fromArg],
|
|
||||||
bundle: true,
|
|
||||||
sourcemap: true,
|
|
||||||
format: 'esm',
|
|
||||||
target: 'es2022',
|
|
||||||
entryNames: plugins.path.parse(toArg).name,
|
|
||||||
outdir: plugins.path.parse(toArg).dir,
|
|
||||||
// splitting: true,
|
|
||||||
tsconfig: paths.tsconfigPath,
|
|
||||||
alias: await this.getAliases(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* creates a bundle for the production environment
|
|
||||||
*/
|
|
||||||
public async buildProduction(fromArg: string, toArg: string, argvArg: any) {
|
|
||||||
// create a bundle
|
|
||||||
console.log('esbuild specific:');
|
|
||||||
console.log(`from: ${fromArg}`);
|
|
||||||
console.log(`to: ${toArg}`);
|
|
||||||
const esbuild = await plugins.esbuild.build({
|
|
||||||
entryPoints: [fromArg],
|
|
||||||
bundle: true,
|
|
||||||
sourcemap: true,
|
|
||||||
format: 'esm',
|
|
||||||
target: 'es2022',
|
|
||||||
minify: true,
|
|
||||||
entryNames: 'bundle',
|
|
||||||
outdir: plugins.path.parse(toArg).dir,
|
|
||||||
tsconfig: paths.tsconfigPath,
|
|
||||||
// splitting: true,
|
|
||||||
chunkNames: 'chunks/[name]-[hash]',
|
|
||||||
alias: await this.getAliases(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const run = async () => {
|
|
||||||
console.log('running spawned compilation process');
|
|
||||||
const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(
|
|
||||||
process.env.transportOptions
|
|
||||||
);
|
|
||||||
console.log('=======> ESBUILD');
|
|
||||||
console.log(transportOptions);
|
|
||||||
process.chdir(transportOptions.cwd);
|
|
||||||
console.log(`switched to ${process.cwd()}`);
|
|
||||||
const tsbundleProcessInstance = new TsBundleProcess();
|
|
||||||
if (transportOptions.mode === 'test') {
|
|
||||||
console.log('building for test:');
|
|
||||||
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:');
|
|
||||||
tsbundleProcessInstance.buildProduction(
|
|
||||||
plugins.smartpath.transform.makeAbsolute(transportOptions.from, process.cwd()),
|
|
||||||
plugins.smartpath.transform.makeAbsolute(transportOptions.to, process.cwd()),
|
|
||||||
transportOptions.argv
|
|
||||||
);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
run();
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
export * from '../plugins.js';
|
|
||||||
|
|
||||||
import esbuild from 'esbuild';
|
|
||||||
|
|
||||||
export {
|
|
||||||
esbuild
|
|
||||||
}
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
import * as plugins from './plugins.js';
|
|
||||||
import * as paths from '../paths.js';
|
|
||||||
|
|
||||||
export class HtmlHandler {
|
|
||||||
public defaultFromPath: string = plugins.path.join(paths.htmlDir, 'index.html');
|
|
||||||
public defaultToPath: string = plugins.path.join(paths.distServeDir, 'index.html');
|
|
||||||
|
|
||||||
public async checkIfExists() {
|
|
||||||
return plugins.smartfile.fs.fileExists(this.defaultFromPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
// copies the html
|
|
||||||
public async processHtml(optionsArg: {
|
|
||||||
from?: string;
|
|
||||||
to?: string;
|
|
||||||
minify?: boolean;
|
|
||||||
}) {
|
|
||||||
optionsArg = {
|
|
||||||
... {
|
|
||||||
from: this.defaultFromPath,
|
|
||||||
to: this.defaultToPath,
|
|
||||||
minify: false,
|
|
||||||
},
|
|
||||||
...optionsArg
|
|
||||||
}
|
|
||||||
if (await this.checkIfExists()) {
|
|
||||||
console.log(`${optionsArg.from} replaces file at ${optionsArg.to}`);
|
|
||||||
}
|
|
||||||
optionsArg.from = plugins.smartpath.transform.toAbsolute(optionsArg.from, paths.cwd) as string;
|
|
||||||
optionsArg.to = plugins.smartpath.transform.toAbsolute(optionsArg.to, paths.cwd) as string;
|
|
||||||
let fileString = plugins.smartfile.fs.toStringSync(optionsArg.from);
|
|
||||||
if (optionsArg.minify) {
|
|
||||||
fileString = plugins.htmlMinifier.minify(fileString, {
|
|
||||||
minifyCSS: true,
|
|
||||||
minifyJS: true,
|
|
||||||
sortAttributes: true,
|
|
||||||
sortClassName: true,
|
|
||||||
removeAttributeQuotes: true,
|
|
||||||
collapseWhitespace: true,
|
|
||||||
collapseInlineTagWhitespace: true,
|
|
||||||
removeComments: true,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
await plugins.smartfile.memory.toFs(fileString, optionsArg.to);
|
|
||||||
console.log(`html processing succeeded!`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
export * from '../plugins.js';
|
|
||||||
|
|
||||||
import * as htmlMinifier from 'html-minifier';
|
|
||||||
|
|
||||||
export {
|
|
||||||
htmlMinifier
|
|
||||||
}
|
|
||||||
11
ts/paths.ts
11
ts/paths.ts
@ -1,11 +0,0 @@
|
|||||||
import * as plugins from './plugins.js';
|
|
||||||
|
|
||||||
export const cwd = process.cwd();
|
|
||||||
export const packageDir = plugins.path.join(
|
|
||||||
plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
|
|
||||||
'../'
|
|
||||||
);
|
|
||||||
export const htmlDir = plugins.path.join(cwd, './html');
|
|
||||||
export const distServeDir = plugins.path.join(cwd, './dist_serve');
|
|
||||||
export const assetsDir = plugins.path.join(packageDir, 'assets');
|
|
||||||
export const tsconfigPath = plugins.path.join(assetsDir, './tsconfig.json');
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
// node native
|
|
||||||
import * as path from 'path';
|
|
||||||
|
|
||||||
export { path };
|
|
||||||
|
|
||||||
// pushrocks scope
|
|
||||||
import * as smartcli from '@push.rocks/smartcli';
|
|
||||||
import * as smartfile from '@push.rocks/smartfile';
|
|
||||||
import * as smartlog from '@push.rocks/smartlog';
|
|
||||||
import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
|
|
||||||
import * as smartpath from '@push.rocks/smartpath';
|
|
||||||
import * as smartpromise from '@push.rocks/smartpromise';
|
|
||||||
import * as smartspawn from '@push.rocks/smartspawn';
|
|
||||||
|
|
||||||
export {
|
|
||||||
smartcli,
|
|
||||||
smartfile,
|
|
||||||
smartlog,
|
|
||||||
smartlogDestinationLocal,
|
|
||||||
smartpath,
|
|
||||||
smartpromise,
|
|
||||||
smartspawn,
|
|
||||||
};
|
|
||||||
@ -1,49 +1,127 @@
|
|||||||
import * as plugins from './plugins.js';
|
import * as plugins from './tsbundle.plugins';
|
||||||
import * as interfaces from './interfaces/index.js';
|
import { logger } from './tsbundle.logging';
|
||||||
import { logger } from './tsbundle.logging.js';
|
|
||||||
|
|
||||||
export class TsBundle {
|
export class TsBundle {
|
||||||
|
/**
|
||||||
public async build(
|
* the basic default options for rollup
|
||||||
cwdArg: string,
|
*/
|
||||||
fromArg: string = './ts_web/index.ts',
|
public getBaseOptions(
|
||||||
toArg: string = './dist_bundle/bundle.js',
|
fromArg: string = `ts_web/index.ts`,
|
||||||
argvArg: interfaces.ICliOptions
|
toArg: string = 'dist_bundle/bundle.js'
|
||||||
) {
|
) {
|
||||||
const done = plugins.smartpromise.defer();
|
logger.log('info', `from: ${fromArg}`);
|
||||||
const getBundlerPath = () => {
|
logger.log('info', `to: ${toArg}`);
|
||||||
if (argvArg.bundler === 'esbuild') {
|
|
||||||
return './mod_esbuild/index.child.js'
|
const baseOptions: plugins.rollup.RollupOptions = {
|
||||||
}
|
input: fromArg,
|
||||||
return './mod_esbuild/index.child.js'
|
output: {
|
||||||
}
|
name: 'tsbundle',
|
||||||
const transportOptions: interfaces.IEnvTransportOptions = {
|
file: toArg,
|
||||||
cwd: cwdArg,
|
format: 'iife',
|
||||||
from: fromArg,
|
sourcemap: true
|
||||||
to: toArg,
|
},
|
||||||
mode: argvArg && argvArg.production ? 'production' : 'test',
|
// Indicate here external modules you don't wanna include in your bundle (i.e.: 'lodash')
|
||||||
argv: {
|
external: [],
|
||||||
bundler: 'esbuild',
|
watch: {
|
||||||
...argvArg
|
include: ['src/**']
|
||||||
}
|
},
|
||||||
}
|
plugins: [
|
||||||
const threadsimple = new plugins.smartspawn.ThreadSimple(
|
// Compile TypeScript files
|
||||||
plugins.path.join(
|
plugins.rollupTypescript({
|
||||||
plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
|
include: plugins.path.parse(fromArg).dir ? plugins.path.parse(fromArg).dir + '/**/*.ts' : '**/*.ts',
|
||||||
getBundlerPath()
|
declaration: false,
|
||||||
),
|
emitDecoratorMetadata: true,
|
||||||
[],
|
experimentalDecorators: true,
|
||||||
{
|
inlineSourceMap: true,
|
||||||
env: {
|
noEmitOnError: true,
|
||||||
...process.env,
|
lib: ['esnext', 'dom', 'es2017.object'],
|
||||||
transportOptions: JSON.stringify(transportOptions),
|
noImplicitAny: false,
|
||||||
},
|
target: 'es2018'
|
||||||
}
|
}),
|
||||||
|
// 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({
|
||||||
|
namedExports: {
|
||||||
|
'node_modules/@pushrocks/smartstate/dist/index.js': ['Smartstate']
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
|
||||||
|
// Resolve source maps to the original source
|
||||||
|
plugins.rollupSourceMaps()
|
||||||
|
/*plugins.rollupBabel({
|
||||||
|
runtimeHelpers: true,
|
||||||
|
extensions: ['.js', '.jsx', '.ts', '.tsx'],
|
||||||
|
babelrc: false,
|
||||||
|
presets: [
|
||||||
|
[
|
||||||
|
'@babel/preset-env',
|
||||||
|
{
|
||||||
|
modules: false,
|
||||||
|
targets: {
|
||||||
|
chrome: '41'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
],
|
||||||
|
plugins: [
|
||||||
|
[
|
||||||
|
'@babel/plugin-transform-runtime',
|
||||||
|
{
|
||||||
|
regenerator: true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
]
|
||||||
|
})*/
|
||||||
|
]
|
||||||
|
};
|
||||||
|
return baseOptions;
|
||||||
|
}
|
||||||
|
|
||||||
|
public getOptionsTest(fromArg: string, toArg: string): plugins.rollup.RollupOptions {
|
||||||
|
return this.getBaseOptions(fromArg, toArg);
|
||||||
|
}
|
||||||
|
|
||||||
|
public getOptionsProduction(fromArg: string, toArg: string): plugins.rollup.RollupOptions {
|
||||||
|
const productionOptions = this.getBaseOptions(fromArg, toArg);
|
||||||
|
productionOptions.plugins.push(
|
||||||
|
plugins.rollupTerser({
|
||||||
|
compress: true,
|
||||||
|
mangle: true,
|
||||||
|
sourcemap: true
|
||||||
|
})
|
||||||
);
|
);
|
||||||
const childProcess = await threadsimple.start();
|
return productionOptions;
|
||||||
childProcess.on('exit', (status) => {
|
}
|
||||||
done.resolve();
|
|
||||||
});
|
constructor() {
|
||||||
await done.promise;
|
// Nothing here
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* creates a bundle for the test enviroment
|
||||||
|
*/
|
||||||
|
public async buildTest(fromArg: string, toArg: string) {
|
||||||
|
// create a bundle
|
||||||
|
logger.log('info', `bundling for TEST!`);
|
||||||
|
const buildOptions = this.getOptionsTest(fromArg, toArg);
|
||||||
|
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!`);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* creates a bundle for the production environment
|
||||||
|
*/
|
||||||
|
public async buildProduction(fromArg: string, toArg: string) {
|
||||||
|
// create a bundle
|
||||||
|
logger.log('info', `bundling for PRODUCTION!`);
|
||||||
|
const buildOptions = this.getOptionsProduction(fromArg, toArg);
|
||||||
|
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!`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,61 +1,56 @@
|
|||||||
import * as plugins from './plugins.js';
|
import * as plugins from './tsbundle.plugins';
|
||||||
import { TsBundle } from './tsbundle.class.tsbundle.js';
|
import { TsBundle } from './tsbundle.class.tsbundle';
|
||||||
import { HtmlHandler } from './mod_html/index.js';
|
import { HtmlHandler } from './tsbundle.htmlhandler';
|
||||||
import { logger } from './tsbundle.logging.js';
|
import { logger } from './tsbundle.logging';
|
||||||
import { AssetsHandler } from './mod_assets/index.js';
|
|
||||||
|
|
||||||
export const runCli = async () => {
|
export const runCli = async () => {
|
||||||
const tsBundleCli = new plugins.smartcli.Smartcli();
|
const tsBundleCli = new plugins.smartcli.Smartcli();
|
||||||
tsBundleCli.standardCommand().subscribe(async (argvArg) => {
|
tsBundleCli.standardTask().subscribe(async argvArg => {
|
||||||
const tsbundle = new TsBundle();
|
const tsbundle = new TsBundle();
|
||||||
await tsbundle.build(process.cwd(), argvArg.from, argvArg.to, argvArg);
|
// const htmlHandler = new HtmlHandler();
|
||||||
return;
|
switch (true) {
|
||||||
});
|
case argvArg.production || process.env.CI:
|
||||||
|
await tsbundle.buildProduction(argvArg.from, argvArg.to);
|
||||||
tsBundleCli.addCommand('element').subscribe(async (argvArg) => {
|
// await htmlHandler.minifyHtml();
|
||||||
const tsbundle = new TsBundle();
|
break;
|
||||||
await tsbundle.build(
|
case argvArg.test:
|
||||||
process.cwd(),
|
default:
|
||||||
'./ts_web/index.ts',
|
await tsbundle.buildTest(argvArg.from, argvArg.to);
|
||||||
'./dist_bundle/bundle.js',
|
// await htmlHandler.copyHtml();
|
||||||
argvArg
|
return;
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
tsBundleCli.addCommand('npm').subscribe(async (argvArg) => {
|
|
||||||
const tsbundle = new TsBundle();
|
|
||||||
const htmlHandler = new HtmlHandler();
|
|
||||||
await tsbundle.build(
|
|
||||||
process.cwd(),
|
|
||||||
'./ts/index.ts',
|
|
||||||
'./dist_bundle/bundle.js',
|
|
||||||
argvArg
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
tsBundleCli.addCommand('website').subscribe(async (argvArg) => {
|
|
||||||
const tsbundle = new TsBundle();
|
|
||||||
|
|
||||||
// lets deal with the html
|
|
||||||
const htmlHandler = new HtmlHandler();
|
|
||||||
await tsbundle.build(
|
|
||||||
process.cwd(),
|
|
||||||
'./ts_web/index.ts',
|
|
||||||
'./dist_serve/bundle.js',
|
|
||||||
argvArg
|
|
||||||
);
|
|
||||||
const htmlFiles = await plugins.smartfile.fs.listFiles('./html', /\.html/);
|
|
||||||
for (const htmlFile of htmlFiles) {
|
|
||||||
await htmlHandler.processHtml({
|
|
||||||
from: `./html/${htmlFile}`,
|
|
||||||
to: `./dist_serve/${htmlFile}`,
|
|
||||||
minify: true,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// lets deal with the assets
|
tsBundleCli.addCommand('element').subscribe(async argvArg => {
|
||||||
const assetsHandler = new AssetsHandler();
|
const tsbundle = new TsBundle();
|
||||||
await assetsHandler.processAssets();
|
// const htmlHandler = new HtmlHandler();
|
||||||
|
switch (true) {
|
||||||
|
case argvArg.production || process.env.CI:
|
||||||
|
await tsbundle.buildProduction('./ts_web/index.ts', './dist_bundle/bundle.js');
|
||||||
|
// await htmlHandler.minifyHtml();
|
||||||
|
break;
|
||||||
|
case argvArg.test:
|
||||||
|
default:
|
||||||
|
await tsbundle.buildTest('./ts_web/index.ts', './dist_bundle/bundle.js');
|
||||||
|
// await htmlHandler.copyHtml();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
tsBundleCli.addCommand('website').subscribe(async argvArg => {
|
||||||
|
const tsbundle = new TsBundle();
|
||||||
|
const htmlHandler = new HtmlHandler();
|
||||||
|
switch (true) {
|
||||||
|
case argvArg.production || process.env.CI:
|
||||||
|
await tsbundle.buildProduction('./ts_web/index.ts', './dist_serve/bundle.js');
|
||||||
|
await htmlHandler.minifyHtml();
|
||||||
|
break;
|
||||||
|
case argvArg.test:
|
||||||
|
default:
|
||||||
|
await tsbundle.buildTest('./ts_web/index.ts', './dist_serve/bundle.js');
|
||||||
|
await htmlHandler.copyHtml();
|
||||||
|
return;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
tsBundleCli.startParse();
|
tsBundleCli.startParse();
|
||||||
|
|||||||
38
ts/tsbundle.htmlhandler.ts
Normal file
38
ts/tsbundle.htmlhandler.ts
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
import * as plugins from './tsbundle.plugins';
|
||||||
|
import * as paths from './tsbundle.paths';
|
||||||
|
|
||||||
|
export class HtmlHandler {
|
||||||
|
public sourceFilePath: string = plugins.path.join(paths.htmlDir, 'index.html');
|
||||||
|
public targetFilePath: string = plugins.path.join(paths.distServeDir, 'index.html');
|
||||||
|
|
||||||
|
public async checkIfExists() {
|
||||||
|
return plugins.smartfile.fs.fileExists(this.sourceFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
// copies the html
|
||||||
|
public async copyHtml(targetPathArg = this.targetFilePath) {
|
||||||
|
if (!(await this.checkIfExists())) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await plugins.smartfile.fs.copy(this.sourceFilePath, targetPathArg);
|
||||||
|
}
|
||||||
|
|
||||||
|
// copies and minifies the html
|
||||||
|
public async minifyHtml(targetPathArg = this.targetFilePath) {
|
||||||
|
if (!(await this.checkIfExists())) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const fileString = plugins.smartfile.fs.toStringSync(this.sourceFilePath);
|
||||||
|
const minifiedHtml = plugins.htmlMinifier.minify(fileString, {
|
||||||
|
minifyCSS: true,
|
||||||
|
minifyJS: true,
|
||||||
|
sortAttributes: true,
|
||||||
|
sortClassName: true,
|
||||||
|
removeAttributeQuotes: true,
|
||||||
|
collapseWhitespace: true,
|
||||||
|
collapseInlineTagWhitespace: true,
|
||||||
|
removeComments: true
|
||||||
|
});
|
||||||
|
plugins.smartfile.memory.toFsSync(minifiedHtml, targetPathArg);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
import * as plugins from './plugins.js';
|
import * as plugins from './tsbundle.plugins';
|
||||||
|
|
||||||
export const logger = new plugins.smartlog.Smartlog({
|
export const logger = new plugins.smartlog.Smartlog({
|
||||||
logContext: {
|
logContext: {
|
||||||
@ -7,9 +7,9 @@ export const logger = new plugins.smartlog.Smartlog({
|
|||||||
containerName: 'Some Containername',
|
containerName: 'Some Containername',
|
||||||
environment: 'local',
|
environment: 'local',
|
||||||
runtime: 'node',
|
runtime: 'node',
|
||||||
zone: 'gitzone',
|
zone: 'gitzone'
|
||||||
},
|
},
|
||||||
minimumLogLevel: 'silly',
|
minimumLogLevel: 'silly'
|
||||||
});
|
});
|
||||||
|
|
||||||
logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());
|
logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());
|
||||||
|
|||||||
7
ts/tsbundle.paths.ts
Normal file
7
ts/tsbundle.paths.ts
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
import * as plugins from './tsbundle.plugins';
|
||||||
|
|
||||||
|
export const cwd = process.cwd();
|
||||||
|
export const packageDir = plugins.path.join(__dirname, '../');
|
||||||
|
export const htmlDir = plugins.path.join(cwd, './html');
|
||||||
|
export const distServeDir = plugins.path.join(cwd, './dist_serve');
|
||||||
|
export const assetsDir = plugins.path.join(packageDir, 'assets');
|
||||||
34
ts/tsbundle.plugins.ts
Normal file
34
ts/tsbundle.plugins.ts
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
// node native
|
||||||
|
import * as path from 'path';
|
||||||
|
|
||||||
|
export { path };
|
||||||
|
|
||||||
|
// pushrocks scope
|
||||||
|
import * as smartcli from '@pushrocks/smartcli';
|
||||||
|
import * as smartfile from '@pushrocks/smartfile';
|
||||||
|
import * as smartlog from '@pushrocks/smartlog';
|
||||||
|
import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
|
||||||
|
|
||||||
|
export { smartcli, smartfile, smartlog, smartlogDestinationLocal };
|
||||||
|
|
||||||
|
// third party scope
|
||||||
|
import * as rollup from 'rollup';
|
||||||
|
import rollupBabel from 'rollup-plugin-babel';
|
||||||
|
import rollupCommonjs from '@rollup/plugin-commonjs';
|
||||||
|
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';
|
||||||
|
|
||||||
|
import * as htmlMinifier from 'html-minifier';
|
||||||
|
|
||||||
|
export {
|
||||||
|
rollup,
|
||||||
|
rollupBabel,
|
||||||
|
rollupCommonjs,
|
||||||
|
rollupResolve,
|
||||||
|
rollupSourceMaps,
|
||||||
|
rollupTerser,
|
||||||
|
rollupTypescript,
|
||||||
|
htmlMinifier
|
||||||
|
};
|
||||||
@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"experimentalDecorators": true,
|
|
||||||
"useDefineForClassFields": false,
|
|
||||||
"target": "ES2022",
|
|
||||||
"module": "NodeNext",
|
|
||||||
"moduleResolution": "NodeNext",
|
|
||||||
"esModuleInterop": true,
|
|
||||||
"verbatimModuleSyntax": true
|
|
||||||
},
|
|
||||||
"exclude": [
|
|
||||||
"dist_*/**/*.d.ts"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
17
tslint.json
Normal file
17
tslint.json
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"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"
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user