Merge pull request #664 from nrkno/fix/meteor-update

Meteor update to 2.5.3

.github/actions/setup-meteor/action.yaml

@@ -3,7 +3,7 @@ description: "Setup Meteor"
 runs:
   using: "composite"
   steps:
-    - run: curl "https://install.meteor.com/?release=2.1.1" | sh
+    - run: curl "https://install.meteor.com/?release=2.5.5" | sh
       shell: bash
     - run: meteor npm install -g yarn
       shell: bash

.github/workflows/audit.yaml

@@ -12,10 +12,10 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - uses: ./.github/actions/setup-meteor
       - name: restore node_modules
         uses: actions/cache@v2
@@ -38,10 +38,10 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - uses: ./.github/actions/setup-meteor
       - name: restore node_modules
         uses: actions/cache@v2

.github/workflows/node.yaml

@@ -16,10 +16,10 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - uses: ./.github/actions/setup-meteor
       - name: restore node_modules
         uses: actions/cache@v2
@@ -45,10 +45,10 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - uses: ./.github/actions/setup-meteor
       - name: restore node_modules
         uses: actions/cache@v2
@@ -110,11 +110,11 @@ jobs:
           else
             echo "Skipping docker build"
           fi
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         if: ${{ steps.image-tags.outputs.images }}
         with:
-          node-version: 12.x
+          node-version: 14.x
       - uses: ./.github/actions/setup-meteor
         if: ${{ steps.image-tags.outputs.images }}
       - name: Prepare Environment
@@ -291,10 +291,10 @@ jobs:
         node-version: [12.x, 14.x, 16.x]
         include:
           # include additional configs, to run certain packages in a single version of node
-          - node-version: 12.x
+          - node-version: 14.x
             package-name: corelib
             send-coverage: true
-          - node-version: 12.x
+          - node-version: 14.x
             package-name: job-worker
             send-coverage: true
           # No tests for the gateways yet
@@ -337,10 +337,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - name: Prepare Environment
         run: |
           cd packages 

meteor/.meteor/packages

@@ -4,36 +4,28 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-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
-reactive-var@1.0.11           # Reactive variable for tracker
+meteor-base             # Packages every Meteor app needs to have
+mobile-experience       # Packages for a great mobile UX
+mongo                   # The database Meteor supports right now
+reactive-var            # Reactive variable for tracker
 
-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
-shell-server@0.5.0            # Server-side component of the `meteor shell` command
+standard-minifier-css   # CSS minifier run for production mode
+standard-minifier-js    # JS minifier run for production mode
+es5-shim                # ECMAScript 5 compatibility for older browsers
+ecmascript              # Enable ECMAScript2015+ syntax in app code
+typescript              # Enable TypeScript syntax in .ts and .tsx modules
+shell-server            # Server-side component of the `meteor shell` command
 
-#autopublish@1.0.7             # Publish all data to the clients (for prototyping)
-#insecure@1.0.7                # Allow all DB writes from clients (for prototyping)
-static-html                   # Define static page content in .html files
-react-meteor-data             # React higher-order component for reactively tracking Meteor data
+static-html              # Define static page content in .html files
+react-meteor-data        # React higher-order component for reactively tracking Meteor data
 
 
-tracker@1.2.0                       # Meteor's client-side reactive programming library
-session@1.2.0
-fourseven:scss@4.12.0
+tracker                  # Meteor's client-side reactive programming library
+session
+fourseven:scss
 
-#hwillson:stub-collections
-#nerdmed:catiline
-#runisland:static-assets
-dynamic-import@0.6.0
-#peerlibrary:computed-field
+dynamic-import
 meteorhacks:picker
 ostrio:meteor-root
-#underscore@1.0.10
-#mdg:validated-method
-accounts-password@1.7.0
-kschingiz:meteor-elastic-apm
+accounts-password
+# kschingiz:meteor-elastic-apm #Temporarily disabled, due to being incompatible with Meteor >2.3

meteor/.meteor/release

@@ -1 +1 @@
-METEOR@2.1.1
+METEOR@2.5.5

meteor/.meteor/versions

@@ -1,91 +1,83 @@
-accounts-base@1.8.0
-accounts-password@1.7.0
+accounts-base@2.2.1
+accounts-password@2.2.0
 allow-deny@1.1.0
-autoupdate@1.7.0
-babel-compiler@7.6.0
+autoupdate@1.8.0
+babel-compiler@7.8.0
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
-blaze-tools@1.0.10
+blaze-tools@1.1.2
 boilerplate-generator@1.7.1
 caching-compiler@1.2.2
