Prechádzať zdrojové kódy

Replace Picker for community packages version & small

Jan Dvorak 3 rokov pred
rodič
commit
eb745106d8

+ 0 - 5
.meteor/packages

@@ -65,7 +65,6 @@ msavin:usercache
 # Keep stylus in 1.1.0, because building v2 takes extra 52 minutes.
 coagmano:stylus@1.1.0!
 meteorhacks:subs-manager
-meteorhacks:picker
 meteorhacks:aggregate@1.3.0
 wekan-markdown
 konecty:mongo-counter
@@ -129,7 +128,3 @@ simple:json-routes
 kadira:flow-router
 spacebars
 communitypackages:picker
-useraccounts:core
-useraccounts:unstyled
-useraccounts:flow-routing
-service-configuration

+ 1 - 0
.meteor/versions

@@ -25,6 +25,7 @@ check@1.3.1
 coagmano:stylus@1.1.0
 coffeescript@2.4.1
 coffeescript-compiler@2.4.1
+communitypackages:picker@1.1.0
 cottz:publish-relations@2.0.8
 dburles:collection-helpers@1.1.0
 ddp@1.4.0

+ 4 - 0
models/export.js

@@ -1,6 +1,10 @@
 import { Exporter } from './exporter';
+import { Meteor } from 'meteor/meteor';
+
 /* global JsonRoutes */
 if (Meteor.isServer) {
+  import { Picker } from 'meteor/communitypackages:picker';
+
   // todo XXX once we have a real API in place, move that route there
   // todo XXX also  share the route definition between the client and the server
   // so that we could use something like

+ 1 - 0
models/exportExcel.js

@@ -6,6 +6,7 @@ runOnServer(function() {
   // it here we use runOnServer to have it inside a function instead of an
   // if (Meteor.isServer) block
   import { ExporterExcel } from './server/ExporterExcel';
+  import { Picker } from 'meteor/communitypackages:picker';
 
   // todo XXX once we have a real API in place, move that route there
   // todo XXX also  share the route definition between the client and the server

+ 1 - 0
models/exportPDF.js

@@ -6,6 +6,7 @@ runOnServer(function() {
   // it here we use runOnServer to have it inside a function instead of an
   // if (Meteor.isServer) block
   import { ExporterCardPDF } from './server/ExporterCardPDF';
+  import { Picker } from 'meteor/communitypackages:picker';
 
   // todo XXX once we have a real API in place, move that route there
   // todo XXX also  share the route definition between the client and the server

+ 0 - 3
packages/markdown/package.js

@@ -5,9 +5,6 @@ Package.describe({
 	git: 'https://github.com/wekan/markdown.git',
 });
 
-// Before Meteor 0.9?
-if(!Package.onUse) Package.onUse = Package.on_use;
-
 Package.onUse(function (api) {
 	if(api.versionsFrom) api.versionsFrom('1.8.2');
 

+ 4 - 2
sandstorm.js

@@ -1,7 +1,9 @@
+import { Meteor } from 'meteor/meteor';
+import { Picker } from 'meteor/communitypackages:picker';
+
 // Sandstorm context is detected using the METEOR_SETTINGS environment variable
 // in the package definition.
-const isSandstorm =
-  Meteor.settings && Meteor.settings.public && Meteor.settings.public.sandstorm;
+const isSandstorm = Meteor.settings?.public?.sandstorm;
 
 // In sandstorm we only have one board per sandstorm instance. Since we want to
 // keep most of our code unchanged, we simply hard-code a board `_id` and