Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit 89acafb

Browse files
authored
chore(zpages): simplify build commands (#68)
* chore(zpages): simplify build commands * chore(zpages): update package-lock.json * chore: add templates to files
1 parent 58d23f5 commit 89acafb

9 files changed

Lines changed: 882 additions & 800 deletions

File tree

packages/opencensus-exporter-zpages/package-lock.json

Lines changed: 859 additions & 784 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/opencensus-exporter-zpages/package.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@opencensus/exporter-zpages",
33
"version": "0.0.2",
4-
"description": "Package Zpages implements a collection of HTML pages that display stats and trace data",
4+
"description": "A collection of HTML pages to display stats and trace data and allow library configuration control",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
77
"repository": "census-instrumentation/opencensus-node",
@@ -11,10 +11,9 @@
1111
"check": "gts check",
1212
"compile": "tsc -p .",
1313
"fix": "gts fix",
14-
"prepare": "npm run compile; npm run cp_templates",
15-
"pretest": "npm run compile; npm run cp_templates",
16-
"posttest": "npm run check",
17-
"cp_templates": "cp -r ./src/zpages-frontend/templates ./build/src/zpages-frontend/"
14+
"prepare": "npm run compile",
15+
"pretest": "npm run compile",
16+
"posttest": "npm run check"
1817
},
1918
"keywords": [
2019
"opencensus",
@@ -31,6 +30,7 @@
3130
"build/src/**/*.js",
3231
"build/src/**/*.d.ts",
3332
"doc",
33+
"templates",
3434
"CHANGELOG.md",
3535
"LICENSE",
3636
"README.md"
@@ -39,10 +39,13 @@
3939
"access": "public"
4040
},
4141
"devDependencies": {
42+
"@opencensus/nodejs": "^0.0.2",
43+
"@types/ejs": "^2.6.0",
4244
"@types/express": "^4.11.1",
4345
"@types/extend": "^3.0.0",
4446
"@types/mocha": "^2.2.48",
4547
"@types/node": "^9.4.7",
48+
"@types/pkg-dir": "^2.0.0",
4649
"axios": "^0.18.0",
4750
"gts": "^0.5.4",
4851
"mocha": "^5.0.4",
@@ -52,9 +55,9 @@
5255
"typescript": "~2.6.1"
5356
},
5457
"dependencies": {
55-
"@opencensus/nodejs": "^0.0.2",
5658
"@opencensus/core": "^0.0.2",
5759
"ejs": "^2.5.8",
58-
"express": "^4.16.3"
60+
"express": "^4.16.3",
61+
"pkg-dir": "^3.0.0"
5962
}
6063
}

packages/opencensus-exporter-zpages/src/zpages-frontend/page-handlers/traceconfigz.page-handler.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@
1616

1717
import {SamplerBuilder} from '@opencensus/core';
1818
import * as tracing from '@opencensus/nodejs';
19+
import * as ejs from 'ejs';
20+
import * as pkgDir from 'pkg-dir';
1921

2022
import {ZpagesExporter} from '../../zpages';
2123

22-
const ejs = require('ejs');
24+
// The directory to search for templates.
25+
const templatesDir = `${pkgDir.sync(__dirname)}/templates`;
2326

2427
export interface TraceConfigzParams {
2528
change: string;
@@ -54,7 +57,7 @@ export class TraceConfigzPageHandler {
5457

5558
/** template HTML */
5659
const traceConfigzFile =
57-
ejs.fileLoader(__dirname + '/../templates/traceconfigz.ejs', 'utf8');
60+
ejs.fileLoader(`${templatesDir}/traceconfigz.ejs`).toString();
5861
/** EJS render options */
5962
const options = {delimiter: '?'};
6063
/** Current sampling rate */

packages/opencensus-exporter-zpages/src/zpages-frontend/page-handlers/tracez.page-handler.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515
*/
1616

1717
import {RootSpan, Span} from '@opencensus/core';
18+
import * as ejs from 'ejs';
19+
import * as pkgDir from 'pkg-dir';
1820

1921
import {LatencyBucketBoundaries} from '../latency-bucket-boundaries';
2022

21-
const ejs = require('ejs');
23+
// The directory to search for templates.
24+
const templatesDir = `${pkgDir.sync(__dirname)}/templates`;
2225

2326
export type TracezParams = {
2427
tracename: string; type: string;
@@ -165,14 +168,12 @@ export class TracezPageHandler {
165168
* @returns Output HTML
166169
*/
167170
emitHtml(params: Partial<TracezParams>, json: boolean): string {
168-
const tracezFile =
169-
ejs.fileLoader(__dirname + '/../templates/tracez.ejs', 'utf8');
171+
const tracezFile = ejs.fileLoader(`${templatesDir}/tracez.ejs`).toString();
170172
const summaryFile =
171-
ejs.fileLoader(__dirname + '/../templates/summary.ejs', 'utf8');
173+
ejs.fileLoader(`${templatesDir}/summary.ejs`).toString();
172174
const spanCellFile =
173-
ejs.fileLoader(__dirname + '/../templates/span-cell.ejs', 'utf8');
174-
const spansFile =
175-
ejs.fileLoader(__dirname + '/../templates/spans.ejs', 'utf8');
175+
ejs.fileLoader(`${templatesDir}/span-cell.ejs`).toString();
176+
const spansFile = ejs.fileLoader(`${templatesDir}/spans.ejs`).toString();
176177
/** EJS render options */
177178
const options = {delimiter: '?'};
178179
/** Latency array */

packages/opencensus-exporter-zpages/src/zpages-frontend/templates/span-cell.ejs renamed to packages/opencensus-exporter-zpages/templates/span-cell.ejs

File renamed without changes.

packages/opencensus-exporter-zpages/src/zpages-frontend/templates/spans.ejs renamed to packages/opencensus-exporter-zpages/templates/spans.ejs

File renamed without changes.

packages/opencensus-exporter-zpages/src/zpages-frontend/templates/summary.ejs renamed to packages/opencensus-exporter-zpages/templates/summary.ejs

File renamed without changes.

packages/opencensus-exporter-zpages/src/zpages-frontend/templates/traceconfigz.ejs renamed to packages/opencensus-exporter-zpages/templates/traceconfigz.ejs

File renamed without changes.

packages/opencensus-exporter-zpages/src/zpages-frontend/templates/tracez.ejs renamed to packages/opencensus-exporter-zpages/templates/tracez.ejs

File renamed without changes.

0 commit comments

Comments
 (0)