Compare commits

...

62 Commits

Author SHA1 Message Date
d603baf65e 2.0.3 2022-05-04 18:51:15 +02:00
50e4909984 fix(core): update 2022-05-04 18:51:15 +02:00
7208274156 2.0.2 2022-05-04 17:39:00 +02:00
41ec42d068 fix(core): update 2022-05-04 17:39:00 +02:00
d159b9a6a8 2.0.1 2022-05-04 17:20:28 +02:00
45d0d74559 fix(core): update 2022-05-04 17:20:28 +02:00
661fdf75cf 2.0.0 2022-05-04 17:14:39 +02:00
6f17a76b6e BREAKING CHANGE(core): remove parcel and rollup 2022-05-04 17:14:38 +02:00
324ef71b6f 1.0.104 2022-05-04 17:13:52 +02:00
58a7dca142 fix(core): update 2022-05-04 17:13:52 +02:00
e243e17acb 1.0.103 2022-05-02 18:23:37 +02:00
d788bdc78b fix(core): update 2022-05-02 18:23:36 +02:00
3ef8a145a5 1.0.102 2022-03-25 19:48:58 +01:00
3377554969 fix(core): update 2022-03-25 19:48:58 +01:00
c53d9023fe 1.0.101 2022-03-18 16:16:20 +01:00
1112cfe793 fix(core): update 2022-03-18 16:16:20 +01:00
fc97fac77e 1.0.100 2022-03-18 15:46:12 +01:00
1530f0ad74 fix(core): update 2022-03-18 15:46:11 +01:00
d6d1b063af 1.0.99 2022-03-17 08:28:12 +01:00
98f8aad9c2 fix(core): update 2022-03-17 08:28:11 +01:00
b37315b4ee 1.0.98 2022-03-16 13:25:09 +01:00
6d1dbbb638 fix(core): update 2022-03-16 13:25:08 +01:00
501d5f766f 1.0.97 2022-03-16 11:52:59 +01:00
bf3ba08dde fix(core): update 2022-03-16 11:52:59 +01:00
576ec20e3c 1.0.96 2022-03-16 11:08:52 +01:00
6d48086266 fix(core): update 2022-03-16 11:08:52 +01:00
e3a6e065ee 1.0.95 2022-03-16 00:21:06 +01:00
63d35e2ce8 fix(core): update 2022-03-16 00:21:05 +01:00
d5753019cf 1.0.94 2022-03-15 13:45:03 +01:00
a3ab55cbc6 fix(core): update 2022-03-15 13:45:03 +01:00
ae16fd8170 1.0.93 2022-03-15 13:01:19 +01:00
cf9ca73cd8 fix(core): update 2022-03-15 13:01:18 +01:00
687b83bafd 1.0.92 2022-03-14 16:32:13 +01:00
3c9b178c09 fix(core): update 2022-03-14 16:32:12 +01:00
5f92b58353 1.0.91 2022-03-10 16:32:28 +01:00
ed75a7c695 fix(core): update 2022-03-10 16:32:28 +01:00
59f32fed12 1.0.90 2022-03-10 16:02:51 +01:00
8e176ce2bd fix(core): update 2022-03-10 16:02:51 +01:00
4ca2d2daed 1.0.89 2022-01-24 04:35:53 +01:00
6581e3d662 fix(core): update 2022-01-24 04:35:52 +01:00
827f23107c 1.0.88 2021-10-06 13:36:26 +02:00
ad917bf2ad fix(core): update 2021-10-06 13:36:26 +02:00
306a018efd 1.0.87 2021-08-28 14:29:08 +02:00
a7935958b7 fix(core): update 2021-08-28 14:29:07 +02:00
8818ca9370 1.0.86 2021-08-28 03:08:48 +02:00
85b1988383 fix(core): update 2021-08-28 03:08:48 +02:00
10cbf125a9 1.0.85 2021-08-28 03:07:10 +02:00
d229e0ca37 fix(core): update 2021-08-28 03:07:10 +02:00
f7b260f28b 1.0.84 2021-07-23 15:45:23 +02:00
ba44efe4cc fix(core): update 2021-07-23 15:45:23 +02:00
07718ba618 1.0.83 2021-07-23 01:58:53 +02:00
0af4e4cfb3 fix(core): update 2021-07-23 01:58:52 +02:00
b54681f063 1.0.82 2021-07-22 22:29:52 +02:00
37f3df9deb fix(core): update 2021-07-22 22:29:52 +02:00
4b0d99cf3a 1.0.81 2021-07-22 21:55:08 +02:00
38426a24bc fix(core): update 2021-07-22 21:55:08 +02:00
dadd0b70b3 1.0.80 2021-03-08 00:45:20 +00:00
516b0ff578 fix(core): update 2021-03-08 00:45:20 +00:00
e5fa36fb06 1.0.79 2021-03-08 00:43:15 +00:00
228756951f fix(core): update 2021-03-08 00:43:15 +00:00
a22c837eac 1.0.78 2020-08-13 01:07:08 +00:00
a1a341b2de fix(core): update 2020-08-13 01:07:07 +00:00
32 changed files with 16039 additions and 8466 deletions

