🚧 WIP: Frontend tooling updates #3972

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

Closed

kkellydesign wants to merge 29 commits into mozilla:master from lincolnloop:frontend-tooling-updates

.babel.json

Large diffs are not rendered by default.

.stylelintrc

-Original file line number
+Diff line change
@@ -0,0 +1,93 @@
+    {
+      "extends": "stylelint-config-recommended-scss",
+      "plugins": [
+        "stylelint-order"
+      ],
+      "defaultSeverity": "warning",
+      "rules": {
+        "indentation": 2,
+        "no-descending-specificity": null,
+        "no-empty-source": null,
+        "font-family-no-duplicate-names": null,
+        "font-family-no-missing-generic-family-keyword": null,
+        "order/order": [
+          "dollar-variables",
+          "custom-properties",
+          "declarations"
+        ],
+        "order/properties-order": [
+          "appearance",
+          "position",
+          "top",
+          "right",
+          "bottom",
+          "left",
+          "z-index",
+          "display",
+          "box-sizing",
+          "float",
+          "order",
+          "flex",
+          "flex-direction",
+          "flex-flow",
+          "justify-content",
+          "align-content",
+          "align-items",
+          "align-self",
+          "margin",
+          "margin-top",
+          "margin-right",
+          "margin-bottom",
+          "margin-left",
+          "padding",
+          "padding-top",
+          "padding-right",
+          "padding-bottom",
+          "padding-left",
+          "width",
+          "min-width",
+          "max-width",
+          "height",
+          "min-height",
+          "max-height",
+          "box-shadow",
+          "border",
+          "border-top",
+          "border-right",
+          "border-bottom",
+          "border-left",
+          "border-color",
+          "border-image",
+          "border-radius",
+          "border-width",
+          "background",
+          "background-image",
+          "background-color",
+          "background-position",
+          "background-repeat",
+          "background-size",
+          "background-attachment",
+          "mask",
+          "mask-image",
+          "mask-position",
+          "mask-repeat",
+          "mask-size",
+          "font",
+          "font-family",
+          "font-size",
+          "font-style",
+          "font-weight",
+          "line-height",
+          "text-align",
+          "text-decoration",
+          "text-overflow",
+          "text-transform",
+          "white-space",
+          "vertical-align",
+          "color",
+          "overflow",
+          "clip",
+          "content"
+        ]
+      }
+    }

Dockerfile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,3 +1,15 @@
  
    ################################

    # Node builder

    #

    FROM node:12 as node-builder

    WORKDIR /app

    COPY ./package.json ./package-lock.json ./

    RUN npm i

    COPY ./kitsune/sumo/static/sumo ./kitsune/sumo/static/sumo/

    COPY ./kss-template ./kss-template/

    COPY ./kss-config.json .

    RUN npm run build

    ################################

    # Python dependencies builder

    #

    @@ -38,12 +50,10 @@ ENV GIT_SHA=${GIT_SHA}
  
    FROM base AS base-dev

    RUN apt-get update && apt-get install apt-transport-https && \

        echo "deb https://deb.nodesource.com/node_6.x stretch main" >> /etc/apt/sources.list && \

        echo "deb https://deb.nodesource.com/node_8.x stretch main" >> /etc/apt/sources.list && \

        curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \

        echo "deb https://dl.yarnpkg.com/debian/ stable main" >> /etc/apt/sources.list && \

        curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

        apt-get update && \

        apt-get install -y --no-install-recommends nodejs yarn optipng && \

        apt-get update -qq && \

        apt-get install -y --no-install-recommends nodejs optipng && \

        rm -rf /var/lib/apt/lists/*

    @@ -52,9 +62,9 @@ RUN apt-get update && apt-get install apt-transport-https && \
  
    #

    FROM base-dev AS staticfiles

    COPY package.json bower.json yarn.lock /app/

    COPY package.json bower.json /app/

    RUN yarn install --frozen-lockfile && yarn cache clean

    RUN npm i

    RUN ./node_modules/.bin/bower install --allow-root

    COPY . .

    @@ -114,7 +124,7 @@ RUN apt-get update && \
  
    RUN groupadd --gid 1000 kitsune && useradd -g kitsune --uid 1000 --shell /usr/sbin/nologin kitsune

    COPY --from=base --chown=kitsune:kitsune /venv /venv

    COPY --from=staticfiles --chown=kitsune:kitsune /app/static /app/static

    COPY --from=node-builder --chown=kitsune:kitsune /app/static /app/static

    COPY --from=staticfiles --chown=kitsune:kitsune /app/jsi18n /app/jsi18n

    COPY --from=staticfiles --chown=kitsune:kitsune /app/bower_components /app/bower_components

Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ help: @@
     	${MAKE} build-full
     build: .docker-build-pull
-    	${DC} build base-dev
+    	${DC} build base-dev node
     	touch .docker-build
     build-full: .docker-build-pull
@@ Expand Down @@

docker-compose.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,15 @@ services: @@
         ports:
           - "8000:8000"
+      browsersync:
+        image: itsre/sumo-kitsune:node-${GIT_COMMIT_SHORT:-latest}
+        command: npm start
+        volumes:
+          - ./:/app:delegated
+        ports:
+          - "3000:3000"
+          - "3001:3001"
       test:
         image: itsre/sumo-kitsune:base-dev-${GIT_COMMIT_SHORT:-latest}
         command: ./bin/run-unit-tests.sh
@@ Expand Down Expand Up / @@ -82,6 +91,14 @@ services: @@
             - GIT_SHA
         image: itsre/sumo-kitsune:staticfiles-${GIT_COMMIT_SHORT:-latest}
+      node:
+        build:
+          context: .
+          target: node-builder
+          args:
+            - GIT_SHA
+        image: itsre/sumo-kitsune:node-${GIT_COMMIT_SHORT:-latest}
       locales:
         build:
           context: .
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🚧 WIP: Frontend tooling updates #3972

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!