From 7d1ae7621a141206330ec30bc9f560a48f6a8989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Viande?= Date: Wed, 22 Sep 2021 17:27:26 +0200 Subject: [PATCH 1/4] Meteor Update --- package.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.js b/package.js index 73ad6f5..027b4e9 100644 --- a/package.js +++ b/package.js @@ -8,12 +8,12 @@ Package.describe({ git: "https://github.com/meteorhacks/zones.git" }); -Package.on_use(function (api) { +Package.onUse(function (api) { addPackageFiles(api); api.export('Zones', 'server'); }); -Package.on_test(function (api) { +Package.onTest(function (api) { addPackageFiles(api); api.use([ @@ -21,15 +21,15 @@ Package.on_test(function (api) { 'test-helpers', ], 'client'); - api.add_files([ + api.addFiles([ 'tests/_both.js' ], ['client', 'server']); - api.add_files([ + api.addFiles([ 'tests/_server.js' ], 'server'); - api.add_files([ + api.addFiles([ 'tests/loader.js', 'tests/reporters.js', 'tests/hijacks/methods.js', @@ -46,7 +46,7 @@ function addPackageFiles(api) { api.use('inject-initial'); } - api.add_files([ + api.addFiles([ 'assets/utils.js', 'assets/before.js', 'assets/zone.js', @@ -55,9 +55,9 @@ function addPackageFiles(api) { 'assets/tracer.js', ], 'client', {isAsset: true}); - api.add_files(['server/inject.js'], 'server'); + api.addFiles(['server/inject.js'], 'server'); - api.add_files([ + api.addFiles([ 'client/hijack.js' ], 'client'); From 70a96b2f160fa0c90d1e4a1022d4e9e2fe1ab625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Viande?= Date: Wed, 22 Sep 2021 17:34:25 +0200 Subject: [PATCH 2/4] Zone: fix mutation observer --- assets/zone.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/assets/zone.js b/assets/zone.js index a39edce..900f9cc 100644 --- a/assets/zone.js +++ b/assets/zone.js @@ -512,6 +512,15 @@ function patchClass(className) { return this._o.observe.apply(this._o, arguments); }; + global[className].prototype.takeRecords = function () { + if (!this._active) { + this._creationZone.enqueueTask(); + this._active = true; + } + return this._o.takeRecords.apply(this._o, arguments); + }; + + var prop; for (prop in instance) { (function (prop) { From ac90e886c150cdc747ab665b2fa68c84f4d80875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Viande?= Date: Tue, 19 Oct 2021 12:02:53 +0200 Subject: [PATCH 3/4] AddAssets: instead of addFiles --- package.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.js b/package.js index 027b4e9..a742608 100644 --- a/package.js +++ b/package.js @@ -46,14 +46,14 @@ function addPackageFiles(api) { api.use('inject-initial'); } - api.addFiles([ + api.addAssets([ 'assets/utils.js', 'assets/before.js', 'assets/zone.js', 'assets/after.js', 'assets/reporters.js', 'assets/tracer.js', - ], 'client', {isAsset: true}); + ], 'client'); api.addFiles(['server/inject.js'], 'server'); From 3dc60dbc118d0ff201a9601bb60886a65096145b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Viande?= Date: Tue, 19 Oct 2021 12:40:56 +0200 Subject: [PATCH 4/4] Inject: setupCDN prefix --- server/inject.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/server/inject.js b/server/inject.js index dea8d91..1d1bcf9 100644 --- a/server/inject.js +++ b/server/inject.js @@ -24,9 +24,15 @@ var fileList = [ var cacheAvoider = (new Date).getTime(); var finalHtml = ''; + +var prefixURL = ""; +if (process.env.CDN_URL) { + prefixURL = process.env.CDN_URL; +} + fileList.forEach(function(file) { - var template = '\n'; - finalHtml += format(template, packageName, file, cacheAvoider); + var template = '\n'; + finalHtml += format(template, prefixURL, packageName, file, cacheAvoider); }); Zones = {