add new changes

.gitignore

@@ -1 +1,3 @@
 node_modules
+.idea
+dist

bower.json

@@ -6,7 +6,7 @@
     "Idan Wender <idanwe2@gmail.com>"
   ],
   "description": "Use Meteor's client side DDP protocol and Minimongo in a non Meteor project",
-  "main": "./dist/meteor-client-side.bundle.min.js",
+  "main": "./dist/meteor-client-side.bundle.js",
   "keywords": [
     "meteor",
     "ddp",

bundle-combine.sh

@@ -0,0 +1,4 @@
+
+./scripts/bundle-meteor-base-combine.sh
+#./scripts/bundle-webapp-min.sh
+#./scripts/bundle-hot-code-push-min.sh

bundle-min.sh

@@ -1,3 +1,3 @@
 ./scripts/bundle-meteor-base-min.sh
-./scripts/bundle-webapp-min.sh
-./scripts/bundle-hot-code-push-min.sh
+#./scripts/bundle-webapp-min.sh
+#./scripts/bundle-hot-code-push-min.sh

meteor-runtime-config.js

@@ -4,6 +4,6 @@
 
   __meteor_runtime_config__ = _.defaults({}, config, {
     meteorEnv: {},
-    DDP_DEFAULT_CONNECTION_URL: 'http://localhost:3000'
+    DDP_DEFAULT_CONNECTION_URL: DDP_DEFAULT_CONNECTION_URL ? DDP_DEFAULT_CONNECTION_URL : 'http://localhost:3030'
   });
 }).call(this);

scripts/bundle-meteor-base-combine.sh

@@ -0,0 +1,99 @@
+# Run this script from home folder
+
+# configs variables
+NAME=meteor-client-side # Set the bundle file name
+DIST_FOLDER=dist # The folder that the bundled files will be copy in to
+
+# run time variables
+PROJECT_ROOT=$(pwd)
+PROJECT_PARENT=$PROJECT_ROOT/..
+DIST_PATH=$PROJECT_ROOT/$DIST_FOLDER
+BUNDLER_TEMP="tmp-$NAME-bundler"
+BUNDLER_PATH=$DIST_PATH/$BUNDLER_TEMP
+
+
+# Ansure that the dist folder exists
+#mkdir -p $DIST_PATH
+
+# Create temp meteor project
+#rm -rf $BUNDLER_PATH
+#curl https://install.meteor.com | sh
+#meteor create $BUNDLER_PATH
+
+# Move packages to meteor folder
+#cp src/packages $BUNDLER_PATH/.meteor/
+cd $BUNDLER_PATH
+
+# Build the packages
+PACKAGE_DIRS=$PROJECT_PARENT
+#meteor-build-client ./build
+#tar -zxf $BUNDLER_TEMP.tar.gz
+
+OUTPUT_PATH="$DIST_PATH/$NAME-bundler-output"
+PACKAGES_PATH="$DIST_PATH/$BUNDLER_TEMP/build/.build19571.bundle/programs/web.browser/packages"
+
+# Create output folder and copy the dependencies files
+rm -rf $OUTPUT_PATH
+mkdir $OUTPUT_PATH
+
+# Concat files
+cat "$PACKAGES_PATH/underscore.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/meteor-runtime-config.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/meteor.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/tracker.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/base64.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/reactive-var.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/modules-runtime.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/modules.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/ejson.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/check.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/promise.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/ecmascript-runtime.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/ecmascript.js">> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/babel-compiler.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/babel-runtime.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/random.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/id-map.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/retry.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/ddp-common.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/diff-sequence.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/mongo-id.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/ddp-client.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/ddp-common.js " >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/ordered-dict.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/geojson-utils.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/minimongo.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/ddp-server.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/allow-deny.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/ddp-rate-limiter.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/localstorage.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/callback-hook.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/jquery.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/deps.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/htmljs.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/observe-sequence.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/sha.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/srp.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/blaze.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/mongo.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/accounts-base.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/accounts-password.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/coffeescript.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/url.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/http.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/spacebars.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/templating.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/ostrio_cookies.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/ostrio_files.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/global-imports.js" >> $OUTPUT_PATH/$NAME.bundle.js
+cat "$PACKAGES_PATH/service-configuration.js" >> $OUTPUT_PATH/$NAME.bundle.js
+
+# Minify
+#npm install uglify-js
+uglifyjs $OUTPUT_PATH/$NAME.bundle.js -o $OUTPUT_PATH/$NAME.bundle.min.js
+
+# Copy the bundled files to the dist folder
+cp $OUTPUT_PATH/$NAME.bundle.* $DIST_PATH
+
+# Cleanup
+#rm -rf $BUNDLER_PATH $OUTPUT_PATH

scripts/bundle-meteor-base-min.sh

@@ -17,60 +17,14 @@ mkdir -p $DIST_PATH
 
 # Create temp meteor project
 rm -rf $BUNDLER_PATH
+#curl https://install.meteor.com | sh
 meteor create $BUNDLER_PATH
 
 # Move packages to meteor folder
 cp src/packages $BUNDLER_PATH/.meteor/
-
 cd $BUNDLER_PATH
 
 # Build the packages
-PACKAGE_DIRS=$PROJECT_PARENT meteor build --debug .
-tar -zxf $BUNDLER_TEMP.tar.gz
-
-OUTPUT_PATH="$DIST_PATH/$NAME-bundler-output"
-PACKAGES_PATH="$DIST_PATH/$BUNDLER_TEMP/bundle/programs/web.browser/packages"
-
-# Create output folder and copy the dependencies files
-rm -rf $OUTPUT_PATH
-mkdir $OUTPUT_PATH
-
-# Concat files
-cat "$PACKAGES_PATH/underscore.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PROJECT_ROOT/meteor-runtime-config.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/meteor.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/modules-runtime.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/modules.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/promise.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/babel-runtime.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/ecmascript-runtime.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/ecmascript.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/base64.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/ejson.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/jquery.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/check.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/random.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/tracker.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/retry.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/id-map.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/ordered-dict.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/geojson-utils.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/diff-sequence.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/mongo-id.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/minimongo.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/ddp-common.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/ddp-client.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/ddp.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/allow-deny.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/mongo.js" >> $OUTPUT_PATH/$NAME.bundle.js
-cat "$PACKAGES_PATH/global-imports.js" >> $OUTPUT_PATH/$NAME.bundle.js
-
-# Minify
-npm install uglify-js
-./node_modules/.bin/uglifyjs $OUTPUT_PATH/$NAME.bundle.js -o $OUTPUT_PATH/$NAME.bundle.min.js
-
-# Copy the bundled files to the dist folder
-cp $OUTPUT_PATH/$NAME.bundle.* $DIST_PATH
-
-# Cleanup
-rm -rf $BUNDLER_PATH $OUTPUT_PATH
+PACKAGE_DIRS=$PROJECT_PARENT
+meteor-build-client ./build
+#tar -zxf $BUNDLER_TEMP.tar.gz

src/packages

@@ -1,5 +1,11 @@
-meteor
-underscore
+accounts-base
+accounts-password
+accounts-facebook
+accounts-google
+accounts-twitter
 ddp
+meteor
 mongo
+ostrio:files
 tracker
+underscore