From 452858dcb485a22cdde9ab557823b55e798a4b3b Mon Sep 17 00:00:00 2001 From: Zack Date: Sat, 8 May 2021 14:04:52 -0400 Subject: [PATCH 01/14] Faster fragment parsing --- packages/blaze/dombackend.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/blaze/dombackend.js b/packages/blaze/dombackend.js index 361e37ae5..2c373fd3f 100644 --- a/packages/blaze/dombackend.js +++ b/packages/blaze/dombackend.js @@ -9,13 +9,33 @@ if (! $jq) DOMBackend._$jq = $jq; + +DOMBackend.getContext = function() { + return document; + if (DOMBackend._context) { + return DOMBackend._context; + } + if ( DOMBackend._$jq.support.createHTMLDocument ) { + DOMBackend._context = document.implementation.createHTMLDocument( "" ); + + // Set the base href for the created document + // so any parsed elements with URLs + // are based on the document's URL (gh-2965) + const base = DOMBackend._context.createElement( "base" ); + base.href = document.location.href; + DOMBackend._context.head.appendChild( base ); + } else { + DOMBackend._context = document; + } + return DOMBackend._context; +} DOMBackend.parseHTML = function (html) { // Return an array of nodes. // // jQuery does fancy stuff like creating an appropriate // container element and setting innerHTML on it, as well // as working around various IE quirks. - return $jq.parseHTML(html) || []; + return $jq.parseHTML(html, DOMBackend.getContext()) || []; }; DOMBackend.Events = { From ccf9f612fe563e67f783db7e7b942729a5bea834 Mon Sep 17 00:00:00 2001 From: Zack Date: Sat, 8 May 2021 14:12:10 -0400 Subject: [PATCH 02/14] Update dombackend.js --- packages/blaze/dombackend.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/blaze/dombackend.js b/packages/blaze/dombackend.js index 2c373fd3f..c38a21451 100644 --- a/packages/blaze/dombackend.js +++ b/packages/blaze/dombackend.js @@ -11,7 +11,6 @@ DOMBackend._$jq = $jq; DOMBackend.getContext = function() { - return document; if (DOMBackend._context) { return DOMBackend._context; } From 36e407564b1cad733250097075dd2a8d5c8d5f3d Mon Sep 17 00:00:00 2001 From: Zack Date: Wed, 12 May 2021 09:53:25 -0400 Subject: [PATCH 03/14] Update HISTORY.md --- HISTORY.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 3308f5245..10e30ad60 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,6 @@ +## v.2.4.1, 2021-May-12 +* [#334](https://github.com/meteor/blaze/pull/334) Faster fragnent parsing by retaining a reference to the current document context + ## v.2.4.0, 2021-April-12 * [#313](https://github.com/meteor/blaze/pull/313) Implemented HMR for Blaze From 1071c03e002e74496b8fc72d5e67f2ad20ab2445 Mon Sep 17 00:00:00 2001 From: Zack Date: Wed, 12 May 2021 09:53:44 -0400 Subject: [PATCH 04/14] Update package.js --- packages/blaze/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/blaze/package.js b/packages/blaze/package.js index fbbc01435..ad7c6884c 100644 --- a/packages/blaze/package.js +++ b/packages/blaze/package.js @@ -1,7 +1,7 @@ Package.describe({ name: 'blaze', summary: "Meteor Reactive Templating library", - version: '2.4.0', + version: '2.4.1', git: 'https://github.com/meteor/blaze.git' }); From 5d68d5430c1564c2c21181d43ec7df06dddd6d24 Mon Sep 17 00:00:00 2001 From: Dan Rosart Date: Fri, 13 Aug 2021 23:27:43 -0700 Subject: [PATCH 05/14] Eliminate whitespace in Template.dynamic By moving the whitespace from between the handlebars to inside them, six newlines are eliminated from each instantiation of Template.dynamic.. This is important for cases where you need to have no whitespace between the dynamic template content and the surrounding tags. --- packages/templating-runtime/dynamic.html | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/templating-runtime/dynamic.html b/packages/templating-runtime/dynamic.html index d449fd946..601b7a4ff 100644 --- a/packages/templating-runtime/dynamic.html +++ b/packages/templating-runtime/dynamic.html @@ -3,21 +3,21 @@ property is not specified, then the parent data context will be used instead. Uses the __dynamicWithDataContext template below to actually render the template. --> - + - + From 6ffd4a11c81ea010b393890ac8aedfcb55429a73 Mon Sep 17 00:00:00 2001 From: jankapunkt Date: Tue, 26 Apr 2022 14:26:58 +0200 Subject: [PATCH 06/14] remove fibers from codebase; replace with async/await --- .../spacebars-tests/template_tests_server.js | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/packages/spacebars-tests/template_tests_server.js b/packages/spacebars-tests/template_tests_server.js index d995f6dea..bf7351cd9 100644 --- a/packages/spacebars-tests/template_tests_server.js +++ b/packages/spacebars-tests/template_tests_server.js @@ -1,5 +1,4 @@ -var path = Npm.require("path"); -var Future = Npm.require('fibers/future'); +const path = Npm.require("path"); Meteor.methods({ getAsset: function (filename) { @@ -7,18 +6,29 @@ Meteor.methods({ } }); -var templateSubFutures = {}; +const templateSubFutures = {}; + Meteor.publish("templateSub", function (futureId) { - var self = this; - Meteor.defer(function () { // because subs are blocking + const self = this; + Meteor.defer(async function () { // because subs are blocking if (futureId) { - var f = new Future(); - templateSubFutures[futureId] = f; - f.wait(); - delete templateSubFutures[futureId]; + // XXX: this looks a little bit weird but we need to make + // the internal `resolve` of the promise accessible for the Meteor.method + // `makeTemplateSubReady` without introducing an async/wait cascade + // Thus we link it to a member of the promise and store it in the dict. + // This is the same effect as the prior Future.wait() approach. + let resolver + const promise = new Promise((resolve) => { + resolver = resolve + }) + promise.return = () => resolver() + + templateSubFutures[futureId] = promise + await templateSubFutures[futureId] + delete templateSubFutures[futureId] } - self.ready(); + self.ready() }); }); Meteor.methods({ From 91ec20576010f7623fea773bfb2693cc42c4fd4b Mon Sep 17 00:00:00 2001 From: jankapunkt Date: Tue, 26 Apr 2022 14:29:47 +0200 Subject: [PATCH 07/14] fix: js lint --- .../spacebars-tests/template_tests_server.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/spacebars-tests/template_tests_server.js b/packages/spacebars-tests/template_tests_server.js index bf7351cd9..efd4fabe6 100644 --- a/packages/spacebars-tests/template_tests_server.js +++ b/packages/spacebars-tests/template_tests_server.js @@ -17,18 +17,18 @@ Meteor.publish("templateSub", function (futureId) { // `makeTemplateSubReady` without introducing an async/wait cascade // Thus we link it to a member of the promise and store it in the dict. // This is the same effect as the prior Future.wait() approach. - let resolver + let resolver; const promise = new Promise((resolve) => { - resolver = resolve - }) - promise.return = () => resolver() + resolver = resolve; + }); + promise.return = () => resolver(); - templateSubFutures[futureId] = promise - await templateSubFutures[futureId] - delete templateSubFutures[futureId] + templateSubFutures[futureId] = promise; + await templateSubFutures[futureId]; + delete templateSubFutures[futureId]; } - self.ready() + self.ready(); }); }); Meteor.methods({ From f5dba61dcb538a001f1dfbfdf118fbb80b52afa3 Mon Sep 17 00:00:00 2001 From: harryadel Date: Mon, 20 Jun 2022 11:53:52 +0200 Subject: [PATCH 08/14] [spacebars-compiler] Update uglify-js to 3.16.1 --- .../.npm/package/npm-shrinkwrap.json | 91 +------------------ packages/spacebars-compiler/compiler.js | 1 - packages/spacebars-compiler/package.js | 2 +- 3 files changed, 4 insertions(+), 90 deletions(-) diff --git a/packages/spacebars-compiler/.npm/package/npm-shrinkwrap.json b/packages/spacebars-compiler/.npm/package/npm-shrinkwrap.json index f9df4ac62..c374e5c52 100644 --- a/packages/spacebars-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/spacebars-compiler/.npm/package/npm-shrinkwrap.json @@ -1,95 +1,10 @@ { "lockfileVersion": 1, "dependencies": { - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=" - }, - "async": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" - }, - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" - }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=" - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=" - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "is-buffer": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz", - "integrity": "sha1-z8hszV3FpS+oBIkRHGkgxFfi2Ys=" - }, - "kind-of": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz", - "integrity": "sha1-R11pil5J/15T0U4+cyQp3Iv0z0c=" - }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" - }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" - }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=" - }, - "source-map": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" - }, "uglify-js": { - "version": "2.7.5", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz", - "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=" - }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=" - }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=" - }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=" + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.1.tgz", + "integrity": "sha512-X5BGTIDH8U6IQ1TIRP62YC36k+ULAa1d59BxlWvPUJ1NkW5L3FwcGfEzuVvGmhJFBu0YJ5Ge25tmRISqCmLiRQ==" } } } diff --git a/packages/spacebars-compiler/compiler.js b/packages/spacebars-compiler/compiler.js index 40adcfa25..61d25d8d2 100644 --- a/packages/spacebars-compiler/compiler.js +++ b/packages/spacebars-compiler/compiler.js @@ -115,7 +115,6 @@ export function beautify (code) { } var result = UglifyJSMinify(code, { - fromString: true, mangle: false, compress: false, output: { diff --git a/packages/spacebars-compiler/package.js b/packages/spacebars-compiler/package.js index 1b88b0bb2..8b44b3d82 100644 --- a/packages/spacebars-compiler/package.js +++ b/packages/spacebars-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ }); Npm.depends({ - 'uglify-js': '2.7.5' + 'uglify-js': '3.16.1' }); Package.onUse(function (api) { From e74d532bba645e1fffe64c744fd448b20a8ccff1 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 28 Jul 2022 10:34:59 +0200 Subject: [PATCH 09/14] Add changelog for #373 --- HISTORY.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 5dea13951..82f48380e 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,8 @@ +## v3.0.0, 2023-XXXX-XX + +### Potentially breaking changes +* [#373](https://github.com/meteor/blaze/pull/373) Remove fibers from codebase + ## v2.6.1, 2022-July-25 * [#370](https://github.com/meteor/blaze/pull/370) `templating-runtime@1.6.1`, returned the `Template.__define__` with warning message From 40be1519cf2adaed11c063b3b9e1bb45e4a4bef0 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 28 Jul 2022 11:17:39 +0200 Subject: [PATCH 10/14] Changelog entries for #351 & #378 --- HISTORY.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 82f48380e..23d518b69 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,8 @@ ### Potentially breaking changes * [#373](https://github.com/meteor/blaze/pull/373) Remove fibers from codebase +* [#378](https://github.com/meteor/blaze/pull/378) [spacebars-compiler] Update uglify-js to 3.16.1 +* [#351](https://github.com/meteor/blaze/pull/351) Eliminate whitespace in Template.dynamic ## v2.6.1, 2022-July-25 From bc04677a0d393c7014bd4c0b99b3add47ed74867 Mon Sep 17 00:00:00 2001 From: jankapunkt Date: Thu, 25 Aug 2022 15:15:06 +0200 Subject: [PATCH 11/14] refactor: move package templating-compiler to ES6 --- packages/templating-compiler/compile-templates.js | 5 +++-- packages/templating-compiler/package.js | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/templating-compiler/compile-templates.js b/packages/templating-compiler/compile-templates.js index c5e992c03..bdeda1a86 100644 --- a/packages/templating-compiler/compile-templates.js +++ b/packages/templating-compiler/compile-templates.js @@ -1,9 +1,10 @@ +/* global CachingHtmlCompiler TemplatingTools */ Plugin.registerCompiler({ extensions: ['html'], archMatching: 'web', - isTemplate: true + isTemplate: true, }, () => new CachingHtmlCompiler( - "templating", + 'templating', TemplatingTools.scanHtmlForTags, TemplatingTools.compileTagsWithSpacebars )); diff --git a/packages/templating-compiler/package.js b/packages/templating-compiler/package.js index 0ddc5dcff..0c0664668 100644 --- a/packages/templating-compiler/package.js +++ b/packages/templating-compiler/package.js @@ -1,21 +1,22 @@ +/* eslint-env meteor */ Package.describe({ name: 'templating-compiler', - summary: "Compile templates in .html files", + summary: 'Compile templates in .html files', version: '1.4.1', git: 'https://github.com/meteor/blaze.git', - documentation: null + documentation: null, }); Package.registerBuildPlugin({ - name: "compileTemplatesBatch", + name: 'compileTemplatesBatch', use: [ 'ecmascript@0.15.1', 'caching-html-compiler@1.2.0', - 'templating-tools@1.2.0' + 'templating-tools@1.2.0', ], sources: [ - 'compile-templates.js' - ] + 'compile-templates.js', + ], }); Package.onUse(function (api) { From 873afc704f30bdecac71ab1815b2ec3ed5c55211 Mon Sep 17 00:00:00 2001 From: jankapunkt Date: Thu, 25 Aug 2022 15:30:37 +0200 Subject: [PATCH 12/14] refactor: move CachingHtmlCompiler to ES6 --- .../caching-html-compiler.js | 62 ++++++++++--------- packages/caching-html-compiler/package.js | 17 +++-- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/packages/caching-html-compiler/caching-html-compiler.js b/packages/caching-html-compiler/caching-html-compiler.js index c6b714e4a..7661ff1c9 100644 --- a/packages/caching-html-compiler/caching-html-compiler.js +++ b/packages/caching-html-compiler/caching-html-compiler.js @@ -1,9 +1,12 @@ +/* global TemplatingTools CachingCompiler */ +// eslint-disable-next-line import/no-unresolved import isEmpty from 'lodash.isempty'; -const path = Plugin.path; +const { path } = Plugin; // The CompileResult type for this CachingCompiler is the return value of // htmlScanner.scan: a {js, head, body, bodyAttrs} object. +// eslint-disable-next-line no-undef CachingHtmlCompiler = class CachingHtmlCompiler extends CachingCompiler { /** * Constructor for CachingHtmlCompiler @@ -18,7 +21,7 @@ CachingHtmlCompiler = class CachingHtmlCompiler extends CachingCompiler { constructor(name, tagScannerFunc, tagHandlerFunc) { super({ compilerName: name, - defaultCacheSize: 1024*1024*10, + defaultCacheSize: 1024 * 1024 * 10, }); this._bodyAttrInfo = null; @@ -28,12 +31,13 @@ CachingHtmlCompiler = class CachingHtmlCompiler extends CachingCompiler { } // Implements method from CachingCompilerBase + // eslint-disable-next-line class-methods-use-this compileResultSize(compileResult) { - function lengthOrZero(field) { - return field ? field.length : 0; - } - return lengthOrZero(compileResult.head) + lengthOrZero(compileResult.body) + - lengthOrZero(compileResult.js); + const lengthOrZero = (field) => field ? field.length : 0; + const headSize = lengthOrZero(compileResult.head); + const bodySize = lengthOrZero(compileResult.body); + const jsSize = lengthOrZero(compileResult.js); + return headSize + bodySize + jsSize; } // Overrides method from CachingCompiler @@ -43,13 +47,14 @@ CachingHtmlCompiler = class CachingHtmlCompiler extends CachingCompiler { } // Implements method from CachingCompilerBase + // eslint-disable-next-line class-methods-use-this getCacheKey(inputFile) { // Note: the path is only used for errors, so it doesn't have to be part // of the cache key. return [ inputFile.getArch(), inputFile.getSourceHash(), - inputFile.hmrAvailable && inputFile.hmrAvailable() + inputFile.hmrAvailable && inputFile.hmrAvailable(), ]; } @@ -60,8 +65,8 @@ CachingHtmlCompiler = class CachingHtmlCompiler extends CachingCompiler { try { const tags = this.tagScannerFunc({ sourceName: inputPath, - contents: contents, - tagNames: ["body", "head", "template"] + contents, + tagNames: ['body', 'head', 'template'], }); return this.tagHandlerFunc(tags, inputFile.hmrAvailable && inputFile.hmrAvailable()); @@ -69,25 +74,24 @@ CachingHtmlCompiler = class CachingHtmlCompiler extends CachingCompiler { if (e instanceof TemplatingTools.CompileError) { inputFile.error({ message: e.message, - line: e.line + line: e.line, }); return null; - } else { - throw e; } + throw e; } } // Implements method from CachingCompilerBase addCompileResult(inputFile, compileResult) { - let allJavaScript = ""; + let allJavaScript = ''; if (compileResult.head) { - inputFile.addHtml({ section: "head", data: compileResult.head }); + inputFile.addHtml({ section: 'head', data: compileResult.head }); } if (compileResult.body) { - inputFile.addHtml({ section: "body", data: compileResult.body }); + inputFile.addHtml({ section: 'body', data: compileResult.body }); } if (compileResult.js) { @@ -97,19 +101,19 @@ CachingHtmlCompiler = class CachingHtmlCompiler extends CachingCompiler { if (!isEmpty(compileResult.bodyAttrs)) { Object.keys(compileResult.bodyAttrs).forEach((attr) => { const value = compileResult.bodyAttrs[attr]; - if (this._bodyAttrInfo.hasOwnProperty(attr) && + if (Object.prototype.hasOwnProperty.call(this._bodyAttrInfo, attr) && this._bodyAttrInfo[attr].value !== value) { // two conflicting attributes on tags in two different template // files inputFile.error({ message: - ` declarations have conflicting values for the '${ attr }' ` + - `attribute in the following files: ` + - this._bodyAttrInfo[attr].inputFile.getPathInPackage() + - `, ${ inputFile.getPathInPackage() }` + `${` declarations have conflicting values for the '${attr}' ` + + 'attribute in the following files: '}${ + this._bodyAttrInfo[attr].inputFile.getPathInPackage() + }, ${inputFile.getPathInPackage()}`, }); } else { - this._bodyAttrInfo[attr] = {inputFile, value}; + this._bodyAttrInfo[attr] = { inputFile, value }; } }); @@ -123,25 +127,23 @@ CachingHtmlCompiler = class CachingHtmlCompiler extends CachingCompiler { }); `; } - + if (allJavaScript) { const filePath = inputFile.getPathInPackage(); // XXX this path manipulation may be unnecessarily complex let pathPart = path.dirname(filePath); - if (pathPart === '.') - pathPart = ''; - if (pathPart.length && pathPart !== path.sep) - pathPart = pathPart + path.sep; + if (pathPart === '.') pathPart = ''; + if (pathPart.length && pathPart !== path.sep) pathPart += path.sep; const ext = path.extname(filePath); const basename = path.basename(filePath, ext); // XXX generate a source map inputFile.addJavaScript({ - path: path.join(pathPart, "template." + basename + ".js"), - data: allJavaScript + path: path.join(pathPart, `template.${basename}.js`), + data: allJavaScript, }); } } -} +}; diff --git a/packages/caching-html-compiler/package.js b/packages/caching-html-compiler/package.js index a1eb91e66..03eb2f1a4 100644 --- a/packages/caching-html-compiler/package.js +++ b/packages/caching-html-compiler/package.js @@ -1,27 +1,24 @@ +/* eslint-env meteor */ Package.describe({ name: 'caching-html-compiler', - summary: "Pluggable class for compiling HTML into templates", + summary: 'Pluggable class for compiling HTML into templates', version: '1.2.1', - git: 'https://github.com/meteor/blaze.git' + git: 'https://github.com/meteor/blaze.git', }); Npm.depends({ - 'lodash.isempty': '4.4.0' + 'lodash.isempty': '4.4.0', }); Package.onUse(function(api) { api.use([ 'caching-compiler@1.2.2', - 'ecmascript@0.15.1' + 'ecmascript@0.15.1', ]); api.export('CachingHtmlCompiler', 'server'); - api.use([ - 'templating-tools@1.2.1' - ]); + api.use(['templating-tools@1.2.1']); - api.addFiles([ - 'caching-html-compiler.js' - ], 'server'); + api.addFiles(['caching-html-compiler.js'], 'server'); }); From b8f69856625f737095953b95c941682351e65305 Mon Sep 17 00:00:00 2001 From: jankapunkt Date: Fri, 26 Aug 2022 08:48:27 +0200 Subject: [PATCH 13/14] fix: deprecate UI package --- packages/ui/package.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/ui/package.js b/packages/ui/package.js index f7c7a0f11..da0f91008 100644 --- a/packages/ui/package.js +++ b/packages/ui/package.js @@ -2,7 +2,8 @@ Package.describe({ name: 'ui', summary: "Deprecated: Use the 'blaze' package", version: '1.0.13', - git: 'https://github.com/meteor/blaze.git' + git: 'https://github.com/meteor/blaze.git', + deprecated: true, }); Package.onUse(function (api) { From c5d17532119cfa1a13145fdd47a4a8a7b796af7d Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Mon, 26 Sep 2022 09:00:09 +0200 Subject: [PATCH 14/14] Bump ui package version for deprecation --- packages/ui/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui/package.js b/packages/ui/package.js index da0f91008..79f982f49 100644 --- a/packages/ui/package.js +++ b/packages/ui/package.js @@ -1,7 +1,7 @@ Package.describe({ name: 'ui', summary: "Deprecated: Use the 'blaze' package", - version: '1.0.13', + version: '1.0.14', git: 'https://github.com/meteor/blaze.git', deprecated: true, });