Express revamp

.github/workflows/build-express.yml

@@ -3,36 +3,50 @@ on:
   pull_request:
     paths:
       - 'packages/express/**'
+      - 'packages/common/**' # Added common since it's a dependency
       - '.github/workflows/build-express.yml'
+      - 'package.json'
+      - 'yarn.lock'
+
 jobs:
   build-express-app:
-    runs-on: ubuntu-latest # todo: use whatever is on the DO droplet
+    runs-on: ubuntu-latest
     steps:
-      - run: echo "🎉 The job was triggered by a ${{ github.event_name }} on commit ${{ github.SHA }}"
-      - name: Check out repository code
-        uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Start CouchDB
         uses: iamssen/couchdb-github-action@master
         with:
-          couchdb-version: 2.3.1 # production version
-      - uses: actions/setup-node@v3
+          couchdb-version: 2.3.1 # match production version
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
-      - run: npm install -g yarn@1.22.17
-      - run: npm install -g lerna@3.22.1 # 4.0.0 ?
-      #- run: npm install -g typescript@4.5.5
-      - run: lerna bootstrap
-      - name: Build and Test
+          node-version: 18
+          cache: 'yarn'
+
+      - name: Install Yarn
+        run: corepack enable
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Configure environment
         run: |
-          echo COUCHDB_SERVER=localhost:5984 >> ./packages/express/.env.development.local
-          echo COUCHDB_PROTOCOL=http >> ./packages/express/.env.development.local
-          echo COUCHDB_ADMIN=admin >> ./packages/express/.env.development.local
-          echo COUCHDB_PASSWORD=password >> ./packages/express/.env.development.local
-          echo VERSION=${{ github.SHA }} >> ./packages/express/.env.development.local
-          cd ./packages/express
-          yarn remove @types/jest
-          # yarn remove @types/pouchdb
-          yarn build
-          # nohup yarn serve & # Run the server in the background
-          # sleep 15s
-          yarn test
+          echo "COUCHDB_SERVER=localhost:5984" >> ./packages/express/.env.development.local
+          echo "COUCHDB_PROTOCOL=http" >> ./packages/express/.env.development.local
+          echo "COUCHDB_ADMIN=admin" >> ./packages/express/.env.development.local
+          echo "COUCHDB_PASSWORD=password" >> ./packages/express/.env.development.local
+          echo "VERSION=${{ github.sha }}" >> ./packages/express/.env.development.local
+
+      - name: Build common package
+        run: yarn workspace @vue-skuilder/common build
+
+      - name: Build and test express package
+        run: |
+          yarn workspace @vue-skuilder/express build
+          # yarn workspace @vue-skuilder/express test
+
+      - name: Type check
+        run: yarn workspace @vue-skuilder/express type-check

.github/workflows/build-vue.yml

@@ -3,25 +3,44 @@ on:
   pull_request:
     paths:
       - 'packages/vue/**'
+      - 'packages/common/**'
       - '.github/workflows/build-vue.yml'
 jobs:
   build-vue-spa:
-    runs-on: ubuntu-latest # todo: use whatever is on the DO droplet
+    runs-on: ubuntu-latest
     steps:
-      - run: echo "🎉 The job was triggered by a ${{ github.event_name }} on commit ${{ github.SHA }}"
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v3
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
           node-version: 18
-      - run: npm install -g yarn@1.22.17 # version? 1.22.17 -> 1.22.19 current
-      - run: npm install -g lerna@3.22.1 # version? 3.22.1 -> 6.6.2 current
+          cache: 'yarn'
+
+      - name: Enable Corepack
+        run: |
+          corepack enable
+          corepack prepare yarn@4.6.0 --activate
+
+      - name: Install dependencies
+        run: |
+          yarn --version
+          yarn install --immutable
+
+      - name: Build common package
+        working-directory: ./packages/common
+        run: yarn build
 
-      - run: lerna bootstrap
-      - name: Build and Test
+      - name: Setup Vue environment
+        run: printf "${{ secrets.VUE_ENV }}" > ./packages/vue/.env.production
+
+      - name: Build Vue package
+        working-directory: ./packages/vue
         run: |
-          printf "${{ secrets.VUE_ENV }}" > ./packages/vue/.env.production
-          cd ./packages/vue
+          yarn install
           yarn build
-          yarn test:unit
-          # yarn test:e2e:headless
+
+      - name: Run Vue tests
+        working-directory: ./packages/vue
+        run: yarn test:unit

.gitignore

@@ -33,3 +33,14 @@ vue/Caddyfile
 
 # Cyrpress build artifacts
 /packages/vue/cypress
+
+# yarn 2+ files
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+# TypeScript incremental build info
+*.tsbuildinfo

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-berry.js

package.json

@@ -1,19 +1,23 @@
 {
-    "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^4.14.0",
-        "@typescript-eslint/parser": "^4.14.0",
-        "eslint": "^7.18.0",
-        "eslint-config-prettier": "^10.0.1",
-        "eslint-plugin-prettier": "^3.3.1",
-        "eslint-plugin-prettier-vue": "^5.0.0",
-        "eslint-plugin-vue": "^7.5.0",
-        "lerna": "^4.0.0",
-        "prettier": "^2.2.1",
-        "typescript": "^5.7.2"
-    },
     "name": "vue-skuilder",
     "scripts": {
-        "serve": "./test-couch/test-couch.sh start && lerna run serve --stream",
-        "build": "lerna run --no-bail --stream build"
+        "dev": "yarn workspace @vue-skuilder/common build && node scripts/dev-couchdb.js start && concurrently \"yarn dev:vue\" \"yarn dev:express\"",
+        "dev:vue": "yarn workspace @vue-skuilder/vue dev",
+        "dev:express": "yarn workspace @vue-skuilder/express dev",
+        "dev:couchdb": "node scripts/dev-couchdb.js start",
+        "couchdb:start": "node scripts/dev-couchdb.js start",
+        "couchdb:stop": "node scripts/dev-couchdb.js stop",
+        "couchdb:status": "node scripts/dev-couchdb.js status",
+        "couchdb:remove": "node scripts/dev-couchdb.js remove",
+        "postdev": "node scripts/dev-couchdb.js stop",
+        "build": "yarn workspace @vue-skuilder/common build && yarn workspace @vue-skuilder/vue build && yarn workspace @vue-skuilder/express build"
+    },
+    "private": true,
+    "workspaces": [
+        "packages/*"
+    ],
+    "packageManager": "yarn@4.6.0",
+    "devDependencies": {
+        "concurrently": "^9.1.2"
     }
-}
+}

packages/client/package.json

@@ -1,5 +1,7 @@
 {
+  "name": "@vue-skuilder/client",
   "version": "0.1.0",
+  "private": true,
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -30,7 +32,6 @@
     "singleQuote": true,
     "trailingComma": "es5"
   },
-  "name": "client",
   "author": "Colin Kennedy",
   "module": "dist/client.esm.js",
   "size-limit": [

packages/client/tsconfig.json

@@ -31,5 +31,7 @@
     "forceConsistentCasingInFileNames": true,
     // `tsdx build` ignores this option, but it is commonly used when type-checking separately with `tsc`
     "noEmit": true,
+    // for yarn 2 monorepo support
+    "composite": true
   }
 }