-caching-html-compiler@1.1.3
-callback-hook@1.3.0
+caching-html-compiler@1.2.1
+callback-hook@1.4.0
 check@1.3.1
 ddp@1.4.0
-ddp-client@2.4.0
+ddp-client@2.5.0
 ddp-common@1.4.0
-ddp-rate-limiter@1.0.9
-ddp-server@2.3.2
-deps@1.0.12
+ddp-rate-limiter@1.1.0
+ddp-server@2.5.0
 diff-sequence@1.1.1
-dynamic-import@0.6.0
-ecmascript@0.15.0
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.11.0
-ecmascript-runtime-server@0.10.0
+dynamic-import@0.7.2
+ecmascript@0.16.1
+ecmascript-runtime@0.8.0
+ecmascript-runtime-client@0.12.1
+ecmascript-runtime-server@0.11.0
 ejson@1.1.1
-email@2.0.0
+email@2.2.0
 es5-shim@4.8.0
 fetch@0.1.1
-fourseven:scss@4.12.0
+fourseven:scss@4.15.0
 geojson-utils@1.0.10
 hot-code-push@1.0.4
-html-tools@1.0.11
-htmljs@1.0.11
-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
-kschingiz:meteor-elastic-apm@2.4.1
-kschingiz:meteor-measured@1.0.3
-launch-screen@1.2.0
-livedata@1.0.18
+launch-screen@1.3.0
 localstorage@1.2.0
-logging@1.2.0
-meteor@1.9.3
-meteor-base@1.4.0
+logging@1.3.1
+meteor@1.10.0
+meteor-base@1.5.1
 meteorhacks:picker@1.0.3
-minifier-css@1.5.3
-minifier-js@2.6.0
-minimongo@1.6.1
+minifier-css@1.6.0
+minifier-js@2.7.3
+minimongo@1.7.0
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
-modern-browsers@0.1.5
-modules@0.16.0
+modern-browsers@0.1.7
+modules@0.18.0
 modules-runtime@0.12.0
-mongo@1.10.1
+mongo@1.13.0
 mongo-decimal@0.1.2
 mongo-dev-server@1.1.0
-mongo-id@1.0.7
-mongo-livedata@1.0.12
-npm-bcrypt@0.9.3
-npm-mongo@3.8.1
+mongo-id@1.0.8
+npm-mongo@3.9.1
 ordered-dict@1.1.0
-ostrio:meteor-root@1.0.8
-promise@0.11.2
+ostrio:meteor-root@1.1.0
+promise@0.12.0
 random@1.2.0
 rate-limit@1.0.9
-react-fast-refresh@0.1.0
-react-meteor-data@0.2.16
+react-fast-refresh@0.2.2
+react-meteor-data@2.4.0
 reactive-dict@1.3.0
 reactive-var@1.0.11
 reload@1.3.1
 retry@1.1.0
-routepolicy@1.1.0
-service-configuration@1.0.11
+routepolicy@1.1.1
+service-configuration@1.3.0
 session@1.2.0
 sha@1.0.9
 shell-server@0.5.0
-socket-stream-client@0.3.1
-spacebars-compiler@1.1.3
-srp@1.1.0
-standard-minifier-css@1.7.2
-standard-minifier-js@2.6.0
-static-html@1.2.2
-templating-tools@1.1.2
-tmeasday:check-npm-versions@0.3.2
+socket-stream-client@0.4.0
+spacebars-compiler@1.3.0
+standard-minifier-css@1.7.4
+standard-minifier-js@2.8.0
+static-html@1.3.2
+templating-tools@1.2.1
 tracker@1.2.0
-typescript@4.1.2
+typescript@4.4.1
 underscore@1.0.10
-url@1.3.1
-webapp@1.10.0
+url@1.3.2
+webapp@1.13.0
 webapp-hashing@1.1.0

meteor/Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:experimental
 # BUILD IMAGE
-FROM node:12.22
-RUN curl "https://install.meteor.com/?release=2.1.1" | sh
+FROM node:14.18
+RUN curl "https://install.meteor.com/?release=2.5.5" | sh
 # Temporary change the NODE_ENV env variable, so that all libraries are installed:
 ENV NODE_ENV_TMP $NODE_ENV
 ENV NODE_ENV anythingButProduction
