flayks/housesof
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into dev
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Félix Péault
2020-05-20 15:30:16 +02:00
parent 0d43ccc4e9 b19821452b
commit 6aeedee0ea
5 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@@ -71,7 +71,7 @@ steps:
- name: restart-container-dev - name: restart-container-dev
image: appleboy/drone-ssh image: appleboy/drone-ssh
settings: settings:
host: housesof.world host: flayks.com
username: username:
from_secret: ssh_user from_secret: ssh_user
key: key:
@@ -88,7 +88,7 @@ steps:
- name: restart-container-prod - name: restart-container-prod
image: appleboy/drone-ssh image: appleboy/drone-ssh
settings: settings:
host: housesof.world host: flayks.com
username: username:
from_secret: ssh_user from_secret: ssh_user
key: key:
@@ -115,6 +115,7 @@ steps:
headers: headers:
from_secret: cdn_accesskey from_secret: cdn_accesskey
method: POST method: POST
failure: ignore
when: when:
branch: branch:
- dev - dev
@@ -128,6 +129,7 @@ steps:
headers: headers:
from_secret: cdn_accesskey from_secret: cdn_accesskey
method: POST method: POST
failure: ignore
when: when:
branch: branch:
- master - master

2
.env
View File

@@ -5,7 +5,7 @@ HOME_PHOTOS_LIMIT=6
# API # API
API_TOKEN="NJk0urljsdSvApUDzWxGgoO6" API_TOKEN="NJk0urljsdSvApUDzWxGgoO6"
API_URL_DEV="http://api.housesof.localhost/how" API_URL_DEV="http://api.housesof.localhost/how"
API_URL_PROD="https://api-dev.housesof.world/how" API_URL_PROD="https://api.housesof.world/how"
# Tracking # Tracking
GA_TRACKER_ID="UA-4060922-27" GA_TRACKER_ID="UA-4060922-27"

13
package.json
View File

