Skip to content

Commit 59a4810

Browse files
authored
fix: move icons to /priv/static to aid precompilation + webpack updates (#1949)
1 parent b1f4277 commit 59a4810

File tree

206 files changed

+3429
-2003
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+3429
-2003
lines changed

.dockerignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ deps
88
erl_crash.dump
99
build.sh
1010
deploy.sh
11-
priv/static
11+
/priv/static/*
12+
!/priv/static/icon-svg/
1213
aws
1314
dotcom-build.zip
1415
bin

.github/actions/build-app/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
using: "composite"
1111
steps:
1212
- name: Cache _build
13-
uses: actions/cache@v3
13+
uses: actions/cache@v4
1414
with:
1515
path: |
1616
_build
@@ -25,6 +25,7 @@ runs:
2525
- name: Compile application (if needed)
2626
shell: bash
2727
run: |
28-
MIX_ENV=test mix compile.assets
28+
npm --prefix assets run webpack:build
29+
npm --prefix assets run webpack:build:react
2930
MIX_ENV=test mix compile --all-warnings
3031
if: steps.build-cache.outputs.cache-hit != 'true'

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ node_modules
5151
# Since we are building assets from assets,
5252
# we ignore priv/static. You may want to comment
5353
# this depending on your deployment strategy.
54-
/priv/static/
54+
/priv/static/*
55+
!/priv/static/icon-svg/
5556

5657
# The config/prod.secret.exs file by default contains sensitive
5758
# data and you should not commit it into version control.

README.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,6 @@ Welcome to [Dotcom](https://www.notion.so/mbta-downtown-crossing/Dotcom-6aa7b0f0
110110
111111
Minor note - you may see a prompt to upgrade `npm`. This isn't needed, and `"lockfileVersion": 1` in our `assets/package-lock.json` file means it was generated with an `npm` version prior to 7.
112112
113-
1. Build the project:
114-
```
115-
npm run build
116-
```
117-
* If this fails try adding the following line to `defp deps` section in `mix.exs`:
118-
```
119-
{:fs, git: "https://github.com/synrc/fs.git", override: true}
120-
```
121-
122-
`npm run build` does several things: builds the Phoenix application assets, builds all the front-end assets, and then compiles the entire Elixir application.
123113
124114
1. Set up required environment variables:
125115
```

assets/css/_events.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828

2929
.m-event-listing {
3030
@include media-breakpoint-down(xs) {
31-
/* stylelint-disable-next-line scss/operator-no-unspaced */
32-
margin: 0 -$base-spacing;
31+
margin: 0 (-$base-spacing);
3332
}
3433
}
3534

0 commit comments

Comments
 (0)