nsbp-cli 0.2.20 → 0.2.23

package/README.md

@@ -147,7 +147,7 @@ node ./bin/nsbp.js --help  # Test CLI locally
 
 - **Package Name**: `nsbp-cli`
 - **Bin Command**: `nsbp` (install globally and run `nsbp --help`)
-- **Version**: `0.2.20`
+- **Version**: `0.2.23`
 - **Dependencies**: chalk, commander, fs-extra, inquirer
 - **Package Manager**: Uses pnpm (also compatible with npm)
 - **Node Version**: >=16.0.0

package/bin/nsbp.js

@@ -21,7 +21,7 @@ program
   .command('create <project-name>')
   .description('Create a new NSBP project')
   .option('-t, --template <template>', 'Specify template (basic, blog, ecommerce)', 'basic')
-  .option('--skip-install', 'Skip npm install')
+  .option('--skip-install', 'Skip pnpm install')
   .action(async (projectName, options) => {
     console.log(chalk.cyan(`🚀 Creating NSBP project: ${projectName}`));
     
@@ -104,15 +104,10 @@ program
       // Create package.json for new project
       const originalPackage = require(path.join(templateSource, 'package.json'));
       const newPackage = {
+        ...originalPackage,
         name: projectName,
         version: '1.0.0',
-        description: `NSBP project: ${projectName}`,
-        scripts: originalPackage.scripts,
-        dependencies: originalPackage.dependencies,
-        devDependencies: originalPackage.devDependencies,
-        keywords: originalPackage.keywords,
-        author: originalPackage.author,
-        license: originalPackage.license
+        description: `NSBP project: ${projectName}`
       };
 
       fs.writeFileSync(
@@ -120,20 +115,43 @@ program
         JSON.stringify(newPackage, null, 2)
       );
 
+      // Remove package-lock.json if exists (use pnpm instead)
+      const packageLockPath = path.join(targetDir, 'package-lock.json');
+      if (fs.existsSync(packageLockPath)) {
+        fs.removeSync(packageLockPath);
+      }
+
+      // Create .npmignore to prevent package-lock.json from being committed
+      const npmignorePath = path.join(targetDir, '.npmignore');
+      if (!fs.existsSync(npmignorePath)) {
+        fs.writeFileSync(npmignorePath, 'package-lock.json\n');
+      }
+
       // Optionally install dependencies
       if (!options.skipInstall) {
+        // Check if pnpm is available
+        try {
+          execSync('which pnpm', { stdio: 'ignore' });
+        } catch {
+          console.error(chalk.red('❌ pnpm is not installed or not available in PATH.'));
+          console.error(chalk.yellow('Please install pnpm before continuing:'));
+          console.error(chalk.cyan('  npm install -g pnpm'));
+          console.error(chalk.yellow('Or use --skip-install flag to skip dependency installation.'));
+          process.exit(1);
+        }
+        
         console.log(chalk.cyan('📦 Installing dependencies...'));
         process.chdir(targetDir);
-        execSync('npm install', { stdio: 'inherit' });
+        execSync('pnpm install', { stdio: 'inherit' });
       }
 
       console.log(chalk.green(`✅ NSBP project "${projectName}" created successfully!`));
       console.log(chalk.yellow('\nNext steps:'));
       console.log(`  cd ${projectName}`);
       if (options.skipInstall) {
-        console.log('  npm install');
+        console.log('  pnpm install');
       }
-      console.log('  npm run dev');
+      console.log('  pnpm run dev');
       console.log(chalk.cyan('\nHappy coding! 🎉'));
 
     } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nsbp-cli",
-  "version": "0.2.20",
+  "version": "0.2.23",
   "description": "CLI tool for creating NSBP (Node React SSR by Webpack) projects",
   "main": "index.js",
   "homepage": "https://nsbp.erishen.cn/",
@@ -17,7 +17,7 @@
     "start": "node ./bin/nsbp.js",
     "test": "echo \"Error: no test specified\" && exit 1",
     "sync-template": "node ./scripts/sync-template.js",
-    "update": "npm run sync-template",
+    "update": "pnpm run sync-template",
     "update-changelog": "node ./scripts/update-changelog.js",
     "changelog": "npx conventional-changelog -p angular -i CHANGELOG.md -s"
   },

package/templates/basic/Dockerfile

@@ -16,7 +16,7 @@ RUN npm install -g pnpm && pnpm install
 COPY . .
 
 # Build application
-RUN npm run build
+RUN pnpm run build
 
 # Stage 2: Production
 FROM node:20-alpine AS production

package/templates/basic/Dockerfile.dev

