Compare commits
24 Commits
Author | SHA1 | Date | |
---|---|---|---|
ae16fd8170 | |||
cf9ca73cd8 | |||
687b83bafd | |||
3c9b178c09 | |||
5f92b58353 | |||
ed75a7c695 | |||
59f32fed12 | |||
8e176ce2bd | |||
4ca2d2daed | |||
6581e3d662 | |||
827f23107c | |||
ad917bf2ad | |||
306a018efd | |||
a7935958b7 | |||
8818ca9370 | |||
85b1988383 | |||
10cbf125a9 | |||
d229e0ca37 | |||
f7b260f28b | |||
ba44efe4cc | |||
07718ba618 | |||
0af4e4cfb3 | |||
b54681f063 | |||
37f3df9deb |
@ -12,6 +12,9 @@ stages:
|
|||||||
- release
|
- release
|
||||||
- metadata
|
- metadata
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- npm install -g @shipzone/npmci
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# security stage
|
# security stage
|
||||||
# ====================
|
# ====================
|
||||||
|
4
.snyk
4
.snyk
@ -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
24
.vscode/launch.json
vendored
@ -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"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
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"]
|
"enum": ["website", "element", "service", "npm", "wcc"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
4
cli.child.ts
Normal file
4
cli.child.ts
Normal 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
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 = require('./dist_ts/index');
|
const cliTool = await import('./dist_ts/index.js');
|
||||||
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');
|
|
||||||
const cliTool = require('./ts/index');
|
import * as tsrun from '@gitzone/tsrun';
|
||||||
cliTool.runCli();
|
tsrun.runPath('./cli.child.js', import.meta.url);
|
||||||
|
@ -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"
|
||||||
|
25116
package-lock.json
generated
25116
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
57
package.json
57
package.json
@ -1,52 +1,56 @@
|
|||||||
{
|
{
|
||||||
"name": "@gitzone/tsbundle",
|
"name": "@gitzone/tsbundle",
|
||||||
"version": "1.0.81",
|
"version": "1.0.93",
|
||||||
"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": "(tstest 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)"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"tsbundle": "cli.js"
|
"tsbundle": "cli.js"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.25",
|
"@gitzone/tsbuild": "^2.1.48",
|
||||||
"@gitzone/tsrun": "^1.2.12",
|
"@gitzone/tsrun": "^1.2.31",
|
||||||
"@gitzone/tstest": "^1.0.52",
|
"@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.11.1",
|
"@babel/core": "^7.17.5",
|
||||||
"@babel/plugin-proposal-class-properties": "^7.10.4",
|
"@babel/plugin-proposal-class-properties": "^7.16.7",
|
||||||
"@babel/plugin-proposal-decorators": "^7.10.5",
|
"@babel/plugin-proposal-decorators": "^7.17.2",
|
||||||
"@babel/plugin-transform-runtime": "^7.11.0",
|
"@babel/plugin-transform-runtime": "^7.17.0",
|
||||||
"@babel/preset-env": "^7.11.0",
|
"@babel/preset-env": "^7.16.11",
|
||||||
"@babel/runtime": "^7.11.2",
|
"@babel/runtime": "^7.17.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.8",
|
"@pushrocks/smartfile": "^9.0.6",
|
||||||
"@pushrocks/smartlog": "^2.0.39",
|
"@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",
|
||||||
"@rollup/plugin-commonjs": "^14.0.0",
|
"@pushrocks/smartpath": "^5.0.4",
|
||||||
|
"@pushrocks/smartpromise": "^3.1.7",
|
||||||
|
"@pushrocks/smartspawn": "^2.0.9",
|
||||||
|
"@rollup/plugin-commonjs": "^21.0.2",
|
||||||
"@rollup/plugin-json": "^4.1.0",
|
"@rollup/plugin-json": "^4.1.0",
|
||||||
"@rollup/plugin-node-resolve": "^8.4.0",
|
"@rollup/plugin-node-resolve": "^13.1.3",
|
||||||
"@rollup/plugin-typescript": "^5.0.2",
|
"@rollup/plugin-typescript": "^8.3.1",
|
||||||
"@types/html-minifier": "^4.0.0",
|
"@types/html-minifier": "^4.0.2",
|
||||||
"@types/node": "^14.0.27",
|
"@types/node": "^17.0.21",
|
||||||
"html-minifier": "^4.0.0",
|
"html-minifier": "^4.0.0",
|
||||||
"rollup": "^2.23.1",
|
"rollup": "^2.70.1",
|
||||||
"rollup-plugin-babel": "^4.4.0",
|
"rollup-plugin-babel": "^4.4.0",
|
||||||
"rollup-plugin-sourcemaps": "^0.6.2",
|
"rollup-plugin-sourcemaps": "^0.6.3",
|
||||||
"rollup-plugin-terser": "^6.1.0",
|
"rollup-plugin-terser": "^7.0.2",
|
||||||
"typescript": "^4.2.3"
|
"typescript": "4.7.0"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"ts/**/*",
|
"ts/**/*",
|
||||||
@ -59,5 +63,8 @@
|
|||||||
"cli.js",
|
"cli.js",
|
||||||
"npmextra.json",
|
"npmextra.json",
|
||||||
"readme.md"
|
"readme.md"
|
||||||
|
],
|
||||||
|
"browserslist": [
|
||||||
|
"last 1 chrome versions"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
28
readme.md
28
readme.md
@ -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
|
||||||
[](https://gitlab.com/gitzone/tsbundle/commits/master)
|
|
||||||
[](https://gitlab.com/gitzone/tsbundle/commits/master)
|
Status Category | Status Badge
|
||||||
[](https://www.npmjs.com/package/@gitzone/tsbundle)
|
-- | --
|
||||||
[](https://snyk.io/test/npm/@gitzone/tsbundle)
|
GitLab Pipelines | [](https://lossless.cloud)
|
||||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
npm | [](https://lossless.cloud)
|
||||||
[](https://prettier.io/)
|
Snyk | [](https://lossless.cloud)
|
||||||
|
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
|
||||||
|
|
||||||
@ -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
|
||||||
|
22
test/test.ts
22
test/test.ts
@ -1,15 +1,25 @@
|
|||||||
import { expect, tap } from '@pushrocks/tapbundle';
|
import { expect, tap } from '@pushrocks/tapbundle';
|
||||||
import * as tsbundle from '../ts/index';
|
import * as tsbundle from '../dist_ts/index.js';
|
||||||
|
|
||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
|
|
||||||
tap.skip.test('first test', async () => {
|
tap.test('should bundle test', async () => {
|
||||||
await tsbundle.runCli();
|
const tsbundleInstance = new tsbundle.TsBundle();
|
||||||
|
await tsbundleInstance.buildTest(
|
||||||
|
process.cwd() + '/test',
|
||||||
|
'./ts_web/index.ts',
|
||||||
|
'./dist_manual/test.js',
|
||||||
|
'rollup'
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should run a custom function', async () => {
|
tap.test('should bundle production', async () => {
|
||||||
const tsbundleInstance = new tsbundle.TsBundle();
|
const tsbundleInstance = new tsbundle.TsBundle();
|
||||||
await tsbundleInstance.buildProduction(process.cwd(), './test/ts_web/index.ts', './test/dist_manual/index.js')
|
await tsbundleInstance.buildProduction(
|
||||||
})
|
process.cwd(),
|
||||||
|
'./test/ts_web/index.ts',
|
||||||
|
'./test/dist_manual/production.js'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
||||||
|
@ -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) {
|
||||||
|
10
ts/index.ts
10
ts/index.ts
@ -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 './tsbundle.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 './tsbundle.htmlhandler.js';
|
||||||
export { runCli };
|
export { runCli };
|
||||||
|
@ -1,140 +1,64 @@
|
|||||||
import * as plugins from './tsbundle.plugins';
|
import * as plugins from './tsbundle.plugins.js';
|
||||||
import { logger } from './tsbundle.logging';
|
import { logger } from './tsbundle.logging.js';
|
||||||
|
|
||||||
export class TsBundle {
|
export class TsBundle {
|
||||||
/**
|
|
||||||
* the basic default options for rollup
|
|
||||||
*/
|
|
||||||
public getBaseOptions(
|
|
||||||
fromArg: string = `ts_web/index.ts`,
|
|
||||||
toArg: string = 'dist_bundle/bundle.js'
|
|
||||||
) {
|
|
||||||
logger.log('info', `from: ${fromArg}`);
|
|
||||||
logger.log('info', `to: ${toArg}`);
|
|
||||||
|
|
||||||
const baseOptions: plugins.rollup.RollupOptions = {
|
|
||||||
input: fromArg,
|
|
||||||
output: {
|
|
||||||
name: 'tsbundle',
|
|
||||||
file: toArg,
|
|
||||||
format: 'iife',
|
|
||||||
sourcemap: true,
|
|
||||||
},
|
|
||||||
// Indicate here external modules you don't wanna include in your bundle (i.e.: 'lodash')
|
|
||||||
external: [],
|
|
||||||
watch: {
|
|
||||||
include: ['src/**'],
|
|
||||||
},
|
|
||||||
plugins: [
|
|
||||||
// Compile TypeScript files
|
|
||||||
plugins.rollupTypescript({
|
|
||||||
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 (
|
public async buildTest (
|
||||||
|
cwdArg: string,
|
||||||
fromArg: string,
|
fromArg: string,
|
||||||
toArg: string,
|
toArg: string,
|
||||||
bundlerArg: 'rollup' | 'parcel' = 'rollup'
|
bundlerArg: 'rollup' | 'parcel',
|
||||||
|
argvArg: any
|
||||||
) {
|
) {
|
||||||
// create a bundle
|
const done = plugins.smartpromise.defer();
|
||||||
switch (bundlerArg) {
|
const threadsimple = new plugins.smartspawn.ThreadSimple(
|
||||||
case 'rollup':
|
plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), './tsbundle.class.tsbundleprocess.js'),
|
||||||
logger.log('info', `bundling for TEST!`);
|
[],
|
||||||
const buildOptions = this.getOptionsTest(fromArg, toArg);
|
{
|
||||||
const bundle = await plugins.rollup.rollup(buildOptions);
|
env: {
|
||||||
bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
|
...process.env,
|
||||||
await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
|
tsbundleMode: 'test',
|
||||||
logger.log('ok', `Successfully bundled files!`);
|
tsbundleCwd: cwdArg,
|
||||||
break;
|
tsbundleFrom: fromArg,
|
||||||
case 'parcel':
|
tsbundleTo: toArg,
|
||||||
const parsedPath = plugins.path.parse(toArg);
|
tsbundleBundler: bundlerArg,
|
||||||
const parcelInstance = new plugins.smartparcel.Parcel(fromArg, parsedPath.dir, parsedPath.base);
|
tsbundleArgv: argvArg,
|
||||||
await parcelInstance.build();
|
},
|
||||||
}
|
}
|
||||||
|
);
|
||||||
|
const childProcess = await threadsimple.start();
|
||||||
|
childProcess.on('exit', (status) => {
|
||||||
|
done.resolve();
|
||||||
|
});
|
||||||
|
await done.promise;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public async buildProduction (
|
||||||
* creates a bundle for the production environment
|
cwdArg: string,
|
||||||
*/
|
fromArg: string,
|
||||||
public async buildProduction(cwdArg: string, fromArg: string, toArg: string) {
|
toArg: string,
|
||||||
process.chdir(cwdArg);
|
bundlerArg: 'rollup' | 'parcel',
|
||||||
console.log(process.cwd())
|
argvArg: any
|
||||||
// create a bundle
|
) {
|
||||||
logger.log('info', `bundling for PRODUCTION!`);
|
const done = plugins.smartpromise.defer();
|
||||||
const buildOptions = this.getOptionsProduction(fromArg, toArg);
|
const threadsimple = new plugins.smartspawn.ThreadSimple(
|
||||||
const bundle = await plugins.rollup.rollup(buildOptions);
|
plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), './tsbundle.class.tsbundleprocess.js'),
|
||||||
bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
|
[],
|
||||||
await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
|
{
|
||||||
logger.log('ok', `Successfully bundled files!`);
|
env: {
|
||||||
|
...process.env,
|
||||||
|
tsbundleMode: 'production',
|
||||||
|
tsbundleCwd: cwdArg,
|
||||||
|
tsbundleFrom: fromArg,
|
||||||
|
tsbundleTo: toArg,
|
||||||
|
tsbundleBundler: bundlerArg,
|
||||||
|
tsbundleArgv: argvArg,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
const childProcess = await threadsimple.start();
|
||||||
|
childProcess.on('exit', (status) => {
|
||||||
|
done.resolve();
|
||||||
|
});
|
||||||
|
await done.promise;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
157
ts/tsbundle.class.tsbundleprocess.ts
Normal file
157
ts/tsbundle.class.tsbundleprocess.ts
Normal file
@ -0,0 +1,157 @@
|
|||||||
|
import * as plugins from './tsbundle.plugins.js';
|
||||||
|
import { logger } from './tsbundle.logging.js';
|
||||||
|
|
||||||
|
export class TsBundleProcess {
|
||||||
|
/**
|
||||||
|
* the basic default options for rollup
|
||||||
|
*/
|
||||||
|
public getBaseOptions(
|
||||||
|
fromArg: string = `ts_web/index.ts`,
|
||||||
|
toArg: string = 'dist_bundle/bundle.js',
|
||||||
|
argvArg: any
|
||||||
|
) {
|
||||||
|
logger.log('info', `from: ${fromArg}`);
|
||||||
|
logger.log('info', `to: ${toArg}`);
|
||||||
|
|
||||||
|
const baseOptions: plugins.rollup.RollupOptions = {
|
||||||
|
input: fromArg,
|
||||||
|
output: {
|
||||||
|
name: 'tsbundle',
|
||||||
|
file: toArg,
|
||||||
|
format: 'iife',
|
||||||
|
sourcemap: true,
|
||||||
|
},
|
||||||
|
// Indicate here external modules you don't wanna include in your bundle (i.e.: 'lodash')
|
||||||
|
external: [],
|
||||||
|
watch: {
|
||||||
|
include: ['src/**'],
|
||||||
|
},
|
||||||
|
plugins: [
|
||||||
|
// Compile TypeScript files
|
||||||
|
(plugins.rollupTypescript as any)({
|
||||||
|
include: plugins.path.parse(fromArg).dir
|
||||||
|
? plugins.path.parse(fromArg).dir + '/**/*.ts'
|
||||||
|
: '**/*.ts',
|
||||||
|
declaration: false,
|
||||||
|
emitDecoratorMetadata: true,
|
||||||
|
experimentalDecorators: true,
|
||||||
|
inlineSourceMap: true,
|
||||||
|
noEmitOnError: true,
|
||||||
|
lib: ['dom'],
|
||||||
|
noImplicitAny: false,
|
||||||
|
target: 'es2020',
|
||||||
|
module: 'es2020',
|
||||||
|
moduleResolution: 'node12',
|
||||||
|
allowSyntheticDefaultImports: true,
|
||||||
|
importsNotUsedAsValues: 'preserve',
|
||||||
|
...argvArg && argvArg.skiplibcheck ? {
|
||||||
|
skipLibCheck: true
|
||||||
|
} : {},
|
||||||
|
...argvArg && argvArg.allowimplicitany ? {
|
||||||
|
noImplicitAny: false
|
||||||
|
} : {},
|
||||||
|
...argvArg && argvArg.commonjs ? {
|
||||||
|
module: 'commonjs',
|
||||||
|
moduleResolution: 'node',
|
||||||
|
} : {},
|
||||||
|
}),
|
||||||
|
(plugins.rollupJson as any)(),
|
||||||
|
// Allow node_modules resolution, so you can use 'external' to control
|
||||||
|
// which external modules to include in the bundle
|
||||||
|
// https://github.com/rollup/rollup-plugin-node-resolve#usage
|
||||||
|
plugins.rollupResolve(),
|
||||||
|
(plugins.rollupCommonjs as any)({}),
|
||||||
|
|
||||||
|
// Resolve source maps to the original source
|
||||||
|
plugins.rollupSourceMaps(),
|
||||||
|
],
|
||||||
|
};
|
||||||
|
return baseOptions;
|
||||||
|
}
|
||||||
|
|
||||||
|
public getOptionsTest(fromArg: string, toArg: string, argvArg: any): plugins.rollup.RollupOptions {
|
||||||
|
return this.getBaseOptions(fromArg, toArg, argvArg);
|
||||||
|
}
|
||||||
|
|
||||||
|
public getOptionsProduction(fromArg: string, toArg: string, argvArg: any): plugins.rollup.RollupOptions {
|
||||||
|
const productionOptions = this.getBaseOptions(fromArg, toArg, argvArg);
|
||||||
|
productionOptions.plugins.push(
|
||||||
|
plugins.rollupTerser({
|
||||||
|
compress: true,
|
||||||
|
mangle: true,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
return productionOptions;
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
// Nothing here
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* creates a bundle for the test enviroment
|
||||||
|
*/
|
||||||
|
public async buildTest(
|
||||||
|
fromArg: string,
|
||||||
|
toArg: string,
|
||||||
|
bundlerArg: 'rollup' | 'parcel' = 'rollup',
|
||||||
|
argvArg: any
|
||||||
|
) {
|
||||||
|
// create a bundle
|
||||||
|
switch (bundlerArg) {
|
||||||
|
case 'rollup':
|
||||||
|
logger.log('info', `bundling for TEST!`);
|
||||||
|
const buildOptions = this.getOptionsTest(fromArg, toArg, argvArg);
|
||||||
|
const bundle = await plugins.rollup.rollup(buildOptions);
|
||||||
|
bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
|
||||||
|
await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
|
||||||
|
logger.log('ok', `Successfully bundled files!`);
|
||||||
|
process.exit(0);
|
||||||
|
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
|
||||||
|
*/
|
||||||
|
public async buildProduction(fromArg: string, toArg: string, argvArg: any) {
|
||||||
|
// create a bundle
|
||||||
|
logger.log('info', `bundling for PRODUCTION!`);
|
||||||
|
const buildOptions = this.getOptionsProduction(fromArg, toArg, argvArg);
|
||||||
|
const bundle = await plugins.rollup.rollup(buildOptions);
|
||||||
|
bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
|
||||||
|
await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
|
||||||
|
logger.log('ok', `Successfully bundled files!`);
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const run = async () => {
|
||||||
|
console.log('running spawned compilation process');
|
||||||
|
console.log(`cwd: ${process.env.tsbundleCwd}`);
|
||||||
|
console.log(`from: ${process.env.tsbundleFrom}`);
|
||||||
|
console.log(`to: ${process.env.tsbundleTo}`);
|
||||||
|
console.log(`mode: ${process.env.tsbundleMode}`);
|
||||||
|
process.chdir(process.env.tsbundleCwd);
|
||||||
|
console.log(`switched to ${process.cwd()}`);
|
||||||
|
const tsbundleProcessInstance = new TsBundleProcess();
|
||||||
|
if (process.env.tsbundleMode === 'test') {
|
||||||
|
tsbundleProcessInstance.buildTest(
|
||||||
|
process.env.tsbundleFrom,
|
||||||
|
process.env.tsbundleTo,
|
||||||
|
process.env.tsbundleBundler as 'rollup' | 'parcel',
|
||||||
|
process.env.tsbundleArgv
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
tsbundleProcessInstance.buildProduction(process.env.tsbundleFrom, process.env.tsbundleTo, process.env.tsbundleArgv);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
run();
|
@ -1,69 +1,105 @@
|
|||||||
import * as plugins from './tsbundle.plugins';
|
import * as plugins from './tsbundle.plugins.js';
|
||||||
import { TsBundle } from './tsbundle.class.tsbundle';
|
import { TsBundle } from './tsbundle.class.tsbundle.js';
|
||||||
import { HtmlHandler } from './tsbundle.htmlhandler';
|
import { HtmlHandler } from './tsbundle.htmlhandler.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();
|
// const htmlHandler = new HtmlHandler();
|
||||||
switch (true) {
|
switch (true) {
|
||||||
case argvArg.production || process.env.CI:
|
case argvArg.production || process.env.CI:
|
||||||
await tsbundle.buildProduction(process.cwd(), argvArg.from, argvArg.to);
|
await tsbundle.buildProduction(process.cwd(), argvArg.from, argvArg.to, 'rollup', argvArg);
|
||||||
// await htmlHandler.minifyHtml();
|
// await htmlHandler.minifyHtml();
|
||||||
break;
|
break;
|
||||||
case argvArg.test:
|
case argvArg.test:
|
||||||
default:
|
default:
|
||||||
await tsbundle.buildTest(argvArg.from, argvArg.to);
|
await tsbundle.buildTest(process.cwd(), argvArg.from, argvArg.to, 'rollup', argvArg);
|
||||||
// await htmlHandler.copyHtml();
|
// 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) {
|
switch (true) {
|
||||||
case argvArg.production || process.env.CI:
|
case argvArg.production || process.env.CI:
|
||||||
await tsbundle.buildProduction(process.cwd(), './ts_web/index.ts', './dist_bundle/bundle.js');
|
await tsbundle.buildProduction(
|
||||||
|
process.cwd(),
|
||||||
|
'./ts_web/index.ts',
|
||||||
|
'./dist_bundle/bundle.js',
|
||||||
|
'rollup',
|
||||||
|
argvArg
|
||||||
|
);
|
||||||
// await htmlHandler.minifyHtml();
|
// await htmlHandler.minifyHtml();
|
||||||
break;
|
break;
|
||||||
case argvArg.test:
|
case argvArg.test:
|
||||||
default:
|
default:
|
||||||
await tsbundle.buildTest('./ts_web/index.ts', './dist_bundle/bundle.js');
|
await tsbundle.buildTest(
|
||||||
|
process.cwd(),
|
||||||
|
'./ts_web/index.ts',
|
||||||
|
'./dist_bundle/bundle.js',
|
||||||
|
'rollup',
|
||||||
|
argvArg
|
||||||
|
);
|
||||||
// await htmlHandler.copyHtml();
|
// await htmlHandler.copyHtml();
|
||||||
return;
|
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();
|
// const htmlHandler = new HtmlHandler();
|
||||||
switch (true) {
|
switch (true) {
|
||||||
case argvArg.production || process.env.CI:
|
case argvArg.production || process.env.CI:
|
||||||
await tsbundle.buildProduction(process.cwd(), './ts/index.ts', './dist_bundle/bundle.js');
|
await tsbundle.buildProduction(
|
||||||
|
process.cwd(),
|
||||||
|
'./ts/index.ts',
|
||||||
|
'./dist_bundle/bundle.js',
|
||||||
|
'rollup',
|
||||||
|
argvArg
|
||||||
|
);
|
||||||
// await htmlHandler.minifyHtml();
|
// await htmlHandler.minifyHtml();
|
||||||
break;
|
break;
|
||||||
case argvArg.test:
|
case argvArg.test:
|
||||||
default:
|
default:
|
||||||
await tsbundle.buildTest('./ts/index.ts', './dist_bundle/bundle.js');
|
await tsbundle.buildTest(
|
||||||
|
process.cwd(),
|
||||||
|
'./ts/index.ts',
|
||||||
|
'./dist_bundle/bundle.js',
|
||||||
|
'rollup',
|
||||||
|
argvArg
|
||||||
|
);
|
||||||
// await htmlHandler.copyHtml();
|
// await htmlHandler.copyHtml();
|
||||||
return;
|
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();
|
const htmlHandler = new HtmlHandler();
|
||||||
switch (true) {
|
switch (true) {
|
||||||
case argvArg.production || process.env.CI:
|
case argvArg.production || process.env.CI:
|
||||||
await tsbundle.buildProduction(process.cwd(), './ts_web/index.ts', './dist_serve/bundle.js');
|
await tsbundle.buildProduction(
|
||||||
|
process.cwd(),
|
||||||
|
'./ts_web/index.ts',
|
||||||
|
'./dist_serve/bundle.js',
|
||||||
|
'rollup',
|
||||||
|
argvArg
|
||||||
|
);
|
||||||
await htmlHandler.minifyHtml();
|
await htmlHandler.minifyHtml();
|
||||||
break;
|
break;
|
||||||
case argvArg.test:
|
case argvArg.test:
|
||||||
default:
|
default:
|
||||||
await tsbundle.buildTest('./ts_web/index.ts', './dist_serve/bundle.js');
|
await tsbundle.buildTest(
|
||||||
|
process.cwd(),
|
||||||
|
'./ts_web/index.ts',
|
||||||
|
'./dist_serve/bundle.js',
|
||||||
|
'rollup',
|
||||||
|
argvArg
|
||||||
|
);
|
||||||
await htmlHandler.copyHtml();
|
await htmlHandler.copyHtml();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import * as plugins from './tsbundle.plugins';
|
import * as plugins from './tsbundle.plugins.js';
|
||||||
import * as paths from './tsbundle.paths';
|
import * as paths from './tsbundle.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);
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import * as plugins from './tsbundle.plugins';
|
import * as plugins from './tsbundle.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());
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
import * as plugins from './tsbundle.plugins';
|
import * as plugins from './tsbundle.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');
|
||||||
|
@ -8,9 +8,21 @@ import * as smartcli from '@pushrocks/smartcli';
|
|||||||
import * as smartfile from '@pushrocks/smartfile';
|
import * as smartfile from '@pushrocks/smartfile';
|
||||||
import * as smartlog from '@pushrocks/smartlog';
|
import * as smartlog from '@pushrocks/smartlog';
|
||||||
import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
|
import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
|
||||||
|
import * as smartpath from '@pushrocks/smartpath';
|
||||||
import * as smartparcel from '@pushrocks/smartparcel';
|
import * as smartparcel from '@pushrocks/smartparcel';
|
||||||
|
import * as smartpromise from '@pushrocks/smartpromise';
|
||||||
|
import * as smartspawn from '@pushrocks/smartspawn';
|
||||||
|
|
||||||
export { smartcli, smartfile, smartlog, smartlogDestinationLocal, smartparcel };
|
export {
|
||||||
|
smartcli,
|
||||||
|
smartfile,
|
||||||
|
smartlog,
|
||||||
|
smartlogDestinationLocal,
|
||||||
|
smartpath,
|
||||||
|
smartparcel,
|
||||||
|
smartpromise,
|
||||||
|
smartspawn,
|
||||||
|
};
|
||||||
|
|
||||||
// third party scope
|
// third party scope
|
||||||
import * as rollup from 'rollup';
|
import * as rollup from 'rollup';
|
||||||
@ -33,5 +45,5 @@ export {
|
|||||||
rollupSourceMaps,
|
rollupSourceMaps,
|
||||||
rollupTerser,
|
rollupTerser,
|
||||||
rollupTypescript,
|
rollupTypescript,
|
||||||
htmlMinifier
|
htmlMinifier,
|
||||||
};
|
};
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"experimentalDecorators": true
|
"experimentalDecorators": true,
|
||||||
|
"target": "ES2020",
|
||||||
|
"module": "ES2020",
|
||||||
|
"moduleResolution": "node12",
|
||||||
|
"esModuleInterop": true
|
||||||
}
|
}
|
||||||
}
|
}
|
Reference in New Issue
Block a user