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.

Sign up for GitHub

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

Add web-components #36

Merged
merged 14 commits into from
Dec 4, 2023
Merged

Add web-components #36

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b35c814
chore(structure): depart web-components
zreren Nov 2, 2023
ec3abf5
Update package.json
zreren Nov 2, 2023
eff6d50
fix:import path error
zreren Nov 2, 2023
4d2d7e4
Merge branch 'main' of https://github.com/zreren/joyrtc
zreren Nov 2, 2023
fd523e8
Update: CLA.md && webcomponents build config && .d.ts && remove react…
zreren Nov 17, 2023
6a88453
Update: css inject
zreren Nov 17, 2023
b746919
Add webcompoents build products
zreren Nov 17, 2023
904e774
Remove webcomponents build products
zreren Nov 17, 2023
fcc7267
Apply suggestions from code review
zreren Dec 1, 2023
f425c67
update:add vite.config.ts proxy;remove empty line
zreren Dec 1, 2023
a6b7a2b
Update index.html
zreren Dec 4, 2023
c6157ef
Update index.html
zreren Dec 4, 2023
920bb0b
Merge remote-tracking branch 'origin/main' into main
zreren Dec 4, 2023
3ed0589
fix(infra): docker build
a-wing Dec 4, 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
Prev Previous commit
fix(infra): docker build
  • Loading branch information
@a-wing
a-wing committed Dec 4, 2023
commit 3ed058927dd58662ab3cc990ade8b9d683c9f8ae
8 changes: 7 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
# Logs

webcomponents/**/logs
webcomponents/**/*.log
webcomponents/**/node_modules
webcomponents/**/dist
webcomponents/**/*.local

webui/**/logs
webui/**/*.log

webui/**/node_modules
webui/**/dist
webui/**/*.local
Expand Down
7 changes: 5 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ WORKDIR /src
COPY webui/package.json webui/package-lock.json .
RUN npm install

COPY webui .
COPY webcomponents webcomponents
COPY webui webui

WORKDIR /src/webui

RUN npm run build

Expand All @@ -18,7 +21,7 @@ RUN go mod download

COPY cloud .

COPY --from=builder-webui /src/dist /src/dist
COPY --from=builder-webui /src/webui/dist /src/dist

RUN go build -tags release -o joyrtc-cloud

Expand Down
2 changes: 2 additions & 0 deletions webcomponents/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
dist

# Logs
logs
*.log
Expand Down
Loading