Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(repo): package-structure-adjustment #131

Merged
merged 1 commit into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
extends: ['@ombro/eslint-config-typescript'],
rules: {
'prefer-const': 'off',
'@typescript-eslint/no-empty-interface': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
},
}
24 changes: 0 additions & 24 deletions .eslintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion .tpl/preset-package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@ombro/logger": "^1.5.0",
"@vrn-deco/boilerplate-preset-base": "workspace:*",
"@vrn-deco/boilerplate-protocol": "workspace:*",
"execa": "^5.1.1",
"execa": "^6.1.0",
"fs-extra": "^10.0.0",
"minimist": "^1.2.5"
},
Expand Down
3 changes: 2 additions & 1 deletion .tpl/preset-package/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import path from 'path'
import fs from 'fs-extra'
import execa from 'execa'
import { execaCommandSync } from 'execa'


import type { PresetOptions, PresetRunner } from '@vrn-deco/boilerplate-protocol'
import { BaseRunner } from '@vrn-deco/boilerplate-preset-base'
Expand Down
6 changes: 6 additions & 0 deletions manifest/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @vrn-deco/boilerplate-manifest

## 1.2.17

### Patch Changes

- ESMify

## 1.2.16

### Patch Changes
Expand Down
9 changes: 5 additions & 4 deletions manifest/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"name": "@vrn-deco/boilerplate-manifest",
"version": "1.2.16",
"version": "1.2.17",
"description": "boilerplate manifest",
"author": "Cphayim <i@cphayim.me>",
"homepage": "https://github.com/vrn-deco/boilerplate#readme",
"license": "MIT",
"type": "module",
"main": "dist/index.js",
"files": [
"dist",
Expand All @@ -21,8 +22,8 @@
"scripts": {
"clean": "rm -rf dist coverage tsconfig.tsbuildinfo",
"build": "tsc -p tsconfig.build.json",
"gen": "esno scripts/generator.ts",
"gen:http": "esno scripts/generator.ts --http-boilerplate-release",
"gen": "tsx scripts/generator.ts",
"gen:http": "tsx scripts/generator.ts --http-boilerplate-release",
"prepublish": "pnpm clean && pnpm build && pnpm gen"
},
"bugs": {
Expand All @@ -48,6 +49,6 @@
"@vrn-deco/boilerplate-typescript-vue3-vant-h5plus-app": "workspace:*",
"@vrn-deco/boilerplate-typescript-vue3-vant-mobile": "workspace:*",
"@vrn-deco/boilerplate-typescript-vue3-vben-admin": "workspace:*",
"execa": "^5.1.1"
"execa": "^6.1.0"
}
}
4 changes: 2 additions & 2 deletions manifest/scripts/http-boilerplate.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'path'
import fs from 'fs-extra'
import execa from 'execa'
import { execaCommandSync } from 'execa'
import { Manifest, APIManifest, APIBoilerplate, Lang } from '@vrn-deco/boilerplate-protocol'
import { getAllBoilerplatePackage, ScanPackage } from './utils'
import { logger } from '@ombro/logger'
Expand Down Expand Up @@ -62,7 +62,7 @@ function transformBoilerplateTGZ(packageName: string, pkgs: ScanPackage[]): stri
const file = `${match.groups!.file}.tgz`
const output = path.join(RELEASE_DIR, file)
const ignoreArgs = IGNORE_LIST.map((i) => `--exclude ${i}`).join(' ')
execa.commandSync(`tar ${ignoreArgs} -cvzPhf ${output} boilerplate`, {
execaCommandSync(`tar ${ignoreArgs} -cvzPhf ${output} boilerplate`, {
stdio: 'ignore',
cwd: location,
})
Expand Down
4 changes: 2 additions & 2 deletions manifest/scripts/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'path'
import fs from 'fs-extra'
import execa from 'execa'
import { execaCommandSync, execaCommand } from 'execa'
import {
Boilerplate,
Lang,
Expand All @@ -27,7 +27,7 @@ export function getRepoDir(): string {
}

export function getAllBoilerplatePackage(): ScanPackage[] {
const { stdout } = execa.commandSync('pnpm list -r --json --depth -1', { cwd: getRepoDir() })
const { stdout } = execaCommandSync('pnpm list -r --json --depth -1', { cwd: getRepoDir() })
return JSON.parse(stdout).filter((pkg: ScanPackage) => /\/packages\/.+\/.+/.test(pkg.path))
}

Expand Down
5 changes: 1 addition & 4 deletions manifest/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import path from 'path'
import fs from 'fs-extra'
import type { Manifest } from '@vrn-deco/boilerplate-protocol'

const __dirname = new URL('.', import.meta.url).pathname
const MANIFEST_FILE = path.resolve(__dirname, '..', 'vrn-manifest.json')

export function getManifest(): Manifest {
Expand All @@ -16,7 +17,3 @@ export function getManifest(): Manifest {
}
return fs.readJSONSync(MANIFEST_FILE)
}

if (require.main === module) {
console.log(getManifest())
}
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,20 @@
"repository": "git@github.com:vrn-deco/vrn-boilerplate.git",
"license": "MIT",
"engines": {
"node": "^12.20.0 || ^14.13.1 || >=16.0.0",
"pnpm": ">=6.28.0"
"node": ">=16.14.0"
},
"packageManager": "pnpm@6.28.0",
"scripts": {
"preinstall": "npx only-allow pnpm",
"prepare": "husky install",
"clean": "esno scripts/clean.ts --build --deps",
"clean:build": "esno scripts/clean.ts --build",
"clean:deps": "esno scripts/clean.ts --deps",
"build": "esno scripts/build.ts",
"clean": "tsx scripts/clean.ts --build --deps",
"clean:build": "tsx scripts/clean.ts --build",
"clean:deps": "tsx scripts/clean.ts --deps",
"build": "tsx scripts/build.ts",
"gen:manifest": "pnpm --filter @vrn-deco/boilerplate-manifest gen",
"gen:manifest:http": "pnpm --filter @vrn-deco/boilerplate-manifest gen:http",
"new:boi": "esno scripts/new --boilerplate",
"new:preset": "esno scripts/new --preset",
"new:boi": "tsx scripts/new --boilerplate",
"new:preset": "tsx scripts/new --preset",
"test": "exit 0;",
"lint": "scripts/lint.sh",
"format": "scripts/format.sh",
Expand All @@ -35,8 +34,9 @@
"@changesets/cli": "^2.21.1",
"@commitlint/cli": "^12.1.4",
"@commitlint/config-conventional": "^12.1.4",
"@ombro/eslint-config-typescript": "^0.1.4",
"@ombro/logger": "^1.5.5",
"@ombro/ts-config": "^1.4.0",
"@ombro/tsconfig": "^2.0.0",
"@types/inquirer": "^8.2.0",
"@types/node": "^16.11.26",
"@typescript-eslint/eslint-plugin": "^5.16.0",
Expand All @@ -45,15 +45,15 @@
"@vrn-deco/boilerplate-protocol": "workspace:*",
"commitizen": "^4.2.4",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^8.11.0",
"eslint-config-prettier": "^8.5.0",
"esno": "^0.14.1",
"execa": "^5.1.1",
"husky": "^6.0.0",
"eslint": "^8.57.0",
"execa": "^6.1.0",
"fs-extra": "^10.0.0",
"husky": "^8.0.3",
"inquirer": "^8.2.1",
"lint-staged": "^11.2.6",
"prettier": "^2.6.0",
"lint-staged": "^14.0.1",
"prettier": "^2.8.8",
"rimraf": "^3.0.2",
"typescript": "^4.6.2"
"tsx": "^4.7.1",
"typescript": "^5.3.3"
}
}
8 changes: 8 additions & 0 deletions packages/javascript/vue2-element/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @vrn-deco/boilerplate-javascript-vue2-element

## 2.2.21

### Patch Changes

- ESMify
- Updated dependencies
- @vrn-deco/boilerplate-preset-npm@1.1.4

## 2.2.20

### Patch Changes
Expand Down
10 changes: 7 additions & 3 deletions packages/javascript/vue2-element/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
const { runner } = require('@vrn-deco/boilerplate-preset-npm')
import { isMain, runner } from '@vrn-deco/boilerplate-preset-npm'

const __dirname = new URL('.', import.meta.url).pathname

// Here, you should install and execute a preset or implement your own installation logic
module.exports = (opts) => runner({ ...opts, boiPackageDir: __dirname })
export default (opts) => {
runner({ ...opts, boiPackageDir: __dirname })
}

if (require.main === module) {
if (isMain(import.meta)) {
runner({ boiPackageDir: __dirname })
}
3 changes: 2 additions & 1 deletion packages/javascript/vue2-element/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vrn-deco/boilerplate-javascript-vue2-element",
"version": "2.2.20",
"version": "2.2.21",
"description": "boilerplate javascript vue2 element",
"author": "Cphayim <i@cphayim.me>",
"homepage": "https://github.com/vrn-deco/boilerplate#readme",
Expand All @@ -19,6 +19,7 @@
"!boilerplate/yarn.lock",
"!boilerplate/pnpm-lock.yaml"
],
"type": "module",
"main": "index.js",
"bin": "index.js",
"repository": {
Expand Down
8 changes: 8 additions & 0 deletions packages/javascript/vue2-vant-h5plus/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @vrn-deco/boilerplate-javascript-vue-vant-h5plus

## 2.2.21

### Patch Changes

- ESMify
- Updated dependencies
- @vrn-deco/boilerplate-preset-npm@1.1.4

## 2.2.20

### Patch Changes
Expand Down
11 changes: 8 additions & 3 deletions packages/javascript/vue2-vant-h5plus/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
const { runner } = require('@vrn-deco/boilerplate-preset-npm')
import { isMain, runner } from '@vrn-deco/boilerplate-preset-npm'

module.exports = (opts) => runner({ ...opts, boiPackageDir: __dirname })
const __dirname = new URL('.', import.meta.url).pathname

if (require.main === module) {
// Here, you should install and execute a preset or implement your own installation logic
export default (opts) => {
runner({ ...opts, boiPackageDir: __dirname })
}

if (isMain(import.meta)) {
runner({ boiPackageDir: __dirname })
}
3 changes: 2 additions & 1 deletion packages/javascript/vue2-vant-h5plus/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vrn-deco/boilerplate-javascript-vue2-vant-h5plus",
"version": "2.2.20",
"version": "2.2.21",
"description": "boilerplate-javascript-vue2-vant-h5plus",
"author": "Cphayim <i@cphayim.me>",
"homepage": "https://github.com/vrn-deco/boilerplate#readme",
Expand All @@ -19,6 +19,7 @@
"!boilerplate/yarn.lock",
"!boilerplate/pnpm-lock.yaml"
],
"type": "module",
"main": "index.js",
"bin": "index.js",
"repository": {
Expand Down
8 changes: 8 additions & 0 deletions packages/javascript/vue2-vant/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @vrn-deco/boilerplate-javascript-vue-vant

## 2.2.21

### Patch Changes

- ESMify
- Updated dependencies
- @vrn-deco/boilerplate-preset-npm@1.1.4

## 2.2.20

### Patch Changes
Expand Down
11 changes: 8 additions & 3 deletions packages/javascript/vue2-vant/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
const { runner } = require('@vrn-deco/boilerplate-preset-npm')
import { isMain, runner } from '@vrn-deco/boilerplate-preset-npm'

module.exports = (opts) => runner({ ...opts, boiPackageDir: __dirname })
const __dirname = new URL('.', import.meta.url).pathname

if (require.main === module) {
// Here, you should install and execute a preset or implement your own installation logic
export default (opts) => {
runner({ ...opts, boiPackageDir: __dirname })
}

if (isMain(import.meta)) {
runner({ boiPackageDir: __dirname })
}
3 changes: 2 additions & 1 deletion packages/javascript/vue2-vant/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vrn-deco/boilerplate-javascript-vue2-vant",
"version": "2.2.20",
"version": "2.2.21",
"description": "boilerplate-javascript-vue2-vant",
"author": "Cphayim <i@cphayim.me>",
"homepage": "https://github.com/vrn-deco/boilerplate#readme",
Expand All @@ -19,6 +19,7 @@
"!boilerplate/yarn.lock",
"!boilerplate/pnpm-lock.yaml"
],
"type": "module",
"main": "index.js",
"bin": "index.js",
"repository": {
Expand Down
8 changes: 8 additions & 0 deletions packages/python/flask-sqlalchemy/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @vrn-deco/boilerplate-python-flask-sqlalchemy

## 1.0.7

### Patch Changes

- ESMify
- Updated dependencies
- @vrn-deco/boilerplate-preset-pip@0.0.6

## 1.0.6

### Patch Changes
Expand Down
10 changes: 7 additions & 3 deletions packages/python/flask-sqlalchemy/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
const { runner } = require('@vrn-deco/boilerplate-preset-pip')
import { isMain, runner } from '@vrn-deco/boilerplate-preset-pip'

const __dirname = new URL('.', import.meta.url).pathname

// Here, you should install and execute a preset or implement your own installation logic
module.exports = (opts) => runner({ ...opts, boiPackageDir: __dirname })
export default (opts) => {
runner({ ...opts, boiPackageDir: __dirname })
}

if (require.main === module) {
if (isMain(import.meta)) {
runner({ boiPackageDir: __dirname })
}
3 changes: 2 additions & 1 deletion packages/python/flask-sqlalchemy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vrn-deco/boilerplate-python-flask-sqlalchemy",
"version": "1.0.6",
"version": "1.0.7",
"description": "boilerplate python flask sqlalchemy",
"author": "Cphayim <i@cphayim.me>",
"homepage": "https://github.com/vrn-deco/boilerplate#readme",
Expand All @@ -19,6 +19,7 @@
"!boilerplate/yarn.lock",
"!boilerplate/pnpm-lock.yaml"
],
"type": "module",
"main": "index.js",
"bin": "index.js",
"repository": {
Expand Down
Loading
Loading