Bump

Reviewed-on: cerc-io/test-progressive-web-app#15

.gitea/workflows/publish.yaml

@@ -1,76 +1,31 @@
-name: Publish ApplicationRecord to Registry
+name: Publish ApplicationRecord to Registry
-on:
+on:
-  release:
+  release:
-    types: [published]
+    types: [published]
-
+
-env:
+env:
-  DOCKER_HOST: unix:///var/run/dind.sock
+  CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }}
-
+  CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_LACONIC_BOND_ID }}
-jobs:
+
-  setup_deps:
+jobs:
-    name: "Install project and dependencies"
+  cns_publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-    steps:
+    steps:
-      - name: "Clone project repository"
+      - name: "Clone project repository"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3
-
+      - name: Use Node.js
- # At present the stock setup-python action fails on Linux/aarch64
+        uses: actions/setup-node@v3
-        # Conditional steps below workaroud this by using deadsnakes for that case only
+        with:
-      - name: "Install Python for ARM on Linux"
+          node-version: 18
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
+      - name: "Enable Yarn"
-        uses: deadsnakes/action@v3.0.1
+        run: corepack enable
-        with:
+      - name: "Install registry CLI"
-          python-version: '3.8'
+        run: |
-      
+          npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/
-      - name: "Install Python cases other than ARM on Linux"
+          npm install -g @cerc-io/laconic-registry-cli@0.1.13
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
+      - name: "Install jq"
-        uses: actions/setup-python@v4
+        run: apt -y update && apt -y install jq
-        with:
+      - name: "Publish Application Record"
-          python-version: '3.8'
+        run: scripts/publish-app-record.sh
-      
+      - name: "Request Deployment"
-      - name: "Print Python version"
+        run: scripts/request-app-deployment.sh
-        run: python3 --version
-
-      - name: "Install Stack Orchestrator"
-        run: |
-          mkdir -p /opt/laconic
-          curl -o /opt/laconic/quick-install-linux.sh https://raw.githubusercontent.com/cerc-io/stack-orchestrator/main/scripts/quick-install-linux.sh
-          chmod +x /opt/laconic/quick-install-linux.sh
-          CERC_SO_INSTALL_SKIP_PACKAGES=true /opt/laconic/quick-install-linux.sh -y
-          source ~/.profile
-          laconic-so version
-
-      - name: "Start dockerd" # Also needed until we can incorporate into the executor
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
-      
-      - name: "Use laconic-so"
-        run: |
-          source ~/.profile
-          laconic-so --stack uniswap-urbit-app setup-repositories --pull
-          laconic-so --stack uniswap-urbit-app build-containers
-        # laconic-so --stack uniswap-urbit-app deploy init --output uniswap-urbit-app-spec.yml
-        # edit the above .yml file
-        # laconic-so --stack uniswap-urbit-app deploy create --spec-file uniswap-urbit-app-spec.yml --deployment-dir uniswap-urbit-app-deployment
-        # edit the config file
-        # laconic-so deployment --dir uniswap-urbit-app-deployment start
-
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: "Install Yarn"
-        run: npm install -g yarn
-      - name: "Install registry CLI"
-        run: |
-          npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/
-          yarn global add @cerc-io/laconic-registry-cli
-      - name: "Install jq"
-        run: apt -y update && apt -y install jq
-      - name: "Publish Record"
-        env:
-          CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }}
-          CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_LACONIC_BOND_ID }}
-          CERC_REGISTRY_APP_CRN: "crn://urbit/applications/uniswap"
-        run: scripts/publish-app-record.sh

next.config.mjs

@@ -1,12 +1,13 @@
-/** @type {import('next').NextConfig} */
+import withPWA from 'next-pwa';
-const withPWA = require('next-pwa')({
-  dest: 'public',
-})
 
-module.exports = withPWA({
+const config = {
   env: {
     CERC_TEST_WEBAPP_CONFIG1: process.env.CERC_TEST_WEBAPP_CONFIG1,
     CERC_TEST_WEBAPP_CONFIG2: process.env.CERC_TEST_WEBAPP_CONFIG2,
     CERC_WEBAPP_DEBUG: process.env.CERC_WEBAPP_DEBUG,
-  },
+  }
-})
+};
+
+const nextConfig = withPWA({ dest: 'public' })(config);
+
+export default nextConfig;

package.json

@@ -1,22 +1,21 @@
-{
+{
-  "private": true,
+  "name": "@cerc-io/test-progressive-web-app",
-  "name": "@zramsay/test-progressive-web-app",
+  "version": "0.1.53",
-  "version": "0.1.6",
+  "repository": "https://git.vdb.to/cerc-io/test-progressive-web-app",
-  "repository": "https://git.vdb.to/zramsay/test-progressive-web-app/",
+  "scripts": {
-  "scripts": {
+    "dev": "next dev",
-    "dev": "next dev",
+    "build": "next build",
-    "build": "next build",
+    "start": "next start"
-    "start": "next start"
+  },
-  },
+  "dependencies": {
-  "dependencies": {
+    "next": "latest",
-    "next": "latest",
+    "next-pwa": "^5.6.0",
-    "next-pwa": "^5.6.0",
+    "react": "^18.2.0",
-    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
-    "react-dom": "^18.2.0"
+  },
-  },
+  "devDependencies": {
-  "devDependencies": {
+    "@types/node": "17.0.4",
-    "@types/node": "17.0.4",
+    "@types/react": "17.0.38",
-    "@types/react": "17.0.38",
+    "typescript": "^5"
-    "typescript": "4.5.4"
+  }
-  }
+}
-}

scripts/publish-app-record.sh

@@ -5,7 +5,7 @@ set -e
 RECORD_FILE=tmp.rf.$$
 CONFIG_FILE=`mktemp`
 