View File

@ -12,6 +12,9 @@ stages:
- release - release
- metadata - metadata
before_script:
- npm install -g @shipzone/npmci
# ==================== # ====================
# security stage # security stage
# ==================== # ====================
@ -36,6 +39,7 @@ auditProductionDependencies:
- npmci command npm audit --audit-level=high --only=prod --production - npmci command npm audit --audit-level=high --only=prod --production
tags: tags:
- docker - docker
allow_failure: true
auditDevDependencies: auditDevDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci

4
.snyk
View File

@ -1,4 +0,0 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.13.5
ignore: {}
patch: {}

24
.vscode/launch.json vendored
View File

@ -2,28 +2,10 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"name": "current file", "command": "npm test",
"type": "node", "name": "Run npm test",
"request": "launch", "request": "launch",
"args": [ "type": "node-terminal"
"${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"
} }
] ]
} }

View File

@ -15,7 +15,7 @@
"properties": { "properties": {
"projectType": { "projectType": {
"type": "string", "type": "string",
"enum": ["website", "element", "service", "npm"] "enum": ["website", "element", "service", "npm", "wcc"]
} }
} }
} }

11
assets/tsconfig.json Normal file
View File

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

4
cli.child.ts Normal file
View File

@ -0,0 +1,4 @@
#!/usr/bin/env node
process.env.CLI_CALL = 'true';
import * as cliTool from './ts/index.js';
cliTool.runCli();

2
cli.js
View File

@ -1,4 +1,4 @@
#!/usr/bin/env node #!/usr/bin/env node
process.env.CLI_CALL = 'true'; process.env.CLI_CALL = 'true';
const cliTool = require('./dist_ts/index'); const cliTool = await import('./dist_ts/index.js');
cliTool.runCli(); cliTool.runCli();

View File

@ -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');
const cliTool = require('./ts/index'); import * as tsrun from '@gitzone/tsrun';
cliTool.runCli(); tsrun.runPath('./cli.child.js', import.meta.url);

View File

@ -5,7 +5,7 @@
"githost": "gitlab.com", "githost": "gitlab.com",
"gitscope": "gitzone", "gitscope": "gitzone",
"gitrepo": "tsbundle", "gitrepo": "tsbundle",
"shortDescription": "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": "@gitzone/tsbundle",
"license": "MIT", "license": "MIT",
"projectDomain": "git.zone" "projectDomain": "git.zone"

