Skip to content

Commit

Permalink
refactor: make changes based on usage
Browse files Browse the repository at this point in the history
  • Loading branch information
crookse committed Oct 15, 2023
1 parent d4f69b8 commit 1c78242
Show file tree
Hide file tree
Showing 43 changed files with 296 additions and 423 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@ jobs:
- name: Build Drash libs
run: |
deno task build:all:ci
cp package.lib.json .drashland/lib/package.json
# - name: Publish
# run: |
# cd .drashland/lib
# yarn publish --access public
# env:
# NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTOMATION_TOKEN }}
Expand Down Expand Up @@ -70,11 +68,9 @@ jobs:
- name: Build Drash libs
run: |
deno task build:all:ci
cp package.lib.json .drashland/lib/package.json
# - name: Publish
# run: |
# cd .drashland/lib
# yarn publish --access public
# env:
# NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ yarn.lock

# Directories

.drashland/
.idea/
.vim/
.vscode/
Expand All @@ -19,6 +18,10 @@ node_modules/
tmp*/
tmp/

# Directories (the build directories published to npm)

lib/

# Exceptions

!.gitkeep
11 changes: 5 additions & 6 deletions deno.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
]
},
"include": ["./src", "./tests"],
"exclude": [".deno", ".drashland", "node_modules", "**/_unstable"]
"exclude": [".deno", "node_modules", "**/_unstable"]
},
"fmt": {
"useTabs": false,
Expand All @@ -16,7 +16,7 @@
"semiColons": true,
"singleQuote": false,
"proseWrap": "preserve",
"exclude": [".deno", ".drashland", "node_modules"]
"exclude": [".deno", "lib", "node_modules"]
},
"tasks": {
"build:all:ci": "deno task build:intermediary:ci && deno task build:esm && deno task build:cjs",
Expand All @@ -25,11 +25,11 @@
"check:file-headers": "deno run --allow-read ./scripts/check_file_headers.ts",
"build:cjs": "yarn tsc --project tsconfig.build.cjs.json",
"build:esm": "yarn tsc --project tsconfig.build.esm.json",
"build:intermediary:ci": "deno fmt && deno run -A ./scripts/lib_builder/build_esm_lib.ts --debug --workspace=./.drashland/lib/intermediary --copy-files=./src",
"build:intermediary:ci": "deno fmt && deno run -A ./scripts/lib_builder/build_esm_lib.ts --debug --workspace=./lib/intermediary --copy-files=./src",
"build:intermediary": "./scripts/lib_builder/build_intermediary",
"lint:tests:bun": "deno lint tests/compat/bun",
"lint:tests:node": "deno lint tests/compat/node*/*",
"release": "yarn publish --access public",
"publish:dry-run": "npm publish --access restricted --dry-run",
"test:all": "deno task test:compat:bun && deno task test:compat:deno && deno task test:compat:node && deno task test:middleware:deno && deno task test:unit",
"test:compat:bun": "bun test tests/compat/bun",
"test:compat:cloudflare": "yarn jest --config jest.config.cloudflare.ts tests/compat/cloudflare",
Expand All @@ -39,7 +39,6 @@
"test:middleware:deno": "deno test tests/middleware/deno --allow-net",
"test:unit": "deno test tests/unit",
"validate:file-headers": "deno run --allow-read ./scripts/check_file_headers.ts",
"yarn:clean": "rm -rf node_modules && rm yarn.lock || true",
"yarn:publish": "deno task build:all:ci"
"yarn:clean": "rm -rf node_modules && rm yarn.lock || true"
}
}
26 changes: 18 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
{
"private": true,
"name": "@drashland/drash",
"version": "3.0.0-preview.202308281922",
"name": "@crookse/drash",
"version": "3.0.0-beta.202310151150",
"description": "A microframework for building JavaScript HTTP applications",
"license": "GPL-3.0",
"repository": "[email protected]:drashland/drash.git",
"repository": {
"type": "git",
"url": "git+ssh://[email protected]/drashland/drash.git"
},
"author": "Drash Land",
"contributors": [
{
"name": "Breno Salles"
"name": "Breno",
"url": "https://github.com/Guergeiro"
},
{
"name": "Edward Bebbington"
"name": "Edward",
"url": "https://github.com/ebebbington"
},
{
"name": "Eric Crooks"
"name": "Eric",
"url": "https://github.com/crookse"
},
{
"name": "Sara Gee"
"name": "Sara",
"url": "https://github.com/saragee3"
}
],
"files": [
"./lib/cjs",
"./lib/esm"
],
"devDependencies": {
"@babel/preset-env": "^7.22.10",
"@cloudflare/workers-types": "^4.20221111.1",
Expand Down
23 changes: 0 additions & 23 deletions package.lib.json

This file was deleted.

4 changes: 2 additions & 2 deletions scripts/build_all
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# This script only exists to run Deno in different OSs. This script runs in the
# CI to build the CJS and ESM libs.
(
rm -rf .drashland/lib && \
rm -rf ./lib && \
deno task build:intermediary && \
deno task build:esm && \
deno task build:cjs && \
rm -rf .drashland/lib/intermediary
rm -rf ./lib/intermediary
)
2 changes: 1 addition & 1 deletion scripts/lib_builder/build_intermediary
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
deno fmt \
&& deno run -A ./scripts/lib_builder/build_esm_lib.ts \
--debug \
--workspace=./.drashland/lib/intermediary \
--workspace=./lib/intermediary \
--copy-files=./src
)
41 changes: 0 additions & 41 deletions src/modules/RequestChain/mod.polyfill.ts

This file was deleted.

183 changes: 0 additions & 183 deletions src/modules/builders/ResourceBuilder.ts

This file was deleted.

Loading

0 comments on commit 1c78242

Please sign in to comment.