-CERC_APP_TYPE=${CERC_APP_TYPE:-"webapp"}
+CERC_APP_TYPE=${CERC_APP_TYPE:-"webapp/next"}
 CERC_REPO_REF=${CERC_REPO_REF:-${GITHUB_SHA:-`git log -1 --format="%H"`}}
 CERC_IS_LATEST_RELEASE=${CERC_IS_LATEST_RELEASE:-"true"}
 
@@ -23,8 +23,8 @@ services:
     restEndpoint: '${CERC_REGISTRY_REST_ENDPOINT:-http://console.laconic.com:1317}'
     gqlEndpoint: '${CERC_REGISTRY_GQL_ENDPOINT:-http://console.laconic.com:9473/api}'
     chainId: ${CERC_REGISTRY_CHAIN_ID:-laconic_9000-1}
-    gas: 550000
+    gas: 2950000
-    fees: 200000aphoton
+    fees: 400000aphoton
 EOF
 
 next_ver=$(laconic -c $CONFIG_FILE cns record list --type ApplicationRecord --all --name "$rcd_name" 2>/dev/null | jq -r -s ".[] | sort_by(.createTime) | reverse | [ .[] | select(.bondId == \"$CERC_REGISTRY_BOND_ID\") ] | .[0].attributes.version" | awk -F. -v OFS=. '{$NF += 1 ; print}')
@@ -42,7 +42,8 @@ record:
   homepage: "$rcd_homepage"
   license: "$rcd_license"
   author: "$rcd_author"
-  repository: "$rcd_repository"
+  repository:
+    - "$rcd_repository"
   repository_ref: "$CERC_REPO_REF"
   app_version: "$rcd_app_version"
   app_type: "$CERC_APP_TYPE"
@@ -53,13 +54,16 @@ cat $RECORD_FILE
 RECORD_ID=$(laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} | jq -r '.id')
 echo $RECORD_ID
 
-if [ -n "$CERC_REGISTRY_APP_CRN" ]; then
+if [ -z "$CERC_REGISTRY_APP_CRN" ]; then
-  laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${rcd_app_version}" "$RECORD_ID"
+  authority=$(echo "$rcd_name" | cut -d'/' -f1 | sed 's/@//')
-  laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${CERC_REPO_REF}" "$RECORD_ID"
+  app=$(echo "$rcd_name" | cut -d'/' -f2-)
-  if [ "true" == "$CERC_IS_LATEST_RELEASE" ]; then
+  CERC_REGISTRY_APP_CRN="crn://$authority/applications/$app"
-    laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN" "$RECORD_ID"
+fi
-    laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@latest" "$RECORD_ID"
+
-  fi
+laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${rcd_app_version}" "$RECORD_ID"
+laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${CERC_REPO_REF}" "$RECORD_ID"
+if [ "true" == "$CERC_IS_LATEST_RELEASE" ]; then
+  laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN" "$RECORD_ID"
 fi
 
 rm -f $RECORD_FILE $CONFIG_FILE

scripts/request-app-deployment.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+set -e
+
+RECORD_FILE=tmp.rf.$$
+CONFIG_FILE=`mktemp`
+
+rcd_name=$(jq -r '.name' package.json | sed 's/null//' | sed 's/^@//')
+rcd_app_version=$(jq -r '.version' package.json | sed 's/null//')
+
+cat <<EOF > "$CONFIG_FILE"
+services:
+  cns:
+    restEndpoint: '${CERC_REGISTRY_REST_ENDPOINT:-http://console.laconic.com:1317}'
+    gqlEndpoint: '${CERC_REGISTRY_GQL_ENDPOINT:-http://console.laconic.com:9473/api}'
+    chainId: ${CERC_REGISTRY_CHAIN_ID:-laconic_9000-1}
+    gas: 2950000
+    fees: 400000aphoton
+EOF
+
+if [ -z "$CERC_REGISTRY_APP_CRN" ]; then
+  authority=$(echo "$rcd_name" | cut -d'/' -f1 | sed 's/@//')
+  app=$(echo "$rcd_name" | cut -d'/' -f2-)
+  CERC_REGISTRY_APP_CRN="crn://$authority/applications/$app"
+fi
+
+APP_RECORD=$(laconic -c $CONFIG_FILE cns name resolve "$CERC_REGISTRY_APP_CRN" | jq '.[0]')
+if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
+  echo "No record found for $CERC_REGISTRY_APP_CRN."
+  exit 1
+fi
+
+cat <<EOF | sed '/.*: ""$/d' > "$RECORD_FILE"
+record:
+  type: ApplicationDeploymentRequest
+  version: 1.0.0
+  name: "$rcd_name@$rcd_app_version"
+  application: "$CERC_REGISTRY_APP_CRN@$rcd_app_version"
+  dns: "$CERC_REGISTRY_DEPLOYMENT_SHORT_HOSTNAME"
+  deployment: "$CERC_REGISTRY_DEPLOYMENT_CRN"
+  config:
+    env:
+      CERC_WEBAPP_DEBUG: "$rcd_app_version"
+  meta:
+    note: "Added by CI @ `date`"
+    repository: "`git remote get-url origin`"
+    repository_ref: "${GITHUB_SHA:-`git log -1 --format="%H"`}"
+EOF
+
+cat $RECORD_FILE
+RECORD_ID=$(laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} | jq -r '.id')
+echo $RECORD_ID
+
+rm -f $RECORD_FILE $CONFIG_FILE

tsconfig.json

@@ -1,20 +1,26 @@
 {
   "compilerOptions": {
-    "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
-    "forceConsistentCasingInFileNames": true,
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "paths": {
+      "@/*": ["./src/*"]
+    }
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
   "exclude": ["node_modules"]
 }