23683
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,53 +1,40 @@
{ {
"name": "@gitzone/tsbundle", "name": "@gitzone/tsbundle",
"version": "1.0.77", "version": "2.0.3",
"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": "cd test && node ../cli.ts.js --production", "test": "npm run build && (tstest test/) && (cd test && node ../cli.js --production)",
"build": "(tsbuild --web)" "build": "(tsbuild --web --allowimplicitany)"
}, },
"bin": { "bin": {
"tsbundle": "cli.js" "tsbundle": "cli.js"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.25", "@gitzone/tsbuild": "^2.1.59",
"@gitzone/tsrun": "^1.2.12", "@gitzone/tsrun": "^1.2.31",
"@gitzone/tstest": "^1.0.43", "@gitzone/tstest": "^1.0.69",
"@pushrocks/tapbundle": "^3.2.9", "@pushrocks/tapbundle": "^5.0.2"
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.15.0"
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.11.1",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-decorators": "^7.10.5",
"@babel/plugin-transform-runtime": "^7.11.0",
"@babel/preset-env": "^7.11.0",
"@babel/runtime": "^7.11.2",
"@pushrocks/early": "^3.0.6", "@pushrocks/early": "^3.0.6",
"@pushrocks/smartcli": "^3.0.12", "@pushrocks/smartcli": "^3.0.14",
"@pushrocks/smartfile": "^8.0.0", "@pushrocks/smartfile": "^9.0.6",
"@pushrocks/smartlog": "^2.0.36", "@pushrocks/smartlog": "^2.0.44",
"@pushrocks/smartlog-destination-local": "^8.0.8", "@pushrocks/smartlog-destination-local": "^8.0.8",
"@pushrocks/smartparcel": "^1.0.5", "@pushrocks/smartpath": "^5.0.5",
"@rollup/plugin-commonjs": "^14.0.0", "@pushrocks/smartpromise": "^3.1.7",
"@rollup/plugin-json": "^4.1.0", "@pushrocks/smartspawn": "^2.0.9",
"@rollup/plugin-node-resolve": "^8.4.0", "@types/html-minifier": "^4.0.2",
"@rollup/plugin-typescript": "^5.0.2", "@types/node": "^17.0.21",
"@types/html-minifier": "^4.0.0", "esbuild": "0.14.27",
"@types/node": "^14.0.27",
"html-minifier": "^4.0.0", "html-minifier": "^4.0.0",
"rollup": "^2.23.1", "typescript": "4.7.0"
"rollup-plugin-babel": "^4.4.0",
"rollup-plugin-sourcemaps": "^0.6.2",
"rollup-plugin-terser": "^7.0.0",
"terser": "^5.0.0",
"typescript": "^3.9.7"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",
@ -60,5 +47,8 @@
"cli.js", "cli.js",
"npmextra.json", "npmextra.json",
"readme.md" "readme.md"
],
"browserslist": [
"last 1 chrome versions"
] ]
} }

View File

@ -8,13 +8,20 @@ a bundler using rollup for painless bundling of web projects
* [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/) * [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/)
## Status for master ## Status for master
[![pipeline status](https://gitlab.com/gitzone/tsbundle/badges/master/pipeline.svg)](https://gitlab.com/gitzone/tsbundle/commits/master)
[![coverage report](https://gitlab.com/gitzone/tsbundle/badges/master/coverage.svg)](https://gitlab.com/gitzone/tsbundle/commits/master) Status Category | Status Badge
[![npm downloads per month](https://img.shields.io/npm/dm/@gitzone/tsbundle.svg)](https://www.npmjs.com/package/@gitzone/tsbundle) -- | --
[![Known Vulnerabilities](https://snyk.io/test/npm/@gitzone/tsbundle/badge.svg)](https://snyk.io/test/npm/@gitzone/tsbundle) GitLab Pipelines | [![pipeline status](https://gitlab.com/gitzone/tsbundle/badges/master/pipeline.svg)](https://lossless.cloud)
[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/gitzone/tsbundle/badges/master/coverage.svg)](https://lossless.cloud)
[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) npm | [![npm downloads per month](https://badgen.net/npm/dy/@gitzone/tsbundle)](https://lossless.cloud)
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/) Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/gitzone/tsbundle)](https://lossless.cloud)
TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@gitzone/tsbundle)](https://lossless.cloud)
PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tsbundle)](https://lossless.cloud)
BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@gitzone/tsbundle)](https://lossless.cloud)
Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
## Usage ## Usage
@ -44,6 +51,7 @@ tsbundle --from="./ts/index.ts" --to="dist/bundle.js"
``` ```
## API ## API
You are using TypeScript, aren't you? Most of the stuff is apparent from the IDE intellisense. You are using TypeScript, aren't you? Most of the stuff is apparent from the IDE intellisense.
```typescript ```typescript
@ -52,10 +60,10 @@ import { TsBundle } from '@gitozne/tsbundle';
const myTsBundleInstance = new TsBundle(); const myTsBundleInstance = new TsBundle();
const run = async () => { const run = async () => {
await myTsBundleInstance.buildTest('./from/my.ts', './to/mybundle.js') await myTsBundleInstance.buildTest('./from/my.ts', './to/mybundle.js');
// OR // OR
await myTsBundleInstance.buildProduction('./from/my.ts', './to/mybundle.js') await myTsBundleInstance.buildProduction('./from/my.ts', './to/mybundle.js');
} };
``` ```
## Contribution ## Contribution

View File

@ -1,57 +0,0 @@
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 }]]
})
]
};

