fix: fly new and fly server can't find examples

Author: michaeldwan

packages/core/package.json

@@ -17,6 +17,7 @@
         "build:watch": "tsc -b -w -v ."
     },
     "dependencies": {
+        "@fly/examples": "0.42.0",
         "@fly/v8env": "0.42.0",
         "ansi-colors": "^1.1.0",
         "axios": "^0.18.0",

packages/core/src/cmd/new.ts

@@ -3,6 +3,7 @@ import * as path from "path"
 import * as fs from "fs"
 import { sync as glob } from "glob"
 import * as execa from "execa"
+import { examplesPath } from "@fly/examples"
 
 export interface NewOptions {
   template: string[]
@@ -18,7 +19,7 @@ const newCommand = root
   .option("-t, --template [template]", "Name of the template to use. default: getting-started", "getting-started")
   .option("-l, --list", "List available templates.")
   .action(async (options, args) => {
-    const templateIndex = new TemplateIndex([path.resolve(__dirname, "..", "..", "examples")])
+    const templateIndex = new TemplateIndex([examplesPath])
 
     if (args.name === undefined || options.list) {
       listTemplates(templateIndex)

packages/core/src/cmd/server.ts

@@ -6,6 +6,7 @@ import { spawn } from "child_process"
 import { FileAppStore } from "../file_app_store"
 import { Server } from "../server"
 import { RedisCacheNotifier } from "../redis_cache_notifier"
+import { examplesPath } from "@fly/examples"
 
 interface ServerOptions {
   port?: string
@@ -58,7 +59,8 @@ root
   })
 
 async function getExamplePath(name: string) {
-  const p = path.resolve(__dirname, "..", "..", "examples", name)
+  const p = path.resolve(examplesPath, name)
+
   if (!fs.existsSync(p)) {
     return undefined
   }

packages/core/tsconfig.json

@@ -11,5 +11,10 @@
       "es2017",
       "esnext.asynciterable"
     ]
-  }
-}
+  },
+  "references": [
+    {
+      "path": "../examples"
+    }
+  ]
+}

packages/examples/.gitignore

@@ -0,0 +1,2 @@
+apps/*
+lib

packages/examples/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "@fly/examples",
+  "version": "0.42.0",
+  "description": "Example apps for the fly edge application runtime.",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/superfly/fly"
+  },
+  "homepage": "https://fly.io",
+  "main": "lib/index.js",
+  "files": [
+    "lib/",
+    "apps/"
+  ],
+  "scripts": {
+    "clean": "rm -rf apps",
+    "build": "yarn clean && cp -r ../../examples apps",
+    "prepublishOnly": "yarn build",
+    "postpublishOnly": "yarn clean"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}

packages/examples/src/index.ts

@@ -0,0 +1,11 @@
+import * as path from "path"
+import * as fs from "fs"
+
+let examples = path.resolve(__dirname, "..", "apps")
+
+// use examples from the repo root in dev
+if (!fs.existsSync(examples)) {
+  examples = path.resolve(__dirname, "..", "..", "..", "examples")
+}
+
+export const examplesPath = examples

packages/examples/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.common.json",
+  "include": [
+    "./src/**/*"
+  ],
+  "compilerOptions": {
+    "composite": true,
+    "rootDir": "./src",
+    "outDir": "./lib"
+  }
+}

packages/fly/.gitignore

@@ -1,2 +1 @@
-examples/*
-README.md
+README.md

packages/fly/package.json

@@ -9,15 +9,14 @@
   },
   "homepage": "https://fly.io",
   "files": [
-    "examples/",
     "bin/"
   ],
   "bin": {
     "fly": "./bin/fly.js"
   },
   "scripts": {
-    "clean": "rm -rf examples/* README.md",
-    "build": "cp -r ../../examples/ examples/ && cp ../../README.md .",
+    "clean": "rm -rf README.md",
+    "build": "cp ../../README.md .",
     "prepublishOnly": "yarn build"
   },
   "engines": {