Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Suppress Console Messages in AMP output #609

Merged
merged 8 commits into from
Aug 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions config/rollup.main-thread.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const ESModules = [
removeWorkerWhitespace(),
removeDebugCommandExecutors(),
replace({
DEBUG_ENABLED: false,
WORKER_DOM_DEBUG: false,
}),
babelPlugin({
transpileToES5: false,
Expand Down Expand Up @@ -60,7 +60,7 @@ const ESModules = [
],
}),
replace({
DEBUG_ENABLED: true,
WORKER_DOM_DEBUG: true,
}),
babelPlugin({
transpileToES5: false,
Expand All @@ -74,6 +74,7 @@ const ESModules = [
file: 'dist/amp/main.mjs',
format: 'es',
sourcemap: true,
banner: 'var WORKER_DOM_DEBUG = /log|development/i.test(location.hash);',
},
plugins: [
removeWorkerWhitespace(),
Expand All @@ -85,9 +86,6 @@ const ESModules = [
},
],
}),
replace({
DEBUG_ENABLED: true,
}),
babelPlugin({
transpileToES5: false,
allowConsole: true,
Expand All @@ -109,7 +107,7 @@ const IIFEModules = [
removeWorkerWhitespace(),
removeDebugCommandExecutors(),
replace({
DEBUG_ENABLED: false,
WORKER_DOM_DEBUG: false,
}),
babelPlugin({
transpileToES5: true,
Expand All @@ -130,7 +128,7 @@ const IIFEModules = [
plugins: [
removeWorkerWhitespace(),
replace({
DEBUG_ENABLED: true,
WORKER_DOM_DEBUG: true,
}),
babelPlugin({
transpileToES5: true,
Expand Down
18 changes: 7 additions & 11 deletions config/rollup.worker-thread.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const ESModules = [
],
}),
replace({
DEBUG_ENABLED: false,
WORKER_DOM_DEBUG: false,
}),
babelPlugin({
transpileToES5: false,
Expand All @@ -77,7 +77,7 @@ const ESModules = [
],
}),
replace({
DEBUG_ENABLED: false,
WORKER_DOM_DEBUG: false,
}),
babelPlugin({
transpileToES5: false,
Expand All @@ -92,6 +92,7 @@ const ESModules = [
format: 'iife',
name: 'WorkerThread',
sourcemap: true,
banner: 'var WORKER_DOM_DEBUG = /log|development/i.test(location.hash);',
},
plugins: [
copy({
Expand All @@ -102,9 +103,6 @@ const ESModules = [
},
],
}),
replace({
DEBUG_ENABLED: true,
}),
babelPlugin({
transpileToES5: false,
allowConsole: true,
Expand All @@ -118,6 +116,7 @@ const ESModules = [
format: 'iife',
name: 'WorkerThread',
sourcemap: true,
banner: 'var WORKER_DOM_DEBUG = /log|development/i.test(location.hash);',
},
plugins: [
copy({
Expand All @@ -128,12 +127,9 @@ const ESModules = [
},
],
}),
replace({
DEBUG_ENABLED: false,
}),
babelPlugin({
transpileToES5: true,
allowConsole: false,
allowConsole: true,
}),
...compilePlugins,
],
Expand All @@ -151,7 +147,7 @@ const IIFEModules = [
},
plugins: [
replace({
DEBUG_ENABLED: false,
WORKER_DOM_DEBUG: false,
}),
babelPlugin({
transpileToES5: true,
Expand All @@ -170,7 +166,7 @@ const IIFEModules = [
},
plugins: [
replace({
DEBUG_ENABLED: true,
WORKER_DOM_DEBUG: true,
}),
babelPlugin({
transpileToES5: true,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ampproject/worker-dom",
"version": "0.15.0",
"version": "0.16.0",
"description": "A facsimile of a modern DOM implementation intended to run in a Web Worker.",
"main": "dist/main",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion src/main-thread/main-thread.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ interface Node {

type RenderableElement = (HTMLElement | SVGElement | Text | Comment) & { [index: string]: any };

declare const DEBUG_ENABLED: boolean;
declare const WORKER_DOM_DEBUG: boolean;
6 changes: 3 additions & 3 deletions src/main-thread/mutator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export class MutatorProcessor {
* Investigations in using asyncFlush to resolve are worth considering.
*/
private syncFlush = (): void => {
if (DEBUG_ENABLED) {
if (WORKER_DOM_DEBUG) {
console.group('Mutations');
}
this.mutationQueue.forEach(mutationArray => {
Expand All @@ -123,13 +123,13 @@ export class MutatorProcessor {
while (operationStart < length) {
const mutationType = mutationArray[operationStart];
const executor = this.executors[mutationType];
if (DEBUG_ENABLED) {
if (WORKER_DOM_DEBUG) {
console.log(ReadableMutationType[mutationType], executor.print(mutationArray, operationStart));
}
operationStart = executor.execute(mutationArray, operationStart);
}
});
if (DEBUG_ENABLED) {
if (WORKER_DOM_DEBUG) {
console.groupEnd();
}
this.mutationQueue = [];
Expand Down
4 changes: 2 additions & 2 deletions src/main-thread/worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export class WorkerContext {
${authorScript}
//# sourceURL=${encodeURI(config.authorURL)}`;
this[TransferrableKeys.worker] = new Worker(URL.createObjectURL(new Blob([code])));
if (DEBUG_ENABLED) {
if (WORKER_DOM_DEBUG) {
console.info('debug', 'hydratedNode', readableHydrateableRootNode(baseElement, config));
}
if (config.onCreateWorker) {
Expand All @@ -89,7 +89,7 @@ export class WorkerContext {
* @param message
*/
messageToWorker(message: MessageToWorker, transferables?: Transferable[]) {
if (DEBUG_ENABLED) {
if (WORKER_DOM_DEBUG) {
console.info('debug', 'messageToWorker', readableMessageToWorker(this.nodeContext, message));
}
if (this.config.onSendMessage) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/main-thread/helpers/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export class Env {
value: requestAnimationFrame,
});

Object.defineProperty(global, 'DEBUG_ENABLED', {
Object.defineProperty(global, 'WORKER_DOM_DEBUG', {
configurable: true,
value: false,
});
Expand Down