@@ -49,4 +49,4 @@ EXPOSE 3001
 ENTRYPOINT ["/entrypoint.sh"]
 
 # Start development server
-CMD ["dumb-init", "--", "npm", "run", "dev"]
+CMD ["dumb-init", "--", "pnpm", "run", "dev"]

package/templates/basic/Makefile

@@ -63,4 +63,4 @@ shell-dev: ## Open shell in development container
 	$(COMPOSE) -f docker-compose.dev.yml exec app sh
 
 test: ## Run tests (if configured)
-	$(COMPOSE) exec app npm test
+	$(COMPOSE) exec app $(PM) test

package/templates/basic/README.md

@@ -3,9 +3,9 @@
 🌐 **Online Demo**: [https://nsbp.erishen.cn/](https://nsbp.erishen.cn/)
 
 ## 开发
-- npm run dev   (开发运行)
-- npm run build (生产编译)
-- npm start     (生产运行)
+- pnpm run dev   (开发运行)
+- pnpm run build (生产编译)
+- pnpm start     (生产运行)
 
 ### 本地访问
 

package/templates/basic/docker-compose.dev.yml

@@ -23,7 +23,7 @@ services:
       - node_modules:/app/node_modules
       # Build output - named volume for persistence
       - build_output:/app/build
-    command: ["dumb-init", "--", "npm", "run", "dev"]
+    command: ["dumb-init", "--", "pnpm", "run", "dev"]
     restart: unless-stopped
     networks:
       - nsbp-network

package/templates/basic/package.json

@@ -10,7 +10,7 @@
     "dev:build:server": "webpack --config webpack.server.js --mode development --watch",
     "dev:build:client": "webpack --config webpack.client.js --mode development --watch",
     "dev:build:start": "node ./scripts/start.js",
-    "build": "npm run clean && npm-run-all -l -p build:**",
+    "build": "pnpm run clean && npm-run-all -l -p build:**",
     "build:server": "webpack --config webpack.server.js --mode production",
     "build:client": "webpack --config webpack.client.js --mode production",
     "start": "node ./scripts/start.js",
@@ -29,6 +29,7 @@
   ],
   "author": "Erishen Sun",
   "license": "ISC",
+  "packageManager": "pnpm@10.27.0",
   "dependencies": {
     "@loadable/component": "^5.15.0",
     "@loadable/server": "^5.15.0",

package/templates/basic/src/component/Layout.tsx

@@ -4,7 +4,7 @@ import Loading from './Loading'
 
 const Layout = ({ children, query }: any) => {
   let seo: any = 0
-  if (query) {
+  if (query !== undefined && query !== null) {
     seo = query.seo
   }
 

package/templates/basic/src/containers/Home.tsx

@@ -369,7 +369,7 @@ export const getPhotoMenu = (req: any, res: any) => {
 
               <QuickStartCard>
                 <QuickStartTitle>2️⃣ 启动开发</QuickStartTitle>
-                <QuickStartCode>$ npm run dev</QuickStartCode>
+                <QuickStartCode>$ pnpm run dev</QuickStartCode>
                 <QuickStartDescription>
                   启动开发服务器，默认端口 3001
                 </QuickStartDescription>

package/templates/basic/src/containers/Photo.tsx

@@ -73,7 +73,7 @@ const Photo = ({ query, data, menu, getPhotoMenu }: any) => {
     if (!isSEO()) {
       doGetPhotoMenu()
     } else {
-      if(from === 'link'){
+      if (from === 'link') {
         doGetPhotoMenu()
       }
     }
@@ -154,7 +154,7 @@ const mapStateToProps = (state: any) => {
 }
 
 const mapDispatchToProps = (dispatch: any) => ({
-  getPhotoMenu(dic:any) {
+  getPhotoMenu: (dic: any) => {
     dispatch(loadData(null, dic))
   }
 })

package/templates/basic/src/reducers/home.ts

@@ -2,15 +2,10 @@ import { GITHUB_ZEITNEXT_GET } from '../store/constants'
 
 export const homeReducer = (state = { data: {} }, action: any) => {
   const { type, data } = action
-  let newState = null
 
   switch (type) {
     case GITHUB_ZEITNEXT_GET:
-      newState = Object.assign({}, state)
-
-      if (data) newState.data = data
-
-      return newState
+      return { ...state, data: data !== undefined ? data : state.data }
     default:
       return state
   }

package/templates/basic/src/utils/fetch.ts

@@ -5,7 +5,7 @@ let prefix = 'http://localhost:3001'
 export const doGet = (action:any) => {
   return new Promise((resolve, reject) => {
 
-    if(typeof window !== "undefined"){
+    if(typeof window !== "undefined") {
       prefix = window.location.origin
     }