Update dependencies & improvements for Apollo skeleton

History.md

@@ -12,6 +12,8 @@ N/A
 
 * `--apollo` skeleton was missing client cache setup [PR #11146](https://github.com/meteor/meteor/pull/11146)
 
+* All skeletons got their `npm` dependencies updated. [PR #11172](https://github.com/meteor/meteor/pull/11172)
+
 ## v1.11, 2020-08-18
 
 ### Breaking changes

tools/static-assets/skel-apollo/imports/ui/App.jsx

@@ -1,19 +1,23 @@
 import React from 'react';
-import { ApolloProvider, ApolloClient, InMemoryCache } from '@apollo/client';
+import { InMemoryCache, ApolloProvider, ApolloClient, ApolloLink } from '@apollo/client';
+import { BatchHttpLink } from '@apollo/client/link/batch-http'
+// import { MeteorAccountsLink } from 'meteor/apollo'
 import { Hello } from './Hello.jsx';
 import { Info } from './Info.jsx';
 
+const cache = new InMemoryCache().restore(window.__APOLLO_STATE__);
+
+const link = ApolloLink.from([
+  // MeteorAccountsLink(),
+  new BatchHttpLink({
+    uri: '/graphql'
+  })
+]);
+
 const client = new ApolloClient({
   uri: '/graphql',
-  cache: new InMemoryCache(),
-  /* Uncomment this for accounts use
-  request: operation =>
-    operation.setContext(() => ({
-      headers: {
-        authorization: Accounts._storedLoginToken()
-      }
-    }))
-   */
+  cache,
+  link,
 });
 
 export const App = () => (

tools/static-assets/skel-apollo/package.json

@@ -8,12 +8,12 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@apollo/client": "^3.1.1",
-    "@babel/runtime": "^7.10.5",
+    "@apollo/client": "^3.1.5",
+    "@babel/runtime": "^7.11.2",
     "apollo-boost": "^0.4.9",
-    "apollo-server-express": "^2.16.1",
+    "apollo-server-express": "^2.17.0",
     "graphql": "^15.3.0",
-    "meteor-node-stubs": "^1.0.0",
+    "meteor-node-stubs": "^1.0.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"
   },

tools/static-assets/skel-apollo/server/apollo.js

@@ -21,11 +21,5 @@ const server = new ApolloServer({
 
 server.applyMiddleware({
   app: WebApp.connectHandlers,
-  path: '/graphql'
-});
-
-WebApp.connectHandlers.use('/graphql', (req, res) => {
-  if (req.method === 'GET') {
-    res.end();
-  }
+  cors: true
 });

tools/static-assets/skel-bare/package.json

@@ -5,7 +5,7 @@
     "start": "meteor run"
   },
   "dependencies": {
-    "@babel/runtime": "^7.10.5",
+    "@babel/runtime": "^7.11.2",
     "meteor-node-stubs": "^1.0.1"
   }
 }

tools/static-assets/skel-full/package.json

@@ -6,7 +6,7 @@
     "test": "meteor test --once --driver-package meteortesting:mocha"
   },
   "dependencies": {
-    "@babel/runtime": "^7.10.5",
+    "@babel/runtime": "^7.11.2",
     "jquery": "^3.5.1",
     "meteor-node-stubs": "^1.0.1"
   },

tools/static-assets/skel-minimal/package.json

@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.10.5",
+    "@babel/runtime": "^7.11.2",
     "meteor-node-stubs": "^1.0.1"
   },
   "meteor": {

tools/static-assets/skel-react/package.json

@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.10.5",
+    "@babel/runtime": "^7.11.2",
     "meteor-node-stubs": "^1.0.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"

tools/static-assets/skel-typescript/package.json

@@ -8,17 +8,17 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.10.5",
+    "@babel/runtime": "^7.11.2",
     "meteor-node-stubs": "^1.0.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"
   },
   "devDependencies": {
-    "@types/meteor": "^1.4.48",
-    "@types/mocha": "^8.0.0",
-    "@types/react": "^16.9.43",
+    "@types/meteor": "^1.4.49",
+    "@types/mocha": "^8.0.3",
+    "@types/react": "^16.9.49",
     "@types/react-dom": "^16.9.8",
-    "typescript": "^3.9.7"
+    "typescript": "^4.0.2"
   },
   "meteor": {
     "mainModule": {

tools/static-assets/skel-vue/package.json

@@ -8,9 +8,9 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.10.5",
+    "@babel/runtime": "^7.11.2",
     "meteor-node-stubs": "^1.0.1",
-    "vue": "^2.6.11",
+    "vue": "^2.6.12",
     "vue-meteor-tracker": "^2.0.0-beta.5"
   },
   "meteor": {

tools/static-assets/skel/package.json

@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.10.4",
+    "@babel/runtime": "^7.11.2",
     "jquery": "^3.5.1",
     "meteor-node-stubs": "^1.0.1"
   },