Merge pull request #3 from mayflower-tech/develop

Develop

Author: saitonakamura

.github/workflows/release-package.yml

@@ -0,0 +1,24 @@
+name: Node.js Package
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: yarn
+          registry-url: 'https://registry.npmjs.org'
+      - run: yarn install --immutable
+      - run: yarn build
+      - run: yarn npm publish --tag alpha
+        env:
+          YARN_NPM_AUTH_TOKEN: ${{secrets.YARN_NPM_AUTH_TOKEN}}

.gitignore

@@ -3,4 +3,16 @@
 *.crt
 
 .DS_Store
-node_modules
+node_modules
+.idea
+dist
+
+# yarn
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.npmrc

@@ -0,0 +1 @@
+@mayflower-tech:registry=https://npm.pkg.github.com

.prettierrc.json

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "printWidth": 120
+}

.yarn/releases/yarn-3.4.1.cjs

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

.yarnrc.yml

@@ -0,0 +1,9 @@
+## Release
+
+- Change the version in the package.json
+- Commit the changes
+- Tag last commit with tag `v${version}`
+- Push changes and tags
+- Create release on github releases with this tag
+- Publish it
+- Publish workflow should trigger and publish new version

CONTRIBUTING.md

@@ -19,7 +19,7 @@ fi
 
 # Generate Certificate Authority
 openssl genrsa -out "tmp/${name}CA.key" 2048 &>/dev/null
-openssl req -x509 -config utils/ca.conf -new -nodes -key "tmp/${name}CA.key" -sha256 -days 1825 -out "${name}CA.pem" &>/dev/null
+openssl req -x509 -config utils/ca.conf -new -nodes -key "tmp/${name}CA.key" -sha256 -days 825 -out "${name}CA.pem" &>/dev/null
 
 # This is the part that demands root privileges
 if [ "$EUID" -eq 0 ] ; then
@@ -36,7 +36,7 @@ openssl genrsa -out "${name}.key" 2048 &>/dev/null
 openssl req -new -config utils/ca.conf -key "${name}.key" -out "tmp/${name}.csr" &>/dev/null
 
 # Generate SSL Certificate
-openssl x509 -req -in "tmp/${name}.csr" -CA "${name}CA.pem" -CAkey "tmp/${name}CA.key" -CAcreateserial -out "${name}.crt" -days 1825 -sha256 -extfile utils/ssl.conf &>/dev/null
+openssl x509 -req -in "tmp/${name}.csr" -CA "${name}CA.pem" -CAkey "tmp/${name}CA.key" -CAcreateserial -out "${name}.crt" -days 825 -sha256 -extfile utils/ssl.conf &>/dev/null
 
 # Cleanup files
 rm servorCA.pem servorCA.srl

certify.sh

@@ -1,26 +1,51 @@
 {
-  "name": "servor",
-  "version": "4.0.2",
-  "description": "A dependency free dev server for single page app development",
-  "repository": "lukejacksonn/servor",
-  "main": "./servor.js",
-  "bin": {
-    "servor": "./cli.js"
+  "name": "@mayflower-tech/servor",
+  "version": "5.0.0-alpha.7",
+  "description": "A dev server for single page app development",
+  "repository": "@mayflower-tech/servor",
+  "publishConfig": {
+    "access": "public"
   },
+  "type": "commonjs",
+  "main": "./dist/servor.js",
+  "bin": "./dist/cli.js",
   "keywords": [
     "server",
     "https",
     "livereload",
     "spa"
   ],
+  "files": [
+    "dist/**/*",
+    "src/**/*"
+  ],
   "scripts": {
-    "start": "sudo node cli tests/example --reload --browse --secure --static --module",
+    "start": "SWC_NODE_PROJECT=./tsconfig.json node -r @swc-node/register src/cli.ts tests/example index.html 8081 --reload --browse",
+    "build": "tsc",
     "cleanup": "rm -f servor.key servor.crt",
     "test": "npm run cleanup && cd tests && node index.js"
   },
   "author": "Luke Jackson <[email protected]>",
   "license": "MIT",
   "devDependencies": {
-    "puppeteer": "^3.0.4"
+    "@swc-node/register": "^1.6.4",
+    "@swc/core": "^1.3.53",
+    "@types/http-proxy": "^1.17.10",
+    "@types/node": "^18.14.6",
+    "prettier": "^2.8.7",
+    "puppeteer": "^3.0.4",
+    "typescript": "^4.9.5"
+  },
+  "dependencies": {
+    "chokidar": "^3.5.3",
+    "commander": "^10.0.1",
+    "http-proxy": "^1.18.1"
+  },
+  "packageManager": "[email protected]",
+  "prettier": {
+    "printWidth": 120,
+    "singleQuote": true,
+    "trailingComma": "es5",
+    "endOfLine": "auto"
   }
 }