Skip to content
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
5 changes: 5 additions & 0 deletions .changeset/dull-suns-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@aiou/neo": patch
---

remove debug console
5 changes: 5 additions & 0 deletions .changeset/fresh-bikes-glow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@aiou/generator-pnpm-ci": major
---

upgrade to latest version(node@20, typescript@5.9.0, @aiou/eslint-config@1.5.1)
6 changes: 6 additions & 0 deletions .changeset/violet-coins-flash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@aiou/mario": patch
"@aiou/neo": patch
---

upgrade build scripts
34 changes: 19 additions & 15 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
"bin": {
"neo": "bin/index.mjs"
},
"exports": {
"./package.json": "./package.json"
},
"scripts": {
"clean": "rimraf lib compiled",
"build": "pnpm run clean && rollup -c --environment BUILD:production --compact",
Expand Down Expand Up @@ -51,18 +54,18 @@
"@aiou/schema": "workspace:^1.1.0",
"@changesets/cli": "latest",
"@pnpm/parse-wanted-dependency": "^2.0.0",
"@rollup/plugin-alias": "^3.1.9",
"@rollup/plugin-commonjs": "21.0.1",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.1.3",
"@rollup/plugin-replace": "^3.0.1",
"@rollup/plugin-alias": "^5.1.1",
"@rollup/plugin-commonjs": "28.0.6",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^16.0.1",
"@rollup/plugin-replace": "^6.0.2",
"@types/debug": "^4.1.7",
"@types/fs-extra": "9.0.13",
"@types/fs-extra": "11.0.4",
"@types/inquirer": "8.1.3",
"@types/listr": "^0.14.4",
"@types/node": "17.0.8",
"@types/node": "24.3.0",
"@types/pacote": "^11.1.8",
"@types/rimraf": "3.0.2",
"@types/rimraf": "4.0.5",
"@types/update-notifier": "^5.1.0",
"@types/zen-observable": "^0.8.3",
"c8": "^7.11.0",
Expand All @@ -71,12 +74,12 @@
"commander": "8.3.0",
"consola": "^2.15.3",
"cosmiconfig": "^7.0.1",
"debug": "4.3.3",
"debug": "4.4.1",
"esbuild": "^0.25.0",
"esno": "^0.13.0",
"esno": "^4.8.0",
"execa": "^6.0.0",
"find-up": "^6.2.0",
"fs-extra": "10.0.0",
"fs-extra": "11.3.1",
"gitconfig": "^2.0.8",
"globby": "12.0.2",
"inquirer": "8.2.0",
Expand All @@ -89,17 +92,18 @@
"picocolors": "^1.0.0",
"read-pkg-up": "^9.0.0",
"read-yaml-file": "^2.1.0",
"rimraf": "3.0.2",
"rollup": "^2.64.0",
"rimraf": "6.0.1",
"rollup": "^4.49.0",
"rollup-plugin-esbuild": "^6.2.1",
"rollup-plugin-size": "^0.2.2",
"rollup-plugin-node-externals": "^8.1.0",
"rollup-plugin-size": "^0.3.1",
"semver": "^7.3.7",
"tempy": "^2.0.0",
"terminal-link": "^3.0.0",
"typescript": "^5.6.3",
"vitest": "^0.7.7",
"vitest-extra": "^0.0.4",
"write-yaml-file": "^4.2.0",
"write-yaml-file": "^5.0.0",
"zen-observable": "^0.8.15"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { nodeResolve } from '@rollup/plugin-node-resolve'
import { defineConfig } from 'rollup'
import esbuild from 'rollup-plugin-esbuild'
import size from 'rollup-plugin-size'
import replace from '@rollup/plugin-replace'

export default defineConfig([
// CommonJS (for Node) and ES module (for bundlers) build.
Expand All @@ -22,6 +23,14 @@ export default defineConfig([
target: 'es2022',
minify: false,
}),
replace({
delimiters: ['', ''],
preventAssignment: true,
values: {
'readable-stream/readable': 'readable-stream/readable.js',
'readable-stream/readable.js': 'readable-stream/readable.js',
},
}),
// TODO: external or include
// fix: https://github.com/rollup/rollup/issues/1507
// replace({
Expand All @@ -39,8 +48,6 @@ export default defineConfig([
{ find: '@/', replacement: './src/' },
// fix: https://github.com/SamVerschueren/stream-to-observable/issues/2
{ find: 'any-observable', replacement: 'zen-observable' },
// TODO: in next major version, use rollup-plugin-node-externals
{ find: /^node:(.+)$/, replacement: '$1' },
],
}),
nodeResolve({
Expand Down
1 change: 0 additions & 1 deletion packages/core/src/commands/add.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export const add = async (
) => {
try {
const { storeDir, preset } = options
console.log('storeDir', storeDir)
debug.add('options is alias %s / options %O', pref, options)
// init store
const store = await createStore({ storeDir })
Expand Down
8 changes: 6 additions & 2 deletions packages/core/src/utils/constants.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import { createRequire } from 'node:module'
import os from 'node:os'
import path from 'node:path'
import path, { dirname } from 'node:path'

const require = createRequire(import.meta.url)

const PKG_ROOT = dirname(require.resolve('@aiou/neo/package.json'))
export const STORE_PATH = path.join(os.homedir(), '.neo-store')
export const LOCK_FILE = 'neo-lock.yml'
export const CACHE_DIRNAME = '.cache'
export const NPM_REGISTRY = 'https://registry.npmjs.org/'
export const ASSETS_BANNER = 'assets/neo.txt'
export const ASSETS_BANNER = path.join(PKG_ROOT, 'assets/neo.txt')
export const CONFIG_FILE = '.neorc'
export const HOMEPAGE = 'https://neo-docs.netlify.app'
8 changes: 4 additions & 4 deletions packages/generators/pnpm-ci/assets/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x]
node-version: [20.x, 22.x]

steps:
- name: Checkout code repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
# Install pnpm depends on package.json packageManager field
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
name: Install pnpm
id: pnpm-install
with:
Expand All @@ -33,7 +33,7 @@ jobs:
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
Expand Down
8 changes: 4 additions & 4 deletions packages/generators/pnpm-ci/assets/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ jobs:
pull-requests: write
steps:
- name: Checkout code repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
# Install pnpm depends on package.json packageManager field
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
name: Install pnpm
id: pnpm-install
with:
Expand All @@ -34,7 +34,7 @@ jobs:
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout code repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0
- name: setup node.js
uses: actions/setup-node@v4
with:
node-version: 18
- uses: pnpm/action-setup@v2
node-version: 20
- uses: pnpm/action-setup@v4
name: Install pnpm
id: pnpm-install
with:
Expand All @@ -35,7 +35,7 @@ jobs:
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_ENV
- uses: actions/cache@v3
- uses: actions/cache@v4
name: setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
Expand Down
4 changes: 2 additions & 2 deletions packages/generators/pnpm-ci/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ jobs:
with:
pairs:
- path: "devDependencies.typescript"
value: "^4.6.4"
value: "^5.9.0"
- path: "devDependencies.eslint"
value: "^8.56.0"
- path: "devDependencies.@aiou/eslint-config"
value: "^1.2.1"
value: "^1.5.1"
- path: "devDependencies.lint-staged"
value: "^13.1.0"

Expand Down
10 changes: 5 additions & 5 deletions packages/mario/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,17 @@
"@types/listr": "^0.14.3",
"@types/lodash-es": "^4.17.5",
"@types/zen-observable": "^0.8.7",
"esbuild": "^0.18.13",
"esbuild": "^0.25.9",
"execa": "^6.0.0",
"husky": "^7.0.0",
"json-schema-to-typescript": "^10.1.5",
"listr": "^0.14.3",
"rimraf": "3.0.2",
"rollup": "2.58.0",
"rollup-plugin-esbuild": "^5.0.0",
"rollup": "4.49.0",
"rollup-plugin-esbuild": "^6.2.1",
"rollup-plugin-multi-input": "^1.3.1",
"rollup-plugin-node-externals": "^5.0.0",
"rollup-plugin-size": "^0.2.2",
"rollup-plugin-node-externals": "^8.1.0",
"rollup-plugin-size": "^0.3.1",
"ts-patch": "^3.3.0",
"tslib": "2.3.0",
"tsx": "4.20.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { nodeResolve } from '@rollup/plugin-node-resolve'
import { defineConfig } from 'rollup'
import esbuild from 'rollup-plugin-esbuild'
import multiple from 'rollup-plugin-multi-input'
import { externals } from 'rollup-plugin-node-externals'
import { nodeExternals as externals } from 'rollup-plugin-node-externals'
import bundleSize from 'rollup-plugin-size'

export default defineConfig([
Expand Down
Loading