Compare commits

..

1 Commits

Author SHA1 Message Date
Stefan Zermatten
8b3f11603a Update Meteor to 1.2
This requires local copies of packages that are broken or not Polymer 0.5
2015-10-03 22:38:25 +02:00
75 changed files with 512 additions and 94 deletions

3
rpg-docs/.gitignore vendored
View File

@@ -1,7 +1,6 @@
.meteor/local
.meteor/meteorite
.demeteorized
settings.json
public/components
nohup.out
dump
dump

View File

@@ -11,6 +11,7 @@ dburles:collection-helpers
reactive-var
underscore
aldeed:collection2
differential:vulcanize
matb33:collection-hooks
zimme:collection-softremovable
momentjs:moment
@@ -41,6 +42,3 @@ ejson
spacebars
check
useraccounts:iron-routing
wizonesolutions:canonical
meteorhacks:fast-render
appcache

View File

@@ -6,7 +6,6 @@ accounts-ui@1.1.6
accounts-ui-unstyled@1.1.8
aldeed:collection2@2.5.0
aldeed:simple-schema@1.3.3
appcache@1.0.6
autoupdate@1.2.3
babel-compiler@5.8.24_1
babel-runtime@0.1.4
@@ -20,7 +19,6 @@ caching-compiler@1.0.0
caching-html-compiler@1.0.2
callback-hook@1.0.4
check@1.0.6
chuangbo:cookie@1.1.0
chuangbo:marked@0.3.5_1
coffeescript@1.0.10
dburles:collection-helpers@1.0.3
@@ -32,6 +30,7 @@ ddp-rate-limiter@1.0.0
ddp-server@1.2.1
deps@1.0.9
diff-sequence@1.0.1
differential:vulcanize@2.0.1
ecmascript@0.1.5
ecmascript-collections@0.1.6
ecwyne:mathjs@0.25.0
@@ -64,11 +63,8 @@ logging@1.0.8
matb33:collection-hooks@0.8.1
meteor@1.1.9
meteor-base@1.0.1
meteorhacks:fast-render@2.10.0
meteorhacks:inject-data@1.4.1
meteorhacks:kadira@2.23.4
meteorhacks:meteorx@1.3.1
meteorhacks:picker@1.0.3
meteorhacks:subs-manager@1.6.2
minifiers@1.1.7
minimongo@1.0.10
@@ -115,7 +111,6 @@ useraccounts:iron-routing@1.12.3
useraccounts:polymer@1.12.3
webapp@1.2.2
webapp-hashing@1.0.5
wizonesolutions:canonical@0.0.5
wolves:bourbon@1.2.0
zimme:collection-behaviours@1.1.3
zimme:collection-softremovable@1.0.4

View File

