Compare commits

..

4 Commits

Author SHA1 Message Date
bcd69059f8 1.0.18 2021-01-08 22:08:02 +00:00
acba539a6f fix(core): update 2021-01-08 22:08:01 +00:00
446b4c38ea 1.0.17 2021-01-08 22:06:26 +00:00
bc6d3f45f8 fix(core): update 2021-01-08 22:06:25 +00:00
5 changed files with 1557 additions and 1111 deletions

View File

@ -26,16 +26,28 @@ mirror:
- docker - docker
- notpriv - notpriv
audit: auditProductionDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security
script:
- npmci npm prepare
- 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
auditDevDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security stage: security
script: script:
- npmci npm prepare - npmci npm prepare
- npmci command npm install --ignore-scripts - npmci command npm install --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org - npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high - npmci command npm audit --audit-level=high --only=dev
tags: tags:
- docker - docker
allow_failure: true
# ==================== # ====================
# test stage # test stage

2601
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "@pushrocks/smartssr", "name": "@pushrocks/smartssr",
"version": "1.0.16", "version": "1.0.18",
"private": false, "private": false,
"description": "a smart server side renderer supporting shadow dom", "description": "a smart server side renderer supporting shadow dom",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",
@ -13,20 +13,20 @@
"format": "(gitzone format)" "format": "(gitzone format)"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.24", "@gitzone/tsbuild": "^2.1.25",
"@gitzone/tstest": "^1.0.43", "@gitzone/tstest": "^1.0.52",
"@pushrocks/smartserve": "^1.1.41", "@pushrocks/smartserve": "^1.1.41",
"@pushrocks/tapbundle": "^3.2.9", "@pushrocks/tapbundle": "^3.2.9",
"@types/node": "^14.0.27", "@types/node": "^14.14.20",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-config-prettier": "^1.15.0" "tslint-config-prettier": "^1.15.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/smartdelay": "^2.0.10", "@pushrocks/smartdelay": "^2.0.10",
"@pushrocks/smartfile": "^7.0.12", "@pushrocks/smartfile": "^8.0.8",
"@pushrocks/smartpromise": "^3.0.6", "@pushrocks/smartpromise": "^3.1.3",
"@pushrocks/smartpuppeteer": "^1.0.15", "@pushrocks/smartpuppeteer": "^1.0.19",
"@pushrocks/smarttime": "^3.0.24" "@pushrocks/smarttime": "^3.0.38"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",

View File

@ -11,7 +11,7 @@ export interface ISmartSSROptions {
* *
*/ */
export class SmartSSR { export class SmartSSR {
public browser: plugins.smartpuppeteer.puppeteer.Browser; public browser: plugins.smartpuppeteer.IncognitoBrowser;
public options: ISmartSSROptions; public options: ISmartSSROptions;
constructor(optionsArg?: ISmartSSROptions) { constructor(optionsArg?: ISmartSSROptions) {
@ -24,12 +24,13 @@ export class SmartSSR {
} }
public async start() { public async start() {
this.browser = await plugins.smartpuppeteer.getEnvAwareBrowserInstance(); this.browser = new plugins.smartpuppeteer.IncognitoBrowser();
await this.browser.start();
} }
public async stop() { public async stop() {
if (this.browser) { if (this.browser) {
await plugins.smartdelay.delayFor(3000); await plugins.smartdelay.delayFor(3000);
await this.browser.close(); await this.browser.stop();
this.browser = null; this.browser = null;
} else { } else {
console.log('browser was not in started mode'); console.log('browser was not in started mode');
@ -40,7 +41,7 @@ export class SmartSSR {
const overallTimeMeasurement = new plugins.smarttime.HrtMeasurement(); const overallTimeMeasurement = new plugins.smarttime.HrtMeasurement();
overallTimeMeasurement.start(); overallTimeMeasurement.start();
const resultDeferred = plugins.smartpromise.defer<string>(); const resultDeferred = plugins.smartpromise.defer<string>();
const context = await this.browser.createIncognitoBrowserContext(); const context = await this.browser.getNewIncognitoContext();
const page = await context.newPage(); const page = await context.newPage();
page.on('console', (msg) => { page.on('console', (msg) => {
console.log(`${urlArg}: ${msg.text()}`); console.log(`${urlArg}: ${msg.text()}`);
@ -65,7 +66,6 @@ export class SmartSSR {
const renderedPageString = pageContent; const renderedPageString = pageContent;
resultDeferred.resolve(renderedPageString); resultDeferred.resolve(renderedPageString);
const result = await resultDeferred.promise; const result = await resultDeferred.promise;
renderTimeMeasurement.stop(); renderTimeMeasurement.stop();

View File

@ -47,11 +47,12 @@ export function serializeFunction(rootNode) {
slotsForMove.push(slot); slotsForMove.push(slot);
}); });
for (const slot of slotsForMove) { for (const slot of slotsForMove) {
const slottedLightNodesForMove = []; const slottedLightNodesForMove = [];
slot.assignedNodes().forEach((lightNode) => slottedLightNodesForMove.push(lightNode)); slot.assignedNodes().forEach((lightNode) => slottedLightNodesForMove.push(lightNode));
slottedLightNodesForMove.forEach((lightNode) => slot.parentNode.insertBefore(lightNode, slot)); slottedLightNodesForMove.forEach((lightNode) =>
slot.parentNode.insertBefore(lightNode, slot)
);
} }
// lets modify the css // lets modify the css