View File

@ -1,8 +1,17 @@
import { expect, tap } from '@pushrocks/tapbundle'; import { expect, tap } from '@pushrocks/tapbundle';
import * as tsbundle from '../ts/index'; import * as tsbundle from '../ts/index.js';
tap.test('first test', async () => { tap.test('should bundle with esbuild', async () => {
await tsbundle.runCli(); const tsbundleInstance = new tsbundle.TsBundle();
await tsbundleInstance.build(
process.cwd() + '/test',
'./ts_web/index.ts',
'./dist_manual/test.js',
{
bundler: 'esbuild'
}
);
}); });
tap.start(); tap.start();

View File

@ -1,3 +1,18 @@
const myConst = 'hello'; const myConst: string = 'hello';
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);

8
ts/00_commitinfo_data.ts Normal file
View File

@ -0,0 +1,8 @@
/**
* autocreated commitinfo by @pushrocks/commitinfo
*/
export const commitinfo = {
name: '@gitzone/tsbundle',
version: '2.0.3',
description: 'a bundler using rollup for painless bundling of web projects'
}

View File

@ -1,13 +1,13 @@
import * as early from '@pushrocks/early'; import * as early from '@pushrocks/early';
early.start('tsbundle'); early.start('tsbundle');
// lets import all plugins beforehand // lets import all plugins beforehand
import './tsbundle.plugins'; import './plugins.js';
import { logger } from './tsbundle.logging'; import { logger } from './tsbundle.logging.js';
import { runCli } from './tsbundle.cli'; import { runCli } from './tsbundle.cli.js';
early.stop(); early.stop();
// lets make this usable programmatically // lets make this usable programmatically
export * from './tsbundle.class.tsbundle'; export * from './tsbundle.class.tsbundle.js';
export * from './tsbundle.htmlhandler'; export * from './mod_html/index.js';
export { runCli }; export { runCli };

14
ts/interfaces/index.ts Normal file
View File

@ -0,0 +1,14 @@
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
}

View File

