Merge pull request #6 from oslabs-beta/noahReduceBranch

Noah reduce branch

Author: noahFavelo

Dockerfile

@@ -7,57 +7,54 @@ RUN apk add --no-cache --virtual .gyp \
     make \
     g++
 
-RUN npm install -g [email protected]
+ENV NODE_ENV='production'
 
 
-WORKDIR /app
 
-COPY package*.json ./
+ COPY package*.json ./
+# we do need this.
 
+RUN npm install --omit=dev --no-install-recommends --fetch-retry-maxtimeout 500000
 
-RUN npm install --no-install-recommends --fetch-retry-maxtimeout 500000
+#yep, we have to copy these.... );
+COPY ./index.html ./index.html
+#COPY ./app/src/public/styles/style.css ./app/src/public/styles/style.css
+COPY ./app/src ./app/src
+COPY ./vite.config.ts ./vite.config.ts
+COPY ./resources ./resources
+COPY ./src ./src 
 
-# install vite virst
+RUN npm run prod-build 
 
 
-COPY . .
- ENV NODE_ENV='production'
- # i am hoping the above will make it so that the frontend files will know that it is production.
-RUN npm run prod-build 
 
-# Stage 2: Runtime
+# # Stage 2: Runtime
 FROM node:21.2.0-alpine AS runtime
 
-WORKDIR /app
-
-COPY --from=build /app/package*.json ./
+ WORKDIR /app
 
-RUN npm install --no-install-recommends --fetch-retry-maxtimeout 500000
 
-# RUN npm run dev-frontend # no, dont just run the app while building
+COPY --from=build /build /app/build
 
-# make a build file?
 
+# just copy this straight if we can?
+COPY ../server ./server
 
-# --only=prod
-# COPY --from=build /app/.env .env
-COPY --from=build /app/config.js ./config.js
-COPY --from=build /app/server ./server
-COPY --from=build /app/build /app/build
+# these things build dosent have so dont copy them through
+COPY package*.json ./
+COPY  .env .env
+COPY ./config.js ./config.js
 
-# COPY .env .env
-#just make the env file go into the docker image?
 
+# and now we need to copy a bunch of stuff.
+COPY --from=build ./node_modules ./node_modules
 
+ENV PORT=5656
 EXPOSE 5656
 
 ENV IS_DOCKER=true
 
-
 ENV VIDEOSDK='vidsdk'
 
- ENV PORT=5656
-
-# no longer put the envs here
 
 CMD [ "npm", "start" ]

Dockerfile-old

@@ -0,0 +1,79 @@
+# Stage 1: Build
+FROM node:21.2.0-alpine AS build
+
+# python: required dependency for node alpine, shrinks image size from 2.17GB to 1.67GB
+RUN apk add --no-cache --virtual .gyp \
+    python3 \
+    make \
+    g++
+
+RUN npm install -g [email protected]
+
+
+WORKDIR /app
+
+COPY package*.json ./
+# also make the below copies for the runtime stage to use.
+COPY ./config.js ./config.js
+COPY ./server ./server
+
+
+RUN npm install --production --no-install-recommends --fetch-retry-maxtimeout 500000
+
+# install vite virst
+
+
+COPY ./index.html ./index.html
+#COPY ./app/src/public/styles/style.css ./app/src/public/styles/style.css
+COPY ./app/src ./app/src
+COPY ./vite.config.ts ./vite.config.ts
+COPY ./resources ./resources
+COPY ./src ./src 
+
+
+#also copy this one file lol.
+
+ ENV NODE_ENV='production'
+ # i am hoping the above will make it so that the frontend files will know that it is production.
+RUN npm run prod-build 
+
+
+#COPY ./build ./build
+# they will need the above.
+
+# Stage 2: Runtime
+FROM node:21.2.0-alpine AS runtime
+
+WORKDIR /app
+
+COPY --from=build /app/package*.json ./
+
+RUN npm install --production --no-install-recommends --fetch-retry-maxtimeout 500000
+
+# RUN npm run dev-frontend # no, dont just run the app while building
+
+# make a build file?
+
+
+# --only=prod
+# COPY --from=build /app/.env .env
+COPY --from=build /app/config.js ./config.js
+COPY --from=build /app/server ./server
+COPY --from=build /app/build /app/build
+
+COPY .env .env
+#just make the env file go into the docker image?
+
+
+EXPOSE 5656
+
+ENV IS_DOCKER=true
+
+
+ENV VIDEOSDK='vidsdk'
+
+ ENV PORT=5656
+
+# no longer put the envs here
+
+CMD [ "npm", "start" ]

__tests__/componentBuilder.test.tsx

@@ -25,7 +25,7 @@ describe('componentBuilder', () => {
         name: 'input',
         childId: 1,
         style: {},
-        attributes: { cssClasses: 'test-class' },
+        attributes: { cssclasses: 'test-class' },
         events: {},
         stateProps: [],
         passedInProps: [],
@@ -90,7 +90,7 @@ describe('componentBuilder', () => {
         name: 'img',
         childId: 2,
         style: {},
-        attributes: { compLink: 'http://example.com/image.png' },
+        attributes: { complink: 'http://example.com/image.png' },
         events: {},
         stateProps: [],
         passedInProps: [],
@@ -113,7 +113,7 @@ describe('componentBuilder', () => {
         name: 'div',
         childId: 3,
         style: {},
-        attributes: { cssClasses: 'container' },
+        attributes: { cssclasses: 'container' },
         events: {},
         stateProps: [],
         passedInProps: [],

__tests__/generateCode.test.ts

@@ -338,7 +338,7 @@ describe('elementTagDetails', () => {
   it('generates correct details for an HTML element', () => {
     const childElement = {
       childId: '1',
-      attributes: { cssClasses: 'btn' },
+      attributes: { cssclasses: 'btn' },
       style: {},
       events: {}
     };