Compare commits

..

5 Commits

Author SHA1 Message Date
d0ce17299a 1.0.33 2019-07-17 12:55:26 +02:00
1b0fa5b465 1.0.32 2019-07-17 12:40:40 +02:00
7a6f9d9569 fix(core): update 2019-07-17 12:40:40 +02:00
ebcf89520a 1.0.31 2019-07-17 12:22:25 +02:00
ca6ef86c8c fix(core): update 2019-07-17 12:22:24 +02:00
6 changed files with 16 additions and 22 deletions

View File

@ -1,5 +1,5 @@
# gitzone ci_default # gitzone ci_default
image: hosttoday/ht-docker-node:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
cache: cache:
paths: paths:
@ -49,14 +49,14 @@ testLTS:
tags: tags:
- docker - docker
- notpriv - notpriv
testSTABLE: testBuild:
stage: test stage: test
script: script:
- npmci npm prepare - npmci npm prepare
- npmci node install stable - npmci node install lts
- npmci npm install - npmci npm install
- npmci npm test - npmci command npm run build
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- docker - docker
@ -65,7 +65,7 @@ testSTABLE:
release: release:
stage: release stage: release
script: script:
- npmci node install stable - npmci node install lts
- npmci npm publish - npmci npm publish
only: only:
- tags - tags

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@gitzone/tsbundle", "name": "@gitzone/tsbundle",
"version": "1.0.30", "version": "1.0.33",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "@gitzone/tsbundle", "name": "@gitzone/tsbundle",
"version": "1.0.30", "version": "1.0.33",
"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/index.js", "main": "dist/index.js",

View File

@ -9,7 +9,7 @@ export const runCli = async () => {
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(); await tsbundle.buildProduction();
await htmlHandler.minifyHtml(); await htmlHandler.minifyHtml();
break; break;

View File

@ -5,24 +5,21 @@ export class HtmlHandler {
public sourceFilePath: string = plugins.path.join(paths.htmlDir, 'index.html'); 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.distWebDir, 'index.html');
public async checkIfExists () { public async checkIfExists() {
return plugins.smartfile.fs.fileExists(this.sourceFilePath); return plugins.smartfile.fs.fileExists(this.sourceFilePath);
} }
// copies the html // copies the html
public async copyHtml() { public async copyHtml() {
if (!(await this.checkIfExists)) { if (!(await this.checkIfExists())) {
return; return;
} }
await plugins.smartfile.fs.copy( await plugins.smartfile.fs.copy(this.sourceFilePath, this.targetFilePath);
this.sourceFilePath,
this.targetFilePath
);
} }
// copies and minifies the html // copies and minifies the html
public async minifyHtml() { public async minifyHtml() {
if (!(await this.checkIfExists)) { if (!(await this.checkIfExists())) {
return; return;
} }
const fileString = plugins.smartfile.fs.toStringSync(this.sourceFilePath); const fileString = plugins.smartfile.fs.toStringSync(this.sourceFilePath);
@ -34,9 +31,8 @@ export class HtmlHandler {
removeAttributeQuotes: true, removeAttributeQuotes: true,
collapseWhitespace: true, collapseWhitespace: true,
collapseInlineTagWhitespace: true, collapseInlineTagWhitespace: true,
removeComments: true removeComments: true
}); });
plugins.smartfile.memory.toFsSync(minifiedHtml, this.targetFilePath); plugins.smartfile.memory.toFsSync(minifiedHtml, this.targetFilePath);
} }
} }

View File

@ -1,9 +1,7 @@
// node native // node native
import * as path from 'path'; import * as path from 'path';
export { export { path };
path
};
// pushrocks scope // pushrocks scope
import * as smartcli from '@pushrocks/smartcli'; import * as smartcli from '@pushrocks/smartcli';