Skip to content

Commit

Permalink
Merge pull request #425 from MasterKale/feat/server-esm-take-2-dnt
Browse files Browse the repository at this point in the history
feat/server-esm-take-2-dnt
  • Loading branch information
MasterKale authored Aug 22, 2023
2 parents 443c341 + 2935857 commit fefc95e
Show file tree
Hide file tree
Showing 168 changed files with 11,049 additions and 23,896 deletions.
7 changes: 0 additions & 7 deletions .eslintignore

This file was deleted.

15 changes: 0 additions & 15 deletions .eslintrc.js

This file was deleted.

15 changes: 15 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
######################
# Deno formatting runs
######################
# "Use single-quotes and increase line width"
a59634a1a9b0393622fb121fbe229132c01a2624
# "Run `deno fmt` on everything"
549e08dbed9736b63d827649aaf422958f989609
# "Format browser"
dfb32f4891f6c955c25b2f305fa702cdaf8c5a5e
# "Format README.md"
34a0c49714b2974e409495bd0dba59ccc7003ae1
# "Run `deno fmt` on example project"
872893e3c4930c293cd8b701395429e24088ce1e
# "Run `ddi fmt` over src/"
070f73b8de107111b4a34001254a981548f677f7
69 changes: 69 additions & 0 deletions .github/workflows/ciChecks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: CI Checks

on:
push:
branches: [ master, beta ]
pull_request:
branches: [ master, beta ]

jobs:
unit_tests:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [ 16, 18 ]
# TODO: Find a better action, this one is limited to v1.33.1
# See https://github.com/maximousblk/setup-deno/issues
deno-version: [ 'v1.33.1' ]

steps:
- uses: actions/checkout@v3

# Install Node
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: node -v

# Install Deno
- name: Setup Deno ${{ matrix.deno-version }}
uses: maximousblk/setup-deno@v2
with:
deno-version: ${{ matrix.deno-version }}
- run: deno -V

# Install pnpm w/cache for quicker installs
# https://github.com/pnpm/action-setup#use-cache-to-reduce-installation-time
- name: Setup pnpm 8.6.12
uses: pnpm/action-setup@v2
with:
version: 8.6.12
run_install: false
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- name: Setup pnpm cache
uses: actions/cache@v3
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
# Install deps
- name: Install dependencies
run: pnpm install

# Build and test dnt packages
- run: npm run build:types # browser tests will need this to be built
- run: npm run build:server # dnt will test everything in Node too

# Test packages
- run: npm run test:browser
29 changes: 0 additions & 29 deletions .github/workflows/node.js.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
node_modules/
dist/
npm/
npm-test/
coverage/
.DS_Store
docs/
Expand Down
5 changes: 0 additions & 5 deletions .prettierignore

This file was deleted.

4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"runtimeExecutable": "npm",
"skipFiles": [
"<node_internals>/**",
"${workspaceFolder}/**/node_modules/**",
"${workspaceFolder}/**/node_modules/**"
],
"cwd": "${workspaceFolder}/example",
"cwd": "${workspaceFolder}/example"
}
]
}
24 changes: 23 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
{
"typescript.tsdk": "node_modules/typescript/lib",
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
"deno.path": "/opt/homebrew/bin/deno",
"deno.enablePaths": [
"./packages/server",
"./packages/typescript-types"
],
"editor.rulers": [
100
],
"editor.defaultFormatter": "denoland.vscode-deno",
// Required for formatOnSave to work, see https://github.com/denoland/vscode_deno/issues/789
"[typescript]": {
"editor.defaultFormatter": "denoland.vscode-deno"
},
"[jsonc]": {
"editor.defaultFormatter": "denoland.vscode-deno"
},
"[markdown]": {
"editor.defaultFormatter": "denoland.vscode-deno"
},
"gitlens.advanced.blame.customArguments": [
"--ignore-revs-file",
".git-blame-ignore-revs"
]
}
50 changes: 25 additions & 25 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "build:server",
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": [],
"label": "npm: build:server",
"detail": "lerna bootstrap --scope=@simplewebauthn/server"
},
{
"type": "npm",
"script": "build:browser",
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": [],
"label": "npm: build:browser",
"detail": "lerna bootstrap --scope=@simplewebauthn/browser"
}
]
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "build:server",
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": [],
"label": "npm: build:server",
"detail": "lerna bootstrap --scope=@simplewebauthn/server"
},
{
"type": "npm",
"script": "build:browser",
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": [],
"label": "npm: build:browser",
"detail": "lerna bootstrap --scope=@simplewebauthn/browser"
}
]
}
Loading

0 comments on commit fefc95e

Please sign in to comment.