github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,728 Commits 1,974 Branches 1,623 Tags
f0932db7e11b8709084e0abf5bc0dfba80c19455
Commit Graph

231 Commits

Author SHA1 Message Date
Sashko Stubailo
ce1a405101 Bump every single package version number due to a change in compilation 2014-09-30 11:51:17 -07:00
David Greenspan
0f4f77f8a2 Fix #2627 (source maps with a PATH_PREFIX) 
When you set ROOT_URL_PATH_PREFIX, source maps are not found because the server serves them at a different path from where the client looks for them.

I don’t understand this code super well, but based on what’s reported in issue #2627, the new code seems strictly more correct than the old code.
 2014-09-29 12:15:13 -07:00
Emily Stark
f510cd0174 Simplify validPid, thanks Ben 2014-09-26 14:42:12 -07:00
Emily Stark
1797d28d0e Factor out check for valid --parent-pid and add tests. 2014-09-26 14:36:40 -07:00
Emily Stark
a8d77fb91a Fix check for valid parent id. 
Parse as decimal (which means you can't specify --parent-pid in hex,
that's fine). And convert back to string to check that the whole string
was parsed as an int (i.e. "123foobar" should not be converted to
"123").

Thanks Slava and Avital.
 2014-09-26 14:23:57 -07:00
Emily Stark
6041122944 Exit immediately if --parent-pid doesn't look like an integer. 
If you pass "--parent-pid foobar", then we immediately log an error
message and exit. This check happens via `parseInt` rather than testing
for exceptions in `process.kill(parentPid, 0)` because `process.kill`
converts its pid argument to an integer, so `process.kill('foobar', 0)`
returns true just as `process.kill(0, 0)` does.
 2014-09-26 14:01:19 -07:00
ekatek
dd7635af6e merging from master 2014-09-25 19:45:48 -07:00
ekatek
bab557d49b incrementing package versions for a clean release 2014-09-25 18:34:34 -07:00
Emily Stark
c592ec91ad Add comment about pid reuse to startCheckForLiveParent 2014-09-25 15:33:32 -07:00
Emily Stark
af3fe5624b Replace keepalives with a check if the parent pid is still running. 
Downsides:
* Doesn't catch the case where the parent is CPU-hogging (but maybe we
  don't want to catch that case anyway, since the bundler not yielding
  is what's causing #2536).
* Could be fooled by pid re-use, i.e. if another process comes up and
  takes the parent process's place before the child process dies.

Untested so far because I haven't been able to actually kill a parent
process in such a way that the child stays alive.
 2014-09-25 15:30:17 -07:00
Slava Kim
b19b269dc9 Use wrapAsync instead of Future.wrap 2014-09-23 15:00:43 -07:00
ekatek
220cc69e31 package versions incremented 2014-09-19 21:16:14 -07:00
Emily Stark
ccfee68145 Merge branch 'master' into devel 
Conflicts:
	docs/client/api.html
	docs/client/data.js
	docs/client/names.json
	meteor
	packages/autoupdate/package.js
	packages/base64/.gitignore
	packages/constraint-solver/package.js
	packages/device-orientation/.gitignore
	packages/less/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	packages/package-version-parser/package.js
	packages/webapp/webapp_server.js
	scripts/admin/meteor-release-experimental.json
	tools/commands.js
	tools/help.txt
	tools/package-version-parser.js
	tools/run-all.js
	tools/tests/apps/build-errors/packages/with-colon-plugin/.gitignore
 2014-09-15 14:48:57 -07:00
Emily Stark
833c6f5b4f Bump package versions for 0.9.2 2014-09-15 11:36:57 -07:00
Emily Stark
d36909a489 bump packages for 0.9.2-rc7 2014-09-11 17:35:06 -07:00
Emily Stark
5dca0bb99a Fix html attributes in boilerplate generation. 
We were not passing html attributes through to the Boilerplate object,
so appcache manifest was never showing up in the <html> tag. Add
'extraData' to `Boilerplate.toHTML` so that we can specify the html
attributes at request time.
 2014-09-11 16:43:02 -07:00
Slava Kim
52d66644e9 Bump packages 2014-09-10 19:01:53 -07:00
Slava Kim
00413f88c3 Merge branch 'cordova-httpd' into release-0.9.2 
Conflicts:
	tools/commands-cordova.js
 2014-09-10 15:50:49 -07:00
Slava Kim
939bf1bc07 Fix a regression in __cordova paths 2014-09-09 16:38:11 -07:00
Matthew Arbesfeld
ec30f42945 Scope cordova path by using using __ prefix 2014-09-09 16:19:03 -07:00
Slava Kim
10599e5bc5 Hot Code Push working with pushing new boilerplate 
at least on iOS
 2014-09-09 15:56:11 -07:00
Emily Stark
fb3fb5de03 Bump package versions for 0.9.2-rc2 2014-09-09 07:52:41 -07:00
Matthew Arbesfeld
05b2765d61 Clean up serving of manifest.json 2014-09-06 11:02:26 -04:00
Slava Kim
3decef135a Bump package versions 2014-09-05 17:55:37 -07:00
Slava Kim
497e47ca5b Another fix for webapp test and behavior. 
The previous commit didn't really fix the issue
 2014-09-05 15:31:06 -07:00
Slava Kim
590a733cd8 Fix a broken webapp test 
Invalidate teh boilerplate after flipping the inlineScriptsAllowed flag
 2014-09-05 14:55:31 -07:00
Avital Oliver
186579ea5e Merge branch 'master' into devel 
Conflicts:
	examples/todos/.meteor/versions
	packages/autoupdate/package.js
	packages/constraint-solver/package.js
	packages/less/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	scripts/admin/meteor-release-experimental.json
	tools/help.txt
	tools/tests/apps/hot-code-push-test/.meteor/versions
 2014-09-04 16:56:19 -07:00
David Glasser
aa7bc6b2b9 Update a source map comment. 2014-09-04 16:13:45 -07:00
Avital Oliver
c23408bdd7 versions for 0.9.1 2014-09-04 15:41:39 -07:00
Slava Kim
620b095ec8 Invalidate memoization of boilerplate 
Fixes bug introduced on the cordova-hcp branch. Fixes #2498
 2014-09-03 12:07:33 -07:00
Slava Kim
3df58956e1 Emily's comments on webapp change 2014-09-02 14:59:22 -07:00
Slava Kim
fc56f795d6 Bump versions of packages for the 0.9.2-rc0 2014-09-02 14:57:33 -07:00
Slava Kim
f3d0c24d2e Invalidate memoization of boilerplate 
Fixes bug introduced on the cordova-hcp branch. Fixes #2498
 2014-09-02 14:57:33 -07:00
Matthew Arbesfeld
fca5c382d5 Merge branch 'release-0.9.1' into cordova-hcp 
Conflicts:
	docs/client/api.html
	docs/client/api.js
	meteor
	packages/autoupdate/autoupdate_server.js
	packages/autoupdate/package.js
	packages/constraint-solver/package.js
	packages/less/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	packages/minimongo/package.js
	packages/mongo-livedata/package.js
	packages/oauth1/package.js
	packages/package-version-parser/package.js
	packages/spiderable/package.js
	packages/standard-app-packages/package.js
	packages/templating/package.js
	packages/test-in-console/package.js
	packages/webapp/package.js
	scripts/admin/meteor-release-experimental.json
	scripts/generate-dev-bundle.sh
	tools/uniload.js
 2014-08-28 21:13:59 -07:00
Matthew Arbesfeld
0af50c04ef Change client.* to web.* and accept client and web 2014-08-28 13:35:26 -07:00
Avital Oliver
864fffc9e9 Bump package versions in preparation for 0.9.1-rc0 2014-08-28 11:00:35 -07:00
Matthew Arbesfeld
124b0d869e Bump versions for CORDOVA-PREVIEW@4 2014-08-27 13:41:07 -07:00
David Greenspan
d37dafe0f8 Rename references to ‘ui’ package to ‘blaze’ 2014-08-26 16:15:34 -07:00
Slava Kim
d4f8f8ce25 Don't serve the manifest for Cordova program if such program is not present 2014-08-26 16:04:26 -07:00
Matthew Arbesfeld
c05397be11 Revert "Revert "Bump package versions"" 
This reverts commit 46ea7dcf30.
 2014-08-20 23:08:49 -07:00
Matthew Arbesfeld
46ea7dcf30 Revert "Bump package versions" 
This reverts commit 97b389b9d6.
 2014-08-20 22:38:09 -07:00
Matthew Arbesfeld
97b389b9d6 Bump package versions 2014-08-20 21:37:56 -07:00
Matthew Arbesfeld
922af65765 Merge branch 'devel' into cordova-hcp 
Conflicts:
	meteor
	scripts/generate-dev-bundle.sh
	tools/bundler.js
	tools/unipackage.js
 2014-08-20 19:48:26 -07:00
Slava Kim
c6047a9cdf Implement public Meteor.settings for Cordova builds 2014-08-18 14:07:40 -07:00
Slava Kim
88edda5557 Extract WebApp-Hashing and use it from tool for Cordova builds 2014-08-15 17:38:16 -07:00
Slava Kim
fcdeda957d Revert "Remove unused webapp_server code" 
This reverts commit 963a16f5f1.

It is not unused
 2014-08-15 16:43:04 -07:00
Matthew Arbesfeld
c463a62477 Omit autoupdateCordova from hash 2014-08-15 16:06:07 -07:00
Matthew Arbesfeld
963a16f5f1 Remove unused webapp_server code 2014-08-15 14:48:25 -07:00
Slava Kim
e3ae279a60 more code duplication for having a separate update version for cordova 2014-08-15 14:46:45 -07:00
David Glasser
bc6239dfc1 vbump for rc9 
Hopefully we won't have to do "bump for all the npm modules" again after
this
 2014-08-15 12:34:47 -07:00