@@ -26,7 +26,7 @@ WORKDIR /opt/core/packages
 RUN yarn --prod --ignore-scripts
 
 # DEPLOY IMAGE
-FROM node:12.22-slim
+FROM node:14.18-slim
 COPY --from=0 /opt/bundle /opt/core
 COPY --from=0 /opt/core/packages /opt/packages
 COPY meteor/docker-entrypoint.sh /opt

meteor/Dockerfile.circle

@@ -1,5 +1,5 @@
 # DEPLOY IMAGE
-FROM node:12.22-slim
+FROM node:14.18-slim
 COPY meteor/bundle /opt/core
 COPY meteor/docker-entrypoint.sh /opt
 WORKDIR /opt/core/

meteor/__mocks__/_setupMocks.ts

@@ -23,9 +23,9 @@ jest.mock('meteor/accounts-base', (...args) => require('./accounts-base').setup(
 
 jest.mock('meteor/meteorhacks:picker', (...args) => require('./meteorhacks-picker').setup(args), { virtual: true })
 jest.mock('meteor/mdg:validated-method', (...args) => require('./validated-method').setup(args), { virtual: true })
-jest.mock('meteor/kschingiz:meteor-elastic-apm', (...args) => require('./meteor-elastic-apm').setup(args), {
-	virtual: true,
-})
+// jest.mock('meteor/kschingiz:meteor-elastic-apm', (...args) => require('./meteor-elastic-apm').setup(args), {
+// 	virtual: true,
+// })
 
 jest.mock('meteor/mongo', (...args) => require('./mongo').setup(args), { virtual: true })
 

meteor/package.json

@@ -3,7 +3,7 @@
 	"version": "1.39.0-in-development",
 	"private": true,
 	"engines": {
-		"node": "^12.22.1 || 14"
+		"node": ">=14.18.0"
 	},
 	"scripts": {
 		"preinstall": "node -v",
@@ -66,7 +66,6 @@
 		"deep-extend": "0.6.0",
 		"deepmerge": "^4.2.2",
 		"eslint-plugin-custom-rules": "file:eslint-rules",
-		"html-entities": "^1.4.0",
 		"i18next": "^19.9.2",
 		"i18next-browser-languagedetector": "^4.3.1",
 		"i18next-xhr-backend": "^3.2.2",

meteor/server/api/integration/soap.ts

@@ -13,8 +13,6 @@ import { throwFatalError } from '../ExternalMessageQueue'
 import { ExternalMessageQueueObj } from '../../../lib/collections/ExternalMessageQueue'
 import { logger } from '../../logging'
 import { escapeHtml } from '../../../lib/lib'
-// import { XmlEntities as Entities } from 'html-entities'
-// const entities = new Entities()
 
 type ExternalMessageQueueObjSOAP0 = ExternalMessageQueueObjSOAP & ExternalMessageQueueObj
 export async function sendSOAPMessage(msg: ExternalMessageQueueObjSOAP0 & ExternalMessageQueueObj) {
@@ -120,7 +118,6 @@ async function resolveSOAPFcnData(soapClient: soap.Client, valFcn: ExternalMessa
 				})
 			}
 			const xml: string = parser.toXml(val)
-			// resolve(entities.encode(xml))
 			resolve(xml)
 		} else {
 			reject(new Meteor.Error(401, 'Unknown SOAP function: ' + _.keys(valFcn._fcn)))

meteor/server/api/profiler.ts

@@ -1,4 +1,27 @@
-import Agent from 'meteor/kschingiz:meteor-elastic-apm'
+/*
+	Note: meteor-elastic-apm has been temporarily disabled due to being incompatible Meteor 2.3
+	See https://github.com/Meteor-Community-Packages/meteor-elastic-apm/pull/61
+	So instead I've just added a temporary black-hole replacement for now /Johan Nyman 2022-01-18
+*/
+type StartSpan = (name: string) => undefined | { end: Function; addLabels: Function }
+type StartTransaction = (
+	description: string,
+	name: string
+) => undefined | { end: Function; addLabels: Function; startSpan: StartSpan }
+
+const Agent: {
+	startSpan: StartSpan
+	startTransaction: StartTransaction
+} = {
+	startSpan: (_name: string) => {
+		return undefined
+	},
+	startTransaction: (_descr: string, _name: string) => {
+		return undefined
+	},
+}
+
+// import Agent from 'meteor/kschingiz:meteor-elastic-apm'
 
 class Profiler {
 	private active: boolean = false