Skip to content

Commit 3becf4b

Browse files
authored
Merge pull request #3753 from mnutt/meteor-2.16-upgrade-deps-rebased
Meteor 2.16 upgrade deps
2 parents fbe5841 + d594115 commit 3becf4b

23 files changed

Lines changed: 11221 additions & 5869 deletions

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
# the constant below.
108108
make lint | tee lint.log
109109
num_problems=$(cat lint.log | grep ' problems (0 errors, ' | awk '{print $2}')
110-
[ "$num_problems" = 775 ]
110+
[ "$num_problems" = 774 ]
111111
- name: setup java 11
112112
uses: actions/setup-java@v4
113113
with:
@@ -116,7 +116,7 @@ jobs:
116116
- name: setup chrome
117117
uses: browser-actions/setup-chrome@v1
118118
with:
119-
chrome-version: 142
119+
chrome-version: 144
120120
- name: remove system chrome
121121
run: |
122122
sudo rm -f /usr/bin/google-chrome /usr/bin/google-chrome-stable

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,6 @@ tests/tmp-sandstorm
8181
app-index.spk
8282
test-app.spk
8383
deps/llvm-build
84+
85+
# no npm in the root
86+
/package-lock.json

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,11 +284,13 @@ shell-env: tmp/.shell-env
284284

285285
# Note that we need Ekam to build node_modules before we can run Meteor, hence
286286
# the dependency on tmp/.ekam-run.
287-
tmp/.shell-env: tmp/.ekam-run $(IMAGES) shell/imports/client/changelog.html shell/client/styles/_icons.scss shell/package.json shell/npm-shrinkwrap.json
287+
tmp/.shell-env: tmp/.ekam-run $(IMAGES) shell/imports/client/changelog.html shell/client/styles/_icons.scss shell/package.json shell/package-lock.json
288288
@$(call color,configuring meteor frontend)
289289
@mkdir -p tmp
290290
@mkdir -p node_modules/capnp
291291
@bash -O extglob -c 'cp src/capnp/!(*test*).capnp node_modules/capnp'
292+
@test deps/node-capnp/src/node-capnp/capnp.js -ef node_modules/capnp.js || cp deps/node-capnp/src/node-capnp/capnp.js node_modules/capnp.js
293+
@test tmp/node-capnp/capnp.node -ef node_modules/capnp.node || cp tmp/node-capnp/capnp.node node_modules/capnp.node
292294
@cd shell/ && PATH=$(METEOR_DEV_BUNDLE)/bin:$$PATH $(METEOR_DEV_BUNDLE)/bin/npm install
293295
@touch tmp/.shell-env
294296

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
jinja2==3.0.3
1+
jinja2==3.1.6
22
markdown==3.3.7
33
mkdocs==1.3.0

meteor-testapp/.meteor/versions

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
allow-deny@1.1.0
1+
allow-deny@1.1.1
22
autopublish@1.0.7
3-
autoupdate@1.7.0
4-
babel-compiler@7.7.0
5-
babel-runtime@1.5.0
3+
autoupdate@1.8.0
4+
babel-compiler@7.10.5
5+
babel-runtime@1.5.1
66
base64@1.0.12
77
binary-heap@1.0.11
8-
blaze@2.5.0
8+
blaze@2.7.1
99
blaze-html-templates@1.2.1
1010
blaze-tools@1.1.2
11-
boilerplate-generator@1.7.1
11+
boilerplate-generator@1.7.2
1212
caching-compiler@1.2.2
1313
caching-html-compiler@1.2.1
14-
callback-hook@1.3.1
15-
check@1.3.1
16-
ddp@1.4.0
17-
ddp-client@2.5.0
18-
ddp-common@1.4.0
19-
ddp-server@2.4.1
20-
diff-sequence@1.1.1
21-
dynamic-import@0.7.1
22-
ecmascript@0.15.3
23-
ecmascript-runtime@0.7.0
24-
ecmascript-runtime-client@0.11.1
25-
ecmascript-runtime-server@0.10.1
26-
ejson@1.1.1
14+
callback-hook@1.5.1
15+
check@1.4.1
16+
ddp@1.4.1
17+
ddp-client@2.6.2
18+
ddp-common@1.4.1
19+
ddp-server@2.7.1
20+
diff-sequence@1.1.2
21+
dynamic-import@0.7.3
22+
ecmascript@0.16.8
23+
ecmascript-runtime@0.8.1
24+
ecmascript-runtime-client@0.12.1
25+
ecmascript-runtime-server@0.11.0
26+
ejson@1.1.3
2727
es5-shim@4.8.0
28-
fetch@0.1.1
29-
geojson-utils@1.0.10
28+
fetch@0.1.4
29+
geojson-utils@1.0.11
3030
hot-code-push@1.0.4
3131
html-tools@1.1.2
3232
htmljs@1.1.1
@@ -36,45 +36,46 @@ insecure@1.0.7
3636
inter-process-messaging@0.1.1
3737
jquery@3.0.0
3838
kenton:accounts-sandstorm@0.7.0
39-
launch-screen@1.3.0
40-
logging@1.2.0
41-
meteor@1.9.3
39+
launch-screen@2.0.0
40+
logging@1.3.4
41+
meteor@1.11.5
4242
meteor-base@1.5.1
43-
minifier-css@1.5.4
44-
minifier-js@2.6.1
45-
minimongo@1.7.0
46-
mobile-experience@1.1.0
43+
minifier-css@1.6.4
44+
minifier-js@2.8.0
45+
minimongo@1.9.4
46+
mobile-experience@1.1.1
4747
mobile-status-bar@1.1.0
48-
modern-browsers@0.1.5
49-
modules@0.16.0
50-
modules-runtime@0.12.0
51-
mongo@1.12.0
52-
mongo-decimal@0.1.2
48+
modern-browsers@0.1.10
49+
modules@0.20.0
50+
modules-runtime@0.13.1
51+
mongo@1.16.10
52+
mongo-decimal@0.1.3
5353
mongo-dev-server@1.1.0
5454
mongo-id@1.0.8
55-
npm-mongo@3.9.1
55+
npm-mongo@4.17.2
5656
observe-sequence@1.0.19
5757
ordered-dict@1.1.0
58-
promise@0.12.0
59-
random@1.2.0
60-
react-fast-refresh@0.1.1
61-
reactive-var@1.0.11
58+
promise@0.12.2
59+
random@1.2.1
60+
react-fast-refresh@0.2.8
61+
reactive-var@1.0.12
6262
reload@1.3.1
6363
retry@1.1.0
6464
routepolicy@1.1.1
6565
shell-server@0.5.0
66-
socket-stream-client@0.4.0
67-
spacebars@1.2.0
66+
socket-stream-client@0.5.2
67+
spacebars@1.3.0
6868
spacebars-compiler@1.3.0
69-
standard-minifier-css@1.7.3
70-
standard-minifier-js@2.6.1
71-
templating@1.4.1
69+
standard-minifier-css@1.9.2
70+
standard-minifier-js@2.8.1
71+
templating@1.4.2
7272
templating-compiler@1.4.1
73-
templating-runtime@1.5.0
73+
templating-runtime@1.6.0
7474
templating-tools@1.2.1
75-
tracker@1.2.0
75+
tracker@1.3.3
76+
typescript@4.9.5
7677
ui@1.0.13
77-
underscore@1.0.10
78+
underscore@1.6.1
7879
url@1.3.2
79-
webapp@1.11.1
80-
webapp-hashing@1.1.0
80+
webapp@1.13.8
81+
webapp-hashing@1.1.1

0 commit comments

Comments
 (0)