From 36608487ce53169506b3297536a699adc0da7537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Tue, 26 Oct 2021 13:54:13 +0200 Subject: [PATCH] feat: upgrade to latest active node LTS version --- .nvmrc | 1 + Dockerfile | 7 ++-- docker/entrypoint.sh | 4 +-- package.json | 6 ++-- yarn.lock | 84 +++++++++++++++++++------------------------- 5 files changed, 45 insertions(+), 57 deletions(-) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000000..141e9a2a2ce --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +16.11.1 diff --git a/Dockerfile b/Dockerfile index 59625fe0336..e787fcdbf4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ -FROM ruby:2.7.1-alpine3.12 +FROM ruby:2.7.4-alpine3.14 RUN apk add --update --no-cache \ alpine-sdk \ nodejs-current \ - python2 \ + python3 \ git \ - nodejs-npm \ yarn \ tzdata @@ -15,7 +14,7 @@ COPY package.json yarn.lock Gemfile Gemfile.lock /app/ COPY vendor /app/vendor -RUN yarn install --pure-lockfile --ignore-engines +RUN yarn install --pure-lockfile RUN gem install bundler && bundle install diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 7fc7f578bf0..a8c17ec4d9f 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -17,9 +17,9 @@ case "$COMMAND" in echo "Prestart Step 2/5 - Cleaning assets" bundle exec rails assets:clobber echo "Prestart Step 3/5 - Installing dependencies" - npm install + yarn install --pure-lockfile echo "Prestart Step 4/5 - Creating Webpack bundle" - npm run bundle + yarn run bundle echo "Prestart Step 5/5 - Compiling assets" bundle exec rails assets:precompile echo "Starting Server..." diff --git a/package.json b/package.json index a0838b0a607..35b426f6b7a 100644 --- a/package.json +++ b/package.json @@ -70,9 +70,9 @@ "@reach/checkbox": "^0.16.0", "@reach/dialog": "^0.16.2", "@reach/listbox": "^0.16.2", - "@standardnotes/features": "1.7.2", - "@standardnotes/sncrypto-web": "^1.5.3", - "@standardnotes/snjs": "2.16.0", + "@standardnotes/features": "1.7.3", + "@standardnotes/sncrypto-web": "1.5.3", + "@standardnotes/snjs": "2.16.2", "mobx": "^6.3.5", "mobx-react-lite": "^3.2.1", "preact": "^10.5.15", diff --git a/yarn.lock b/yarn.lock index ad005dabb8a..84f98e265df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2147,55 +2147,43 @@ prop-types "^15.7.2" tslib "^2.3.0" -"@standardnotes/auth@3.7.2": - version "3.7.2" - resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.7.2.tgz#de553ca38c64ae76b3ee3a3aa12ea20311030adb" - integrity sha512-YED+iWX1FxMpn4UJ0Yo37/K0Py/xNYoqcFSlgEcXNorNllRHpLXGXKZ3ILAQVRa0R1oYXpmsthx4bjg2JSptiA== - dependencies: - "@standardnotes/common" "^1.1.0" - -"@standardnotes/auth@^3.7.0": - version "3.7.1" - resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.7.1.tgz#d0b1eb63f605e04ecb077fdb5ef83e3fe6db33f9" - integrity sha512-xtjAvtikLW3Xv75X/kYA1KTm8FJVPPlXvl+ofnrf/ijkIaRkbUW/3TUhMES+G5CMiG2TZv6uVn32GqJipqgQQQ== +"@standardnotes/auth@^3.8.1": + version "3.8.1" + resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.8.1.tgz#4197fb2f7e223c6bd13a870a3feac3c73294fb3c" + integrity sha512-Q2/81dgFGIGuYlQ4VnSjGRsDB0Qw0tQP/qsiuV+DQj+wdp5Wy5WX3Q4g+p2PNvoyEAYgbuduEHZfWuTLAaIdyw== dependencies: - "@standardnotes/common" "^1.1.0" + "@standardnotes/common" "^1.2.1" -"@standardnotes/common@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.2.0.tgz#949c9d384c54fbabeacca9ea3f6485cbc78da4bf" - integrity sha512-QiOAG858BcXUGSRjsmtk854/4OLyGkdcbvixia8Xcfv4d76iL/pQf7JFTDbanr9Ygodrc6B+h+NuzliO41COcg== - -"@standardnotes/common@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.1.0.tgz#5ffb0a50f9947471e236bb66d097f153ad9a148f" - integrity sha512-Nm2IFWbMSfZDD7cnKtN+Gjic0f+PhPq/da/o4eOoUKg21VeOaQkTn+jlQKraKIs6Lmf+w9mmPNAgMc5o4hj7Lg== +"@standardnotes/common@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.2.1.tgz#9db212db86ccbf08b347da02549b3dbe4bedbb02" + integrity sha512-HilBxS50CBlC6TJvy1mrnhGVDzOH63M/Jf+hyMxQ0Vt1nYzpd0iyxVEUrgMh7ZiyO1b9CLnCDED99Jy9rnZWVQ== -"@standardnotes/domain-events@2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@standardnotes/domain-events/-/domain-events-2.1.0.tgz#a5c4379983a728a738f145aa9e76f7640c7283a2" - integrity sha512-8bCQk2V2fyWKalVWC9L8cuj2kuKLe+bTTp0xBVTDpDhWrGFzXfsI79AzWbOl/CLHJU/PWrXf1lvUgQwPwT+RlA== +"@standardnotes/domain-events@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@standardnotes/domain-events/-/domain-events-2.5.1.tgz#e6433e940ae616683d1c24f76133c70755504c44" + integrity sha512-p0VB4Al/ZcVqcj9ztU7TNqzc3jjjG6/U7x9lBW/QURHxpB+PnwJq3kFU5V5JA9QpCOYlXLT71CMERMf/O5QX6g== dependencies: - "@standardnotes/auth" "^3.7.0" + "@standardnotes/auth" "^3.8.1" -"@standardnotes/features@1.7.2": - version "1.7.2" - resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.7.2.tgz#7a45a947f56c55d191614f7293af553c5209705a" - integrity sha512-zFTHzYAC+08Lbeni5x3RalR5FT8qVORgv3T/z6/Ye4mGvDyXSAddgDPn+o/NmzirwBTpaF6ogSzwZocsElm8zg== +"@standardnotes/features@1.7.3", "@standardnotes/features@^1.7.3": + version "1.7.3" + resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.7.3.tgz#4872c837fd11d069a8a41941bb3e5f294fb13d9c" + integrity sha512-G9NACv8pfVOB9O9L1C+Yoh25vMWVFLfF0FKSK5jjm/THm/w3SiQ2K82BIGgoQGpVGGAPEPa3Ru+OCBs3w8u+Jg== dependencies: - "@standardnotes/common" "^1.1.0" + "@standardnotes/common" "^1.2.1" -"@standardnotes/settings@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@standardnotes/settings/-/settings-1.2.0.tgz#d7936c788138265b0720085ca9e63358d3092459" - integrity sha512-7ikL9BfgXPcLsTJKgCNuRCJN/rFeWreXNxC8M/rxGY+Yk0694WXYyM6jFY8Ry6yV9vLaVukS7Ov6acf+D4wrFg== +"@standardnotes/settings@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@standardnotes/settings/-/settings-1.2.1.tgz#4c7656ea86d784a2f77c70acc89face5d28da024" + integrity sha512-EhCDtQKcVzY6cJ6qXCkAiA3sJ3Wj/q0L0ZVYq+tCXd0jaxmZ8fSk5YNqdwJfjmNXsqtuh7xq6eA2dcXd1fD9VQ== -"@standardnotes/sncrypto-common@1.5.2", "@standardnotes/sncrypto-common@^1.5.2": +"@standardnotes/sncrypto-common@^1.5.2": version "1.5.2" resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.5.2.tgz#be9404689d94f953c68302609a4f76751eaa82cd" integrity sha512-+OQ6gajTcVSHruw33T52MHyBDKL1vRCfQBXQn4tt4+bCfBAe+PFLkEQMHp35bg5twCfg9+wUf2KhmNNSNyBBZw== -"@standardnotes/sncrypto-web@^1.5.3": +"@standardnotes/sncrypto-web@1.5.3": version "1.5.3" resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-web/-/sncrypto-web-1.5.3.tgz#b055bcac553914cbeebfa10e45f46fff817116c3" integrity sha512-thyFc71cTJTfmLNPgT1hDMiMefZ1bgN0eTa22GEJSp4T41J/X9MldyP2dTmc7sHNM95TJlwzlIJ0iQtxFUE50w== @@ -2204,17 +2192,17 @@ buffer "^6.0.3" libsodium-wrappers "^0.7.9" -"@standardnotes/snjs@2.16.0": - version "2.16.0" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.16.0.tgz#af1e427d8ed7f71b5019f7c8cca349422a885b02" - integrity sha512-dAvFFRu9PuIbW4fF1hZEfh/DwADO2bZP1s24biYY1bfMOr9Z0131n2xIN/yUsA7zw0Sch6m1Nof8OCEZntX5xQ== - dependencies: - "@standardnotes/auth" "3.7.2" - "@standardnotes/common" "1.2.0" - "@standardnotes/domain-events" "2.1.0" - "@standardnotes/features" "1.7.2" - "@standardnotes/settings" "1.2.0" - "@standardnotes/sncrypto-common" "1.5.2" +"@standardnotes/snjs@2.16.2": + version "2.16.2" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.16.2.tgz#2958ec0a2f1724343de82204f905311d7c3ffb65" + integrity sha512-G9HNu1TsAnK0OeRo6IYvmIR/huKoNkB+qWDPuh2+p/pJjLrtO6SGrOD4cm4Mg/63t29g8wW8Za/6/tPJHZOFCg== + dependencies: + "@standardnotes/auth" "^3.8.1" + "@standardnotes/common" "^1.2.1" + "@standardnotes/domain-events" "^2.5.1" + "@standardnotes/features" "^1.7.3" + "@standardnotes/settings" "^1.2.1" + "@standardnotes/sncrypto-common" "^1.5.2" "@svgr/babel-plugin-add-jsx-attribute@^5.4.0": version "5.4.0"