Skip to content

Commit d7c60cf

Browse files
brunolemosbrunolemos
committed
[Landing Page] Fix deploy
1 parent 7cdae87 commit d7c60cf

File tree

12 files changed

+162
-51
lines changed

12 files changed

+162
-51
lines changed

‎.nowignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,11 @@ packages/components/dist
1313
packages/components/node_modules
1414
packages/components/package.json
1515
packages/components/src
16-
packages/core
1716
packages/desktop
1817
packages/mobile
1918
packages/web/build
2019
packages/web/dist/**.map
2120
packages/web/node_modules
2221
packages/web/package.json
2322
packages/web/src
24-
patches
25-
subdomains
26-
tsconfig.json
27-
tslint.json
23+
subdomains

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ script:
2727
-v ~/.cache/electron:/root/.cache/electron \
2828
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
2929
electronuserland/builder:wine \
30-
/bin/bash -c "yarn --pure-lockfile && yarn clean && yarn workspace @devhub/web build && yarn workspace @devhub/desktop build:skipweb --linux --win"
30+
/bin/bash -c "yarn --pure-lockfile && yarn workspace @devhub/web build && yarn workspace @devhub/desktop build:skipweb --linux --win"
3131
else
32-
yarn --pure-lockfile && yarn clean && yarn workspace @devhub/web build && yarn workspace @devhub/desktop build:skipweb --mac && now --target production --token $NOW_TOKEN && now alias beta.devhubapp.com --token $NOW_TOKEN
32+
yarn --pure-lockfile && yarn workspace @devhub/web build && yarn workspace @devhub/desktop build:skipweb --mac && yarn now --local-config ./now.app.json --target production --token $NOW_TOKEN && yarn now --local-config ./now.landing.json --target production --token $NOW_TOKEN
3333
fi
3434
3535
before_cache:

‎next.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const withCSS = require('@zeit/next-css')
22

33
module.exports = withCSS({
4+
target: 'serverless',
45
env: {
56
STRIPE_PUBLIC_KEY:
67
process.env.NODE_ENV === 'production'

‎now.app.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"public": true,
3+
"name": "devhub-app",
4+
"alias": "app.devhubapp.com",
5+
"version": 2,
6+
"builds": [
7+
{ "src": "packages/web/dist/**", "use": "@now/static" }
8+
],
9+
"routes": [
10+
{
11+
"src": "/(.*)\\.(.*)",
12+
"dest": "/packages/web/dist/$1.$2"
13+
},
14+
{
15+
"src": "/",
16+
"dest": "/packages/web/dist/index.html"
17+
},
18+
{
19+
"src": "/(.*)",
20+
"status": 301, "headers": { "Location": "/" }
21+
}
22+
],
23+
"regions": ["all"],
24+
"github": {
25+
"enabled": false,
26+
"autoAlias": false
27+
}
28+
}

‎now.json

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎now.landing.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"public": true,
3+
"name": "devhub-landing",
4+
"alias": "devhubapp.com",
5+
"version": 2,
6+
"builds": [
7+
{ "src": "next.config.js", "use": "@now/next" }
8+
],
9+
"regions": ["all"],
10+
"github": {
11+
"enabled": false,
12+
"autoAlias": false
13+
}
14+
}

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"clean": "yarn workspaces run clean",
2727
"dev": "yarn workspace @devhub/desktop compile && concurrently --kill-others \"yarn workspace @devhub/desktop compile -w\" \"yarn workspace @devhub/web start\" \"yarn workspace @devhub/mobile start\" \"wait-on http://localhost:3000 && yarn workspace @devhub/desktop start\"",
2828
"dev:desktop": "cross-env BROWSER=none concurrently \"yarn dev:web\" \"yarn workspace @devhub/desktop compile -w\" \"wait-on http://localhost:3000 && yarn workspace @devhub/desktop start\"",
29-
"dev:landing": "yarn workspace @devhub/core compile && concurrently \"yarn workspace @devhub/core compile -w\" \"PORT=4000 now dev\"",
29+
"dev:landing": "yarn workspace @devhub/core compile && concurrently \"yarn workspace @devhub/core compile -w\" \"next\"",
3030
"dev:mobile": "yarn workspace @devhub/mobile compile && concurrently --kill-others \"yarn workspace @devhub/mobile compile -w\" \"yarn workspace @devhub/mobile start\"",
3131
"dev:web": "yarn workspace @devhub/web compile && concurrently --kill-others \"yarn workspace @devhub/web compile -w\" \"yarn workspace @devhub/web start\"",
3232
"format": "yarn workspaces run format",
@@ -40,15 +40,15 @@
4040
"dependencies": {
4141
"@devhub/core": "0.93.0",
4242
"@devhub/landing": "0.93.0",
43-
"next": "9.0.2",
43+
"next": "9.0.3",
4444
"opencollective-postinstall": "2.0.2"
4545
},
4646
"devDependencies": {
4747
"concurrently": "4.1.0",
4848
"cross-env": "5.2.0",
4949
"husky": "1.3.1",
5050
"lint-staged": "8.1.5",
51-
"now": "15.8.5",
51+
"now": "16.1.1",
5252
"patch-package": "6.0.5",
5353
"postinstall-prepare": "1.0.1",
5454
"prettier": "1.16.4",

‎packages/landing/src/components/sections/UsedByCompaniesBlock.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export default function UsedByCompaniesBlock(
9898
</div>
9999
</div>
100100

101-
<p className="text-xs text-muted-40 italic">
101+
<p className="text-xs text-muted-60 italic">
102102
Not affiliated with these companies. Used by some of their
103103
individuals.
104104
</p>

‎packages/web/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"build": "yarn compile && react-app-rewired build && shx rm -rf dist && mv build dist",
88
"clean": "shx rm -rf dist/*",
99
"compile": "tsc -b",
10-
"deploy": "yarn build && cd ../../ && now --target production && cd -",
11-
"deploy:beta": "yarn build && cd ../../ && now --target staging && now alias beta.devhubapp.com && cd -",
10+
"deploy": "yarn build && cd ../../ && now --local-config ./now.app.json --target production && cd -",
11+
"deploy:beta": "yarn build && cd ../../ && now --local-config ./now.app.json --target staging && now alias beta.devhubapp.com && cd -",
1212
"eject": "react-app-rewired eject",
1313
"format": "prettier --write '{.,src/**}/*.{js,jsx,ts,tsx}'",
1414
"lint": "tslint -p .",
@@ -34,7 +34,7 @@
3434
"@types/react": "16.8.24",
3535
"@types/react-dom": "16.8.5",
3636
"babel-plugin-react-native-web": "0.11.5",
37-
"now": "15.8.5",
37+
"now": "16.1.1",
3838
"postinstall-prepare": "1.0.1",
3939
"prettier": "1.16.4",
4040
"react-app-rewired": "2.1.1",

‎subdomains/slack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"dependencies": {},
1717
"devDependencies": {
1818
"eslint": "5.9.0",
19-
"now": "15.8.5"
19+
"now": "16.1.1"
2020
}
2121
}

‎subdomains/www/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"dependencies": {},
1717
"devDependencies": {
1818
"eslint": "5.9.0",
19-
"now": "15.8.5"
19+
"now": "16.1.1"
2020
}
2121
}

‎yarn.lock

Lines changed: 107 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4299,9 +4299,9 @@ [email protected]:
42994299
safe-buffer "5.1.2"
43004300
vary "~1.1.2"
43014301

4302-
compression@^1.5.2, compression@^1.7.1:
4302+
compression@1.7.4, compression@^1.5.2, compression@^1.7.1:
43034303
version "1.7.4"
4304-
resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
4304+
resolved "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
43054305
integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
43064306
dependencies:
43074307
accepts "~1.3.5"
@@ -10534,6 +10534,25 @@ [email protected]:
1053410534
styled-jsx "3.2.1"
1053510535
url "0.11.0"
1053610536

10537+
[email protected]:
10538+
version "9.0.3"
10539+
resolved "https://registry.npmjs.org/next-server/-/next-server-9.0.3.tgz#b1372df158646ec40118c6e845d9a51764a21d89"
10540+
integrity sha512-fBTiph8k3GklHikeBcxkPZMTler7Q4oKSCUU7hJa0qDa8Sx+Tm4F1cn8FU0pM8C8Q1A+FVBZPEz5iJLJwhtZqA==
10541+
dependencies:
10542+
amp-toolbox-optimizer "1.2.0-alpha.1"
10543+
content-type "1.0.4"
10544+
cookie "0.4.0"
10545+
etag "1.8.1"
10546+
find-up "4.0.0"
10547+
fresh "0.5.2"
10548+
path-to-regexp "2.1.0"
10549+
prop-types "15.7.2"
10550+
raw-body "2.4.0"
10551+
react-is "16.8.6"
10552+
send "0.16.1"
10553+
styled-jsx "3.2.1"
10554+
url "0.11.0"
10555+
1053710556
[email protected]:
1053810557
version "9.0.2"
1053910558
resolved "https://registry.npmjs.org/next/-/next-9.0.2.tgz#4de9da7ca64d89dd1759ad2b5d9d23a9dc3ca63b"
@@ -10586,6 +10605,59 @@ [email protected]:
1058610605
webpack-sources "1.3.0"
1058710606
worker-farm "1.7.0"
1058810607

10608+
[email protected]:
10609+
version "9.0.3"
10610+
resolved "https://registry.npmjs.org/next/-/next-9.0.3.tgz#5c7b6f8dd142de907456a7c1df41e839ad16804a"
10611+
integrity sha512-Du0bGMdQDFq0itPm+OyaN/cKW20p9h6ZoEXnwIcop28L06pB45KcLEDdZgDZ75rk36UHiuwpRnjLMVzcbEqhRg==
10612+
dependencies:
10613+
"@babel/core" "7.4.5"
10614+
"@babel/plugin-proposal-class-properties" "7.4.4"
10615+
"@babel/plugin-proposal-object-rest-spread" "7.4.4"
10616+
"@babel/plugin-syntax-dynamic-import" "7.2.0"
10617+
"@babel/plugin-transform-modules-commonjs" "7.4.4"
10618+
"@babel/plugin-transform-runtime" "7.4.4"
10619+
"@babel/preset-env" "7.4.5"
10620+
"@babel/preset-react" "7.0.0"
10621+
"@babel/preset-typescript" "7.3.3"
10622+
"@babel/runtime" "7.4.5"
10623+
"@babel/runtime-corejs2" "7.4.5"
10624+
amphtml-validator "1.0.23"
10625+
async-sema "3.0.0"
10626+
autodll-webpack-plugin "0.4.2"
10627+
babel-core "7.0.0-bridge.0"
10628+
babel-loader "8.0.6"
10629+
babel-plugin-react-require "3.0.0"
10630+
babel-plugin-transform-async-to-promises "0.8.10"
10631+
babel-plugin-transform-react-remove-prop-types "0.4.24"
10632+
chalk "2.4.2"
10633+
compression "1.7.4"
10634+
find-up "4.0.0"
10635+
fork-ts-checker-webpack-plugin "1.3.4"
10636+
fresh "0.5.2"
10637+
launch-editor "2.2.1"
10638+
loader-utils "1.2.3"
10639+
mkdirp "0.5.1"
10640+
next-server "9.0.3"
10641+
prop-types "15.7.2"
10642+
prop-types-exact "1.2.0"
10643+
react-error-overlay "5.1.6"
10644+
react-is "16.8.6"
10645+
serialize-javascript "1.7.0"
10646+
source-map "0.6.1"
10647+
string-hash "1.1.3"
10648+
strip-ansi "5.2.0"
10649+
styled-jsx "3.2.1"
10650+
terser "4.0.0"
10651+
tty-aware-progress "1.0.4"
10652+
unfetch "4.1.0"
10653+
url "0.11.0"
10654+
watchpack "2.0.0-beta.5"
10655+
webpack "4.38.0"
10656+
webpack-dev-middleware "3.7.0"
10657+
webpack-hot-middleware "2.25.0"
10658+
webpack-sources "1.3.0"
10659+
worker-farm "1.7.0"
10660+
1058910661
nice-try@^1.0.4:
1059010662
version "1.0.5"
1059110663
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -10786,10 +10858,10 @@ normalize.css@^8.0.1:
1078610858
resolved "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
1078710859
integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==
1078810860

10789-
now@15.8.5:
10790-
version "15.8.5"
10791-
resolved "https://registry.npmjs.org/now/-/now-15.8.5.tgz#1201ad17d8f21f41455e5aeaf879def711beb3c5"
10792-
integrity sha512-YjkbEzxANkqDrQG5FAMkK4asZnU5NYvVUCgeACZlASNs+SXZgDObDlIOW2OCs1TF5zBZStD9BMkE8l16imddQA==
10861+
now@16.1.1:
10862+
version "16.1.1"
10863+
resolved "https://registry.npmjs.org/now/-/now-16.1.1.tgz#692c406158c21bb0371de137b5f9957c861a4810"
10864+
integrity sha512-SXro0fOBTVBn+A2wEYV63It706egm7swgo6qb8zp6g07pOK0PQ1smeO0wmdYbx2Kuk5+Deh5t92KnZQi8wZjzA==
1079310865

1079410866
npm-bundled@^1.0.1:
1079510867
version "1.0.6"
@@ -16018,6 +16090,35 @@ [email protected]:
1601816090
watchpack "^1.5.0"
1601916091
webpack-sources "^1.3.0"
1602016092

16093+
[email protected]:
16094+
version "4.38.0"
16095+
resolved "https://registry.npmjs.org/webpack/-/webpack-4.38.0.tgz#6d77108404b08883c78f4e7e45a43c4e5c47c931"
16096+
integrity sha512-lbuFsVOq8PZY+1Ytz/mYOvYOo+d4IJ31hHk/7iyoeWtwN33V+5HYotSH+UIb9tq914ey0Hot7z6HugD+je3sWw==
16097+
dependencies:
16098+
"@webassemblyjs/ast" "1.8.5"
16099+
"@webassemblyjs/helper-module-context" "1.8.5"
16100+
"@webassemblyjs/wasm-edit" "1.8.5"
16101+
"@webassemblyjs/wasm-parser" "1.8.5"
16102+
acorn "^6.2.0"
16103+
ajv "^6.1.0"
16104+
ajv-keywords "^3.1.0"
16105+
chrome-trace-event "^1.0.0"
16106+
enhanced-resolve "^4.1.0"
16107+
eslint-scope "^4.0.0"
16108+
json-parse-better-errors "^1.0.2"
16109+
loader-runner "^2.3.0"
16110+
loader-utils "^1.1.0"
16111+
memory-fs "~0.4.1"
16112+
micromatch "^3.1.8"
16113+
mkdirp "~0.5.0"
16114+
neo-async "^2.5.0"
16115+
node-libs-browser "^2.0.0"
16116+
schema-utils "^1.0.0"
16117+
tapable "^1.1.0"
16118+
terser-webpack-plugin "^1.1.0"
16119+
watchpack "^1.5.0"
16120+
webpack-sources "^1.3.0"
16121+
1602116122
websocket-driver@>=0.5.1:
1602216123
version "0.7.0"
1602316124
resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"

0 commit comments

Comments
 (0)