@@ -7,7 +7,6 @@ Schemas.Action = new SimpleSchema({
charId: {
type: String,
regEx: SimpleSchema.RegEx.Id,
index: 1,
},
name: {
type: String,

View File

@@ -7,7 +7,6 @@ Schemas.Attack = new SimpleSchema({
charId: {
type: String,
regEx: SimpleSchema.RegEx.Id,
index: 1,
},
name: {
type: String,

View File

@@ -4,7 +4,6 @@ Schemas.Buff = new SimpleSchema({
charId: {
type: String,
regEx: SimpleSchema.RegEx.Id,
index: 1,
},
name: {
type: String,

View File

@@ -1,7 +1,7 @@
Classes = new Mongo.Collection("classes");
Schemas.Class = new SimpleSchema({
charId: {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
charId: {type: String, regEx: SimpleSchema.RegEx.Id},
name: {type: String, trim: false},
level: {type: Number},
createdAt: {

View File

@@ -8,7 +8,6 @@ Schemas.Effect = new SimpleSchema({
charId: {
type: String,
regEx: SimpleSchema.RegEx.Id,
index: 1,
},
name: {
type: String,

View File

@@ -1,7 +1,7 @@
Experiences = new Mongo.Collection("experience");
Schemas.Experience = new SimpleSchema({
charId: {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
charId: {type: String, regEx: SimpleSchema.RegEx.Id},
name: {type: String, defaultValue: "New Experience", trim: false},
description: {type: String, optional: true, trim: false},
value: {type: Number, defaultValue: 0},

View File

@@ -1,7 +1,7 @@
Features = new Mongo.Collection("features");
Schemas.Feature = new SimpleSchema({
charId: {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
charId: {type: String, regEx: SimpleSchema.RegEx.Id},
name: {type: String, trim: false},
description: {type: String, optional: true, trim: false},
uses: {type: String, optional: true, trim: false},

View File

@@ -1,7 +1,7 @@
Notes = new Mongo.Collection("notes");
Schemas.Note = new SimpleSchema({
charId: {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
charId: {type: String, regEx: SimpleSchema.RegEx.Id},
name: {type: String, trim: false},
description: {type: String, optional: true, trim: false},
color: {

View File

@@ -4,7 +4,6 @@ Schemas.Proficiency = new SimpleSchema({
charId: {
type: String,
regEx: SimpleSchema.RegEx.Id,
index: 1,
},
name: {
type: String,

View File

@@ -1,7 +1,7 @@
SpellLists = new Mongo.Collection("spellLists");
Schemas.SpellLists = new SimpleSchema({
charId: {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
charId: {type: String, regEx: SimpleSchema.RegEx.Id},
name: {type: String, trim: false},
description: {type: String, optional: true, trim: false},
saveDC: {type: String, optional: true, trim: false},

View File

@@ -1,7 +1,7 @@
Spells = new Mongo.Collection("spells");
Schemas.Spell = new SimpleSchema({
charId: {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
charId: {type: String, regEx: SimpleSchema.RegEx.Id},
prepared: {
type: String,
defaultValue: "prepared",

View File

@@ -1,7 +1,7 @@
TemporaryHitPoints = new Mongo.Collection("temporaryHitPoints");
Schemas.TemporaryHitPoints = new SimpleSchema({
charId: {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
charId: {type: String, regEx: SimpleSchema.RegEx.Id},
name: {type: String, optional: true},
maximum: {type: Number, defaultValue: 0, min: 0, max: 500},
used: {type: Number, defaultValue: 0, min: 0, max: 500},

View File

@@ -3,7 +3,7 @@ Containers = new Mongo.Collection("containers");
Schemas.Container = new SimpleSchema({
name: {type: String, trim: false},
charId: {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
charId: {type: String, regEx: SimpleSchema.RegEx.Id},
isCarried: {type: Boolean},
weight: {type: Number, min: 0, defaultValue: 0, decimal: true},
value: {type: Number, min: 0, defaultValue: 0, decimal: true},

View File

@@ -4,7 +4,7 @@ Schemas.Item = new SimpleSchema({
name: {type: String, defaultValue: "New Item", trim: false},
plural: {type: String, optional: true, trim: false},
description:{type: String, optional: true, trim: false},
charId: {type: String, regEx: SimpleSchema.RegEx.Id, index: 1}, //id of owner
charId: {type: String, regEx: SimpleSchema.RegEx.Id}, //id of owner
quantity: {type: Number, min: 0, defaultValue: 1},
weight: {type: Number, min: 0, defaultValue: 0, decimal: true},
value: {type: Number, min: 0, defaultValue: 0, decimal: true},

View File

@@ -34,7 +34,6 @@ Router.map(function() {
onAfterAction: function() {
document.title = appName;
},
fastRender: true,
});
this.route("characterSheet", {
@@ -64,7 +63,6 @@ Router.map(function() {
window.ga && window.ga("send", "pageview", "/character");
this.next();
},
fastRender: true,
});
this.route("loading", {
@@ -93,7 +91,6 @@ Router.map(function() {
onAfterAction: function() {
document.title = appName;
},
fastRender: true,
});
this.route("/guide", {

View File

@@ -24,7 +24,7 @@ Template.carryCapacityBar.onCreated(function() {
var self = this;
self.carriedFraction = new ReactiveVar(0);
self.autorun(function() {
self.carriedFraction.set(getFractionCarried(Template.currentData()));
self.carriedFraction.set(getFractionCarried(self.data));
});
});

View File

@@ -1,45 +0,0 @@
<head>
<!--core components-->
<link rel="import" href="/components/core-animated-pages/core-animated-pages.html">
<link rel="import" href="/components/core-animated-pages/transitions/cross-fade.html">
<link rel="import" href="/components/core-animated-pages/transitions/hero-transition.html">
<link rel="import" href="/components/core-animated-pages/transitions/slide-from-right.html">
<link rel="import" href="/components/core-icons/av-icons.html">
<link rel="import" href="/components/core-icons/core-icons.html">
<link rel="import" href="/components/core-icons/editor-icons.html">
<link rel="import" href="/components/core-icons/image-icons.html">
<link rel="import" href="/components/core-icons/social-icons.html">
<link rel="import" href="/components/core-image/core-image.html">
<link rel="import" href="/components/core-item/core-item.html">
<link rel="import" href="/components/core-menu/core-menu.html">
<link rel="import" href="/components/core-scaffold/core-scaffold.html">
<link rel="import" href="/components/core-transition/core-transition.html">
<!--paper components-->
<link rel="import" href="/components/paper-button/paper-button.html">
<link rel="import" href="/components/paper-checkbox/paper-checkbox.html">
<link rel="import" href="/components/paper-dialog/paper-action-dialog.html">
<link rel="import" href="/components/paper-dialog/paper-dialog.html">
<link rel="import" href="/components/paper-dialog/paper-dialog-transition.html">
<link rel="import" href="/components/paper-dropdown/paper-dropdown.html">
<link rel="import" href="/components/paper-fab/paper-fab.html">
<link rel="import" href="/components/paper-fab-menu/paper-fab-menu.html">
<link rel="import" href="/components/paper-icon-button/paper-icon-button.html">
<link rel="import" href="/components/paper-input/paper-autogrow-textarea.html">
<link rel="import" href="/components/paper-input/paper-input.html">
<link rel="import" href="/components/paper-input/paper-input-decorator.html">
<link rel="import" href="/components/paper-item/paper-item.html">
<link rel="import" href="/components/paper-menu-button/paper-menu-button.html">
<link rel="import" href="/components/paper-radio-button/paper-radio-button.html">
<link rel="import" href="/components/paper-radio-group/paper-radio-group.html">
<link rel="import" href="/components/paper-shadow/paper-shadow.html">
<link rel="import" href="/components/paper-spinner/paper-spinner.html">
<link rel="import" href="/components/paper-slider/paper-slider.html">
<link rel="import" href="/components/paper-tabs/paper-tabs.html">
<link rel="import" href="/components/paper-toast/paper-toast.html">
<link rel="import" href="/components/paper-toggle-button/paper-toggle-button.html">
<!--custom components-->
<link rel="import" href="/custom_components/paper-dropdown-menu/paper-dropdown-menu.html">
<link rel="import" href="/custom_components/paper-diff-slider/paper-diff-slider.html">
</head>

View File

@@ -0,0 +1 @@
.build*

View File

@@ -0,0 +1 @@
node_modules

View File

@@ -0,0 +1,7 @@
This directory and the files immediately inside it are automatically generated
when you change this package's NPM dependencies. Commit the files in this
directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
so that others run the same versions of sub-dependencies.
You should NOT check in the node_modules directory that Meteor automatically
creates; if you are using git, the .gitignore file tells git to ignore it.

View File

@@ -0,0 +1,272 @@
{
"dependencies": {
"vulcanize": {
"version": "1.9.1",
"dependencies": {
"dom5": {
"version": "1.1.0",
"dependencies": {
"parse5": {
"version": "1.4.2"
}
}
},
"es6-promise": {
"version": "2.2.0"
},
"hydrolysis": {
"version": "1.13.1",
"dependencies": {
"espree": {
"version": "2.0.3"
},
"estraverse": {
"version": "3.1.0"
},
"setimmediate": {
"version": "1.0.2"
}
}
},
"nopt": {
"version": "3.0.2",
"dependencies": {
"abbrev": {
"version": "1.0.7"
}
}
},
"path-posix": {
"version": "1.0.0"
},
"update-notifier": {
"version": "0.5.0",
"dependencies": {
"chalk": {
"version": "1.0.0",
"dependencies": {
"ansi-styles": {
"version": "2.0.1"
},
"escape-string-regexp": {
"version": "1.0.3"
},
"has-ansi": {
"version": "1.0.3",
"dependencies": {
"ansi-regex": {
"version": "1.1.1"
},
"get-stdin": {
"version": "4.0.1"
}
}
},
"strip-ansi": {
"version": "2.0.1",
"dependencies": {
"ansi-regex": {
"version": "1.1.1"
}
}
},
"supports-color": {
"version": "1.3.1"
}
}
},
"configstore": {
"version": "1.1.0",
"dependencies": {
"graceful-fs": {
"version": "3.0.8"
},
"mkdirp": {
"version": "0.5.1",
"dependencies": {
"minimist": {
"version": "0.0.8"
}
}
},
"object-assign": {
"version": "2.1.1"
},
"os-tmpdir": {
"version": "1.0.1"
},
"osenv": {
"version": "0.1.1"
},
"user-home": {
"version": "1.1.1"
},
"uuid": {
"version": "2.0.1"
},
"xdg-basedir": {
"version": "1.0.1"
}
}
},
"is-npm": {
"version": "1.0.0"
},
"latest-version": {
"version": "1.0.0",
"dependencies": {
"package-json": {
"version": "1.2.0",
"dependencies": {
"got": {
"version": "3.2.0",
"dependencies": {
"duplexify": {
"version": "3.4.1",
"dependencies": {
"end-of-stream": {
"version": "1.0.0",
"dependencies": {
"once": {
"version": "1.3.2",
"dependencies": {
"wrappy": {
"version": "1.0.1"
}
}
}
}
},
"readable-stream": {
"version": "1.1.13",
"dependencies": {
"core-util-is": {
"version": "1.0.1"
},
"isarray": {
"version": "0.0.1"
},
"string_decoder": {
"version": "0.10.31"
},
"inherits": {
"version": "2.0.1"
}
}
}
}
},
"infinity-agent": {
"version": "2.0.3"
},
"is-stream": {
"version": "1.0.1"
},
"lowercase-keys": {
"version": "1.0.0"
},
"nested-error-stacks": {
"version": "1.0.0"
},
"object-assign": {
"version": "2.1.1"
},
"prepend-http": {
"version": "1.0.1"
},
"read-all-stream": {
"version": "2.1.2",
"dependencies": {
"readable-stream": {
"version": "1.1.13",
"dependencies": {
"core-util-is": {
"version": "1.0.1"
},
"isarray": {
"version": "0.0.1"
},
"string_decoder": {
"version": "0.10.31"
},
"inherits": {
"version": "2.0.1"
}
}
}
}
},
"statuses": {
"version": "1.2.1"
},
"timed-out": {
"version": "2.0.0"
}
}
},
"registry-url": {
"version": "3.0.3",
"dependencies": {
"rc": {
"version": "1.0.3",
"dependencies": {
"minimist": {
"version": "0.0.10"
},
"deep-extend": {
"version": "0.2.11"
},
"strip-json-comments": {
"version": "0.1.3"
},
"ini": {
"version": "1.3.4"
}
}
}
}
}
}
}
}
},
"repeating": {
"version": "1.1.3",
"dependencies": {
"is-finite": {
"version": "1.0.1",
"dependencies": {
"number-is-nan": {
"version": "1.0.0"
}
}
}
}
},
"semver-diff": {
"version": "2.0.0",
"dependencies": {
"semver": {
"version": "4.3.6"
}
}
},
"string-length": {
"version": "1.0.0",
"dependencies": {
"strip-ansi": {
"version": "2.0.1",
"dependencies": {
"ansi-regex": {
"version": "1.1.1"
}
}
}
}
}
}
}
}
}
}
}

View File

@@ -0,0 +1,3 @@
differential:vulcanize@2.0.0
meteor@1.1.6
underscore@1.0.3

View File

@@ -0,0 +1,29 @@
Vulcanize
==============================================================================
Warning: API Change for version 1.0.0.
This package a meteor build plugin that wraps the [vulcanize](https://www.npmjs.com/package/vulcanize) npm package, which is used to process web components into a single output file.
### Usage
1. Ensure all your components are located somewhere under your public directory. (via bower, zip, etc)
2. Include a `config.vulcanize` file in the root of your project. This file will optionally define a path to the polyfill and paths to html imports for your components. For Example:
````
{
"polyfill": "/bower_components/webcomponentsjs/webcomponents.min.js",
"useShadowDom": true, // optional, defaults to shady dom (polymer default)
"imports": [
"/bower_components/paper-button/paper-button.html",
"/bower_components/paper-checkbox/paper-checkbox.html"
]
}
````
- By specifying a path to the polyfill we can ensure that it is injected into the bundle before any imports.
- By setting `useShadowDom` to true, we configure polymer to opt out of shady dom and use full shadow dom. This is pretty much required at the moment unless you only use polymer elements as leaf nodes. Any light dom (child elements) that gets rendered by blaze, react, etc will not be accounted for otherwise.
- Running your app in development as usual will result in individual imports being added to your `<head>` tag, resulting in multiple subsequent HTTP requests (good in development - debugging).
- Running `meteor`, `meteor build`, `modulus deploy`, etc with the `VULCANIZE=true` environment variable set will result in all your html imports being vulcanized or concatenated into a single html import (good in production). The resulting file will be called `vulcanized-{md5}.html`, which will be automatically added to your `<head>` tag. For example, `VULCANIZE=true meteor`, `VULCANIZE=true modulus deploy`.
- Setting the `CDN_PREFIX` environment variable will prepend the string to the beginning of the file path that is inserted into your HTML's `<head>` tag.

View File

@@ -0,0 +1,17 @@
Package.describe({
name: 'differential:vulcanize',
summary: 'Vulcanize',
version: '2.0.1',
git: 'https://github.com/Differential/meteor-vulcanize'
});
Package.registerBuildPlugin({
name: 'vulcanize',
use: [
"underscore@1.0.3"
],
sources: [
'vulcanize.js'
],
npmDependencies: {'vulcanize': '1.9.1'}
});

View File

@@ -0,0 +1,20 @@
{
"dependencies": [
[
"meteor",
"1.1.3"
],
[
"underscore",
"1.0.1"
]
],
"pluginDependencies": [
[
"vulcanize",
{}
]
],
"toolVersion": "meteor-tool@1.0.35",
"format": "1.0"
}

View File

@@ -0,0 +1,5 @@
// Write your tests here!
// Here is an example.
Tinytest.add('example', function (test) {
test.equal(true, true);
});

View File

@@ -0,0 +1,141 @@
var vulcan = Npm.require('vulcanize');
var crypto = Npm.require('crypto');
var url = Npm.require('url');
var fs = Npm.require('fs');
/**
* Vulcanize now requires a target input file.
* We need to create a temp file located within the same
* 'abspath' as the actual imports. Otherwise, vulcanize
* gets confused during the process.
*/
var tmpFile = '_imports.html';
var tmpDir = 'public';
var tmpPath = tmpDir + '/' + tmpFile;
/**
* Log
*/
function log() {
args = _.values(arguments);
args.unshift("=> Vulcanize:");
console.log.apply(this, args);
}
/**
* Get script tag with specified path.
*/
function scriptTag(path) {
return '<script src="' + path + '"></script>';
}
/**
* Get link tag with specified path.
*/
function linkTag(path) {
return '<link rel="import" href="' + path + '">';
}
/**
* Add config for dom mode to head.
*/
function addShadowDomConfig(compileStep) {
compileStep.addHtml({
section: 'head',
data: '<script> window.Polymer = {dom: "shadow"}; </script>'
});
}
/**
* Add webcomponentsjs script to head.
* @todo read first line and check for script tag
*/
function addPolyfillTag(compileStep, path) {
compileStep.addHtml({
section: 'head',
data: scriptTag(path)
});
}
/**
* Add imports to head.
*/
function addImportTag(compileStep, path) {
compileStep.addHtml({
section: 'head',
data: linkTag(path)
});
}
/**
* Vulcanize all files and add output file to head.
*/
function vulcanizeImports(compileStep, imports) {
var tags = _.map(imports, function(path) {
return linkTag(path);
});
fs.writeFileSync(tmpPath, tags.join("\n"));
vulcan.setOptions({ abspath: tmpDir });
vulcan.process(tmpFile, function(err, html) {
fs.unlinkSync(tmpPath);
var filenameHash = crypto.createHash('md5').update(html).digest('hex');
var filePath = '/vulcanized-' + filenameHash + '.html';
compileStep.addAsset({
path: filePath,
data: html
});
if (_.isString(process.env.CDN_PREFIX)) {
filePath = url.resolve(process.env.CDN_PREFIX, filePath);
}
addImportTag(compileStep, filePath);
});
}
/**
* Add individual import tags
*/
function individualImports(compileStep, imports) {
_.each(imports, function(path) {
addImportTag(compileStep, path);
});
}
/**
* Register appropriate plugin.
*/
Plugin.registerSourceHandler("vulcanize", function(compileStep) {
if (compileStep.inputPath === "config.vulcanize"
&& compileStep.arch === "web.browser") {
// Get JSON file.
var json = JSON.parse(compileStep.read().toString('utf8'));
// Add polyfill to html if defined.
if (_.isString(json.polyfill)) {
addPolyfillTag(compileStep, json.polyfill);
}
// Optionally opt into shadow dom, rather than shady dom.
if (json.useShadowDom) {
addShadowDomConfig(compileStep);
}
// Add imports if defined.
if (process.env.VULCANIZE && _.isArray(json.imports)) {
log("Importing vulcanized file...");
vulcanizeImports(compileStep, json.imports);
} else {
log("Importing individual files...");
individualImports(compileStep, json.imports);
}
} else if (compileStep.arch === "web.browser") {
log("File "+compileStep.inputPath+" ignored");
}
});

View File

@@ -0,0 +1,3 @@
.build*
versions.json
.versions

View File

@@ -275,23 +275,3 @@ ChangeLogs.insert({
"Fixed spell attacks appearing on features page when the spell is not prepared",
],
});
ChangeLogs.insert({
version: "0.8.0",
changes: [
"Migrate to a new hosting provider. Server should now respond to interaction in milliseconds, rather than minutes",
"Redirected www.dicecloud.com to dicecloud.com",
"Fixed errors loggin in with Google",
],
});
ChangeLogs.insert({
version: "0.9.0",
changes: [
"Added fast render support, direct links to characters should load instantly",
"Added extra indexes to the database to improve performance",
"Added appcache support to improve load times on return visits",
],
});