Merge branch 'charmed-snapcraft-io' into staging

Author: edisile

.env

@@ -1,4 +1,6 @@
 PORT=8004
+VITE_PORT=5004
+VITE_OUTPUT_DIR=static/js/dist/vite
 ENVIRONMENT=devel
 FLASK_DEBUG=true
 DEVEL=True

.github/workflows/coverage.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: 20
 
@@ -118,13 +118,13 @@ jobs:
           path: coverage
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.10"
           cache: "pip"
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: "22"
           cache: "yarn"

.github/workflows/pr.yml

@@ -79,7 +79,7 @@ jobs:
 
       - name: Run dotrun
         run: |
-          dotrun &
+          dotrun --env ENVIRONMENT="prod" serve &
           curl --head --fail --retry-delay 3 --retry 30 --retry-connrefused http://localhost:8004
       # END copy of the run-dotrun job
 
@@ -88,6 +88,20 @@ jobs:
           docker run --network="host" -v .:/app cypress/base:22.18.0 \
             bash "-c" "cd /app && npx cypress install && yarn run test-e2e"
 
+  pack-rock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup LXD
+        uses: canonical/setup-lxd@main
+
+      - name: Setup rockcraft
+        run: sudo snap install rockcraft --classic
+
+      - name: Pack rock
+        run: rockcraft pack
+
   lint-python:
     runs-on: ubuntu-latest
     permissions:
@@ -236,7 +250,7 @@ jobs:
             tsx:
               - '**/*.tsx'
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: 20
 

Dockerfile

@@ -17,23 +17,16 @@ ADD package.json .
 ADD yarn.lock .
 RUN --mount=type=cache,target=/usr/local/share/.cache/yarn yarn install --production
 
-
-# Build stage: Run "yarn run build-css"
+# Build stage: Run "yarn run build"
 # ===
-FROM yarn-dependencies AS build-css
-ADD static/sass static/sass
-RUN yarn run build-css
-
-# Build stage: Run "yarn run build-js"
-# ===
-FROM yarn-dependencies AS build-js
+FROM yarn-dependencies AS build
 ADD static/js static/js
+ADD static/sass static/sass
 ADD vite.config.js .
-ADD vite.config.entry.js .
 ADD tsconfig.json .
-ADD babel.config.json .
+ADD templates .
 RUN yarn install
-RUN yarn run build-js
+RUN yarn run build
 
 # Build the production image
 # ===
@@ -52,8 +45,7 @@ WORKDIR /srv
 # Import code, build assets and mirror list
 ADD . .
 RUN rm -rf package.json yarn.lock .babelrc requirements.txt
-COPY --from=build-css /srv/static/css static/css
-COPY --from=build-js /srv/static/js static/js
+COPY --from=build /srv/static/js static/js
 
 # Set revision ID
 ARG BUILD_ID

README.md

@@ -34,6 +34,11 @@ dotrun
 
 Once the server has started, you can visit `http://127.0.0.1:8004` in your browser. You stop the server using `<ctrl>+c`.
 
+> If you're running dotrun on macOS or Windows, you will have to use a different command to launch dotrun with an additional argument in order to get JavaScript code working:
+```bash
+dotrun -p 5004:5004
+```
+
 For more detailed local development instructions, see [HACKING.md](HACKING.md).
 
 ## Brand stores

charm/charmcraft.yaml

@@ -20,7 +20,7 @@ extensions:
 config:
   options:
     sentry-dsn:
-      description: ""
+      description: "Sentry Data Source Name for the project"
       type: string
 
     environment:
@@ -29,47 +29,47 @@ config:
       type: string
 
     marketo-client-id:
-      description: ""
+      description: "Marketo API client ID"
       type: string
 
     marketo-client-secret:
-      description: ""
+      description: "Marketo API client secret"
       type: string
 
     github-client-id:
-      description: ""
+      description: "GitHub OAuth application ID for prompting users for access to their repositories"
       type: string
 
     github-client-secret:
-      description: ""
+      description: "GitHub OAuth application client secret for prompting users for access to their repositories"
       type: string
 
     github-snapcraft-user-token:
-      description: ""
+      description: "GitHub application token for automated builds"
       type: string
 
     github-snapcraft-bot-user-token:
-      description: ""
+      description: "GitHub application token for CVE data"
       type: string
 
     github-webhook-secret:
-      description: ""
+      description: "Secret salt used for signing automated build webhooks"
       type: string
 
     github-webhook-host-url:
-      description: ""
+      description: "URL of the automated build webhooks' host"
       type: string
 
     lp-api-username:
-      description: ""
+      description: "Launchpad API username"
       type: string
 
     lp-api-token:
-      description: ""
+      description: "Launchpad API token"
       type: string
 
     lp-api-token-secret:
-      description: ""
+      description: "Launchpad API secret"
       type: string
 
     youtube-api-key:
@@ -88,6 +88,22 @@ config:
       description: ""
       type: string
 
+    login-url:
+      description: "Base URL for SSO login redirects"
+      default: "https://login.ubuntu.com"
+      type: string
+
+    bsi-url:
+      description: ""
+      default: "https://build.snapcraft.io"
+      type: string
+
+    snapstore-dashboard-api-url:
+      description: "Base URL for SCA backend"
+      default: "https://dashboard.snapcraft.io/"
+      type: string
+
+
 # requires:
 #   tracing:
 #     interface: tracing

cypress.config.ts

@@ -6,5 +6,12 @@ export default defineConfig({
       // implement node event listeners here
     },
     supportFile: false,
+    blockHosts: [
+      "www.googletagmanager.com",
+      "analytics.google.com",
+      "*.analytics.google.com",
+      "www.google-analytics.com",
+      "assets.ubuntu.com"
+    ],
   },
 });

cypress/e2e/fsf.cy.js

@@ -1,4 +1,4 @@
-import jest from "eslint-plugin-jest";
+import vitest from '@vitest/eslint-plugin'
 import react from "eslint-plugin-react";
 import prettier from "eslint-plugin-prettier";
 import jsxA11Y from "eslint-plugin-jsx-a11y";
@@ -38,7 +38,7 @@ export default [
   ),
   {
     plugins: {
-      jest,
+      vitest,
       react,
       prettier,
       "jsx-a11y": jsxA11Y,
@@ -48,7 +48,7 @@ export default [
         Object.entries({
           ...globals.browser,
           ...globals.node,
-          ...jest.environments.globals.globals,
+          ...vitest.environments.env.globals
         }).map(([key, value]) => [key.trim(), value]),
       ),
       parser: babelParser,