Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jaywcjlove/tsbb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.3.5
Choose a base ref
...
head repository: jaywcjlove/tsbb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.3.6
Choose a head ref
  • 5 commits
  • 14 files changed
  • 1 contributor

Commits on Sep 28, 2021

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    752332c View commit details
  2. Copy the full SHA
    3e6e642 View commit details
  3. Copy the full SHA
    9fcfcb5 View commit details

Commits on Sep 29, 2021

  1. Copy the full SHA
    81a02b9 View commit details
  2. released v3.3.6

    jaywcjlove committed Sep 29, 2021
    Copy the full SHA
    97d35da View commit details
11 changes: 9 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -15,10 +15,10 @@ jobs:
node-version: 14

- name: Look Changelog
uses: jaywcjlove/changelog-generator@v1.4.3
uses: jaywcjlove/changelog-generator@v1.4.6
with:
token: ${{ secrets.GITHUB_TOKEN }}
filter-author: (jaywcjlove|小弟调调™|dependabot\[bot\]|Renovate Bot|renovate\-bot)
filter-author: (小弟调调™|renovate\-bot)
filter: '[R|r]elease[d]\s+[v|V]\d(\.\d+){0,2}'

- run: npm install
@@ -164,11 +164,14 @@ jobs:
body, html { height: 100%; font-size: 12px; font-family: Avenir Next,PingFang SC,Hiragino Sans GB,Droid Sans Fallback,Microsoft YaHei,sans-serif; }
h1 { font-size: 2.6rem; font-weight: 300; }
h1 sup { color: #7b7b7b; font-size: 14px; position: absolute; font-weight: normal;}
.docbtn { background: #2196f3; display: inline-block; padding: 5px 12px; color: #fff; border-radius: 2px; transition: all 0.3s; }
.docbtn:hover { background: #377eb7; }
a:hover { color: #0949d1; }
.header { position: relative; width: 100%; height: 60%; text-align: center; }
.list { border-spacing: 0; border-collapse: collapse; margin: 0 auto 0 auto;}
.list td { padding: 3px 10px; line-height: 21px; }
.list td svg { display: block; }
.list tr { transition: all 0.3s; }
.list tr:hover { background-color: #f1f1f1; }
.links { text-align: center; padding: 50px 0 0 0; font-size: 14px; }
.footer { color: #696969; text-align: center; padding: 10px 0 90px 0; }
@@ -178,6 +181,7 @@ jobs:
<body>
<table class="header"> <tbody> <tr> <td>
<h1>TSBB Example Zip Files<sup>v$VERSION_NUMBER</sup></h1>
<a target="__blank" class="docbtn" href="doc.html">Document</a>
</td> </tr> </tbody> </table>
<table class="list">
@@ -206,6 +210,9 @@ jobs:
</body></html>
EOF
- run: npm i markdown-to-html-cli -g
- run: markdown-to-html --output zip/doc.html --source packages/tsbb/README.md

- name: Build and Deploy
uses: peaceiris/actions-gh-pages@v3
with:
4 changes: 2 additions & 2 deletions example/basic/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@template/basic",
"private": true,
"version": "3.3.5",
"version": "3.3.6",
"description": "Basic Example.",
"scripts": {
"start": "node lib/index.js",
@@ -17,6 +17,6 @@
"keywords": [],
"license": "MIT",
"devDependencies": {
"tsbb": "^3.3.5"
"tsbb": "^3.3.6"
}
}
4 changes: 2 additions & 2 deletions example/express-typeorm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/express-typeorm",
"version": "3.3.5",
"version": "3.3.6",
"private": true,
"description": "Express Typeorm Example.",
"scripts": {
@@ -35,7 +35,7 @@
"nodemon": "2.0.13",
"ts-node": "10.2.1",
"ts-node-dev": "1.1.8",
"tsbb": "^3.3.5"
"tsbb": "^3.3.6"
},
"dependencies": {
"compression": "1.7.4",
4 changes: 2 additions & 2 deletions example/express/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/express",
"version": "3.3.5",
"version": "3.3.6",
"private": true,
"description": "Express Example.",
"scripts": {
@@ -33,7 +33,7 @@
"@types/http-errors": "1.8.1",
"nodemon": "2.0.13",
"ts-node-dev": "1.1.8",
"tsbb": "^3.3.5"
"tsbb": "^3.3.6"
},
"dependencies": {
"compression": "1.7.4",
4 changes: 2 additions & 2 deletions example/hapi/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/hapi",
"version": "3.3.5",
"version": "3.3.6",
"private": true,
"description": "hapi Example.",
"main": "index.js",
@@ -30,7 +30,7 @@
"devDependencies": {
"@types/hapi__hapi": "20.0.9",
"nodemon": "2.0.13",
"tsbb": "^3.3.5"
"tsbb": "^3.3.6"
},
"dependencies": {
"@babel/runtime": "7.15.4",
4 changes: 2 additions & 2 deletions example/koa/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/koa",
"version": "3.3.5",
"version": "3.3.6",
"private": true,
"description": "Koa Example",
"scripts": {
@@ -28,7 +28,7 @@
"devDependencies": {
"@types/koa": "2.13.4",
"nodemon": "2.0.13",
"tsbb": "^3.3.5"
"tsbb": "^3.3.6"
},
"dependencies": {
"koa": "2.13.3"
4 changes: 2 additions & 2 deletions example/react-component-tsx/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/react-component-tsx",
"version": "3.3.5",
"version": "3.3.6",
"description": "React Component Example for TypeScript.",
"private": true,
"main": "lib/index.js",
@@ -52,7 +52,7 @@
"prettier": "2.4.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"tsbb": "^3.3.5"
"tsbb": "^3.3.6"
},
"eslintConfig": {
"extends": [
4 changes: 2 additions & 2 deletions example/react-component/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/react-component",
"version": "3.3.5",
"version": "3.3.6",
"private": true,
"description": "React Component Example.",
"scripts": {
@@ -42,7 +42,7 @@
"less": "4.1.1",
"parcel": "2.0.0-rc.0",
"react-test-renderer": "17.0.2",
"tsbb": "^3.3.5"
"tsbb": "^3.3.6"
},
"dependencies": {
"@parcel/transformer-react-refresh-wrap": "2.0.0-rc.0",
4 changes: 2 additions & 2 deletions example/transform-typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@template/transform-typescript",
"private": true,
"version": "3.3.5",
"version": "3.3.6",
"description": "Transform Typescript Example.",
"scripts": {
"watch": "tsbb watch --disable-babel-option --no-esm",
@@ -17,6 +17,6 @@
"keywords": [],
"license": "MIT",
"devDependencies": {
"tsbb": "^3.3.5"
"tsbb": "^3.3.6"
}
}
4 changes: 2 additions & 2 deletions example/umd/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@template/umd",
"private": true,
"version": "3.3.5",
"version": "3.3.6",
"description": "UMD Example.",
"scripts": {
"watch": "tsbb watch --no-esm --disable-babel",
@@ -12,6 +12,6 @@
"keywords": [],
"license": "MIT",
"devDependencies": {
"tsbb": "^3.3.5"
"tsbb": "^3.3.6"
}
}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.3.5",
"version": "3.3.6",
"packages": ["example/*", "packages/*"],
"command": {
"bootstrap": {
4 changes: 2 additions & 2 deletions packages/create-tsbb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-tsbb",
"version": "3.3.5",
"version": "3.3.6",
"description": "Creates a TSBB application using the command line.",
"homepage": "https://jaywcjlove.github.io/tsbb",
"author": "Kenny Wong <wowohoo@qq.com> (https://github.com/jaywcjlove)",
@@ -36,7 +36,7 @@
"frontend"
],
"devDependencies": {
"tsbb": "^3.3.5"
"tsbb": "^3.3.6"
},
"dependencies": {
"create-kkt": "2.3.0"
2 changes: 1 addition & 1 deletion packages/tsbb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tsbb",
"version": "3.3.5",
"version": "3.3.6",
"description": "TSBB is a zero-config CLI that helps you develop, test, and publish modern TypeScript project.",
"author": "kenny wang <wowohoo@qq.com>",
"license": "MIT",
12 changes: 6 additions & 6 deletions packages/tsbb/src/utils/watchCompile.ts
Original file line number Diff line number Diff line change
@@ -35,11 +35,11 @@ export async function watchCompile(
const output = filepath.replace(entryDir, esm);
if (
!disableBabel &&
isMatch(output, ['**/*.[jt]s?(x)']) &&
!isMatch(output, ['**/?(*.)+(spec|test).[jt]s?(x)', '**/*.d.ts', '**/tsconfig.json'])
isMatch(path.resolve(output), ['**/*.[jt]s?(x)']) &&
!isMatch(path.resolve(output), ['**/?(*.)+(spec|test).[jt]s?(x)', '**/*.d.ts', '**/tsconfig.json'])
) {
transform(filepath, { entryDir, esm, ...other });
} else if (!isMatch(output, ['**/?(*.)+(spec|test).[jt]s?(x)', '**/tsconfig.json', '**/*.d.ts'])) {
} else if (!isMatch(path.resolve(output), ['**/?(*.)+(spec|test).[jt]s?(x)', '**/tsconfig.json', '**/*.d.ts'])) {
const result = ts.sys.readFile(filepath);
outputFiles(output, result);
}
@@ -48,11 +48,11 @@ export async function watchCompile(
const output = filepath.replace(entryDir, cjs);
if (
!disableBabel &&
isMatch(output, ['**/*.[jt]s?(x)']) &&
!isMatch(output, ['**/?(*.)+(spec|test).[jt]s?(x)', '**/*.d.ts'])
isMatch(path.resolve(output), ['**/*.[jt]s?(x)']) &&
!isMatch(path.resolve(output), ['**/?(*.)+(spec|test).[jt]s?(x)', '**/*.d.ts'])
) {
transform(filepath, { entryDir, cjs, ...other });
} else if (!isMatch(output, ['**/?(*.)+(spec|test).[jt]s?(x)', '**/tsconfig.json', '**/*.d.ts'])) {
} else if (!isMatch(path.resolve(output), ['**/?(*.)+(spec|test).[jt]s?(x)', '**/tsconfig.json', '**/*.d.ts'])) {
const result = ts.sys.readFile(filepath);
outputFiles(output, result);
}