@@ -10,10 +10,9 @@
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "sapper dev --port 3000", "dev": "sapper dev --port 3000",
"build": "sapper build dist", "build": "sapper build dist --legacy",
"export": "sapper export export", "export": "sapper export export --legacy",
"start": "node __sapper__/build", "start": "node dist"
"serve": "node server/server.js"
}, },
"dependencies": { "dependencies": {
"animejs": "^3.2.0", "animejs": "^3.2.0",
@@ -26,7 +25,8 @@
"scroll-out": "^2.2.8", "scroll-out": "^2.2.8",
"sirv": "^0.4.2", "sirv": "^0.4.2",
"svelte-lazy": "^0.1.11", "svelte-lazy": "^0.1.11",
"swipe-listener": "^1.1.0" "swipe-listener": "^1.1.0",
"node-fetch": "^2.6.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.9.6", "@babel/core": "^7.9.6",
@@ -41,12 +41,11 @@
"@rollup/plugin-replace": "^2.3.2", "@rollup/plugin-replace": "^2.3.2",
"autoprefixer": "^9.7.6", "autoprefixer": "^9.7.6",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"node-fetch": "^2.6.0",
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"postcss": "^7.0.29", "postcss": "^7.0.29",
"postcss-load-config": "^2.1.0", "postcss-load-config": "^2.1.0",
"postcss-preset-env": "^6.7.0", "postcss-preset-env": "^6.7.0",
"rollup": "^2.8.2", "rollup": "^2.9.0",
"rollup-plugin-glslify": "^1.2.0", "rollup-plugin-glslify": "^1.2.0",
"rollup-plugin-svelte": "^5.2.1", "rollup-plugin-svelte": "^5.2.1",
"rollup-plugin-terser": "^5.3.0", "rollup-plugin-terser": "^5.3.0",

70
pnpm-lock.yaml generated
View File

@@ -3,6 +3,7 @@ dependencies:
compression: 1.7.4 compression: 1.7.4
imagesloaded: 4.1.4 imagesloaded: 4.1.4
lazysizes: 5.2.0 lazysizes: 5.2.0
node-fetch: 2.6.0
normalize.css: 8.0.1 normalize.css: 8.0.1
polka: 1.0.0-next.11 polka: 1.0.0-next.11
rellax: 1.12.1 rellax: 1.12.1
@@ -16,22 +17,21 @@ devDependencies:
'@babel/plugin-transform-runtime': 7.9.6_@babel+core@7.9.6 '@babel/plugin-transform-runtime': 7.9.6_@babel+core@7.9.6
'@babel/preset-env': 7.9.6_@babel+core@7.9.6 '@babel/preset-env': 7.9.6_@babel+core@7.9.6
'@babel/runtime': 7.9.6 '@babel/runtime': 7.9.6
'@rollup/plugin-alias': 3.1.0_rollup@2.8.2 '@rollup/plugin-alias': 3.1.0_rollup@2.9.0
'@rollup/plugin-babel': 5.0.0_@babel+core@7.9.6+rollup@2.8.2 '@rollup/plugin-babel': 5.0.0_@babel+core@7.9.6+rollup@2.9.0
'@rollup/plugin-commonjs': 11.0.2_rollup@2.8.2 '@rollup/plugin-commonjs': 11.0.2_rollup@2.9.0
'@rollup/plugin-node-resolve': 7.1.3_rollup@2.8.2 '@rollup/plugin-node-resolve': 7.1.3_rollup@2.9.0
'@rollup/plugin-replace': 2.3.2_rollup@2.8.2 '@rollup/plugin-replace': 2.3.2_rollup@2.9.0
autoprefixer: 9.7.6 autoprefixer: 9.7.6
dotenv: 8.2.0 dotenv: 8.2.0
node-fetch: 2.6.0
node-sass: 4.14.1 node-sass: 4.14.1
postcss: 7.0.29 postcss: 7.0.29
postcss-load-config: 2.1.0 postcss-load-config: 2.1.0
postcss-preset-env: 6.7.0 postcss-preset-env: 6.7.0
rollup: 2.8.2 rollup: 2.9.0
rollup-plugin-glslify: 1.2.0 rollup-plugin-glslify: 1.2.0
rollup-plugin-svelte: 5.2.1_rollup@2.8.2+svelte@3.22.2 rollup-plugin-svelte: 5.2.1_rollup@2.9.0+svelte@3.22.2
rollup-plugin-terser: 5.3.0_rollup@2.8.2 rollup-plugin-terser: 5.3.0_rollup@2.9.0
sapper: 0.27.12_svelte@3.22.2 sapper: 0.27.12_svelte@3.22.2
svelte: 3.22.2 svelte: 3.22.2
svelte-preprocess: 3.7.4_0f5e9935bde736cfabfb00c1d85a6ff4 svelte-preprocess: 3.7.4_0f5e9935bde736cfabfb00c1d85a6ff4
@@ -908,9 +908,9 @@ packages:
dev: false dev: false
resolution: resolution:
integrity: sha512-3NsZsJIA/22P3QUyrEDNA2D133H4j224twJrdipXN38dpnIOzAbUDtOwkcJ5pXmn75w7LSQDjA4tO9dm1XlqlA== integrity: sha512-3NsZsJIA/22P3QUyrEDNA2D133H4j224twJrdipXN38dpnIOzAbUDtOwkcJ5pXmn75w7LSQDjA4tO9dm1XlqlA==
/@rollup/plugin-alias/3.1.0_rollup@2.8.2: /@rollup/plugin-alias/3.1.0_rollup@2.9.0:
dependencies: dependencies:
rollup: 2.8.2 rollup: 2.9.0
slash: 3.0.0 slash: 3.0.0
dev: true dev: true
engines: engines:
@@ -919,12 +919,12 @@ packages:
rollup: ^1.20.0||^2.0.0 rollup: ^1.20.0||^2.0.0
resolution: resolution:
integrity: sha512-IzoejtAqdfwAvx4D0bztAJFoL5Js36kJgnbO00zfI1B9jf9G80vWysyG0C4+E6w5uG5hz0EeetPpoBWKdNktCQ== integrity: sha512-IzoejtAqdfwAvx4D0bztAJFoL5Js36kJgnbO00zfI1B9jf9G80vWysyG0C4+E6w5uG5hz0EeetPpoBWKdNktCQ==
/@rollup/plugin-babel/5.0.0_@babel+core@7.9.6+rollup@2.8.2: /@rollup/plugin-babel/5.0.0_@babel+core@7.9.6+rollup@2.9.0:
dependencies: dependencies:
'@babel/core': 7.9.6 '@babel/core': 7.9.6
'@babel/helper-module-imports': 7.8.3 '@babel/helper-module-imports': 7.8.3
'@rollup/pluginutils': 3.0.9_rollup@2.8.2 '@rollup/pluginutils': 3.0.9_rollup@2.9.0
rollup: 2.8.2 rollup: 2.9.0
dev: true dev: true
engines: engines:
node: '>= 10.0.0' node: '>= 10.0.0'
@@ -933,14 +933,14 @@ packages:
rollup: ^1.20.0||^2.0.0 rollup: ^1.20.0||^2.0.0
resolution: resolution:
integrity: sha512-YpVnwdUeVj/fDFN75Y3CAzJTMYNcqbH05SJs551wqj+BSwLT9pS3dqJrVDPYl3eH4OrI8ueiEseX5VgUn+0HLA== integrity: sha512-YpVnwdUeVj/fDFN75Y3CAzJTMYNcqbH05SJs551wqj+BSwLT9pS3dqJrVDPYl3eH4OrI8ueiEseX5VgUn+0HLA==
/@rollup/plugin-commonjs/11.0.2_rollup@2.8.2: /@rollup/plugin-commonjs/11.0.2_rollup@2.9.0:
dependencies: dependencies:
'@rollup/pluginutils': 3.0.10_rollup@2.8.2 '@rollup/pluginutils': 3.0.10_rollup@2.9.0
estree-walker: 1.0.1 estree-walker: 1.0.1
is-reference: 1.1.4 is-reference: 1.1.4
magic-string: 0.25.7 magic-string: 0.25.7
resolve: 1.17.0 resolve: 1.17.0
rollup: 2.8.2 rollup: 2.9.0
dev: true dev: true
engines: engines:
node: '>= 8.0.0' node: '>= 8.0.0'
@@ -948,14 +948,14 @@ packages:
rollup: ^1.20.0 rollup: ^1.20.0
resolution: resolution:
integrity: sha512-MPYGZr0qdbV5zZj8/2AuomVpnRVXRU5XKXb3HVniwRoRCreGlf5kOE081isNWeiLIi6IYkwTX9zE0/c7V8g81g== integrity: sha512-MPYGZr0qdbV5zZj8/2AuomVpnRVXRU5XKXb3HVniwRoRCreGlf5kOE081isNWeiLIi6IYkwTX9zE0/c7V8g81g==
/@rollup/plugin-node-resolve/7.1.3_rollup@2.8.2: /@rollup/plugin-node-resolve/7.1.3_rollup@2.9.0:
dependencies: dependencies:
'@rollup/pluginutils': 3.0.9_rollup@2.8.2 '@rollup/pluginutils': 3.0.9_rollup@2.9.0
'@types/resolve': 0.0.8 '@types/resolve': 0.0.8
builtin-modules: 3.1.0 builtin-modules: 3.1.0
is-module: 1.0.0 is-module: 1.0.0
resolve: 1.17.0 resolve: 1.17.0
rollup: 2.8.2 rollup: 2.9.0
dev: true dev: true
engines: engines:
node: '>= 8.0.0' node: '>= 8.0.0'
@@ -963,22 +963,22 @@ packages:
rollup: ^1.20.0||^2.0.0 rollup: ^1.20.0||^2.0.0
resolution: resolution:
integrity: sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q== integrity: sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q==
/@rollup/plugin-replace/2.3.2_rollup@2.8.2: /@rollup/plugin-replace/2.3.2_rollup@2.9.0:
dependencies: dependencies:
'@rollup/pluginutils': 3.0.9_rollup@2.8.2 '@rollup/pluginutils': 3.0.9_rollup@2.9.0
magic-string: 0.25.7 magic-string: 0.25.7
rollup: 2.8.2 rollup: 2.9.0
dev: true dev: true
peerDependencies: peerDependencies:
rollup: ^1.20.0 || ^2.0.0 rollup: ^1.20.0 || ^2.0.0
resolution: resolution:
integrity: sha512-KEEL7V2tMNOsbAoNMKg91l1sNXBDoiP31GFlqXVOuV5691VQKzKBh91+OKKOG4uQWYqcFskcjFyh1d5YnZd0Zw== integrity: sha512-KEEL7V2tMNOsbAoNMKg91l1sNXBDoiP31GFlqXVOuV5691VQKzKBh91+OKKOG4uQWYqcFskcjFyh1d5YnZd0Zw==
/@rollup/pluginutils/3.0.10_rollup@2.8.2: /@rollup/pluginutils/3.0.10_rollup@2.9.0:
dependencies: dependencies:
'@types/estree': 0.0.39 '@types/estree': 0.0.39
estree-walker: 1.0.1 estree-walker: 1.0.1
picomatch: 2.2.2 picomatch: 2.2.2
rollup: 2.8.2 rollup: 2.9.0
dev: true dev: true
engines: engines:
node: '>= 8.0.0' node: '>= 8.0.0'
@@ -986,12 +986,12 @@ packages:
rollup: ^1.20.0||^2.0.0 rollup: ^1.20.0||^2.0.0
resolution: resolution:
integrity: sha512-d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw== integrity: sha512-d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw==
/@rollup/pluginutils/3.0.9_rollup@2.8.2: /@rollup/pluginutils/3.0.9_rollup@2.9.0:
dependencies: dependencies:
'@types/estree': 0.0.39 '@types/estree': 0.0.39
estree-walker: 1.0.1 estree-walker: 1.0.1
micromatch: 4.0.2 micromatch: 4.0.2
rollup: 2.8.2 rollup: 2.9.0
dev: true dev: true
engines: engines:
node: '>= 8.0.0' node: '>= 8.0.0'
@@ -2465,7 +2465,7 @@ packages:
resolution: resolution:
integrity: sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== integrity: sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
/node-fetch/2.6.0: /node-fetch/2.6.0:
dev: true dev: false
engines: engines:
node: 4.x || >=6.0.0 node: 4.x || >=6.0.0
resolution: resolution:
@@ -3364,10 +3364,10 @@ packages:
dev: true dev: true
resolution: resolution:
integrity: sha512-EqUFINMICD9U3MJ4jsxBcCRhzWNZJBWyAK2ol+2ClWIPaIWOuz0OY/Ml8rdT81F4aufwxJN5I9N7QvCth0OrUQ== integrity: sha512-EqUFINMICD9U3MJ4jsxBcCRhzWNZJBWyAK2ol+2ClWIPaIWOuz0OY/Ml8rdT81F4aufwxJN5I9N7QvCth0OrUQ==
/rollup-plugin-svelte/5.2.1_rollup@2.8.2+svelte@3.22.2: /rollup-plugin-svelte/5.2.1_rollup@2.9.0+svelte@3.22.2:
dependencies: dependencies:
require-relative: 0.8.7 require-relative: 0.8.7
rollup: 2.8.2 rollup: 2.9.0
rollup-pluginutils: 2.8.2 rollup-pluginutils: 2.8.2
sourcemap-codec: 1.4.8 sourcemap-codec: 1.4.8
svelte: 3.22.2 svelte: 3.22.2
@@ -3377,11 +3377,11 @@ packages:
svelte: '*' svelte: '*'
resolution: resolution:
integrity: sha512-wc93cN66sRpX6uFljVFqvWT6NU3V5ab/uLXKt2UiARuexFU/ctolzkmdXM7WM5iKdTX9scToS9sabJTJV4DUMA== integrity: sha512-wc93cN66sRpX6uFljVFqvWT6NU3V5ab/uLXKt2UiARuexFU/ctolzkmdXM7WM5iKdTX9scToS9sabJTJV4DUMA==
/rollup-plugin-terser/5.3.0_rollup@2.8.2: /rollup-plugin-terser/5.3.0_rollup@2.9.0:
dependencies: dependencies:
'@babel/code-frame': 7.8.3 '@babel/code-frame': 7.8.3
jest-worker: 24.9.0 jest-worker: 24.9.0
rollup: 2.8.2 rollup: 2.9.0
rollup-pluginutils: 2.8.2 rollup-pluginutils: 2.8.2
serialize-javascript: 2.1.2 serialize-javascript: 2.1.2
terser: 4.6.12 terser: 4.6.12
@@ -3396,7 +3396,7 @@ packages:
dev: true dev: true
resolution: resolution:
integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ== integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
/rollup/2.8.2: /rollup/2.9.0:
dev: true dev: true
engines: engines:
node: '>=10.0.0' node: '>=10.0.0'
@@ -3404,7 +3404,7 @@ packages:
optionalDependencies: optionalDependencies:
fsevents: 2.1.3 fsevents: 2.1.3
resolution: resolution:
integrity: sha512-LRzMcB8V1M69pSvf6uCbR+W9OPCy5FuxcIwqioWg5RKidrrqKbzjJF9pEGXceaMVkbptNFZgIVJlUokCU0sfng== integrity: sha512-a3fLsmHUbO2OCE/Qp1aM8PtqnCWHysc9QfYs4PIGbUDraeNMH1v0uT7nqQeDB3IfDjNNLl8H2Z7UKs0q1SbK1g==
/safe-buffer/5.1.2: /safe-buffer/5.1.2:
resolution: resolution:
integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -4042,7 +4042,7 @@ specifiers:
postcss-load-config: ^2.1.0 postcss-load-config: ^2.1.0
postcss-preset-env: ^6.7.0 postcss-preset-env: ^6.7.0
rellax: ^1.12.1 rellax: ^1.12.1
rollup: ^2.8.2 rollup: ^2.9.0
rollup-plugin-glslify: ^1.2.0 rollup-plugin-glslify: ^1.2.0
rollup-plugin-svelte: ^5.2.1 rollup-plugin-svelte: ^5.2.1
rollup-plugin-terser: ^5.3.0 rollup-plugin-terser: ^5.3.0

4
rollup.config.js
View File

@@ -79,8 +79,8 @@ export default {
commonjs(), commonjs(),
legacy && babel({ legacy && babel({
extensions: resolveExtensions, extensions: resolveExtensions,
exclude: ['*.scss', '*.css', 'node_modules/@babel/**'], babelHelpers: 'runtime',
runtimeHelpers: true exclude: ['node_modules/@babel/**']
}), }),
// Compress Javascript // Compress Javascript