Skip to content

Commit cc162a0

Browse files
authored
Merge pull request meteor#180 from hwillson/react
Updated Meteor, packages, npm deps/devDeps and linting
2 parents 491106f + b8442bc commit cc162a0

File tree

17 files changed

+140
-3104
lines changed

17 files changed

+140
-3104
lines changed

.meteor/.finished-upgraders

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ notices-for-facebook-graph-api-2
1111
1.2.0-cordova-changes
1212
1.2.0-breaking-changes
1313
1.3.0-split-minifiers-package
14+
1.4.0-remove-old-dev-bundle-link
15+
1.4.1-add-shell-server-package

.meteor/packages

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
# but you can also edit it by hand.
66

77
# meteor libraries
8-
meteor-base
9-
ecmascript
10-
es5-shim
11-
check
12-
tracker
8+
meteor-base@1.0.4
9+
ecmascript@0.5.8
10+
es5-shim@4.6.14
11+
check@1.2.3
12+
tracker@1.1.0
1313
session
1414

1515
# standard libraries
16-
jquery
17-
underscore
18-
less
16+
jquery@1.11.9
17+
underscore@1.0.9
18+
less@2.7.5
1919

2020
# ui
21-
static-html
21+
static-html@1.1.12
2222
react-meteor-data
2323

2424
# data
25-
mongo
25+
mongo@1.1.12
2626
aldeed:simple-schema
2727
aldeed:collection2
2828
dburles:collection-helpers
@@ -34,17 +34,17 @@ mdg:validation-error
3434
tap:i18n
3535

3636
# accounts
37-
accounts-password
37+
accounts-password@1.3.0
3838

3939
# mobile
40-
crosswalk
41-
mobile-experience
40+
crosswalk@1.6.2
41+
mobile-experience@1.0.4
4242
chriswessels:hammer
4343

4444
# production
4545
juliancwirko:postcss@1.0.0-beta.11
46-
standard-minifier-js
47-
ddp-rate-limiter
46+
standard-minifier-js@1.2.0
47+
ddp-rate-limiter@1.0.5
4848
app-prod-security
4949

5050
# rest apis
@@ -56,5 +56,8 @@ factory
5656
publication-collector
5757
xolvio:cleaner
5858
dispatch:mocha-phantomjs
59-
practicalmeteor:mocha@2.1.1-rc.1
59+
practicalmeteor:mocha
60+
practicalmeteor:chai
61+
practicalmeteor:sinon
6062
hwillson:stub-collections
63+
shell-server

.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@1.3.4.1
1+
METEOR@1.4.1.1

