Compare commits

...

20 Commits

Author SHA1 Message Date
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
29 changed files with 7857 additions and 13051 deletions

View File

@ -12,6 +12,9 @@ stages:
- release - release
- metadata - metadata
before_script:
- npm install -g @shipzone/npmci
# ==================== # ====================
# security stage # security stage
# ==================== # ====================

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"]
} }
} }
} }

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"

20142
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,11 @@
{ {
"name": "@gitzone/tsbundle", "name": "@gitzone/tsbundle",
"version": "1.0.86", "version": "1.0.96",
"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": {
@ -15,40 +16,42 @@
"tsbundle": "cli.js" "tsbundle": "cli.js"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.26", "@gitzone/tsbuild": "^2.1.48",
"@gitzone/tsrun": "^1.2.17", "@gitzone/tsrun": "^1.2.31",
"@gitzone/tstest": "^1.0.57", "@gitzone/tstest": "^1.0.67",
"@pushrocks/tapbundle": "^3.2.14", "@pushrocks/tapbundle": "^5.0.2",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-config-prettier": "^1.15.0" "tslint-config-prettier": "^1.15.0"
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.15.0", "@babel/core": "^7.17.5",
"@babel/plugin-proposal-class-properties": "^7.14.5", "@babel/plugin-proposal-class-properties": "^7.16.7",
"@babel/plugin-proposal-decorators": "^7.14.5", "@babel/plugin-proposal-decorators": "^7.17.2",
"@babel/plugin-transform-runtime": "^7.15.0", "@babel/plugin-transform-runtime": "^7.17.0",
"@babel/preset-env": "^7.15.0", "@babel/preset-env": "^7.16.11",
"@babel/runtime": "^7.15.3", "@babel/runtime": "^7.17.2",
"@pushrocks/early": "^3.0.6", "@pushrocks/early": "^3.0.6",
"@pushrocks/smartcli": "^3.0.14", "@pushrocks/smartcli": "^3.0.14",
"@pushrocks/smartfile": "^8.0.10", "@pushrocks/smartfile": "^9.0.6",
"@pushrocks/smartlog": "^2.0.44", "@pushrocks/smartlog": "^2.0.44",
"@pushrocks/smartlog-destination-local": "^8.0.8", "@pushrocks/smartlog-destination-local": "^8.0.8",
"@pushrocks/smartparcel": "^1.0.9", "@pushrocks/smartparcel": "^1.0.13",
"@pushrocks/smartpromise": "^3.1.6", "@pushrocks/smartpath": "^5.0.4",
"@pushrocks/smartpromise": "^3.1.7",
"@pushrocks/smartspawn": "^2.0.9", "@pushrocks/smartspawn": "^2.0.9",
"@rollup/plugin-commonjs": "^19.0.1", "@rollup/plugin-commonjs": "^21.0.2",
"@rollup/plugin-json": "^4.1.0", "@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.0.4", "@rollup/plugin-node-resolve": "^13.1.3",
"@rollup/plugin-typescript": "^8.2.5", "@rollup/plugin-typescript": "^8.3.1",
"@types/html-minifier": "^4.0.1", "@types/html-minifier": "^4.0.2",
"@types/node": "^16.7.4", "@types/node": "^17.0.21",
"esbuild": "^0.14.27",
"html-minifier": "^4.0.0", "html-minifier": "^4.0.0",
"rollup": "^2.56.3", "rollup": "^2.70.1",
"rollup-plugin-babel": "^4.4.0", "rollup-plugin-babel": "^4.4.0",
"rollup-plugin-sourcemaps": "^0.6.3", "rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
"typescript": "^4.4.2" "typescript": "4.7.0"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",
@ -61,5 +64,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,16 +1,40 @@
import { expect, tap } from '@pushrocks/tapbundle'; import { expect, tap } from '@pushrocks/tapbundle';
import * as tsbundle from '../dist_ts/index'; import * as tsbundle from '../ts/index.js';
import * as path from 'path'; import * as path from 'path';
tap.test('should bundle test', async () => { tap.test('should bundle with esbuild', async () => {
const tsbundleInstance = new tsbundle.TsBundle(); const tsbundleInstance = new tsbundle.TsBundle();
await tsbundleInstance.buildTest(process.cwd() + '/test', './ts_web/index.ts', './dist_manual/test.js', 'rollup') await tsbundleInstance.build(
}) process.cwd() + '/test',
'./ts_web/index.ts',
'./dist_manual/test.js',
{
bundler: 'esbuild'
}
);
});
tap.test('should bundle production', async () => { tap.test('should bundle with parcel', async () => {
const tsbundleInstance = new tsbundle.TsBundle(); const tsbundleInstance = new tsbundle.TsBundle();
await tsbundleInstance.buildProduction(process.cwd(), './test/ts_web/index.ts', './test/dist_manual/production.js') await tsbundleInstance.build(
}) process.cwd() + '/test',
'./ts_web/index.ts',
'./dist_manual/test.js',
{
bundler: 'parcel'
}
);
});
tap.test('should bundle with rollup', async () => {
const tsbundleInstance = new tsbundle.TsBundle();
await tsbundleInstance.build(
process.cwd(),
'./test/ts_web/index.ts',
'./test/dist_manual/production.js',
{bundler: 'rollup'}
);
});
tap.start(); tap.start();

View File

@ -7,7 +7,7 @@ function sealed(constructor: Function) {
@sealed @sealed
class BugReport { class BugReport {
type = "report"; type = 'report';
title: string; title: string;
constructor(t: string) { constructor(t: string) {

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_rollup/htmlhandler.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,72 @@
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
) {
// create a bundle
const esbuild = await plugins.esbuild.build({
entryPoints: [fromArg],
bundle: true,
outfile: toArg
});
}
/**
* 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,
outfile: toArg
});
}
}
const run = async () => {
console.log('running spawned compilation process');
const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(process.env.transportOptions);
console.log('bundling with 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.path.join(process.cwd(), transportOptions.from),
plugins.path.join(process.cwd(), transportOptions.to),
transportOptions.argv
);
} else {
console.log('building for production:')
tsbundleProcessInstance.buildProduction(
transportOptions.from,
transportOptions.to,
transportOptions.argv
);
}
};
run();

View File

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

View File

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

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

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

View File

@ -1,5 +1,5 @@
import * as plugins from './tsbundle.plugins'; import * as plugins from './plugins.js';
import * as paths from './tsbundle.paths'; import * as paths from '../paths.js';
export class HtmlHandler { export class HtmlHandler {
public sourceFilePath: string = plugins.path.join(paths.htmlDir, 'index.html'); public sourceFilePath: string = plugins.path.join(paths.htmlDir, 'index.html');
@ -31,7 +31,7 @@ export class HtmlHandler {
removeAttributeQuotes: true, removeAttributeQuotes: true,
collapseWhitespace: true, collapseWhitespace: true,
collapseInlineTagWhitespace: true, collapseInlineTagWhitespace: true,
removeComments: true removeComments: true,
}); });
plugins.smartfile.memory.toFsSync(minifiedHtml, targetPathArg); plugins.smartfile.memory.toFsSync(minifiedHtml, targetPathArg);
} }

View File

@ -1,5 +1,6 @@
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 TsBundleProcess { export class TsBundleProcess {
/** /**
@ -7,7 +8,8 @@ export class TsBundleProcess {
*/ */
public getBaseOptions( 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: any
) { ) {
logger.log('info', `from: ${fromArg}`); logger.log('info', `from: ${fromArg}`);
logger.log('info', `to: ${toArg}`); logger.log('info', `to: ${toArg}`);
@ -27,7 +29,7 @@ export class TsBundleProcess {
}, },
plugins: [ plugins: [
// Compile TypeScript files // Compile TypeScript files
plugins.rollupTypescript({ (plugins.rollupTypescript as any)({
include: plugins.path.parse(fromArg).dir include: plugins.path.parse(fromArg).dir
? plugins.path.parse(fromArg).dir + '/**/*.ts' ? plugins.path.parse(fromArg).dir + '/**/*.ts'
: '**/*.ts', : '**/*.ts',
@ -36,59 +38,62 @@ export class TsBundleProcess {
experimentalDecorators: true, experimentalDecorators: true,
inlineSourceMap: true, inlineSourceMap: true,
noEmitOnError: true, noEmitOnError: true,
lib: ['esnext', 'dom', 'es2017.object'], lib: ['dom'],
noImplicitAny: false, noImplicitAny: false,
target: 'es2018', target: 'es2020',
module: 'es2020',
moduleResolution: 'node12',
allowSyntheticDefaultImports: true, allowSyntheticDefaultImports: true,
importsNotUsedAsValues: 'preserve',
...(argvArg && argvArg.skiplibcheck
? {
skipLibCheck: true,
}
: {}),
...(argvArg && argvArg.allowimplicitany
? {
noImplicitAny: false,
}
: {}),
...(argvArg && argvArg.commonjs
? {
module: 'commonjs',
moduleResolution: 'node',
}
: {}),
}), }),
plugins.rollupJson(), (plugins.rollupJson as any)(),
// Allow node_modules resolution, so you can use 'external' to control // Allow node_modules resolution, so you can use 'external' to control
// which external modules to include in the bundle // which external modules to include in the bundle
// https://github.com/rollup/rollup-plugin-node-resolve#usage // https://github.com/rollup/rollup-plugin-node-resolve#usage
plugins.rollupResolve(), plugins.rollupResolve(),
plugins.rollupCommonjs({}), (plugins.rollupCommonjs as any)({}),
// Resolve source maps to the original source // Resolve source maps to the original source
plugins.rollupSourceMaps(), 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; return baseOptions;
} }
public getOptionsTest(fromArg: string, toArg: string): plugins.rollup.RollupOptions { public getOptionsTest(
return this.getBaseOptions(fromArg, toArg); fromArg: string,
toArg: string,
argvArg: any
): plugins.rollup.RollupOptions {
return this.getBaseOptions(fromArg, toArg, argvArg);
} }
public getOptionsProduction(fromArg: string, toArg: string): plugins.rollup.RollupOptions { public getOptionsProduction(
const productionOptions = this.getBaseOptions(fromArg, toArg); fromArg: string,
toArg: string,
argvArg: any
): plugins.rollup.RollupOptions {
const productionOptions = this.getBaseOptions(fromArg, toArg, argvArg);
productionOptions.plugins.push( productionOptions.plugins.push(
plugins.rollupTerser({ plugins.rollupTerser({
compress: true, compress: true,
mangle: true mangle: true,
}) })
); );
return productionOptions; return productionOptions;
@ -104,32 +109,25 @@ export class TsBundleProcess {
public async buildTest( public async buildTest(
fromArg: string, fromArg: string,
toArg: string, toArg: string,
bundlerArg: 'rollup' | 'parcel' = 'rollup' argvArg: any
) { ) {
// create a bundle // create a bundle
switch (bundlerArg) {
case 'rollup':
logger.log('info', `bundling for TEST!`); logger.log('info', `bundling for TEST!`);
const buildOptions = this.getOptionsTest(fromArg, toArg); const buildOptions = this.getOptionsTest(fromArg, toArg, argvArg);
const bundle = await plugins.rollup.rollup(buildOptions); const bundle = await plugins.rollup.rollup(buildOptions);
bundle.generate(buildOptions.output as plugins.rollup.OutputOptions); bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
await bundle.write(buildOptions.output as plugins.rollup.OutputOptions); await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
logger.log('ok', `Successfully bundled files!`); logger.log('ok', `Successfully bundled files!`);
process.exit(0); process.exit(0);
case 'parcel':
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 * creates a bundle for the production environment
*/ */
public async buildProduction(fromArg: string, toArg: string) { public async buildProduction(fromArg: string, toArg: string, argvArg: any) {
// create a bundle // create a bundle
logger.log('info', `bundling for PRODUCTION!`); logger.log('info', `bundling for PRODUCTION!`);
const buildOptions = this.getOptionsProduction(fromArg, toArg); const buildOptions = this.getOptionsProduction(fromArg, toArg, argvArg);
const bundle = await plugins.rollup.rollup(buildOptions); const bundle = await plugins.rollup.rollup(buildOptions);
bundle.generate(buildOptions.output as plugins.rollup.OutputOptions); bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
await bundle.write(buildOptions.output as plugins.rollup.OutputOptions); await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
@ -140,18 +138,25 @@ export class TsBundleProcess {
const run = async () => { const run = async () => {
console.log('running spawned compilation process'); console.log('running spawned compilation process');
console.log(`cwd: ${process.env.tsbundleCwd}`); const transportOptions: interfaces.IEnvTransportOptions = JSON.parse(process.env.transportOptions);
console.log(`from: ${process.env.tsbundleFrom}`); console.log('bundling with rollup:');
console.log(`to: ${process.env.tsbundleTo}`); console.log(transportOptions);
console.log(`mode: ${process.env.tsbundleMode}`); process.chdir(transportOptions.cwd);
process.chdir(process.env.tsbundleCwd); console.log(`switched to ${process.cwd()}`);
console.log(`switched to ${process.cwd()}`)
const tsbundleProcessInstance = new TsBundleProcess(); const tsbundleProcessInstance = new TsBundleProcess();
if (process.env.tsbundleMode === 'test') { if (transportOptions.mode === 'test') {
tsbundleProcessInstance.buildTest(process.env.tsbundleFrom, process.env.tsbundleTo, process.env.tsbundleBundler as 'rollup' | 'parcel'); tsbundleProcessInstance.buildTest(
transportOptions.from,
transportOptions.to,
transportOptions.argv
);
} else { } else {
tsbundleProcessInstance.buildProduction(process.env.tsbundleFrom, process.env.tsbundleTo); tsbundleProcessInstance.buildProduction(
transportOptions.from,
transportOptions.to,
transportOptions.argv
);
} }
} };
run(); run();

View File

@ -1,18 +1,4 @@
// node native export * from '../plugins.js';
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';
import * as smartpromise from '@pushrocks/smartpromise';
import * as smartspawn from '@pushrocks/smartspawn';
export { smartcli, smartfile, smartlog, smartlogDestinationLocal, smartparcel, smartpromise, smartspawn };
// third party scope // third party scope
import * as rollup from 'rollup'; import * as rollup from 'rollup';
@ -35,5 +21,5 @@ export {
rollupSourceMaps, rollupSourceMaps,
rollupTerser, rollupTerser,
rollupTypescript, rollupTypescript,
htmlMinifier htmlMinifier,
}; };

View File

@ -1,7 +1,10 @@
import * as plugins from './tsbundle.plugins'; import * as plugins from './plugins.js';
export const cwd = process.cwd(); export const cwd = process.cwd();
export const packageDir = plugins.path.join(__dirname, '../'); export const packageDir = plugins.path.join(
plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
'../'
);
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');

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,41 +1,54 @@
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 {
public async buildTest(cwdArg: string, fromArg: string, toArg: string, bundlerArg: 'rollup' | 'parcel') {
const done = plugins.smartpromise.defer();
const threadsimple = new plugins.smartspawn.ThreadSimple(plugins.path.join(__dirname, './tsbundle.class.tsbundleprocess.js'), [], {
env: {
...process.env,
tsbundleMode: 'test',
tsbundleCwd: cwdArg,
tsbundleFrom: fromArg,
tsbundleTo: toArg,
tsbundleBundler: bundlerArg
}
})
const childProcess = await threadsimple.start();
childProcess.on('exit', (status) => {
done.resolve();
})
await done.promise;
};
public async buildProduction(cwdArg: string, fromArg: string, toArg: string) { public async build(
cwdArg: string,
fromArg: string = './ts_web/index.ts',
toArg: string = './dist_bundle/bundle.js',
argvArg: interfaces.ICliOptions
) {
const done = plugins.smartpromise.defer(); const done = plugins.smartpromise.defer();
const threadsimple = new plugins.smartspawn.ThreadSimple(plugins.path.join(__dirname, './tsbundle.class.tsbundleprocess.js'), [], { const getBundlerPath = () => {
if (argvArg.bundler === 'esbuild') {
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 = {
cwd: cwdArg,
from: fromArg,
to: toArg,
mode: argvArg && argvArg.production ? 'production' : 'test',
argv: argvArg ? argvArg : {
bundler: 'esbuild'
}
}
const threadsimple = new plugins.smartspawn.ThreadSimple(
plugins.path.join(
plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
getBundlerPath()
),
[],
{
env: { env: {
...process.env, ...process.env,
tsbundleMode: 'production', transportOptions: JSON.stringify(transportOptions),
tsbundleCwd: cwdArg, },
tsbundleFrom: fromArg,
tsbundleTo: toArg
} }
}) );
const childProcess = await threadsimple.start(); const childProcess = await threadsimple.start();
childProcess.on('exit', (status) => { childProcess.on('exit', (status) => {
done.resolve(); done.resolve();
}) });
await done.promise; await done.promise;
}; }
} }

View File

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

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,5 +1,9 @@
{ {
"compilerOptions": { "compilerOptions": {
"experimentalDecorators": true "experimentalDecorators": true,
"target": "ES2020",
"module": "ES2020",
"moduleResolution": "node12",
"esModuleInterop": true
} }
} }