Compare commits
90 Commits
Author | SHA1 | Date | |
---|---|---|---|
4ca2d2daed | |||
6581e3d662 | |||
827f23107c | |||
ad917bf2ad | |||
306a018efd | |||
a7935958b7 | |||
8818ca9370 | |||
85b1988383 | |||
10cbf125a9 | |||
d229e0ca37 | |||
f7b260f28b | |||
ba44efe4cc | |||
07718ba618 | |||
0af4e4cfb3 | |||
b54681f063 | |||
37f3df9deb | |||
4b0d99cf3a | |||
38426a24bc | |||
dadd0b70b3 | |||
516b0ff578 | |||
e5fa36fb06 | |||
228756951f | |||
a22c837eac | |||
a1a341b2de | |||
046d3107e8 | |||
956bcdf16e | |||
f61640b65a | |||
0125591149 | |||
6aa0d800b3 | |||
19160170a9 | |||
8bf9e3d691 | |||
737d43b59e | |||
7e5a225ae1 | |||
bb13c14d3b | |||
501a7417ba | |||
31a9249e0b | |||
9367ad2e05 | |||
8676f97843 | |||
f1b4e76a5b | |||
558edb8f09 | |||
e244ca30b9 | |||
104cdab0dc | |||
a935dc0b86 | |||
9a43d77fe6 | |||
e9ca5147f3 | |||
b418ccd10a | |||
eeeac6cb7f | |||
c0d05bab7f | |||
0cceb23987 | |||
1b91c7a46c | |||
bd9ec3b313 | |||
ada2ae72ee | |||
ceaabe35c8 | |||
0b0c36da1b | |||
3a53cd5405 | |||
623438e1d1 | |||
8bf19d55c7 | |||
b1952365bc | |||
753225053b | |||
715b7a89ad | |||
166dd28ad3 | |||
ca039552ba | |||
d435c0fdf9 | |||
911523dc6a | |||
1f6917ed45 | |||
d92edd60d9 | |||
acc7936a6a | |||
9785399565 | |||
d1bb93e9e1 | |||
5c00555ea8 | |||
7fd0ff65e5 | |||
0cca5cafdf | |||
f5340e7109 | |||
71c917b32f | |||
ac3ef390e8 | |||
7ca9c52cc7 | |||
0c702029f2 | |||
dddd3ead1c | |||
bad5690d99 | |||
a8fb7aac7f | |||
f33f985d3d | |||
ddae40ddb2 | |||
4256578bc6 | |||
1dd604d572 | |||
262fd6e718 | |||
d660550485 | |||
0842c2fdec | |||
20bf5dfc57 | |||
04a77f9eeb | |||
a97af3232a |
4
.gitignore
vendored
4
.gitignore
vendored
@ -15,8 +15,6 @@ node_modules/
|
||||
|
||||
# builds
|
||||
dist/
|
||||
dist_web/
|
||||
dist_serve/
|
||||
dist_ts_web/
|
||||
dist_*/
|
||||
|
||||
# custom
|
105
.gitlab-ci.yml
105
.gitlab-ci.yml
@ -1,18 +1,16 @@
|
||||
# gitzone ci_default
|
||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||
variables:
|
||||
GIT_STRATEGY: clone
|
||||
|
||||
cache:
|
||||
paths:
|
||||
- .npmci_cache/
|
||||
key: "$CI_BUILD_STAGE"
|
||||
- .npmci_cache/
|
||||
key: '$CI_BUILD_STAGE'
|
||||
|
||||
stages:
|
||||
- security
|
||||
- test
|
||||
- release
|
||||
- metadata
|
||||
- security
|
||||
- test
|
||||
- release
|
||||
- metadata
|
||||
|
||||
# ====================
|
||||
# security stage
|
||||
@ -20,21 +18,37 @@ stages:
|
||||
mirror:
|
||||
stage: security
|
||||
script:
|
||||
- npmci git mirror
|
||||
- npmci git mirror
|
||||
only:
|
||||
- tags
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
snyk:
|
||||
auditProductionDependencies:
|
||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||
stage: security
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci command npm install -g snyk
|
||||
- npmci command npm install --ignore-scripts
|
||||
- npmci command snyk test
|
||||
- npmci command npm install --production --ignore-scripts
|
||||
- npmci command npm config set registry https://registry.npmjs.org
|
||||
- npmci command npm audit --audit-level=high --only=prod --production
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- docker
|
||||
allow_failure: true
|
||||
|
||||
auditDevDependencies:
|
||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||
stage: security
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci command npm install --ignore-scripts
|
||||
- npmci command npm config set registry https://registry.npmjs.org
|
||||
- npmci command npm audit --audit-level=high --only=dev
|
||||
tags:
|
||||
- docker
|
||||
allow_failure: true
|
||||
|
||||
# ====================
|
||||
# test stage
|
||||
@ -43,37 +57,36 @@ snyk:
|
||||
testStable:
|
||||
stage: test
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci node install stable
|
||||
- npmci npm install
|
||||
- npmci npm test
|
||||
- npmci npm prepare
|
||||
- npmci node install stable
|
||||
- npmci npm install
|
||||
- npmci npm test
|
||||
coverage: /\d+.?\d+?\%\s*coverage/
|
||||
tags:
|
||||
- docker
|
||||
- priv
|
||||
- docker
|
||||
|
||||
testBuild:
|
||||
stage: test
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci node install lts
|
||||
- npmci npm install
|
||||
- npmci command npm run build
|
||||
- npmci npm prepare
|
||||
- npmci node install stable
|
||||
- npmci npm install
|
||||
- npmci command npm run build
|
||||
coverage: /\d+.?\d+?\%\s*coverage/
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- docker
|
||||
|
||||
release:
|
||||
stage: release
|
||||
script:
|
||||
- npmci node install lts
|
||||
- npmci npm publish
|
||||
- npmci node install stable
|
||||
- npmci npm publish
|
||||
only:
|
||||
- tags
|
||||
- tags
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
# ====================
|
||||
# metadata stage
|
||||
@ -81,35 +94,39 @@ release:
|
||||
codequality:
|
||||
stage: metadata
|
||||
allow_failure: true
|
||||
only:
|
||||
- tags
|
||||
script:
|
||||
- npmci command npm install -g tslint typescript
|
||||
- npmci npm prepare
|
||||
- npmci npm install
|
||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
||||
tags:
|
||||
- docker
|
||||
- priv
|
||||
- lossless
|
||||
- docker
|
||||
- priv
|
||||
|
||||
trigger:
|
||||
stage: metadata
|
||||
script:
|
||||
- npmci trigger
|
||||
- npmci trigger
|
||||
only:
|
||||
- tags
|
||||
- tags
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
pages:
|
||||
image: hosttoday/ht-docker-dbase:npmci
|
||||
services:
|
||||
- docker:18-dind
|
||||
stage: metadata
|
||||
script:
|
||||
- npmci node install lts
|
||||
- npmci command npm install -g @gitzone/tsdoc
|
||||
- npmci npm prepare
|
||||
- npmci npm install
|
||||
- npmci command tsdoc
|
||||
tags:
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
only:
|
||||
@ -117,5 +134,5 @@ pages:
|
||||
artifacts:
|
||||
expire_in: 1 week
|
||||
paths:
|
||||
- public
|
||||
- public
|
||||
allow_failure: true
|
||||
|
29
.vscode/launch.json
vendored
Normal file
29
.vscode/launch.json
vendored
Normal file
@ -0,0 +1,29 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "current file",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"args": [
|
||||
"${relativeFile}"
|
||||
],
|
||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
},
|
||||
{
|
||||
"name": "test.ts",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"args": [
|
||||
"test/test.ts"
|
||||
],
|
||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
}
|
||||
]
|
||||
}
|
26
.vscode/settings.json
vendored
Normal file
26
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
{
|
||||
"json.schemas": [
|
||||
{
|
||||
"fileMatch": ["/npmextra.json"],
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"npmci": {
|
||||
"type": "object",
|
||||
"description": "settings for npmci"
|
||||
},
|
||||
"gitzone": {
|
||||
"type": "object",
|
||||
"description": "settings for gitzone",
|
||||
"properties": {
|
||||
"projectType": {
|
||||
"type": "string",
|
||||
"enum": ["website", "element", "service", "npm"]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
3
cli.js
3
cli.js
@ -1,3 +1,4 @@
|
||||
#!/usr/bin/env node
|
||||
process.env.CLI_CALL = 'true';
|
||||
require('./dist/index');
|
||||
const cliTool = require('./dist_ts/index');
|
||||
cliTool.runCli();
|
||||
|
@ -1,4 +1,5 @@
|
||||
#!/usr/bin/env node
|
||||
process.env.CLI_CALL = 'true';
|
||||
require('@gitzone/tsrun');
|
||||
require('./ts/index');
|
||||
const cliTool = require('./ts/index');
|
||||
cliTool.runCli();
|
||||
|
@ -1,5 +1,6 @@
|
||||
{
|
||||
"gitzone": {
|
||||
"projectType": "npm",
|
||||
"module": {
|
||||
"githost": "gitlab.com",
|
||||
"gitscope": "gitzone",
|
||||
|
25679
package-lock.json
generated
25679
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
80
package.json
80
package.json
@ -1,59 +1,63 @@
|
||||
{
|
||||
"name": "@gitzone/tsbundle",
|
||||
"version": "1.0.44",
|
||||
"version": "1.0.89",
|
||||
"private": false,
|
||||
"description": "a bundler using rollup for painless bundling of web projects",
|
||||
"main": "dist/index.js",
|
||||
"typings": "dist/index.d.ts",
|
||||
"main": "dist_ts/index.js",
|
||||
"typings": "dist_ts/index.d.ts",
|
||||
"author": "Lossless GmbH",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"test": "cd test && node ../cli.ts.js --production",
|
||||
"build": "(tsbuild)",
|
||||
"format": "(gitzone format)"
|
||||
"test": "npm run build && (tstest test/) && (cd test && node ../cli.js --production)",
|
||||
"build": "(tsbuild --web)"
|
||||
},
|
||||
"bin": {
|
||||
"tsbundle": "cli.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@gitzone/tsbuild": "^2.1.17",
|
||||
"@gitzone/tsrun": "^1.2.8",
|
||||
"@gitzone/tstest": "^1.0.28",
|
||||
"@pushrocks/tapbundle": "^3.0.13",
|
||||
"@types/node": "^12.7.11",
|
||||
"tslint": "^5.20.0",
|
||||
"@gitzone/tsbuild": "^2.1.29",
|
||||
"@gitzone/tsrun": "^1.2.18",
|
||||
"@gitzone/tstest": "^1.0.60",
|
||||
"@pushrocks/tapbundle": "^4.0.0",
|
||||
"tslint": "^6.1.3",
|
||||
"tslint-config-prettier": "^1.15.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.6.2",
|
||||
"@babel/plugin-proposal-class-properties": "^7.5.5",
|
||||
"@babel/plugin-proposal-decorators": "^7.6.0",
|
||||
"@babel/plugin-transform-runtime": "^7.6.2",
|
||||
"@babel/preset-env": "^7.6.2",
|
||||
"@babel/runtime": "^7.6.2",
|
||||
"@pushrocks/early": "^3.0.3",
|
||||
"@pushrocks/smartcli": "^3.0.7",
|
||||
"@pushrocks/smartfile": "^7.0.6",
|
||||
"@pushrocks/smartlog": "^2.0.19",
|
||||
"@pushrocks/smartlog-destination-local": "^8.0.2",
|
||||
"@types/html-minifier": "^3.5.3",
|
||||
"@babel/core": "^7.16.12",
|
||||
"@babel/plugin-proposal-class-properties": "^7.16.7",
|
||||
"@babel/plugin-proposal-decorators": "^7.16.7",
|
||||
"@babel/plugin-transform-runtime": "^7.16.10",
|
||||
"@babel/preset-env": "^7.16.11",
|
||||
"@babel/runtime": "^7.16.7",
|
||||
"@pushrocks/early": "^3.0.6",
|
||||
"@pushrocks/smartcli": "^3.0.14",
|
||||
"@pushrocks/smartfile": "^9.0.5",
|
||||
"@pushrocks/smartlog": "^2.0.44",
|
||||
"@pushrocks/smartlog-destination-local": "^8.0.8",
|
||||
"@pushrocks/smartparcel": "^1.0.9",
|
||||
"@pushrocks/smartpromise": "^3.1.6",
|
||||
"@pushrocks/smartspawn": "^2.0.9",
|
||||
"@rollup/plugin-commonjs": "^21.0.1",
|
||||
"@rollup/plugin-json": "^4.1.0",
|
||||
"@rollup/plugin-node-resolve": "^13.1.3",
|
||||
"@rollup/plugin-typescript": "^8.3.0",
|
||||
"@types/html-minifier": "^4.0.2",
|
||||
"@types/node": "^17.0.10",
|
||||
"html-minifier": "^4.0.0",
|
||||
"rollup": "^1.23.1",
|
||||
"rollup-plugin-babel": "^4.3.2",
|
||||
"rollup-plugin-commonjs": "^10.1.0",
|
||||
"rollup-plugin-node-resolve": "^5.2.0",
|
||||
"rollup-plugin-sourcemaps": "^0.4.2",
|
||||
"rollup-plugin-terser": "^5.1.2",
|
||||
"rollup-plugin-typescript2": "^0.24.3",
|
||||
"terser": "4.3.6"
|
||||
"rollup": "^2.66.0",
|
||||
"rollup-plugin-babel": "^4.4.0",
|
||||
"rollup-plugin-sourcemaps": "^0.6.3",
|
||||
"rollup-plugin-terser": "^7.0.2",
|
||||
"typescript": "^4.5.5"
|
||||
},
|
||||
"files": [
|
||||
"ts/*",
|
||||
"ts_web/*",
|
||||
"dist/*",
|
||||
"dist_web/*",
|
||||
"dist_ts_web/*",
|
||||
"assets/*",
|
||||
"ts/**/*",
|
||||
"ts_web/**/*",
|
||||
"dist/**/*",
|
||||
"dist_*/**/*",
|
||||
"dist_ts/**/*",
|
||||
"dist_ts_web/**/*",
|
||||
"assets/**/*",
|
||||
"cli.js",
|
||||
"npmextra.json",
|
||||
"readme.md"
|
||||
|
43
readme.md
43
readme.md
@ -8,7 +8,7 @@ a bundler using rollup for painless bundling of web projects
|
||||
* [docs (typedoc)](https://gitzone.gitlab.io/tsbundle/)
|
||||
|
||||
## Status for master
|
||||
[](https://gitlab.com/gitzone/tsbundle/commits/master)
|
||||
[](https://gitlab.com/gitzone/tsbundle/commits/master)
|
||||
[](https://gitlab.com/gitzone/tsbundle/commits/master)
|
||||
[](https://www.npmjs.com/package/@gitzone/tsbundle)
|
||||
[](https://snyk.io/test/npm/@gitzone/tsbundle)
|
||||
@ -22,10 +22,45 @@ Use TypeScript for best in class intellisense.
|
||||
|
||||
tsbundle will bundle modern JavaScript websites in an Google Bot conformant way so things like AdSense do work.
|
||||
|
||||
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
||||
> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
|
||||
tsbundle supports two modes of usage: CLI and API usage.
|
||||
|
||||
[](https://maintainedby.lossless.com)
|
||||
### CLI
|
||||
|
||||
```shell
|
||||
# Note: This is code that belongs into your terminal ;)
|
||||
# Install the tool for cli usage
|
||||
|
||||
# Globally
|
||||
npm install -g @gitzone/tsbundle
|
||||
|
||||
# Locally for use in your pacakge.json
|
||||
npm install --save-dev @gitzone/tsbundle
|
||||
|
||||
# then use it
|
||||
tsbundle --from="./ts/index.ts" --to="dist/bundle.js"
|
||||
|
||||
## note you can call tsbundle without arguments. Default values are --from="./ts_web/index.ts" --to="dist_bundle/bundle.js"
|
||||
## You can use --production to enable minification using terser
|
||||
```
|
||||
|
||||
## API
|
||||
You are using TypeScript, aren't you? Most of the stuff is apparent from the IDE intellisense.
|
||||
|
||||
```typescript
|
||||
import { TsBundle } from '@gitozne/tsbundle';
|
||||
|
||||
const myTsBundleInstance = new TsBundle();
|
||||
|
||||
const run = async () => {
|
||||
await myTsBundleInstance.buildTest('./from/my.ts', './to/mybundle.js')
|
||||
// OR
|
||||
await myTsBundleInstance.buildProduction('./from/my.ts', './to/mybundle.js')
|
||||
}
|
||||
```
|
||||
|
||||
## Contribution
|
||||
|
||||
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
|
||||
|
||||
For further information read the linked docs at the top of this readme.
|
||||
|
||||
|
17
test/test.ts
17
test/test.ts
@ -1,9 +1,16 @@
|
||||
import { expect, tap } from '@pushrocks/tapbundle';
|
||||
import * as tsbundle from '../ts/index';
|
||||
import * as tsbundle from '../dist_ts/index';
|
||||
|
||||
tap.test('first test', async () => {
|
||||
tsbundle;
|
||||
console.log('hi');
|
||||
});
|
||||
import * as path from 'path';
|
||||
|
||||
tap.test('should bundle test', async () => {
|
||||
const tsbundleInstance = new tsbundle.TsBundle();
|
||||
await tsbundleInstance.buildTest(process.cwd() + '/test', './ts_web/index.ts', './dist_manual/test.js', 'rollup')
|
||||
})
|
||||
|
||||
tap.test('should bundle production', async () => {
|
||||
const tsbundleInstance = new tsbundle.TsBundle();
|
||||
await tsbundleInstance.buildProduction(process.cwd(), './test/ts_web/index.ts', './test/dist_manual/production.js')
|
||||
})
|
||||
|
||||
tap.start();
|
||||
|
@ -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);
|
||||
|
@ -7,9 +7,7 @@ import { logger } from './tsbundle.logging';
|
||||
import { runCli } from './tsbundle.cli';
|
||||
early.stop();
|
||||
|
||||
if (process.env.CLI_CALL) {
|
||||
runCli();
|
||||
}
|
||||
|
||||
// lets make this usable programmatically
|
||||
export * from './tsbundle.class.tsbundle';
|
||||
export * from './tsbundle.htmlhandler';
|
||||
export { runCli };
|
||||
|
@ -2,125 +2,40 @@ import * as plugins from './tsbundle.plugins';
|
||||
import { logger } from './tsbundle.logging';
|
||||
|
||||
export class TsBundle {
|
||||
/**
|
||||
* the basic default options for rollup
|
||||
*/
|
||||
public getBaseOptions(fromArg: string = `ts_web/index.ts`, toArg: string = 'dist_web/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({
|
||||
useTsconfigDeclarationDir: true,
|
||||
tsconfigOverride: {
|
||||
compilerOptions: {
|
||||
declaration: true,
|
||||
emitDecoratorMetadata: true,
|
||||
experimentalDecorators: true,
|
||||
inlineSourceMap: true,
|
||||
noEmitOnError: true,
|
||||
lib: ['es2017', 'dom'],
|
||||
target: 'es2017',
|
||||
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
|
||||
plugins.rollupResolve(),
|
||||
plugins.rollupCommonjs({
|
||||
namedExports: {
|
||||
'node_modules/@pushrocks/smartstate/dist/index.js': ['Smartstate']
|
||||
}
|
||||
}),
|
||||
|
||||
// Resolve source maps to the original source
|
||||
plugins.rollupSourceMaps()
|
||||
/*plugins.rollupBabel({
|
||||
runtimeHelpers: true,
|
||||
extensions: ['.js', '.jsx', '.ts', '.tsx'],
|
||||
babelrc: false,
|
||||
presets: [
|
||||
[
|
||||
'@babel/preset-env',
|
||||
{
|
||||
modules: false,
|
||||
targets: {
|
||||
chrome: '41'
|
||||
}
|
||||
}
|
||||
]
|
||||
],
|
||||
plugins: [
|
||||
[
|
||||
'@babel/plugin-transform-runtime',
|
||||
{
|
||||
regenerator: true
|
||||
}
|
||||
]
|
||||
]
|
||||
})*/
|
||||
]
|
||||
};
|
||||
return baseOptions;
|
||||
}
|
||||
|
||||
public getOptionsTest(fromArg: string, toArg: string): plugins.rollup.RollupOptions {
|
||||
return this.getBaseOptions(fromArg, toArg);
|
||||
}
|
||||
|
||||
public getOptionsProduction(fromArg: string, toArg: string): plugins.rollup.RollupOptions {
|
||||
const productionOptions = this.getBaseOptions(fromArg, toArg);
|
||||
productionOptions.plugins.push(plugins.rollupTerser({
|
||||
compress: true,
|
||||
mangle: true,
|
||||
sourcemap: false
|
||||
}));
|
||||
return productionOptions;
|
||||
}
|
||||
|
||||
constructor() {
|
||||
// Nothing here
|
||||
}
|
||||
|
||||
/**
|
||||
* creates a bundle for the test enviroment
|
||||
*/
|
||||
public async buildTest(fromArg: string, toArg: string) {
|
||||
// create a bundle
|
||||
logger.log('info', `bundling for TEST!`);
|
||||
const buildOptions = this.getOptionsTest(fromArg, toArg);
|
||||
const bundle = await plugins.rollup.rollup(buildOptions);
|
||||
bundle.generate(buildOptions.output);
|
||||
await bundle.write(buildOptions.output);
|
||||
logger.log('ok', `Successfully bundled files!`);
|
||||
}
|
||||
|
||||
/**
|
||||
* creates a bundle for the production environment
|
||||
*/
|
||||
public async buildProduction(fromArg: string, toArg: string) {
|
||||
// create a bundle
|
||||
logger.log('info', `bundling for PRODUCTION!`);
|
||||
const buildOptions = this.getOptionsProduction(fromArg, toArg);
|
||||
const bundle = await plugins.rollup.rollup(buildOptions);
|
||||
bundle.generate(buildOptions.output);
|
||||
await bundle.write(buildOptions.output);
|
||||
logger.log('ok', `Successfully bundled files!`);
|
||||
}
|
||||
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) {
|
||||
const done = plugins.smartpromise.defer();
|
||||
const threadsimple = new plugins.smartspawn.ThreadSimple(plugins.path.join(__dirname, './tsbundle.class.tsbundleprocess.js'), [], {
|
||||
env: {
|
||||
...process.env,
|
||||
tsbundleMode: 'production',
|
||||
tsbundleCwd: cwdArg,
|
||||
tsbundleFrom: fromArg,
|
||||
tsbundleTo: toArg
|
||||
}
|
||||
})
|
||||
const childProcess = await threadsimple.start();
|
||||
childProcess.on('exit', (status) => {
|
||||
done.resolve();
|
||||
})
|
||||
await done.promise;
|
||||
};
|
||||
}
|
||||
|
158
ts/tsbundle.class.tsbundleprocess.ts
Normal file
158
ts/tsbundle.class.tsbundleprocess.ts
Normal file
@ -0,0 +1,158 @@
|
||||
import * as plugins from './tsbundle.plugins';
|
||||
import { logger } from './tsbundle.logging';
|
||||
|
||||
export class TsBundleProcess {
|
||||
/**
|
||||
* 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,
|
||||
importsNotUsedAsValues: 'preserve',
|
||||
}),
|
||||
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!`);
|
||||
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) {
|
||||
// create a bundle
|
||||
logger.log('info', `bundling for PRODUCTION!`);
|
||||
const buildOptions = this.getOptionsProduction(fromArg, toArg);
|
||||
const bundle = await plugins.rollup.rollup(buildOptions);
|
||||
bundle.generate(buildOptions.output as plugins.rollup.OutputOptions);
|
||||
await bundle.write(buildOptions.output as plugins.rollup.OutputOptions);
|
||||
logger.log('ok', `Successfully bundled files!`);
|
||||
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');
|
||||
} else {
|
||||
tsbundleProcessInstance.buildProduction(process.env.tsbundleFrom, process.env.tsbundleTo);
|
||||
}
|
||||
}
|
||||
|
||||
run();
|
@ -6,16 +6,64 @@ import { logger } from './tsbundle.logging';
|
||||
export const runCli = async () => {
|
||||
const tsBundleCli = new plugins.smartcli.Smartcli();
|
||||
tsBundleCli.standardTask().subscribe(async argvArg => {
|
||||
const tsbundle = new TsBundle();
|
||||
// const htmlHandler = new HtmlHandler();
|
||||
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;
|
||||
}
|
||||
});
|
||||
|
||||
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(process.cwd(), './ts_web/index.ts', './dist_bundle/bundle.js');
|
||||
// await htmlHandler.minifyHtml();
|
||||
break;
|
||||
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 => {
|
||||
const tsbundle = new TsBundle();
|
||||
// const htmlHandler = new HtmlHandler();
|
||||
switch (true) {
|
||||
case argvArg.production || process.env.CI:
|
||||
await tsbundle.buildProduction(process.cwd(), './ts/index.ts', './dist_bundle/bundle.js');
|
||||
// await htmlHandler.minifyHtml();
|
||||
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 => {
|
||||
const tsbundle = new TsBundle();
|
||||
const htmlHandler = new HtmlHandler();
|
||||
switch (true) {
|
||||
case argvArg.production || process.env.CI:
|
||||
await tsbundle.buildProduction(argvArg.from, argvArg.to);
|
||||
await tsbundle.buildProduction(process.cwd(), './ts_web/index.ts', './dist_serve/bundle.js');
|
||||
await htmlHandler.minifyHtml();
|
||||
break;
|
||||
case argvArg.test:
|
||||
default:
|
||||
await tsbundle.buildTest(argvArg.from, argvArg.to);
|
||||
await tsbundle.buildTest(process.cwd(), './ts_web/index.ts', './dist_serve/bundle.js', 'rollup');
|
||||
await htmlHandler.copyHtml();
|
||||
return;
|
||||
}
|
||||
|
@ -3,22 +3,22 @@ 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.distWebDir, '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() {
|
||||
public async copyHtml(targetPathArg = this.targetFilePath) {
|
||||
if (!(await this.checkIfExists())) {
|
||||
return;
|
||||
}
|
||||
await plugins.smartfile.fs.copy(this.sourceFilePath, this.targetFilePath);
|
||||
await plugins.smartfile.fs.copy(this.sourceFilePath, targetPathArg);
|
||||
}
|
||||
|
||||
// copies and minifies the html
|
||||
public async minifyHtml() {
|
||||
public async minifyHtml(targetPathArg = this.targetFilePath) {
|
||||
if (!(await this.checkIfExists())) {
|
||||
return;
|
||||
}
|
||||
@ -33,6 +33,6 @@ export class HtmlHandler {
|
||||
collapseInlineTagWhitespace: true,
|
||||
removeComments: true
|
||||
});
|
||||
plugins.smartfile.memory.toFsSync(minifiedHtml, this.targetFilePath);
|
||||
plugins.smartfile.memory.toFsSync(minifiedHtml, targetPathArg);
|
||||
}
|
||||
}
|
||||
|
@ -3,4 +3,5 @@ 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 distWebDir = plugins.path.join(cwd, './dist_web');
|
||||
export const distServeDir = plugins.path.join(cwd, './dist_serve');
|
||||
export const assetsDir = plugins.path.join(packageDir, 'assets');
|
||||
|
@ -8,17 +8,21 @@ 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 };
|
||||
export { smartcli, smartfile, smartlog, smartlogDestinationLocal, smartparcel, smartpromise, smartspawn };
|
||||
|
||||
// third party scope
|
||||
import * as rollup from 'rollup';
|
||||
import rollupBabel from 'rollup-plugin-babel';
|
||||
import rollupCommonjs from 'rollup-plugin-commonjs';
|
||||
import rollupResolve from 'rollup-plugin-node-resolve';
|
||||
import 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-typescript2';
|
||||
import rollupTypescript from '@rollup/plugin-typescript';
|
||||
|
||||
import * as htmlMinifier from 'html-minifier';
|
||||
|
||||
@ -26,6 +30,7 @@ export {
|
||||
rollup,
|
||||
rollupBabel,
|
||||
rollupCommonjs,
|
||||
rollupJson,
|
||||
rollupResolve,
|
||||
rollupSourceMaps,
|
||||
rollupTerser,
|
||||
|
5
tsconfig.json
Normal file
5
tsconfig.json
Normal file
@ -0,0 +1,5 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"experimentalDecorators": true
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user