.meteor/versions

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
1-
accounts-base@1.2.8
2-
accounts-password@1.1.11
3-
aldeed:collection2@2.9.1
4-
aldeed:collection2-core@1.1.1
5-
aldeed:schema-deny@1.0.1
6-
aldeed:schema-index@1.0.1
1+
accounts-base@1.2.11
2+
accounts-password@1.3.0
3+
aldeed:collection2@2.10.0
4+
aldeed:collection2-core@1.2.0
5+
aldeed:schema-deny@1.1.0
6+
aldeed:schema-index@1.1.0
77
aldeed:simple-schema@1.5.3
88
allow-deny@1.0.5
99
app-prod-security@0.0.0
10-
autoupdate@1.2.10
11-
babel-compiler@6.8.3
12-
babel-runtime@0.1.9_1
10+
autoupdate@1.2.11
11+
babel-compiler@6.9.1
12+
babel-runtime@0.1.11
1313
base64@1.0.9
1414
binary-heap@1.0.9
15-
blaze@2.1.8
16-
blaze-tools@1.0.9
17-
boilerplate-generator@1.0.9
15+
blaze@2.1.9
16+
blaze-tools@1.0.10
17+
boilerplate-generator@1.0.10
1818
browser-policy@1.0.9
1919
browser-policy-common@1.0.10
2020
browser-policy-content@1.0.11
2121
browser-policy-framing@1.0.11
22-
caching-compiler@1.0.5_1
23-
caching-html-compiler@1.0.6
22+
caching-compiler@1.1.7
23+
caching-html-compiler@1.0.7
2424
callback-hook@1.0.9
2525
cfs:http-methods@0.0.32
2626
check@1.2.3
2727
chriswessels:hammer@4.0.2
28-
coffeescript@1.1.2_1
28+
coffeescript@1.0.17
2929
crosswalk@1.6.2
3030
dburles:collection-helpers@1.0.4
3131
ddp@1.2.5
32-
ddp-client@1.2.8_1
32+
ddp-client@1.2.9
3333
ddp-common@1.2.6
3434
ddp-rate-limiter@1.0.5
35-
ddp-server@1.2.8_1
35+
ddp-server@1.2.10
3636
deps@1.0.12
3737
diff-sequence@1.0.6
38-
dispatch:mocha-phantomjs@0.1.6
38+
dispatch:mocha-phantomjs@0.1.7
3939
dispatch:phantomjs-tests@0.0.5
40-
ecmascript@0.4.6_1
41-
ecmascript-runtime@0.2.11_1
40+
ecmascript@0.5.8
41+
ecmascript-runtime@0.3.14
4242
ejson@1.0.12
43-
email@1.0.14_1
44-
es5-shim@4.5.12_1
43+
email@1.1.17
44+
es5-shim@4.6.14
4545
factory@1.0.0
4646
fastclick@1.0.12
4747
force-ssl@1.0.12
4848
geojson-utils@1.0.9
4949
hot-code-push@1.0.4
50-
html-tools@1.0.10
51-
htmljs@1.0.10
52-
http@1.1.7
50+
html-tools@1.0.11
51+
htmljs@1.0.11
52+
http@1.1.8
5353
hwillson:stub-collections@1.0.1
5454
id-map@1.0.8
5555
jquery@1.11.9
5656
juliancwirko:postcss@1.1.1
5757
launch-screen@1.0.12
58-
less@2.6.3_1
58+
less@2.7.5
5959
livedata@1.0.18
6060
localstorage@1.0.11
61-
logging@1.0.13_1
61+
logging@1.1.15
6262
mdg:validated-method@1.1.0
6363
mdg:validation-error@0.5.1
64-
meteor@1.1.15_1
64+
meteor@1.2.17
6565
meteor-base@1.0.4
6666
meteorspark:util@0.2.0
67-
minifier-css@1.1.12_1
68-
minifier-js@1.1.12_1
67+
minifier-css@1.1.13
68+
minifier-js@1.2.14
6969
minimongo@1.0.17
7070
mobile-experience@1.0.4
7171
mobile-status-bar@1.0.12
72-
modules@0.6.4
73-
modules-runtime@0.6.4_1
74-
mongo@1.1.9_1
72+
modules@0.7.6
73+
modules-runtime@0.7.6
74+
mongo@1.1.12
7575
mongo-id@1.0.5
76-
npm-bcrypt@0.8.7
77-
npm-mongo@1.4.44_1
76+
npm-bcrypt@0.9.1
77+
npm-mongo@1.5.49
7878
observe-sequence@1.0.12
7979
ordered-dict@1.0.8
8080
practicalmeteor:chai@2.1.0_1
8181
practicalmeteor:loglevel@1.2.0_2
82-
practicalmeteor:mocha@2.4.5_4
83-
practicalmeteor:mocha-core@1.0.0
82+
practicalmeteor:mocha@2.4.5_6
83+
practicalmeteor:mocha-core@1.0.1
8484
practicalmeteor:sinon@1.14.1_2
85-
promise@0.7.2_1
85+
promise@0.8.7
8686
publication-collector@0.0.1
8787
raix:eventemitter@0.1.3
8888
random@1.0.10
@@ -97,26 +97,27 @@ routepolicy@1.0.11
9797
service-configuration@1.0.10
9898
session@1.1.6
9999
sha@1.0.8
100+
shell-server@0.2.1
100101
simple:authenticate-user-by-token@1.0.1
101102
simple:json-routes@2.1.0
102103
simple:rest@1.1.1
103104
simple:rest-accounts-password@1.1.2
104105
simple:rest-bearer-token-parser@1.0.1
105106
simple:rest-json-error-handler@1.0.1
106-
spacebars@1.0.12
107-
spacebars-compiler@1.0.12
107+
spacebars@1.0.13
108+
spacebars-compiler@1.0.13
108109
srp@1.0.9
109-
standard-minifier-js@1.0.7_1
110-
static-html@1.0.10_1
110+
standard-minifier-js@1.2.0
111+
static-html@1.1.13
111112
tap:i18n@1.8.2
112-
templating@1.1.12_1
113-
templating-tools@1.0.4
113+
templating@1.1.14
114+
templating-tools@1.0.5
114115
tmeasday:check-npm-versions@0.2.0
115116
tmeasday:test-reporter-helpers@0.2.1
116-
tracker@1.0.14
117-
ui@1.0.11
117+
tracker@1.1.0
118+
ui@1.0.12
118119
underscore@1.0.9
119120
url@1.0.10
120-
webapp@1.2.9_1
121+
webapp@1.3.11
121122
webapp-hashing@1.0.9
122123
xolvio:cleaner@0.3.1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Circle CI](https://circleci.com/gh/meteor/todos/tree/react.svg?style=svg)](https://circleci.com/gh/meteor/todos/tree/react)
22

3-
This is a Todos example app built on the principles described in the [Meteor Guide](http://guide.meteor.com/structure.html). This app uses the module functionality from the Meteor 1.3.
3+
This is a Todos example app built on the principles described in the [Meteor Guide](http://guide.meteor.com/structure.html). This app uses the module functionality introduced in Meteor 1.3.
44

55
This branch (`react`) implements the UI in [React](https://facebook.github.io/react/index.html). You can read more about using React in Meteor in the [Meteor guide article on the subject](http://guide.meteor.com/v1.3/react.html).
66

circle.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
machine:
22
node:
3-
version: 0.10.40
3+
version: 4.5.0
44
dependencies:
55
override:
66
- curl https://install.meteor.com | /bin/sh
77
- npm install
88
checkout:
99
post:
1010
- git submodule update --init
11-

client/main.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* global document */
2+
13
import { Meteor } from 'meteor/meteor';
24
import { render } from 'react-dom';
35
import { renderRoutes } from '../imports/startup/client/routes.jsx';

imports/api/generate-data.app-tests.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ if (Meteor.isClient) {
3636
});
3737
}
3838

39+
const generateDataExport = generateData;
3940

40-
export { generateData };
41+
export { generateDataExport };

imports/api/lists/lists.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class ListsCollection extends Mongo.Collection {
1010
let nextLetter = 'A';
1111
ourList.name = `List ${nextLetter}`;
1212

13-
while (!!this.findOne({ name: ourList.name })) {
13+
while (this.findOne({ name: ourList.name })) {
1414
// not going to be too smart here, can go past Z
1515
nextLetter = String.fromCharCode(nextLetter.charCodeAt(0) + 1);
1616
ourList.name = `List ${nextLetter}`;

imports/api/lists/lists.tests.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
/* eslint-env mocha */
22

33
import { Factory } from 'meteor/factory';
4-
import { Lists } from './lists.js';
5-
import { insert, makePublic, makePrivate, updateName, remove } from './methods.js';
6-
import { Todos } from '../todos/todos.js';
74
import { PublicationCollector } from 'meteor/publication-collector';
85
import { chai, assert } from 'meteor/practicalmeteor:chai';
96
import { Random } from 'meteor/random';
107
import { Meteor } from 'meteor/meteor';
118
import { _ } from 'meteor/underscore';
129
import { DDP } from 'meteor/ddp-client';
1310

11+
import { Lists } from './lists.js';
12+
import { insert, makePublic, makePrivate, updateName, remove } from './methods.js';
13+
import { Todos } from '../todos/todos.js';
14+
1415
if (Meteor.isServer) {
15-
require('./server/publications.js');
16+
// eslint-disable-next-line import/no-unresolved
17+
import './server/publications.js';
1618

1719
describe('lists', () => {
1820
describe('mutators', () => {

0 commit comments

Comments
 (0)