Skip to content

Commit 40a4e69

Browse files
bryphe-coderbryphe-coder
committed
Use same entry point as v1
1 parent 3a724e4 commit 40a4e69

File tree

3 files changed

+12
-76
lines changed

3 files changed

+12
-76
lines changed

‎site/index.tsx renamed to ‎site/Main.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ import { App } from "./app"
66
// This is the entry point for the app - where everything start.
77
// In the future, we'll likely bring in more bootstrapping logic -
88
// like: https://github.com/coder/m/blob/50898bd4803df7639bd181e484c74ac5d84da474/product/coder/site/pages/_app.tsx#L32
9-
10-
function render() {
9+
const main = () => {
1110
const element = document.getElementById("root")
1211
ReactDOM.render(<App />, element)
1312
}
1413

15-
render()
14+
main()

‎site/webpack.prod.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as webpack from "webpack"
55
import "webpack-dev-server"
66

77
const config: webpack.Configuration = {
8-
entry: "./index.tsx",
8+
entry: "./Main.tsx",
99
mode: "production",
1010
module: {
1111
rules: [

‎site/yarn.lock

Lines changed: 9 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,11 +1707,6 @@
17071707
mkdirp "^1.0.4"
17081708
rimraf "^3.0.2"
17091709

1710-
<<<<<<< HEAD
1711-
"@pmmmwh/react-refresh-webpack-plugin@^0.5.1", "@pmmmwh/react-refresh-webpack-plugin@^0.5.4":
1712-
||||||| 7e72eb9
1713-
"@pmmmwh/react-refresh-webpack-plugin@^0.5.1":
1714-
=======
17151710
"@playwright/test@1.19.2":
17161711
version "1.19.2"
17171712
resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.19.2.tgz#429d1aa70f5e4cd521cdc8a5d9861ae4fcda3f7c"
@@ -1756,8 +1751,7 @@
17561751
stack-utils "2.0.5"
17571752
yazl "2.5.1"
17581753

1759-
"@pmmmwh/react-refresh-webpack-plugin@^0.5.1":
1760-
>>>>>>> main
1754+
"@pmmmwh/react-refresh-webpack-plugin@0.5.4", "@pmmmwh/react-refresh-webpack-plugin@^0.5.1":
17611755
version "0.5.4"
17621756
resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.4.tgz#df0d0d855fc527db48aac93c218a0bf4ada41f99"
17631757
integrity sha512-zZbZeHQDnoTlt2AF+diQT0wsSXpvWiaIOZwBRdltNFhG1+I3ozyaw7U/nBiUwyJ0D+zwdXp0E3bWOl38Ag2BMw==
@@ -5078,7 +5072,7 @@ comma-separated-tokens@^1.0.0:
50785072
resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
50795073
integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==
50805074

5081-
commander@8.3.0:
5075+
commander@8.3.0, commander@^8.3.0:
50825076
version "8.3.0"
50835077
resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
50845078
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
@@ -5103,11 +5097,6 @@ commander@^7.0.0:
51035097
resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
51045098
integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
51055099

5106-
commander@^8.3.0:
5107-
version "8.3.0"
5108-
resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
5109-
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
5110-
51115100
common-path-prefix@^3.0.0:
51125101
version "3.0.0"
51135102
resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
@@ -5595,7 +5584,6 @@ deepmerge@^4.2.2:
55955584
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
55965585
integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
55975586

5598-
<<<<<<< HEAD
55995587
default-gateway@^6.0.3:
56005588
version "6.0.3"
56015589
resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
@@ -5608,14 +5596,6 @@ define-lazy-prop@^2.0.0:
56085596
resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
56095597
integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
56105598

5611-
||||||| 7e72eb9
5612-
=======
5613-
define-lazy-prop@^2.0.0:
5614-
version "2.0.0"
5615-
resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
5616-
integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
5617-
5618-
>>>>>>> main
56195599
define-properties@^1.1.2, define-properties@^1.1.3:
56205600
version "1.1.3"
56215601
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -10006,7 +9986,7 @@ onetime@^5.1.2:
100069986
dependencies:
100079987
mimic-fn "^2.1.0"
100089988

10009-
open@8.4.0:
9989+
open@8.4.0, open@^8.0.9:
100109990
version "8.4.0"
100119991
resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
100129992
integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
@@ -10023,15 +10003,6 @@ open@^7.0.3:
1002310003
is-docker "^2.0.0"
1002410004
is-wsl "^2.1.1"
1002510005

10026-
open@^8.0.9:
10027-
version "8.4.0"
10028-
resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
10029-
integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
10030-
dependencies:
10031-
define-lazy-prop "^2.0.0"
10032-
is-docker "^2.1.1"
10033-
is-wsl "^2.2.0"
10034-
1003510006
optionator@^0.8.1:
1003610007
version "0.8.3"
1003710008
resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -10578,7 +10549,6 @@ pretty-error@^2.1.1:
1057810549
lodash "^4.17.20"
1057910550
renderkid "^2.0.4"
1058010551

10581-
<<<<<<< HEAD
1058210552
pretty-error@^4.0.0:
1058310553
version "4.0.0"
1058410554
resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6"
@@ -10587,12 +10557,7 @@ pretty-error@^4.0.0:
1058710557
lodash "^4.17.20"
1058810558
renderkid "^3.0.0"
1058910559

10590-
pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1:
10591-
||||||| 7e72eb9
10592-
pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1:
10593-
=======
1059410560
pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.2.5, pretty-format@^27.5.1:
10595-
>>>>>>> main
1059610561
version "27.5.1"
1059710562
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
1059810563
integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
@@ -11389,13 +11354,7 @@ resolve.exports@^1.1.0:
1138911354
resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
1139011355
integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
1139111356

11392-
<<<<<<< HEAD
11393-
resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.9.0:
11394-
||||||| 7e72eb9
11395-
resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.2:
11396-
=======
11397-
resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.2:
11398-
>>>>>>> main
11357+
resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.9.0:
1139911358
version "1.22.0"
1140011359
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
1140111360
integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -11417,20 +11376,16 @@ ret@~0.1.10:
1141711376
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
1141811377
integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
1141911378

11420-
<<<<<<< HEAD
11421-
retry@^0.13.1:
11422-
version "0.13.1"
11423-
resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
11424-
integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
11425-
11426-
||||||| 7e72eb9
11427-
=======
1142811379
retry@^0.12.0:
1142911380
version "0.12.0"
1143011381
resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
1143111382
integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
1143211383

11433-
>>>>>>> main
11384+
retry@^0.13.1:
11385+
version "0.13.1"
11386+
resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
11387+
integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
11388+
1143411389
reusify@^1.0.4:
1143511390
version "1.0.4"
1143611391
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -11862,7 +11817,6 @@ snapdragon@^0.8.1:
1186211817
source-map-resolve "^0.5.0"
1186311818
use "^3.1.0"
1186411819

11865-
<<<<<<< HEAD
1186611820
sockjs@^0.3.21:
1186711821
version "0.3.24"
1186811822
resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
@@ -11872,8 +11826,6 @@ sockjs@^0.3.21:
1187211826
uuid "^8.3.2"
1187311827
websocket-driver "^0.7.4"
1187411828

11875-
||||||| 7e72eb9
11876-
=======
1187711829
socks-proxy-agent@6.1.1:
1187811830
version "6.1.1"
1187911831
resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
@@ -11891,7 +11843,6 @@ socks@^2.6.1:
1189111843
ip "^1.1.5"
1189211844
smart-buffer "^4.2.0"
1189311845

11894-
>>>>>>> main
1189511846
source-list-map@^2.0.0:
1189611847
version "2.0.1"
1189711848
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
@@ -13513,25 +13464,11 @@ ws@^7.4.6:
1351313464
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
1351413465
integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
1351513466

13516-
<<<<<<< HEAD
13517-
ws@^8.2.3:
13518-
version "8.4.2"
13519-
resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
13520-
integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==
13521-
1352213467
ws@^8.4.2:
1352313468
version "8.5.0"
1352413469
resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
1352513470
integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
1352613471

13527-
||||||| 7e72eb9
13528-
ws@^8.2.3:
13529-
version "8.4.2"
13530-
resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
13531-
integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==
13532-
13533-
=======
13534-
>>>>>>> main
1353513472
xml-name-validator@^3.0.0:
1353613473
version "3.0.0"
1353713474
resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"

0 commit comments

Comments
 (0)