Skip to content

Commit e43a2ac

Browse files
authored
Mk js build heroku (#26)
* add alembic migrations and heroku migration support * update requirements * deploy * release * degugging * debugging * debug * debug * debug * debug * debug * dirty_data_transfer * last updates * Revert "dirty_data_transfer" This reverts commit 0dc22f9. * make things proper * linting * linting * linting * make heroku build js * rm build files
1 parent abc540e commit e43a2ac

16 files changed

+38
-12158
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Procfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
web: gunicorn cre:app --log-file=-
1+
web: cp cres/db.sqlite standards_cache.sqlite; gunicorn cre:app --log-file=-
22
init: FLASK_APP=cre.py flask db init
33
migrate: FLASK_APP=cre.py flask db migrate
44
upgrade: FLASK_APP=cre.py flask db upgrade

application/frontend/yarn.lock

-12,096
This file was deleted.

application/web/web_main.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# type: ignore
22
# silence mypy for the routes file
33
import os
4-
from pprint import pprint
54
from typing import Any
65

76
from flask import Blueprint, abort, current_app, jsonify, request, send_from_directory
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

application/frontend/webpack.prod.js webpack.prod.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ const { TsConfigPathsPlugin } = require('awesome-typescript-loader');
44

55
module.exports = {
66
mode: 'production',
7-
context: path.join(__dirname, 'src'),
7+
context: path.join(__dirname, 'application/frontend/src'),
88
entry: ['./main.tsx'],
99
output: {
10-
path: path.join(__dirname, 'www'),
10+
path: path.join(__dirname, 'application/frontend/www'),
1111
filename: 'bundle.js',
1212
publicPath: '/',
1313
},

yarn.lock

+35-58
Original file line numberDiff line numberDiff line change
@@ -3274,7 +3274,7 @@ bonjour@^3.5.0:
32743274
multicast-dns "^6.0.1"
32753275
multicast-dns-service-types "^1.1.0"
32763276

3277-
boolbase@^1.0.0, boolbase@~1.0.0:
3277+
boolbase@^1.0.0:
32783278
version "1.0.0"
32793279
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
32803280
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
@@ -4072,16 +4072,6 @@ css-loader@^5.2.4:
40724072
schema-utils "^3.0.0"
40734073
semver "^7.3.5"
40744074

4075-
css-select@^2.0.2:
4076-
version "2.1.0"
4077-
resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef"
4078-
integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==
4079-
dependencies:
4080-
boolbase "^1.0.0"
4081-
css-what "^3.2.1"
4082-
domutils "^1.7.0"
4083-
nth-check "^1.0.2"
4084-
40854075
css-select@^4.1.2:
40864076
version "4.1.2"
40874077
resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.2.tgz#8b52b6714ed3a80d8221ec971c543f3b12653286"
@@ -4093,10 +4083,16 @@ css-select@^4.1.2:
40934083
domutils "^2.6.0"
40944084
nth-check "^2.0.0"
40954085

4096-
css-what@^3.2.1:
4097-
version "3.4.2"
4098-
resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
4099-
integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
4086+
css-select@^4.1.3:
4087+
version "4.1.3"
4088+
resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
4089+
integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==
4090+
dependencies:
4091+
boolbase "^1.0.0"
4092+
css-what "^5.0.0"
4093+
domhandler "^4.2.0"
4094+
domutils "^2.6.0"
4095+
nth-check "^2.0.0"
41004096

41014097
css-what@^5.0.0:
41024098
version "5.0.1"
@@ -4601,7 +4597,7 @@ dom-accessibility-api@^0.5.6:
46014597
resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz#3f5d43b52c7a3bd68b5fb63fa47b4e4c1fdf65a9"
46024598
integrity sha512-DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw==
46034599

4604-
dom-converter@^0.2:
4600+
dom-converter@^0.2.0:
46054601
version "0.2.0"
46064602
resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
46074603
integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
@@ -4630,7 +4626,7 @@ domain-browser@^1.1.1:
46304626
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
46314627
integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
46324628

4633-
domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
4629+
domelementtype@1, domelementtype@^1.3.0:
46344630
version "1.3.1"
46354631
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
46364632
integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
@@ -4668,7 +4664,7 @@ domhandler@^4.0.0, domhandler@^4.2.0:
46684664
dependencies:
46694665
domelementtype "^2.2.0"
46704666

4671-
domutils@^1.5.1, domutils@^1.7.0:
4667+
domutils@^1.5.1:
46724668
version "1.7.0"
46734669
resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
46744670
integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
@@ -6116,14 +6112,14 @@ html-react-parser@^0.6.1:
61166112
style-to-object "0.2.2"
61176113

61186114
html-webpack-plugin@^5.3.1:
6119-
version "5.3.1"
6120-
resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.3.1.tgz#8797327548e3de438e3494e0c6d06f181a7f20d1"
6121-
integrity sha512-rZsVvPXUYFyME0cuGkyOHfx9hmkFa4pWfxY/mdY38PsBEaVNsRoA+Id+8z6DBDgyv3zaw6XQszdF8HLwfQvcdQ==
6115+
version "5.3.2"
6116+
resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.3.2.tgz#7b04bf80b1f6fe84a6d3f66c8b79d64739321b08"
6117+
integrity sha512-HvB33boVNCz2lTyBsSiMffsJ+m0YLIQ+pskblXgN9fnjS1BgEcuAfdInfXfGrkdXV406k9FiDi86eVCDBgJOyQ==
61226118
dependencies:
61236119
"@types/html-minifier-terser" "^5.0.0"
61246120
html-minifier-terser "^5.0.1"
6125-
lodash "^4.17.20"
6126-
pretty-error "^2.1.1"
6121+
lodash "^4.17.21"
6122+
pretty-error "^3.0.4"
61276123
tapable "^2.0.0"
61286124

61296125
@@ -6138,18 +6134,6 @@ [email protected]:
61386134
inherits "^2.0.1"
61396135
readable-stream "^2.0.2"
61406136

6141-
htmlparser2@^3.10.1:
6142-
version "3.10.1"
6143-
resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
6144-
integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
6145-
dependencies:
6146-
domelementtype "^1.3.1"
6147-
domhandler "^2.3.0"
6148-
domutils "^1.5.1"
6149-
entities "^1.1.1"
6150-
inherits "^2.0.1"
6151-
readable-stream "^3.1.1"
6152-
61536137
htmlparser2@^6.1.0:
61546138
version "6.1.0"
61556139
resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
@@ -7896,7 +7880,7 @@ lodash.truncate@^4.4.2:
78967880
resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
78977881
integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
78987882

7899-
[email protected], lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.0:
7883+
[email protected], lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.0:
79007884
version "4.17.21"
79017885
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
79027886
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -8759,13 +8743,6 @@ npmlog@^4.1.2, npmlog@~4.1.2:
87598743
gauge "~2.7.3"
87608744
set-blocking "~2.0.0"
87618745

8762-
nth-check@^1.0.2:
8763-
version "1.0.2"
8764-
resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
8765-
integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
8766-
dependencies:
8767-
boolbase "~1.0.0"
8768-
87698746
nth-check@^2.0.0:
87708747
version "2.0.0"
87718748
resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
@@ -9393,13 +9370,13 @@ prettier@^2.2.0:
93939370
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.1.tgz#76903c3f8c4449bc9ac597acefa24dc5ad4cbea6"
93949371
integrity sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA==
93959372

9396-
pretty-error@^2.1.1:
9397-
version "2.1.2"
9398-
resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
9399-
integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==
9373+
pretty-error@^3.0.4:
9374+
version "3.0.4"
9375+
resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-3.0.4.tgz#94b1d54f76c1ed95b9c604b9de2194838e5b574e"
9376+
integrity sha512-ytLFLfv1So4AO1UkoBF6GXQgJRaKbiSiGFICaOPNwQ3CMvBvXpLRubeQWyPGnsbV/t9ml9qto6IeCsho0aEvwQ==
94009377
dependencies:
94019378
lodash "^4.17.20"
9402-
renderkid "^2.0.4"
9379+
renderkid "^2.0.6"
94039380

94049381
pretty-format@^26.0.0, pretty-format@^26.6.2:
94059382
version "26.6.2"
@@ -9866,7 +9843,7 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
98669843
string_decoder "~1.1.1"
98679844
util-deprecate "~1.0.1"
98689845

9869-
readable-stream@^3.0.6, readable-stream@^3.1.1:
9846+
readable-stream@^3.0.6:
98709847
version "3.6.0"
98719848
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
98729849
integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -10042,16 +10019,16 @@ remove-trailing-separator@^1.0.1:
1004210019
resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
1004310020
integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
1004410021

10045-
renderkid@^2.0.4:
10046-
version "2.0.5"
10047-
resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz#483b1ac59c6601ab30a7a596a5965cabccfdd0a5"
10048-
integrity sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ==
10022+
renderkid@^2.0.6:
10023+
version "2.0.7"
10024+
resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609"
10025+
integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==
1004910026
dependencies:
10050-
css-select "^2.0.2"
10051-
dom-converter "^0.2"
10052-
htmlparser2 "^3.10.1"
10053-
lodash "^4.17.20"
10054-
strip-ansi "^3.0.0"
10027+
css-select "^4.1.3"
10028+
dom-converter "^0.2.0"
10029+
htmlparser2 "^6.1.0"
10030+
lodash "^4.17.21"
10031+
strip-ansi "^3.0.1"
1005510032

1005610033
repeat-element@^1.1.2:
1005710034
version "1.1.4"

0 commit comments

Comments
 (0)