Skip to content

Commit 4d651bc

Browse files
committed
Updates license ownership information.
1 parent 386a408 commit 4d651bc

5 files changed

Lines changed: 26 additions & 16 deletions

File tree

Dockerfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
FROM gzlock/node-pm2
22

33
################## ESTABLISH DIRECTORIES ######################
4+
5+
# Establish our webfolder root
46
RUN rm -rf /var/www/
57
WORKDIR /var/www/
68
COPY package.json /var/www/
9+
10+
11+
# Install and cache npm dependencies unless package.json changes
12+
713
ENV NODE_ENV=production
8-
RUN npm install
14+
ADD package.json /tmp/package.json
15+
RUN cd /tmp && npm install
16+
RUN cp -a /tmp/node_modules /var/www/
17+
918
COPY public/ /var/www/public
1019
COPY server/ /var/www/server
1120
COPY config/ /var/www/config

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015 Feathers
3+
Copyright (c) 2017 Jon Paul Miles
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

app/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
require('./vendor')
22
// reboot vue app from client-side because the server makes a one time static render that's not interactable
33
require('./boot')
4-
require('./css/app.styl')
4+
require('./css/app.styl')

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"cors": "^2.8.3",
3636
"eslint": "^3.19.0",
3737
"feathers": "^2.1.2",
38-
"feathers-authentication": "^1.2.3",
38+
"feathers-authentication": "^1.2.4",
3939
"feathers-authentication-hooks": "^0.1.3",
4040
"feathers-authentication-jwt": "^0.3.1",
4141
"feathers-authentication-local": "^0.3.4",
@@ -52,21 +52,20 @@
5252
"feathers-socketio": "^2.0.0",
5353
"helmet": "^3.6.1",
5454
"jade": "^1.11.0",
55+
"lru-cache": "^4.0.2",
5556
"mongoose": "^4.10.1",
5657
"nodemailer-smtp-transport": "^2.7.4",
5758
"passport-facebook": "^2.1.1",
5859
"passport-github": "^1.1.0",
5960
"passport-google-oauth20": "^1.0.0",
61+
"pm2": "^2.2.3",
6062
"request": "^2.81.0",
6163
"request-promise": "^4.2.1",
6264
"serve-favicon": "^2.4.3",
6365
"vue-server-renderer": "^2.3.3",
64-
"winston": "^2.3.1",
65-
"pm2": "^2.2.3",
66-
"lru-cache": "^4.0.2"
66+
"winston": "^2.3.1"
6767
},
6868
"devDependencies": {
69-
"webpack": "^1.14.0",
7069
"axios": "^0.15.3",
7170
"axios-mock-adapter": "^1.7.1",
7271
"bluebird": "^3.4.7",
@@ -115,6 +114,7 @@
115114
"vue-router": "^2.4.0",
116115
"vue-stash": "^2.0.1-beta",
117116
"vue-template-compiler": "^2.1.10",
117+
"webpack": "^1.14.0",
118118
"webpack-async-await": "1.0.4"
119119
}
120120
}

yarn.lock

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1821,21 +1821,22 @@ feathers-authentication-oauth2@^0.2.4:
18211821
feathers-rest "^1.5.2"
18221822
lodash.merge "^4.6.0"
18231823

1824-
feathers-authentication@^1.2.3:
1825-
version "1.2.3"
1826-
resolved "https://registry.yarnpkg.com/feathers-authentication/-/feathers-authentication-1.2.3.tgz#7cbba3a2f228876d5671f3bb8616dd2fabb07934"
1824+
feathers-authentication@^1.2.4:
1825+
version "1.2.4"
1826+
resolved "https://registry.yarnpkg.com/feathers-authentication/-/feathers-authentication-1.2.4.tgz#c0d65d16b37c853bb54485d8beb753713d3ee099"
18271827
dependencies:
18281828
debug "^2.2.0"
18291829
feathers-authentication-client "^0.3.1"
18301830
feathers-commons "^0.8.4"
18311831
feathers-errors "^2.4.0"
18321832
feathers-socket-commons "^2.3.1"
18331833
jsonwebtoken "^7.1.9"
1834+
lodash.clone "^4.5.0"
18341835
lodash.merge "^4.6.0"
18351836
lodash.omit "^4.5.0"
18361837
lodash.pick "^4.4.0"
18371838
long-timeout "^0.1.1"
1838-
ms "^1.0.0"
1839+
ms "^2.0.0"
18391840
passport "^0.3.2"
18401841

18411842
feathers-commons@^0.8.0, feathers-commons@^0.8.4, feathers-commons@^0.8.5, feathers-commons@^0.8.6, feathers-commons@^0.8.7:
@@ -3372,6 +3373,10 @@ lodash.camelcase@^4.3.0:
33723373
version "4.3.0"
33733374
resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
33743375

3376+
lodash.clone@^4.5.0:
3377+
version "4.5.0"
3378+
resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
3379+
33753380
lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
33763381
version "4.5.0"
33773382
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -3796,10 +3801,6 @@ ms@2.0.0, ms@^2.0.0:
37963801
version "2.0.0"
37973802
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
37983803

3799-
ms@^1.0.0:
3800-
version "1.0.0"
3801-
resolved "https://registry.yarnpkg.com/ms/-/ms-1.0.0.tgz#59adcd22edc543f7b5381862d31387b1f4bc9473"
3802-
38033804
multipipe@^0.1.2:
38043805
version "0.1.2"
38053806
resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"

0 commit comments

Comments
 (0)