Skip to content

Commit

Permalink
Merge #2233
Browse files Browse the repository at this point in the history
2233: Remove JS build step and tooling r=mythmon a=rehandalal

Fixes #2232 

r?

Co-authored-by: Rehan Dalal <rehandalal@gmail.com>
  • Loading branch information
bors[bot] and rehandalal authored Jun 16, 2020
2 parents af64ac2 + c9671c9 commit b14493c
Show file tree
Hide file tree
Showing 26 changed files with 1,424 additions and 3,137 deletions.
43 changes: 0 additions & 43 deletions .eslintrc

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
db.sqlite3
.DS_Store
__pycache__/
/assets/
/static/
/media/
GeoLite2-Country.mmdb
Expand Down
31 changes: 0 additions & 31 deletions .stylelintrc

This file was deleted.

3 changes: 0 additions & 3 deletions .therapist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ actions:
include: "*.py"
exclude: "docs/"

yarn-audit:
run: yarn audit

missing-migirations:
include: "*.py"
run: |
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ COPY ./poetry.lock /app/poetry.lock
RUN poetry install --no-dev --no-root --no-interaction --verbose

COPY . /app
RUN NODE_ENV=production yarn build && \
DJANGO_CONFIGURATION=Build python ./manage.py collectstatic --no-input && \
RUN DJANGO_CONFIGURATION=Build python ./manage.py collectstatic --no-input && \
mkdir -p media && chown app:app media

USER app
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.development
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ RUN poetry install --no-root --extras docs

COPY . /app

RUN NODE_ENV=production yarn build && \
DJANGO_CONFIGURATION=Build python ./manage.py collectstatic --no-input && \
RUN DJANGO_CONFIGURATION=Build python ./manage.py collectstatic --no-input && \
mkdir -p media

ENV DJANGO_SETTINGS_MODULE=normandy.settings \
Expand Down
183 changes: 183 additions & 0 deletions assets/bundles/console-log.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions assets/bundles/console-log.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b14493c

Please sign in to comment.