Skip to content

Commit c103a3c

Browse files
authored
Merge pull request BruceDevices#1742 from emericklaw/update-esp-web-tools
Update ESP Web Tools to 10.1.1
2 parents 7d565ec + b92a7d9 commit c103a3c

File tree

235 files changed

+35589
-7935
lines changed

Some content is hidden

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

235 files changed

+35589
-7935
lines changed

src/routes/+layout.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
{#if $current_page == Page.Flasher}
113113
<p data-i18n="footer_note">
114114
Flasher customized by
115+
<a href="https://github.com/emericklaw">emericklaw</a>,
115116
<a href="https://github.com/unveroleone">unveroleone</a>,
116117
<a href="https://github.com/bmorcelli">bmorcelli</a> and
117118
<a href="https://github.com/pr3y">pr3y</a> — Installer powered by

src/routes/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
Explore GitHub
5353
</a>
5454
<a
55-
href="https://bruce.computer/flasher"
55+
href="/flasher"
5656
target="_blank"
5757
class="ml-4 inline-block rounded-lg border-2 border-[#9B51E0] px-6 py-2 text-center text-lg text-[#9B51E0] transition"
5858
>

src/routes/flasher/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</script>
126126

127127
<svelte:head>
128-
<script type="module" src="/esp-web-tools-8.0.1/dist/web/install-button.js?module"></script>
128+
<script type="module" src="/esp-web-tools-10.1.1/dist/web/install-button.js?module"></script>
129129
</svelte:head>
130130

131131
<section class="relative flex h-[500px] w-full flex-col overflow-hidden pr-4 pl-4 md:flex-row">
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.177.0/containers/typescript-node/.devcontainer/base.Dockerfile
2+
3+
# [Choice] Node.js version: 16, 14, 12
4+
ARG VARIANT="16-buster"
5+
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
6+
7+
# [Optional] Uncomment this section to install additional OS packages.
8+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
9+
# && apt-get -y install --no-install-recommends <your-package-list-here>
10+
11+
# [Optional] Uncomment if you want to install an additional version of node using nvm
12+
# ARG EXTRA_NODE_VERSION=10
13+
# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
14+
15+
# [Optional] Uncomment if you want to install more global node packages
16+
# RUN su node -c "npm install -g <your-package-list -here>"
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.177.0/containers/typescript-node
3+
{
4+
"name": "Node.js & TypeScript",
5+
"build": {
6+
"dockerfile": "Dockerfile",
7+
// Update 'VARIANT' to pick a Node version: 12, 14, 16, 18, 20
8+
"args": {
9+
"VARIANT": "20"
10+
}
11+
},
12+
13+
// Add the IDs of extensions you want installed when the container is created.
14+
"extensions": [
15+
"dbaeumer.vscode-eslint",
16+
"esbenp.prettier-vscode",
17+
"bierner.lit-html",
18+
"runem.lit-plugin"
19+
],
20+
21+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
22+
"forwardPorts": [5000],
23+
24+
// Use 'postCreateCommand' to run commands after the container is created.
25+
"postCreateCommand": "npm install",
26+
27+
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
28+
"remoteUser": "node",
29+
30+
"settings": {
31+
"files.eol": "\n",
32+
"editor.tabSize": 2,
33+
"editor.formatOnPaste": false,
34+
"editor.formatOnSave": true,
35+
"editor.formatOnType": true,
36+
"[typescript]": {
37+
"editor.defaultFormatter": "esbenp.prettier-vscode"
38+
},
39+
"[javascript]": {
40+
"editor.defaultFormatter": "esbenp.prettier-vscode"
41+
},
42+
"files.trimTrailingWhitespace": true
43+
}
44+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: weekly
7+
- package-ecosystem: "npm"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
categories:
2+
- title: "Breaking Changes"
3+
labels:
4+
- "breaking change"
5+
- title: "Dependencies"
6+
collapse-after: 1
7+
labels:
8+
- "dependencies"
9+
template: |
10+
## What's Changed
11+
12+
$CHANGES
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: CI
5+
6+
on:
7+
push:
8+
branches: [main]
9+
pull_request:
10+
branches: [main]
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Install jq tool
19+
run: |
20+
sudo apt-get update
21+
sudo apt-get install jq
22+
- name: Use Node.js
23+
uses: actions/setup-node@v4
24+
with:
25+
node-version: 16
26+
- run: npm ci
27+
- run: script/build
28+
- run: npm exec -- prettier --check src
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
3+
4+
name: Node.js Package
5+
6+
on:
7+
release:
8+
types: [published]
9+
10+
jobs:
11+
publish-npm:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
- name: Install jq tool
16+
run: |
17+
sudo apt-get update
18+
sudo apt-get install jq
19+
- uses: actions/setup-node@v4
20+
with:
21+
node-version: 16
22+
registry-url: https://registry.npmjs.org/
23+
- run: npm ci
24+
- run: npm publish
25+
env:
26+
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Release Drafter
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
update_release_draft:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: release-drafter/release-drafter@v6
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)