feat: new templates

Author: boyander

.github/workflows/release.yml

@@ -7,13 +7,13 @@ jobs:
   release:
     name: release
     runs-on: ubuntu-latest
+    timeout-minutes: 3
     steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: "16"
-          cache: "yarn"
-      - run: yarn install --frozen-lockfile
+      - run: yarn install
       - run: yarn build
       - run: yarn release
         env:

.github/workflows/test.yaml

@@ -0,0 +1,23 @@
+name: Check blog
+on:
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - reopened
+    branches:
+      - main
+jobs:
+  build-cli:
+    name: Package CLI
+    runs-on: ubuntu-latest
+    timeout-minutes: 2
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+      - run: yarn install
+      - run: yarn build

bin/faable

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import "../dist/index.js";

bin/faable.js

@@ -4,6 +4,7 @@
   "main": "dist/index.js",
   "license": "MIT",
   "author": "Marc Pomar <marc@faable.com>",
+  "type": "module",
   "types": "./dist/index.d.ts",
   "bugs": {
     "url": "https://github.com/faablecloud/faable/issues"
@@ -32,12 +33,13 @@
     "@types/yargs": "^17.0.17",
     "rimraf": "^3.0.2",
     "rollup": "^3.7.5",
+    "rollup-plugin-auto-external": "^2.0.0",
     "semantic-release": "^19.0.5",
-    "ts-node": "^10.5.0",
+    "ts-node": "^10.9.1",
     "typescript": "^4.5.5"
   },
   "scripts": {
-    "cli": "ts-node src/index.ts",
+    "cli": "ts-node --esm --experimental-specifier-resolution=node src/index.ts",
     "build": "rimraf pkg && rollup --config rollup.config.mjs",
     "release": "yarn build && semantic-release"
   },

package.json

@@ -4,25 +4,28 @@ import commonjs from "@rollup/plugin-commonjs";
 import { nodeResolve } from "@rollup/plugin-node-resolve";
 import copy from "rollup-plugin-copy";
 import generatePackageJson from "rollup-plugin-generate-package-json";
+import autoExternal from "rollup-plugin-auto-external";
 
 export default {
   input: "src/index.ts",
   output: {
-    file: "pkg/dist/faable.js",
-    format: "cjs",
+    dir: "pkg/dist",
+    format: "esm",
     exports: "named",
-    preserveModules: false,
+    preserveModules: true,
     preserveModulesRoot: "src",
   },
   plugins: [
+    autoExternal(),
     json(),
     typescript(),
-    commonjs(),
-    nodeResolve(),
+    // commonjs(),
+    // nodeResolve(),
     copy({
       targets: [
         { src: "README.md", dest: "pkg" },
         { src: "bin/*", dest: "pkg/bin" },
+        { src: "templates/**/*", dest: "pkg/templates" },
       ],
     }),
     generatePackageJson({
@@ -32,8 +35,9 @@ export default {
         main: pkg.main,
         dependencies: pkg.dependencies,
         bin: {
-          faable: "bin/faable",
+          faable: "bin/faable.js",
         },
+        type: "module",
         license: "MIT",
         author: "Marc Pomar <marc@faable.com>",
         types: "./dist/index.d.ts",

rollup.config.mjs

@@ -1,9 +1,13 @@
-import * as fs from "fs-extra";
+import fs from "fs-extra";
 import Handlebars from "handlebars";
 import * as path from "path";
 import { log } from "../../log";
+import { fileURLToPath } from "url";
 
-const templates_dir = path.join(__dirname, "./templates");
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const templates_dir = path.join(__dirname, "../../../templates");
 const dockerfile = fs.readFileSync(`${templates_dir}/Dockerfile`).toString();
 
 // Docker template file

src/commands/deploy/index.ts src/commands/deploy/deploy.tssrc/commands/deploy/index.ts renamed to src/commands/deploy/deploy.ts

@@ -1,6 +1,6 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { deploy } from "./commands/deploy";
+import { deploy } from "./commands/deploy/deploy";
 
 yargs(hideBin(process.argv))
   .scriptName("faable")