Skip to content

Commit

Permalink
fix: module.exports being overwritten (#1)
Browse files Browse the repository at this point in the history
  • Loading branch information
skypesky authored Sep 11, 2024
1 parent 75c28d7 commit e4e01b4
Show file tree
Hide file tree
Showing 16 changed files with 6,584 additions and 38 deletions.
25 changes: 25 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
### 关联 Issue

<!-- 请用 fixes、closes、resolves、relates 这些关键词来关联 issue,原则上,所有 PR 都应该有关联 Issue -->

### 主要改动

<!--
@example:
1. 修复了 xxx
2. 改进了 xxx
3. 调整了 xxx
-->

### 界面截图

<!-- 如果改动的是跟 UI 相关的,不论是 CLI 还是 WEB 都应该截图 -->

### 测试计划

<!-- 如果本次变更没有自动化测试覆盖,你整理的测试用例集是什么?需要编写成 todo list 放到下面 -->

### 检查清单

- [ ] CHANGELOG.md 是否更新好了
- [ ] 版本升级过了吗?
20 changes: 20 additions & 0 deletions .github/workflows/check-pr-title.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: check-pr-title

on:
pull_request:
types:
- opened
- reopened
- edited
- synchronize
branches:
- main
- dev

jobs:
lint-title:
runs-on: ubuntu-latest
steps:
- uses: ArcBlock/action-lint-pull-request-title@main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40 changes: 40 additions & 0 deletions .github/workflows/publish-beta-to-npm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: publish-beta-to-npm

on:
push:
branches: [main]

jobs:
publish-beta-to-npm:
runs-on: ubuntu-latest
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
steps:
- name: Checkout release branch code
uses: actions/checkout@v3
with:
fetch-depth: 1

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "pnpm"
registry-url: "https://registry.npmjs.org"

- name: Install deps
run: pnpm install

- name: Build
run: pnpm build

- name: Publish to NPM
run: |
node scripts/update-beta-package-version.js
cat package.json | grep version
npm publish --tag beta
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
36 changes: 36 additions & 0 deletions .github/workflows/publish-to-npm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: publish-to-npm

on:
push:
branches: [release]

jobs:
publish-to-npm:
runs-on: ubuntu-latest
steps:
- name: Checkout release branch code
uses: actions/checkout@v3
with:
fetch-depth: 1

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "pnpm"
registry-url: "https://registry.npmjs.org"

- name: Install deps
run: pnpm install

- name: Build
run: pnpm build

- name: Publish to NPM
run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
12 changes: 12 additions & 0 deletions .github/workflows/task-list-checker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: task-list-checker
on:
pull_request:
types: [opened, edited, synchronize, reopened]
jobs:
task-list-checker:
runs-on: ubuntu-latest
steps:
- name: Check for incomplete task list items
uses: Shopify/task-list-checker@main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
34 changes: 34 additions & 0 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: unit-test

on:
pull_request:
branches:
- release
- main
- master

jobs:
integration:
runs-on: ubuntu-latest

if: "! contains(toJSON(github.event.commits.*.message), '[skip actions]')"

steps:
- name: Checkout repo
uses: actions/checkout@v3

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "pnpm"

- name: Install deps
run: pnpm install

- name: Run unit test
run: pnpm run test
43 changes: 43 additions & 0 deletions .github/workflows/version-check-for-npm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: version-check-for-npm
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true

on:
pull_request:
branches:
- release

jobs:
version-check-for-npm:
timeout-minutes: 30
runs-on: ubuntu-latest
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '16'

- name: Extract current version
id: get_version
run: |
PACKAGE_NAME=$(node -p -e "require('./package.json').name")
echo "PACKAGE_NAME=${PACKAGE_NAME}" >> $GITHUB_ENV
CURRENT_VERSION=$(node -p -e "require('./package.json').version")
echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV
- name: Publish to NPM
run: |
LATEST_VERSION=$(npm show $PACKAGE_NAME version)
# https://www.npmjs.com/package/compare-versions-cli
npm install -g compare-versions-cli
COMPARE=$(compare-versions-cli $CURRENT_VERSION $LATEST_VERSION)
if [ $COMPARE -le 0 ]
then
echo "CURRENT_VERSION($CURRENT_VERSION) must greater than LATEST_VERSION($LATEST_VERSION)"
echo "npm: https://www.npmjs.com/package/$PACKAGE_NAME"
exit 1
fi
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dist/
node_modules/
package-lock\.json
coverage
32 changes: 0 additions & 32 deletions build.js

This file was deleted.

2 changes: 1 addition & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,4 @@ xbytes.createByteParser = createByteParser;
xbytes.createSizeParser = createSizeParser;
xbytes.createRelativeSizer = createRelativeSizer;

if (typeof module !== 'undefined') module.exports = xbytes;
module.exports = xbytes;
14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "xbytes",
"name": "@arcblock/xbytes",
"version": "1.9.1",
"description": "Parse bytes to human readable sizes (4747) → ('4.75 KB') and vice versa.",
"main": "dist/index.js",
Expand All @@ -17,9 +17,11 @@
"types": "typings/index.d.ts",
"scripts": {
"test": "jest",
"build": "babel lib -d dist && node build.js",
"coverage": "npm run test -- --coverage",
"build": "vite build",
"preversion": "npm run build",
"version": "npm test"
"version": "npm test",
"bump-version": "zx scripts/bump-version.mjs"
},
"engines": {
"node": ">=1"
Expand Down Expand Up @@ -71,6 +73,7 @@
"@babel/cli": "^7.8.4",
"@babel/core": "^7.9.0",
"@babel/preset-env": "^7.9.5",
"@rollup/plugin-commonjs": "^26.0.1",
"babel-eslint": "^10.1.0",
"babel-preset-airbnb": "^3.3.2",
"eslint": "^5.16.0",
Expand All @@ -79,11 +82,12 @@
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-prettier": "^3.1.3",
"jest": "^28.1.1",
"prettier": "^1.19.1"
"prettier": "^1.19.1",
"vite": "^5.4.3"
},
"homepage": "https://github.com/miraclx/xbytes#readme",
"directories": {
"lib": "lib",
"test": "test"
}
}
}
Loading

0 comments on commit e4e01b4

Please sign in to comment.