Merge branch 'release-2.6'

meteor · Jun 15, 2021 · c869828 · c869828
2 parents 39c8ae5 + 3471870
commit c869828
Show file tree

Hide file tree

Showing 18 changed files with 64 additions and 92 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,7 @@
+## v2.6.0, 2021-June-XX
+
+* [#330](https://github.com/meteor/blaze/pull/330) Removed deprecated APIs
+
 ## v2.5.0, 2021-June-5
 
 * [#331](https://github.com/meteor/blaze/pull/331) Remove underscore and all of its methods in the code

diff --git a/packages/blaze-hot/package.js b/packages/blaze-hot/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'blaze-hot',
   summary: "Update files using Blaze's API with HMR",
-  version: '1.1.0',
+  version: '1.1.1',
   git: 'https://github.com/meteor/blaze.git',
   documentation: null,
   debugOnly: true
@@ -10,8 +10,8 @@ Package.describe({
 Package.onUse(function (api) {
   api.use('modules@0.16.0');
   api.use('ecmascript@0.15.1');
-  api.use('blaze@2.5.0');
-  api.use('templating-runtime@1.4.0');
+  api.use('blaze@2.6.0');
+  api.use('templating-runtime@1.6.0');
   api.use('hot-module-replacement@0.2.0', { weak: true });
 
   api.addFiles('hot.js', 'client');

diff --git a/packages/blaze-html-templates/package.js b/packages/blaze-html-templates/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'blaze-html-templates',
   summary: "Compile HTML templates into reactive UI with Meteor Blaze",
-  version: '1.2.1',
+  version: '2.0.0',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -10,12 +10,6 @@ Package.onUse(function(api) {
     // A library for reactive user interfaces
     'blaze@2.5.0',
 
-    // The following packages are basically empty shells that just exist to
-    // satisfy code checking for the existence of a package. Rest assured that
-    // they are not adding any bloat to your bundle.
-    'ui@1.0.13', // XXX COMPAT WITH PACKAGES BUILT FOR 0.9.0.
-    'spacebars@1.2.0', // XXX COMPAT WITH PACKAGES BUILT FOR 0.9.0
-
     // Compile .html files into Blaze reactive views
     'templating@1.4.1'
   ]);

diff --git a/packages/blaze-tools/package.js b/packages/blaze-tools/package.js
@@ -1,13 +1,13 @@
 Package.describe({
   name: 'blaze-tools',
   summary: "Compile-time tools for Blaze",
-  version: '1.1.2',
+  version: '1.1.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
 Package.onUse(function (api) {
   api.use('ecmascript@0.15.1');
-  api.use('htmljs@1.1.0');
+  api.use('htmljs@1.1.1');
 
   api.export('BlazeTools');
   api.mainModule('preamble.js');
@@ -18,7 +18,7 @@ Package.onTest(function (api) {
   api.use('ecmascript');
 
   api.use('blaze-tools');
-  api.use('html-tools@1.1.1');
+  api.use('html-tools@1.1.3');
 
   api.addFiles([
     'token_tests.js'

diff --git a/packages/blaze/builtins.js b/packages/blaze/builtins.js
@@ -353,5 +353,3 @@ Blaze._InOuterTemplateScope = function (templateView, contentFunc) {
   return view;
 };
 
-// XXX COMPAT WITH 0.9.0
-Blaze.InOuterTemplateScope = Blaze._InOuterTemplateScope;
diff --git 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.5.0',
+  version: '2.6.0',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -27,8 +27,8 @@ Package.onUse(function (api) {
     'Handlebars'
   ]);
 
-  api.use('htmljs@1.1.0');
-  api.imply('htmljs@1.1.0');
+  api.use('htmljs@1.1.1');
+  api.imply('htmljs@1.1.1');
 
   api.addFiles([
     'preamble.js'
@@ -63,8 +63,8 @@ Package.onTest(function (api) {
   api.use('tracker@1.1.0');
 
   api.use('blaze');
-  api.use('blaze-tools@1.1.2'); // for BlazeTools.toJS
-  api.use('html-tools@1.1.0');
+  api.use('blaze-tools@1.1.3'); // for BlazeTools.toJS
+  api.use('html-tools@1.1.3');
   api.use('templating');
 
   api.addFiles('view_tests.js');

diff --git a/packages/html-tools/package.js b/packages/html-tools/package.js
@@ -1,14 +1,14 @@
 Package.describe({
   name: 'html-tools',
   summary: "Standards-compliant HTML tools",
-  version: '1.1.2',
+  version: '1.1.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
 Package.onUse(function (api) {
   api.use('ecmascript@0.15.1');
-  api.use('htmljs@1.1.0');
-  api.imply('htmljs@1.1.0');
+  api.use('htmljs@1.1.1');
+  api.imply('htmljs@1.1.1');
 
   api.export('HTMLTools');
   api.mainModule('main.js');
@@ -19,7 +19,7 @@ Package.onTest(function (api) {
   api.use('tinytest@1.1.0');
 
   api.use('html-tools');
-  api.use('htmljs@1.1.0');
+  api.use('htmljs@1.1.1');
   api.use('blaze-tools'); // for `toJS`
 
   api.addFiles([

diff --git a/packages/spacebars-compiler/package.js b/packages/spacebars-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'spacebars-compiler',
   summary: "Compiler for Spacebars template language",
-  version: '1.3.0',
+  version: '1.3.1',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -12,9 +12,9 @@ Npm.depends({
 Package.onUse(function (api) {
   api.use('ecmascript@0.15.1');
 
-  api.use('htmljs@1.1.0');
-  api.use('html-tools@1.1.2');
-  api.use('blaze-tools@1.1.2');
+  api.use('htmljs@1.1.1');
+  api.use('html-tools@1.1.3');
+  api.use('blaze-tools@1.1.3');
 
   api.export('SpacebarsCompiler');
 

diff --git a/packages/spacebars/package.js b/packages/spacebars/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'spacebars',
   summary: "Handlebars-like template language for Meteor",
-  version: '1.2.0',
+  version: '1.2.1',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -19,7 +19,7 @@ Package.onUse(function (api) {
 
   api.export('Spacebars');
 
-  api.use('htmljs@1.1.0');
+  api.use('htmljs@1.1.1');
   api.use('blaze@2.5.0');
 
   api.addFiles([

diff --git a/packages/spacebars/spacebars-runtime.js b/packages/spacebars/spacebars-runtime.js
@@ -278,6 +278,3 @@ Spacebars.With = function (argFunc, contentFunc, elseFunc) {
 
   return view;
 };
-
-// XXX COMPAT WITH 0.9.0
-Spacebars.TemplateWith = Blaze._TemplateWith;
diff --git a/packages/templating-runtime/package.js b/packages/templating-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'templating-runtime',
   summary: "Runtime for compiled .html files",
-  version: '1.5.0',
+  version: '1.6.0',
   git: 'https://github.com/meteor/blaze.git',
   documentation: null
 });
@@ -23,14 +23,14 @@ Package.onUse(function (api) {
   // Blaze, so anybody using templating (eg apps) need to implicitly use
   // 'meteor' and 'blaze'.
   api.use([
-    'blaze@2.5.0',
-    'spacebars@1.2.0',
+    'blaze@2.6.0',
+    'spacebars@1.2.1',
     'ecmascript@0.15.1'
   ]);
   api.imply([
     'meteor@1.2.17', // TODO update
-    'blaze@2.5.0',
-    'spacebars@1.2.0'
+    'blaze@2.6.0',
+    'spacebars@1.2.1'
   ], 'client');
 
   // to be able to compile dynamic.html. this compiler is used

diff --git a/packages/templating-runtime/templating.js b/packages/templating-runtime/templating.js
@@ -26,18 +26,6 @@ Template.__checkName = function (name) {
   }
 };
 
-// XXX COMPAT WITH 0.8.3
-Template.__define__ = function (name, renderFunc) {
-  Template.__checkName(name);
-  Template[name] = new Template("Template." + name, renderFunc);
-  // Exempt packages built pre-0.9.0 from warnings about using old
-  // helper syntax, because we can.  It's not very useful to get a
-  // warning about someone else's code (like a package on Atmosphere),
-  // and this should at least put a bit of a dent in number of warnings
-  // that come from packages that haven't been updated lately.
-  Template[name]._NOWARN_OLDSTYLE_HELPERS = true;
-};
-
 // Define a template `Template.body` that renders its
 // `contentRenderFuncs`.  `<body>` tags (of which there may be
 // multiple) will have their contents added to it.
@@ -175,12 +163,3 @@ Template._migrateTemplate = function (templateName, newTemplate, migrate) {
   Template.__checkName(templateName);
   Template[templateName] = newTemplate;
 };
-
-// XXX COMPAT WITH 0.9.0
-UI.body = Template.body;
-
-// XXX COMPAT WITH 0.9.0
-// (<body> tags in packages built with 0.9.0)
-Template.__body__ = Template.body;
-Template.__body__.__contentParts = Template.body.contentViews;
-Template.__body__.__instantiate = Template.body.renderToDocument;
diff --git a/packages/templating-tools/package.js b/packages/templating-tools/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'templating-tools',
   summary: "Tools to scan HTML and compile tags when building a templating package",
-  version: '1.2.1',
+  version: '1.2.2',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -17,7 +17,7 @@ Package.onUse(function(api) {
   api.export('TemplatingTools');
 
   api.use([
-    'spacebars-compiler@1.3.0'
+    'spacebars-compiler@1.3.1'
   ]);
 
   api.mainModule('templating-tools.js');

diff --git a/packages/templating/package.js b/packages/templating/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'templating',
   summary: "Allows templates to be defined in .html files",
-  version: '1.4.1',
+  version: '1.4.2',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -13,7 +13,7 @@ Package.describe({
 Package.onUse(function (api) {
   api.export('Template', 'client');
 
-  api.use('templating-runtime@1.5.0');
+  api.use('templating-runtime@1.6.0');
   api.imply('templating-runtime');
 
   api.imply('templating-compiler@1.4.1');

diff --git a/test-app/.meteor/packages b/test-app/.meteor/packages
@@ -6,14 +6,14 @@
 
 meteor-base@1.4.0             # Packages every Meteor app needs to have
 mobile-experience@1.1.0       # Packages for a great mobile UX
-mongo@1.10.1                   # The database Meteor supports right now
+mongo@1.11.0                   # The database Meteor supports right now
 static-html             # Define static page content in .html files
 reactive-var@1.0.11            # Reactive variable for tracker
 tracker@1.2.0                 # Meteor's client-side reactive programming library
 
 standard-minifier-css@1.7.2   # CSS minifier run for production mode
 standard-minifier-js@2.6.0    # JS minifier run for production mode
 es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers
-ecmascript@0.15.0              # Enable ECMAScript2015+ syntax in app code
-typescript@4.1.2              # Enable TypeScript syntax in .ts and .tsx modules
+ecmascript@0.15.1              # Enable ECMAScript2015+ syntax in app code
+typescript@4.2.2              # Enable TypeScript syntax in .ts and .tsx modules
 shell-server@0.5.0            # Server-side component of the `meteor shell` command
diff --git a/test-app/.meteor/release b/test-app/.meteor/release
@@ -1 +1 @@
-METEOR@2.1
+METEOR@2.2
diff --git a/test-app/.meteor/versions b/test-app/.meteor/versions
@@ -1,22 +1,22 @@
 allow-deny@1.1.0
 autoupdate@1.7.0
-babel-compiler@7.6.0
+babel-compiler@7.6.1
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
-blaze-tools@1.1.1
+blaze-tools@1.1.2
 boilerplate-generator@1.7.1
 caching-compiler@1.2.2
-caching-html-compiler@1.2.0
+caching-html-compiler@1.2.1
 callback-hook@1.3.0
 check@1.3.1
 ddp@1.4.0
-ddp-client@2.4.0
+ddp-client@2.4.1
 ddp-common@1.4.0
-ddp-server@2.3.2
+ddp-server@2.3.3
 diff-sequence@1.1.1
 dynamic-import@0.6.0
-ecmascript@0.15.0
+ecmascript@0.15.1
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.11.0
 ecmascript-runtime-server@0.10.0
@@ -25,45 +25,45 @@ es5-shim@4.8.0
 fetch@0.1.1
 geojson-utils@1.0.10
 hot-code-push@1.0.4
-html-tools@1.1.1
-htmljs@1.1.0
-id-map@1.1.0
+html-tools@1.1.2
+htmljs@1.1.1
+id-map@1.1.1
 inter-process-messaging@0.1.1
-launch-screen@1.2.0
+launch-screen@1.2.1
 livedata@1.0.18
 logging@1.2.0
 meteor@1.9.3
 meteor-base@1.4.0
-minifier-css@1.5.3
+minifier-css@1.5.4
 minifier-js@2.6.0
-minimongo@1.6.1
+minimongo@1.6.2
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
 modern-browsers@0.1.5
 modules@0.16.0
 modules-runtime@0.12.0
-mongo@1.10.1
+mongo@1.11.1
 mongo-decimal@0.1.2
 mongo-dev-server@1.1.0
-mongo-id@1.0.7
-npm-mongo@3.8.1
+mongo-id@1.0.8
+npm-mongo@3.9.0
 ordered-dict@1.1.0
 promise@0.11.2
 random@1.2.0
-react-fast-refresh@0.1.0
+react-fast-refresh@0.1.1
 reactive-var@1.0.11
 reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.0
 shell-server@0.5.0
-socket-stream-client@0.3.1
-spacebars-compiler@1.2.1
+socket-stream-client@0.3.3
+spacebars-compiler@1.3.0
 standard-minifier-css@1.7.2
 standard-minifier-js@2.6.0
-static-html@1.3.0
-templating-tools@1.2.0
+static-html@1.3.2
+templating-tools@1.2.1
 tracker@1.2.0
-typescript@4.1.2
+typescript@4.2.2
 underscore@1.0.10
-webapp@1.10.0
+webapp@1.10.1
 webapp-hashing@1.1.0