Skip to content

Commit

Permalink
Merge pull request #22 from abxvn/fix/builder-init-package-manager
Browse files Browse the repository at this point in the history
chore: update builder
  • Loading branch information
hungluu authored Jan 26, 2024
2 parents 7fc4c9d + 4b4ff90 commit d71f883
Show file tree
Hide file tree
Showing 38 changed files with 927 additions and 911 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
node-version: [ 18 ]
node-version: [ 20 ]
steps:
- name: Running on ref
run: echo ${{ github.ref }}
Expand All @@ -38,6 +38,9 @@ jobs:
- name: Lint
run: |
pnpm lint
- name: Build
run: |
pnpm build
- name: Test
run: |
pnpm test
17 changes: 5 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
"name": "source",
"private": true,
"scripts": {
"start": "rimraf packages/resolve/index.js && webpack",
"build": "rimraf packages/resolve/index.js && webpack --node-env production",
"components": "webpack -c webpack.components.config.js",
"start": "tsup --watch",
"build": "tsup --env.NODE_ENV=production",
"test": "jest -c tests/spec/config.js",
"lint": "eslint packages --ext ts",
"resolve": "pnpm --filter resolve",
Expand All @@ -13,8 +12,8 @@
"dependencies": {
"@abxvn/webpack-dts": "workspace:^",
"@changesets/cli": "^2.27.1",
"typescript": "~5.0.4",
"webpack": "^5.89.0"
"tsup": "^8.0.1",
"typescript": "~5.0.4"
},
"devDependencies": {
"@types/fs-extra": "^11.0.4",
Expand All @@ -33,14 +32,8 @@
"eslint-plugin-promise": "^6.1.1",
"fs-extra": "^11.2.0",
"jest": "^29.7.0",
"node-loader": "^2.0.0",
"rimraf": "^5.0.5",
"terser-webpack-plugin": "^5.3.9",
"ts-jest": "^29.1.1",
"ts-loader": "^9.5.1",
"utf-8-validate": "^6.0.3",
"webpack-cli": "^5.1.4",
"webpack-node-externals": "^3.0.0",
"webpack-pnp-externals": "^1.1.0"
"utf-8-validate": "^6.0.3"
}
}
13 changes: 13 additions & 0 deletions packages/builder/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @abxvn/builder

## 1.2.0

### Minor Changes

- Update builder

### Patch Changes

- Updated dependencies
- @abxvn/webpack-dts@1.1.0
- @abxvn/resolve@2.1.0
- @abxvn/logger@2.1.0

## 1.1.1

### Patch Changes
Expand Down
119 changes: 0 additions & 119 deletions packages/builder/index.d.ts

This file was deleted.

13 changes: 5 additions & 8 deletions packages/builder/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"name": "@abxvn/builder",
"version": "1.1.1",
"version": "1.2.0",
"description": "Quick scaffolding code base to build web apps and games",
"license": "MIT",
"main": "./cli/index.js",
"bin": "./cli/index.js",
"types": "index.d.ts",
"repository": {
"type": "git",
"url": "git+https://github.com/abxvn/source.git",
Expand Down Expand Up @@ -54,12 +51,12 @@
"@types/webpack": "^5.28.0",
"@types/webpack-node-externals": "^3.0.0"
},
"bin": "./dist/index.js",
"main": "./dist/cli/index.js",
"files": [
"cli/index.js",
"src/**/index.js",
"index.d.ts",
"config",
"README.md",
"LICENSE"
"LICENSE",
"dist"
]
}
4 changes: 2 additions & 2 deletions packages/builder/src/cmd/init/updatePackageJson.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const updatePackageJson = async ({ modify = true, deps, editor, pm }: IUp

if (useEslint) {
info(`Essential config for linting command:
${italic('"lint": "eslint packages --ext ts"')}`)
${italic('"lint": "eslint packages --ext ts --ext tsx"')}`)
}

if (useJest) {
Expand Down Expand Up @@ -56,7 +56,7 @@ export const updatePackageJson = async ({ modify = true, deps, editor, pm }: IUp

if (useEslint) {
logProgress('config script "lint"')
scripts.lint = 'eslint packages/**/*.{ts,tsx}'
scripts.lint = 'eslint packages --ext ts --ext tsx'
}
if (useJest) {
logProgress('config script "test"')
Expand Down
4 changes: 4 additions & 0 deletions packages/builder/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["**/*.ts"]
}
11 changes: 11 additions & 0 deletions packages/dts/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @abxvn/dts

## 1.1.0

### Minor Changes

- Update builder

### Patch Changes

- Updated dependencies
- @abxvn/paths@1.1.0

## 1.0.1

### Patch Changes
Expand Down
48 changes: 0 additions & 48 deletions packages/dts/index.d.ts

This file was deleted.

25 changes: 16 additions & 9 deletions packages/dts/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"name": "@abxvn/dts",
"description": "Simple and fast typescript declaration (dts) file generator",
"version": "1.0.1",
"types": "index.d.ts",
"version": "1.1.0",
"repository": {
"type": "git",
"url": "git+https://github.com/abxvn/source.git",
Expand All @@ -26,12 +25,6 @@
"url": "https://github.com/abxvn/source/issues?q=is%3Aopen+is%3Aissue+label%3A%22package%3Adts%22"
},
"homepage": "https://github.com/abxvn/source/tree/main/packages/dts#readme",
"files": [
"index.js",
"index.d.ts",
"README.md",
"LICENSE"
],
"dependencies": {
"@abxvn/paths": "workspace:^",
"fs-extra": "^11.1.1",
Expand All @@ -40,5 +33,19 @@
},
"devDependencies": {
"@types/fs-extra": "^11.0.1"
}
},
"main": "./dist/index.js",
"module": "./dist/index.mjs",
"types": "./dist/index.d.ts",
"exports": {
".": {
"import": "./dist/index.mjs",
"require": "./dist/index.js"
}
},
"files": [
"README.md",
"LICENSE",
"dist"
]
}
4 changes: 4 additions & 0 deletions packages/dts/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["**/*.ts"]
}
6 changes: 6 additions & 0 deletions packages/logger/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @abxvn/logger

## 2.1.0

### Minor Changes

- Update builder

## 2.0.1

### Patch Changes
Expand Down
Loading

0 comments on commit d71f883

Please sign in to comment.