Skip to content

Commit 819027c

Browse files
committed
Attempt to simplify assets config by repalcing webpack with phx 1.6 esbuild
1 parent f721472 commit 819027c

File tree

13 files changed

+138
-4909
lines changed

13 files changed

+138
-4909
lines changed

.github/workflows/elixir.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
run: mix deps.unlock --check-unused
2727
- name: Check code format
2828
run: mix format --check-formatted
29-
- name: Install yarn dependencies
30-
run: yarn --cwd assets
31-
- name: Compile assets
32-
run: cd assets && ./node_modules/.bin/webpack --mode development
3329
- name: Compile elixir deps
3430
run: MIX_ENV=test mix deps.compile
3531
- name: Compile elixir project
3632
run: MIX_ENV=test mix compile --force --warnings-as-errors
33+
- name: Install assets dependencies
34+
run: mix assets.setup
35+
- name: Compile assets
36+
run: mix assets.build
3737
- name: Run tests
3838
run: mix test

assets/.babelrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

assets/js/app.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
// We need to import the CSS so that webpack will load it.
2-
// The MiniCssExtractPlugin is used to separate it out into
3-
// its own CSS file.
4-
import "../css/app.css"
5-
6-
// webpack automatically bundles all modules in your
7-
// entry points. Those entry points can be configured
8-
// in "webpack.config.js".
9-
//
101
// Import deps with the dep name or local files with a relative path, for example:
112
//
123
// import {Socket} from "phoenix"

assets/package.json

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,13 @@
33
"description": " ",
44
"license": "MIT",
55
"scripts": {
6-
"deploy": "webpack --mode production",
7-
"watch": "webpack --mode development --watch"
8-
},
9-
"dependencies": {
10-
"phoenix": "file:../deps/phoenix",
11-
"phoenix_html": "file:../deps/phoenix_html",
12-
"phoenix_live_view": "file:../deps/phoenix_live_view"
6+
"deploy": "NODE_ENV=production tailwindcss --postcss -i css/app.css -o ../priv/static/assets/app.css --minify",
7+
"watch": "NODE_ENV=development tailwindcss --postcss -i css/app.css -o ../priv/static/assets/app.css --watch",
8+
"build": "NODE_ENV=development tailwindcss --postcss -i css/app.css -o ../priv/static/assets/app.css"
139
},
1410
"devDependencies": {
1511
"autoprefixer": "^10.3.6",
16-
"@babel/core": "^7.0.0",
17-
"@babel/preset-env": "^7.0.0",
18-
"babel-loader": "^8.0.0",
19-
"copy-webpack-plugin": "^4.5.0",
20-
"css-loader": "^2.1.1",
21-
"hard-source-webpack-plugin": "^0.13.1",
22-
"mini-css-extract-plugin": "^0.4.0",
23-
"optimize-css-assets-webpack-plugin": "^5.0.1",
2412
"postcss": "^8.3.8",
25-
"postcss-loader": "^4.0.0",
26-
"tailwindcss": "^2.2.16",
27-
"terser-webpack-plugin": "^1.1.0",
28-
"webpack": "4.4.0",
29-
"webpack-cli": "^3.3.2"
30-
},
31-
"resolutions": {
32-
"serialize-javascript": "^2.1.1"
13+
"tailwindcss": "^2.2.16"
3314
}
3415
}

assets/tailwind.config.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
const colors = require('tailwindcss/colors')
22

33
module.exports = {
4-
purge: [],
5-
darkMode: false, // or 'media' or 'class'
4+
mode: 'jit',
5+
purge: [
6+
'./js/**/*.js',
7+
'../lib/*_web/**/*.*ex'
8+
],
69
theme: {
710
extend: {
811
colors: {

assets/webpack.config.js

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)