Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring back trunk-ng into trunk #623

Merged
merged 163 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
f45f7b8
allow some logging/debug/verbose settings
ctron Jul 10, 2023
bb06361
Prevent an event buildup by using notify-debounce-full
ctron Jul 10, 2023
5c35e93
chore: make clippy happy
ctron Aug 21, 2023
0959db0
chore: update lockfile
ctron Aug 21, 2023
9b53420
build: rename to trunk-ng and note that in the docs
ctron Aug 21, 2023
65b2c35
ci: get rid of node12 warnings and make it work with fork
ctron Aug 21, 2023
5d0bf85
chore: update lockfile
ctron Aug 21, 2023
8131e37
chore: uptick version
ctron Aug 21, 2023
47b7f71
ci: fix missing toolchain value
ctron Aug 21, 2023
d8383bf
ci: change names of the binaries
ctron Aug 21, 2023
ce96eea
ci: use minimal profile
ctron Aug 21, 2023
1377ee1
ci: fix missing version
ctron Aug 21, 2023
fa9617e
ci: fix typo
ctron Aug 21, 2023
5087b79
ci: add deploy action
ctron Aug 21, 2023
a32cb87
ci: change name of uploaded artifacts
ctron Aug 21, 2023
1dcac4c
chore: uptick version
ctron Aug 21, 2023
11c974c
ci: add required permissions
ctron Aug 21, 2023
7acf4cd
add config option to build offline
adryzz Jul 11, 2023
5b7054d
update changelog
adryzz Jul 11, 2023
e674b37
docs: add missing changelog
ctron Aug 21, 2023
d21c897
chore: uptick version
ctron Aug 21, 2023
e61339c
docs: try to make the "note" more prominent
ctron Aug 21, 2023
e0bb724
docs: fix links to shields, use new "note" syntax
ctron Aug 21, 2023
61e2421
chore: drop PR template
ctron Aug 21, 2023
75ef782
docs: drop NG, we have a note
ctron Aug 21, 2023
58c7cb7
Extend the recent work to solidify the FS watcher
thedodd Aug 22, 2023
f8a7949
Remove HTML glob in example tailwind.config.js
0e4ef622 Aug 20, 2023
11f879e
feat: add polling mode for filesystem watcher
ctron Sep 18, 2023
dbdbe8c
feat: allow disabling the cooldown
ctron Sep 18, 2023
feff8da
chore: make clippy happy
ctron Sep 18, 2023
700e12b
chore: have default values
ctron Sep 18, 2023
6b1aa04
feat: allow using --verbose multiple times
ctron Sep 20, 2023
bfd58bd
chore: log fs change event before filtering out
ctron Sep 20, 2023
89c3bff
chore: add log message on cooldown
ctron Sep 20, 2023
f1763f3
fix: don't discard events from poll
ctron Sep 25, 2023
fcf39e6
Remove fs_extra dep; Reimplement copy_dir_recursive; Add logging
lpotthast Sep 8, 2023
f262916
ci: drop the changelog file, use convco
ctron Sep 29, 2023
7c13b33
chore: make clippy happy
ctron Sep 29, 2023
2d5b0ce
chore: change version to 0.17.7
ctron Sep 29, 2023
5426bd9
fix: report as trunk-ng, or whatever was in the cargo project
ctron Oct 2, 2023
45f5f4a
chore: uptick version
ctron Oct 2, 2023
17e4b16
style: format with nightly
ctron Oct 2, 2023
8361aa7
docs: update installation instructions
ctron Oct 4, 2023
fe3b003
Add documentation for --proxy-insecure
rogusdev Oct 1, 2023
9bed785
fix: allow cdylib targets
vgwidt Aug 26, 2023
7b997d0
fix: take account tailwindcss variable config tools value
Jarsop Aug 28, 2023
284a336
docs: add a note on conventional commits
ctron Oct 5, 2023
4c09af5
feat: enable TLS for websocket proxies
ctron Oct 5, 2023
f63b443
ci: try creating aarch64 binaries for macos and linux
ctron Oct 5, 2023
7174c4d
ci: publish to crates.io last, if things fail, this can't be repeated
ctron Oct 5, 2023
1b8cf4d
docs: poing to github hosted page, drop changelog requirement
ctron Oct 5, 2023
aac9375
ci: pick specific OS version
ctron Oct 5, 2023
bd988a7
ci: use bash
ctron Oct 5, 2023
1f8b1fe
ci: fix cross deps installation
ctron Oct 5, 2023
45c00cf
ci: fix a typo
ctron Oct 5, 2023
228f532
ci: if we fail, log what's there
ctron Oct 5, 2023
cb60429
ci: fix typo
ctron Oct 5, 2023
240089b
ci: publish pages after uploading new binaries
ctron Oct 5, 2023
5a01a12
ci: strip only when not using cross
ctron Oct 5, 2023
87410d4
ci: fix path of prepared binary
ctron Oct 5, 2023
3a1c85f
ci: check the effect of strip
ctron Oct 5, 2023
e5eb764
ci: really publish pages after build
ctron Oct 5, 2023
ca2e2f6
ci: need to work in a different directory
ctron Oct 5, 2023
a7b730d
pass through any other HTML attributes given to a <link rel="stylesheet>
cormac-ainc Jul 17, 2023
69a0504
chore: uptick version
ctron Oct 5, 2023
0f0abaf
feat: use request host for hot-reload instead of `window.location.host`
amrbashir Feb 24, 2023
9c6c56b
adjust imports
amrbashir Jul 7, 2023
2586627
feat: show version on startup
ctron Oct 5, 2023
f9c1e91
chore: apply nightly formatting
ctron Oct 5, 2023
172c3d6
chore: make clippy happy
ctron Oct 11, 2023
40cf257
chore: make clippy happy for Rust 1.73.0
ctron Oct 11, 2023
283e589
feat: bring back the fix for queuing up of change events
ctron Oct 12, 2023
1d53733
docs: clean up some more links, add a not on the "why"
ctron Oct 14, 2023
6f3f03c
ci: also allow the pages workflow the be run manually
ctron Oct 14, 2023
6766826
docs: even more links and names
ctron Oct 14, 2023
05a7bb8
chore: remove unused file
ctron Oct 19, 2023
340bb48
Added minification for html&css and optimization for PNGs.
Carlrs Oct 25, 2022
cdc5fd3
Properly enable minifying css, allow minifying embedded js and css in…
Carlrs Jun 11, 2023
e8ad461
chore: update lock file
ctron Oct 19, 2023
d897eb3
chore: update dependencies
ctron Oct 19, 2023
a50368c
chore: update dependencies
ctron Oct 19, 2023
a8124ab
style: make one line dependencies
ctron Oct 20, 2023
15ab4bc
chore: sort dependencies alphabetically
ctron Oct 20, 2023
0d8cf67
Add config option to specify additional headers for serve
oberien Feb 17, 2022
10b40d6
style: apply nightly cargo fmt
ctron Oct 20, 2023
20e2440
docs: update docs
ctron Oct 20, 2023
a936a1b
chore: clean up the auto-reload script a bit
ctron Oct 20, 2023
ff4bc9c
refactor: use Emoji type for the emoji
ctron Oct 20, 2023
a9395f4
fix: try fix windows notify issue
ctron Oct 20, 2023
b0c7f9c
feat: add build failure screen
ctron Oct 20, 2023
82a3c0f
ci: ditch nightly cargo fmt
ctron Oct 23, 2023
2606e78
chore: fix typo in log message
ctron Oct 23, 2023
314d79c
docs: cut down on custom HTML
ctron Oct 24, 2023
704986c
chore: drop the changelog file, it's confusing
ctron Oct 24, 2023
90a39a4
style: drop the hr
ctron Oct 24, 2023
c5816cc
style: drop both hrs
ctron Oct 24, 2023
59e8733
chore: add links to badges
ctron Oct 24, 2023
23fb624
feat[src/pipelines/inline.rs]: Add support for inline script tags of …
arichtman May 22, 2022
4be8642
chore: clean up a few things
ctron Oct 24, 2023
3c33dee
chore: uptick version
ctron Oct 24, 2023
9590251
chore: uptick version in lock file
ctron Oct 25, 2023
98ffce4
feat: when using --offline, pass that on to cargo
ctron Oct 25, 2023
72cec34
chore: fix a few typos
ctron Oct 25, 2023
3477dfd
Merge branch `ws-protocol`
amrbashir Oct 25, 2023
f30e397
chore: lower to debug level
ctron Oct 25, 2023
ab45b41
style: cleanup after 3477dfdc9f84cc0cef980ad346b9fb07f5890fef
ctron Oct 26, 2023
1be3de6
feat: add `--locked` and `--frozen`
ctron Oct 30, 2023
e0701e8
style: use ;
ctron Oct 30, 2023
0b80072
feat: improve build error output a bit
ctron Oct 30, 2023
ed320fb
feat: allow setting the `crossorigin` attribute
ctron Nov 6, 2023
32fc30a
feat: add integrity attribute for wasm and loader script
ctron Nov 6, 2023
8d862e9
Add TLS support for trunk serve
lukaselmer Apr 16, 2023
46a0431
style: try to consolidate http/https code
ctron Nov 17, 2023
4ece542
style: apply rustfmt
ctron Nov 17, 2023
c480efd
ci: cache@v2 is deprecated
ctron Nov 17, 2023
fedd47c
fix: don't canonicalize tls paths
ctron Nov 17, 2023
c5b378c
fix: extend certificate until 2033, add instructions generating it
ctron Nov 20, 2023
120047a
Add TLS support for trunk serve
lukaselmer Apr 16, 2023
4dd130e
style: try to consolidate http/https code
ctron Nov 17, 2023
138cc0e
style: apply rustfmt
ctron Nov 17, 2023
c25c9c5
ci: cache@v2 is deprecated
ctron Nov 17, 2023
a0ab041
fix: don't canonicalize tls paths
ctron Nov 17, 2023
9838f7f
fix: extend certificate until 2033, add instructions generating it
ctron Nov 20, 2023
bc3590b
chore: uptick version and update dependencies
ctron Nov 20, 2023
0566e4d
ci: let github turn this into links
ctron Nov 20, 2023
0756eb7
Merge branch 'ctron:trunk-ng' into trunk-ng
lpotthast Nov 21, 2023
785e460
fix: Treat errors as errors when detecting a cargo project
ctron Nov 24, 2023
f0e8bbf
chore: update some dependencies
ctron Nov 24, 2023
9b49521
chore: add some more context to file errors around sass (and others)
ctron Nov 24, 2023
461696f
feat: add `--no-spa` flag
mnemotic Nov 20, 2023
bf41bd7
chore: apply rustfmt
ctron Nov 24, 2023
9c2d1d8
refactor: pull out the address into its own variable
ctron Nov 24, 2023
0fa8897
fix: always provide a replacement for TRUNK_ADDRESS
ctron Nov 24, 2023
97b9f56
refactor: start breaking down larger files
ctron Nov 24, 2023
c3d7f62
Merge branch 'ctron:trunk-ng' into trunk-ng
lpotthast Nov 24, 2023
a466773
feat: add SRI for more resource types
ctron Nov 24, 2023
ccf2c3b
fix: drop the type attribute of the style element
ctron Nov 24, 2023
cc61983
style: have the src attribute first
ctron Nov 24, 2023
67f1cea
style: rename field
ctron Nov 24, 2023
718ed3f
Merge branch 'ctron:trunk-ng' into trunk-ng
lpotthast Nov 24, 2023
1864dcf
Merge remote-tracking branch 'thedodd/master' into trunk-ng
lpotthast Nov 24, 2023
3c11f00
feat: also generate integrity attributes for snippets
ctron Nov 24, 2023
925423b
Merge pull request #12 from lpotthast/merge-thedodd-master
ctron Nov 24, 2023
126b054
Update tool versions; Improve logging
lpotthast Nov 24, 2023
1fbb823
refactor: configure integrity as "data-integrity"
ctron Nov 24, 2023
29c6b33
docs: add sub-resource integrity information
ctron Nov 24, 2023
3bb6c95
refactor: simplify the implementation a bit
ctron Nov 24, 2023
952ced7
feat: structure --help output a bit more
ctron Nov 24, 2023
8c93cc8
Always ignore `.DS_Store` files when watching for file system changes
lpotthast Nov 24, 2023
1ce0b78
chore: uptick version
ctron Nov 24, 2023
3bea614
fix: improve build error screen
ctron Nov 27, 2023
dcf4ac2
ci: improve formatting of generated changelog
ctron Nov 27, 2023
28caf6d
ci: a better way to remove the header
ctron Nov 27, 2023
7e91411
feat: add the ability to show tools information
ctron Nov 28, 2023
0d7784f
chore: make clippy happy
ctron Nov 28, 2023
0e9981e
feat: allow accessing exported Rust functions in JavaScript
ctron Nov 29, 2023
7b2165c
chore: uptick version
ctron Nov 29, 2023
740bbe0
chore: make clippy happy
ctron Nov 29, 2023
c19fa9b
chore: fix messages, rel has dashes
ctron Nov 30, 2023
f50c227
refactor: don't color output when not running in a terminal
ctron Dec 1, 2023
9424f88
fix: drop additional whitespace when emojis are disabled
ctron Dec 1, 2023
450791e
chore: make clippy happy
ctron Dec 1, 2023
522d138
chore: revert from trunk-ng to trunk
ctron Dec 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .convco/template/commit.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
*
{{~#if scope}} **{{scope}}:**
{{~/if}}
{{#if references}}
{{~#each references}} {{#if @root.linkReferences~}}
[{{this.prefix}}{{this.issue}}]({{issueUrlFormat}})
{{~else}}{{this.prefix}}{{this.issue}}
{{~/if}}{{/each}}
{{~/if}}
{{subject}}
{{~#if hash}} {{#if @root.linkReferences}}([{{shortHash}}]({{commitUrlFormat}})){{else}}({{hash}})
{{~/if}}
{{~/if}}

Empty file added .convco/template/footer.hbs
Empty file.
2 changes: 2 additions & 0 deletions .convco/template/header.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

{{#if isPatch}}###{{else}}##{{/if}}{{#if @root.linkCompare}} [{{version}}]({{compareUrlFormat}}){{else}} {{version}}{{/if}}{{#if title}} "{{title}}"{{/if}}{{#if date}} ({{date}}){{/if}}
19 changes: 19 additions & 0 deletions .convco/template/template.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{{> header}}
{{#if noteGroups}}{{#each noteGroups}}

## ⚠ {{title}}

{{#each notes}}* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{this.text}}
{{/each}}
{{/each}}
{{/if}}

{{#each commitGroups}}
{{#if title}}{{#if @root.isPatch}}
##{{else}}
##{{/if}} {{title}}{{/if}}

{{#each commits}}
{{> commit root=@root}}
{{/each}}
{{/each}}
10 changes: 0 additions & 10 deletions .github/pull_request_template.md

This file was deleted.

80 changes: 41 additions & 39 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
name: CI
on: [push, pull_request]
on:
push:
branches:
- master
pull_request:
branches:
- master
jobs:
lint:
name: lint
runs-on: ubuntu-latest
steps:
- name: Setup | Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: |
~/.cargo/registry
Expand All @@ -19,24 +25,13 @@ jobs:
${{ runner.os }}-lint

- name: Setup | Toolchain (clippy)
uses: actions-rs/toolchain@v1
with:
toolchain: stable
default: true
components: clippy
run: |
rustup toolchain install stable --component clippy
rustup default stable

- name: Build | Clippy
uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: --all-targets

- name: Setup | Toolchain (rustfmt)
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
default: true
components: rustfmt
run: |
cargo clippy --all-targets --all-features -- -D warnings

- name: Build | Rustfmt
run: cargo fmt -- --check
Expand All @@ -45,10 +40,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup | Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup | Cache Cargo
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
Expand All @@ -59,10 +54,9 @@ jobs:
${{ runner.os }}-check

- name: Setup | Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
run: |
rustup toolchain install stable
rustup default stable

- name: Build | Check
run: cargo check --all
Expand All @@ -83,10 +77,10 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Setup | Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup | Cache Cargo
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
Expand All @@ -97,67 +91,73 @@ jobs:
${{ runner.os }}-cargo

- name: Setup | Cache | Example proxy
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/proxy/target
key: wasm32-example-proxy
restore-keys: |
wasm32-example-proxy

- name: Setup | Cache | Example seed
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/seed/target
key: wasm32-example-seed
restore-keys: |
wasm32-example-seed

- name: Setup | Cache | Example vanilla
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/vanilla/target
key: wasm32-example-vanilla
restore-keys: |
wasm32-example-vanilla

- name: Setup | Cache | Example webworker
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/webworker/target
key: wasm32-example-webworker
restore-keys: |
wasm32-example-webworker

- name: Setup | Cache | Example webworker-gloo
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/webworker-gloo/target
key: wasm32-example-webworker-gloo
restore-keys: |
wasm32-example-webworker-gloo

- name: Setup | Cache | Example yew
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/yew/target
key: wasm32-example-yew
restore-keys: |
wasm32-example-yew

- name: Setup | Cache | Example yew-tailwindcss
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/yew-tailwindcss/target
key: wasm32-example-yew-tailwindcss
restore-keys: |
wasm32-example-yew-tailwindcss

- name: Setup | Rust
uses: actions-rs/toolchain@v1
- name: Setup | Cache | Example yew-tls
uses: actions/cache@v3
with:
toolchain: stable
profile: minimal
target: wasm32-unknown-unknown
path: examples/yew-tls/target
key: wasm32-example-yew-tls
restore-keys: |
wasm32-example-yew-tls

- name: Setup | Rust
run: |
rustup toolchain install stable --target wasm32-unknown-unknown
rustup default stable

- name: Build | Test
run: cargo test
Expand All @@ -181,5 +181,7 @@ jobs:
run: ${{ matrix.binPath }} --config=examples/yew/Trunk.toml build
- name: Build | Examples | yew-tailwindcss
run: ${{ matrix.binPath }} --config=examples/yew-tailwindcss/Trunk.toml build
- name: Build | Examples | yew-tls
run: ${{ matrix.binPath }} --config=examples/yew-tls/Trunk.toml build
- name: Build | Examples | no-rust
run: ${{ matrix.binPath }} --config=examples/no-rust/Trunk.toml build
16 changes: 11 additions & 5 deletions .github/workflows/pages.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
name: Pages
on:
push:
tags:
- "v*"
# Only run after a successful release
workflow_call:
# Allow to run manually
workflow_dispatch:

permissions:
contents: read
pages: write
id-token: write

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Setup | Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: recursive
- name: Setup | Zola
Expand All @@ -23,4 +29,4 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./site/public
cname: trunkrs.dev
cname: trunkrs.dev
Loading