@ -0,0 +1,82 @@
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
}
/**
* 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: 'es2020',
outfile: toArg,
tsconfig: paths.tsconfigPath
});
}
/**
* 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: 'es2020',
minify: true,
outfile: toArg,
tsconfig: paths.tsconfigPath
});
}
}
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();

View File

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

44
ts/mod_html/index.ts Normal file
View File

@ -0,0 +1,44 @@
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 copyHtml(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;
await plugins.smartfile.fs.copy(fromArg, toArg);
console.log(`html copy succeeded!`);
}
// copies and minifies the html
public async minifyHtml(fromArg: string = this.defaultFromPath, toArg: string = this.defaultToPath) {
if (await this.checkIfExists()) {
console.log(`${fromArg} replaces file at ${toArg}`);
}
fromArg = plugins.smartpath.transform.toAbsolute(fromArg, paths.cwd) as string;
toArg = plugins.smartpath.transform.toAbsolute(toArg, paths.cwd) as string;
const fileString = plugins.smartfile.fs.toStringSync(fromArg);
const minifiedHtml = plugins.htmlMinifier.minify(fileString, {
minifyCSS: true,
minifyJS: true,
sortAttributes: true,
sortClassName: true,
removeAttributeQuotes: true,
collapseWhitespace: true,
collapseInlineTagWhitespace: true,
removeComments: true,
});
await plugins.smartfile.memory.toFs(minifiedHtml, toArg);
console.log(`html minification succeeded!`);
}
}

7
ts/mod_html/plugins.ts Normal file
View File

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

11
ts/paths.ts Normal file
View File

@ -0,0 +1,11 @@
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');

23
ts/plugins.ts Normal file
View File

@ -0,0 +1,23 @@
// 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';
import * as smartpath from '@pushrocks/smartpath';
import * as smartpromise from '@pushrocks/smartpromise';
import * as smartspawn from '@pushrocks/smartspawn';
export {
smartcli,
smartfile,
smartlog,
smartlogDestinationLocal,
smartpath,
smartpromise,
smartspawn,
};

View File

@ -1,138 +1,49 @@
import * as plugins from './tsbundle.plugins'; import * as plugins from './plugins.js';
import { logger } from './tsbundle.logging'; import * as interfaces from './interfaces/index.js';
import { logger } from './tsbundle.logging.js';
export class TsBundle { export class TsBundle {
/**
* the basic default options for rollup public async build(
*/ cwdArg: string,
public getBaseOptions( fromArg: string = './ts_web/index.ts',
fromArg: string = `ts_web/index.ts`, toArg: string = './dist_bundle/bundle.js',
toArg: string = 'dist_bundle/bundle.js' argvArg: interfaces.ICliOptions
) { ) {
logger.log('info', `from: ${fromArg}`); const done = plugins.smartpromise.defer();
logger.log('info', `to: ${toArg}`); const getBundlerPath = () => {
if (argvArg.bundler === 'esbuild') {
const baseOptions: plugins.rollup.RollupOptions = { return './mod_esbuild/index.child.js'
input: fromArg, }
output: { return './mod_esbuild/index.child.js'
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({
include: plugins.path.parse(fromArg).dir
? plugins.path.parse(fromArg).dir + '/**/*.ts'
: '**/*.ts',
declaration: false,
emitDecoratorMetadata: true,
experimentalDecorators: true,
inlineSourceMap: true,
noEmitOnError: true,
lib: ['esnext', 'dom', 'es2017.object'],
noImplicitAny: false,
target: 'es2018',
allowSyntheticDefaultImports: true,
}),
plugins.rollupJson(),
// 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({}),
// 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
})
);
return productionOptions;
}
constructor() {
// Nothing here
}
/**
* creates a bundle for the test enviroment
*/
public async buildTest(
fromArg: string,
toArg: string,
bundlerArg: 'rollup' | 'parcel' = 'rollup'
) {
// create a bundle
switch (bundlerArg) {
case 'rollup':
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!`);
break;
case 'parcel':
const parsedPath = plugins.path.parse(toArg);
const parcelInstance = new plugins.smartparcel.Parcel(fromArg, parsedPath.dir, parsedPath.base);
await parcelInstance.build();
} }
} const transportOptions: interfaces.IEnvTransportOptions = {
cwd: cwdArg,
/** from: fromArg,
* creates a bundle for the production environment to: toArg,
*/ mode: argvArg && argvArg.production ? 'production' : 'test',
public async buildProduction(fromArg: string, toArg: string) { argv: {
// create a bundle bundler: 'esbuild',
logger.log('info', `bundling for PRODUCTION!`); ...argvArg
const buildOptions = this.getOptionsProduction(fromArg, toArg); }
const bundle = await plugins.rollup.rollup(buildOptions); }
bundle.generate(buildOptions.output as plugins.rollup.OutputOptions); const threadsimple = new plugins.smartspawn.ThreadSimple(
await bundle.write(buildOptions.output as plugins.rollup.OutputOptions); plugins.path.join(
logger.log('ok', `Successfully bundled files!`); plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
getBundlerPath()
),
[],
{
env: {
...process.env,
transportOptions: JSON.stringify(transportOptions),
},
}
);
const childProcess = await threadsimple.start();
childProcess.on('exit', (status) => {
done.resolve();
});
await done.promise;
} }
} }

View File

@ -1,72 +1,49 @@
import * as plugins from './tsbundle.plugins'; import * as plugins from './plugins.js';
import { TsBundle } from './tsbundle.class.tsbundle'; import { TsBundle } from './tsbundle.class.tsbundle.js';
import { HtmlHandler } from './tsbundle.htmlhandler'; import { HtmlHandler } from './mod_html/index.js';
import { logger } from './tsbundle.logging'; import { logger } from './tsbundle.logging.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.standardTask().subscribe(async (argvArg) => {
const tsbundle = new TsBundle(); const tsbundle = new TsBundle();
// const htmlHandler = new HtmlHandler(); await tsbundle.build(process.cwd(), argvArg.from, argvArg.to, argvArg);
switch (true) { return;
case argvArg.production || process.env.CI:
await tsbundle.buildProduction(argvArg.from, argvArg.to);
// await htmlHandler.minifyHtml();
break;
case argvArg.test:
default:
await tsbundle.buildTest(argvArg.from, argvArg.to);
// await htmlHandler.copyHtml();
return;
}
}); });
tsBundleCli.addCommand('element').subscribe(async argvArg => { tsBundleCli.addCommand('element').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_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('npm').subscribe(async argvArg => {
const tsbundle = new TsBundle();
// const htmlHandler = new HtmlHandler();
switch (true) {
case argvArg.production || process.env.CI:
await tsbundle.buildProduction('./ts/index.ts', './dist_bundle/bundle.js');
// await htmlHandler.minifyHtml();
break;
case argvArg.test:
default:
await tsbundle.buildTest('./ts/index.ts', './dist_bundle/bundle.js');
// await htmlHandler.copyHtml();
return;
}
});
tsBundleCli.addCommand('website').subscribe(async argvArg => {
const tsbundle = new TsBundle(); const tsbundle = new TsBundle();
const htmlHandler = new HtmlHandler(); const htmlHandler = new HtmlHandler();
switch (true) { // const htmlHandler = new HtmlHandler();
case argvArg.production || process.env.CI: await tsbundle.build(
await tsbundle.buildProduction('./ts_web/index.ts', './dist_serve/bundle.js'); process.cwd(),
await htmlHandler.minifyHtml(); './ts_web/index.ts',
break; './dist_bundle/bundle.js',
case argvArg.test: argvArg
default: );
await tsbundle.buildTest('./ts_web/index.ts', './dist_serve/bundle.js'); });
await htmlHandler.copyHtml();
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();
const htmlHandler = new HtmlHandler();
await tsbundle.build(
process.cwd(),
'./ts_web/index.ts',
'./dist_serve/bundle.js',
argvArg
);
await htmlHandler.minifyHtml('./html/index.html', './dist_serve/index.html')
}); });
tsBundleCli.startParse(); tsBundleCli.startParse();

View File

@ -1,38 +0,0 @@
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);
}
}

View File

@ -1,4 +1,4 @@
import * as plugins from './tsbundle.plugins'; import * as plugins from './plugins.js';
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());

View File

@ -1,7 +0,0 @@
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');

View File

@ -1,37 +0,0 @@
// 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';
import * as smartparcel from '@pushrocks/smartparcel';
export { smartcli, smartfile, smartlog, smartlogDestinationLocal, smartparcel };
// 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';
import * as htmlMinifier from 'html-minifier';
export {
rollup,
rollupBabel,
rollupCommonjs,
rollupJson,
rollupResolve,
rollupSourceMaps,
rollupTerser,
rollupTypescript,
htmlMinifier
};

9
tsconfig.json Normal file
View File

@ -0,0 +1,9 @@
{
"compilerOptions": {
"experimentalDecorators": true,
"useDefineForClassFields": false,
"target": "ES2022",
"module": "ES2022",
"moduleResolution": "nodenext"
}
}

View File

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