create-packer 1.35.20 → 1.35.23

package/bin/createTemp.js

@@ -1,19 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTemp = createTemp;
-const inquirer = require("inquirer");
-const fsExtra = require("fs-extra");
-const path = require("path");
-const chalk = require("chalk");
-const ora = require("ora");
-const child_process_1 = require("child_process");
-const utils_1 = require("./utils");
-const fs_1 = require("fs");
+import chalk from 'chalk';
+import * as inquirer from '@inquirer/prompts';
+import * as fsExtra from 'fs-extra';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import ora from 'ora';
+import { spawnSync } from 'child_process';
+import { genTemplateInfoList, onGenCommand } from './utils/index.js';
+import { existsSync } from 'fs';
 const cwd = process.cwd();
-const command = (0, utils_1.onGenCommand)();
+const command = onGenCommand();
+const dirname = path.dirname(fileURLToPath(import.meta.url));
 const excludes = ['node_modules', 'yarn-error.log', 'dist'];
-const tempRoot = path.join(__dirname, '../template');
-const tempInfoList = (0, utils_1.genTemplateInfoList)(tempRoot);
+const tempRoot = path.join(dirname, '../template');
+const tempInfoList = genTemplateInfoList(tempRoot);
 function copyTempFile(tempPath, output) {
     fsExtra.readdirSync(tempPath).map(name => {
         if (!excludes.includes(name)) {
@@ -22,36 +21,28 @@ function copyTempFile(tempPath, output) {
     });
 }
 function createTempEnd(output) {
-    (0, child_process_1.spawnSync)(command, ['install'], {
+    spawnSync(command, ['install'], {
         cwd: output,
         stdio: 'inherit'
     });
 }
-async function createTemp(dirname) {
+export async function createTemp(dirname) {
     const isCurrent = dirname === '.';
-    let answer = await inquirer.prompt([
-        {
-            type: 'list',
-            name: 'temp',
-            message: 'Select temp.',
-            choices: tempInfoList.map(o => o.name)
-        }
-    ]);
-    let tempInfo = tempInfoList.find(o => o.name === answer.temp);
+    let answer = await inquirer.select({
+        message: 'Select temp.',
+        choices: tempInfoList.map(o => o.name)
+    });
+    let tempInfo = tempInfoList.find(o => o.name === answer);
     if (tempInfo?.children && tempInfo.children.length > 0) {
-        answer = await inquirer.prompt([
-            {
-                type: 'list',
-                name: 'temp',
-                message: 'Select temp type.',
-                choices: tempInfo.children.map(o => o.name)
-            }
-        ]);
-        tempInfo = tempInfo.children.find(o => o.name === answer.temp);
+        answer = await inquirer.select({
+            message: 'Select temp type.',
+            choices: tempInfo.children.map(o => o.name)
+        });
+        tempInfo = tempInfo.children.find(o => o.name === answer);
     }
     const creating = ora(chalk.yellow('Creating...\n')).start();
     const output = path.join(cwd, isCurrent ? '' : dirname);
-    if (!isCurrent && (0, fs_1.existsSync)(output)) {
+    if (!isCurrent && existsSync(output)) {
         return console.log(chalk.red(`${dirname} already exists!`));
     }
     if (!isCurrent) {

package/bin/index.js

@@ -1,6 +1,4 @@
 #!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const createTemp_1 = require("./createTemp");
-const commander_1 = require("commander");
-commander_1.program.argument('<dirname>', 'Create project.', dirname => (0, createTemp_1.createTemp)(dirname)).parse(process.argv);
+import { createTemp } from './createTemp.js';
+import { program } from 'commander';
+program.argument('<dirname>', 'Create project.', dirname => createTemp(dirname)).parse(process.argv);

package/bin/utils/index.js

@@ -1,54 +1,25 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasPnpm = hasPnpm;
-exports.hasYarn = hasYarn;
-exports.onGenCommand = onGenCommand;
-exports.genTemplateInfoList = genTemplateInfoList;
-const path = __importStar(require("path"));
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-function hasPnpm() {
+import * as path from 'path';
+import { execSync } from 'child_process';
+import { readdirSync, existsSync } from 'fs';
+export function hasPnpm() {
     try {
-        (0, child_process_1.execSync)('pnpm --version');
+        execSync('pnpm --version');
         return true;
     }
     catch {
         return false;
     }
 }
-function hasYarn() {
+export function hasYarn() {
     try {
-        (0, child_process_1.execSync)('yarnpkg --version');
+        execSync('yarnpkg --version');
         return true;
     }
     catch {
         return false;
     }
 }
-function onGenCommand() {
+export function onGenCommand() {
     if (hasPnpm()) {
         return 'pnpm';
     }
@@ -57,15 +28,15 @@ function onGenCommand() {
     }
     return 'npm';
 }
-function genTemplateInfoList(root) {
+export function genTemplateInfoList(root) {
     const temps = [];
-    (0, fs_1.readdirSync)(root, { withFileTypes: true }).forEach(o => {
+    readdirSync(root, { withFileTypes: true }).forEach(o => {
         const src = path.join(root, o.name);
         if (o.isDirectory()) {
             temps.push({
                 name: o.name,
                 src,
-                children: (0, fs_1.existsSync)(path.join(src, 'package.json')) ? [] : genTemplateInfoList(src)
+                children: existsSync(path.join(src, 'package.json')) ? [] : genTemplateInfoList(src)
             });
         }
     });

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "create-packer",
-  "version": "1.35.20",
+  "version": "1.35.23",
   "main": "index.js",
   "repository": "https://github.com/kevily/create-packer",
   "author": "1k <bug_zero@163.com>",
   "license": "MIT",
   "private": false,
   "bin": "./bin/index.js",
+  "type": "module",
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "files": [
     "bin",
     "template",
@@ -14,12 +18,12 @@
     ".gitignore"
   ],
   "dependencies": {
-    "chalk": "4.1.2",
+    "@inquirer/prompts": "7.0.0",
+    "chalk": "5.3.0",
     "commander": "8.1.0",
     "fs-extra": "10.0.0",
-    "inquirer": "8.1.2",
     "lodash": "4.17.21",
-    "ora": "5.4.1"
+    "ora": "8.1.0"
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.2",
@@ -42,7 +46,7 @@
   },
   "scripts": {
     "login": "npm login --registry https://registry.npmjs.org",
-    "pub": "pnpm run build && pnpm run push && node ./utils/pub.js",
+    "pub": "pnpm run build && pnpm run push && node ./scripts/pub.js",
     "test": "pnpm run build && rimraf ./__test__ && node ./bin __test__",
     "build": "rimraf ./bin && tsc",
     "clean:pkg": "pnpm -r exec rimraf node_modules",

package/template/cli/package.json

@@ -7,9 +7,10 @@
     "license": "MIT",
     "private": false,
     "bin": "./bin/index.js",
+    "type": "module",
     "scripts": {
         "login": "npm login --registry https://registry.npmjs.org",
-        "pub": "pnpm run build && pnpm run push && node ./utils/pub.js",
+        "pub": "pnpm run build && pnpm run push && node ./scripts/pub.js",
         "test": "pnpm run build && rimraf ./__test__ && node ./bin __test__",
         "build": "rimraf ./bin && tsc",
         "commit": "git add . && cz",
@@ -17,12 +18,12 @@
     },
     "files": ["bin", "template", "template/**/.gitignore", ".gitignore"],
     "dependencies": {
-        "chalk": "4.1.2",
+        "@inquirer/prompts": "7.0.0",
+        "chalk": "5.3.0",
         "commander": "8.1.0",
         "fs-extra": "10.0.0",
-        "inquirer": "8.1.2",
         "lodash": "4.17.21",
-        "ora": "5.4.1"
+        "ora": "8.1.0"
     },
     "devDependencies": {
         "@biomejs/biome": "1.9.3",

package/template/cli/{utils → scripts}/pub.js

@@ -1,7 +1,7 @@
-const inquirer = require('inquirer')
-const currentVersion = require('../package.json').version
-const { execSync } = require('child_process')
-const chalk = require('chalk')
+import * as inquirer from '@inquirer/prompts'
+import pkg from '../package.json' assert { type: 'json' }
+import { execSync } from 'child_process'
+import chalk from 'chalk'
 
 function genPrompt(nextVersion) {
     const version = {
@@ -10,7 +10,7 @@ function genPrompt(nextVersion) {
         patch: 2
     }
     const nextVersionIndex = version[nextVersion]
-    const newVersion = currentVersion.split('.').map(Number)
+    const newVersion = pkg.version.split('.').map(Number)
     newVersion[nextVersionIndex] += 1
     // 把后续的版本号归零
     // ------------------------------------------------------------------------
@@ -27,15 +27,11 @@ const versions = {
 }
 
 inquirer
-    .prompt([
-        {
-            type: 'list',
-            name: 'version',
-            message: 'version:',
-            choices: Object.keys(versions)
-        }
-    ])
-    .then(({ version }) => {
+    .select({
+        message: 'version:',
+        choices: Object.keys(versions)
+    })
+    .then(version => {
         execSync(
             `npm version ${versions[version]} && pnpm publish --registry https://registry.npmjs.org && git push`
         )

package/template/cli/src/createTemp.ts

@@ -1,16 +1,18 @@
-import inquirer = require('inquirer')
-import fsExtra = require('fs-extra')
-import path = require('path')
-import chalk = require('chalk')
-import ora = require('ora')
+import chalk from 'chalk'
+import * as inquirer from '@inquirer/prompts'
+import * as fsExtra from 'fs-extra'
+import path from 'path'
+import { fileURLToPath } from 'url'
+import ora from 'ora'
 import { spawnSync } from 'child_process'
-import { genTemplateInfoList, onGenCommand } from './utils'
+import { genTemplateInfoList, onGenCommand } from './utils/index.js'
 import { existsSync } from 'fs'
 
 const cwd = process.cwd()
 const command = onGenCommand()
+const dirname = path.dirname(fileURLToPath(import.meta.url))
 const excludes = ['node_modules', 'yarn-error.log', 'dist']
-const tempRoot = path.join(__dirname, '../template')
+const tempRoot = path.join(dirname, '../template')
 const tempInfoList = genTemplateInfoList(tempRoot)
 
 function copyTempFile(tempPath, output) {
@@ -29,25 +31,17 @@ function createTempEnd(output: string) {
 
 export async function createTemp(dirname: string) {
     const isCurrent = dirname === '.'
-    let answer = await inquirer.prompt([
-        {
-            type: 'list',
-            name: 'temp',
-            message: 'Select temp.',
-            choices: tempInfoList.map(o => o.name)
-        }
-    ])
-    let tempInfo = tempInfoList.find(o => o.name === answer.temp)
-    if (tempInfo.children.length > 0) {
-        answer = await inquirer.prompt([
-            {
-                type: 'list',
-                name: 'temp',
-                message: 'Select temp type.',
-                choices: tempInfo.children.map(o => o.name)
-            }
-        ])
-        tempInfo = tempInfo.children.find(o => o.name === answer.temp)
+    let answer = await inquirer.select<string>({
+        message: 'Select temp.',
+        choices: tempInfoList.map(o => o.name)
+    })
+    let tempInfo = tempInfoList.find(o => o.name === answer)
+    if (tempInfo?.children && tempInfo.children.length > 0) {
+        answer = await inquirer.select({
+            message: 'Select temp type.',
+            choices: tempInfo.children.map(o => o.name)
+        })
+        tempInfo = tempInfo.children.find(o => o.name === answer)
     }
     const creating = ora(chalk.yellow('Creating...\n')).start()
     const output = path.join(cwd, isCurrent ? '' : dirname)
@@ -57,7 +51,7 @@ export async function createTemp(dirname: string) {
     if (!isCurrent) {
         fsExtra.mkdirSync(output)
     }
-    copyTempFile(tempInfo.src, output)
+    copyTempFile(tempInfo!.src, output)
     createTempEnd(output)
     creating.succeed()
 }

package/template/cli/src/index.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { createTemp } from './createTemp'
+import { createTemp } from './createTemp.js'
 import { program } from 'commander'
 
 program.argument('<dirname>', 'Create project.', dirname => createTemp(dirname)).parse(process.argv)

package/template/cli/tsconfig.json

@@ -1,20 +1,18 @@
 {
     "compilerOptions": {
-        "module": "CommonJS",
+        "module": "NodeNext",
         "esModuleInterop": true,
-        "allowSyntheticDefaultImports": false,
+        "allowSyntheticDefaultImports": true,
         "resolveJsonModule": true,
         "allowJs": true,
         "strictNullChecks": true,
         "target": "ESNext",
         "noImplicitAny": false,
-        "moduleResolution": "node",
         "sourceMap": false,
         "declaration": true,
         "outDir": "bin",
         "baseUrl": ".",
         "skipLibCheck": true
     },
-    "include": ["src/**/*"],
-    "exclude": ["node_modules/**"]
+    "include": ["src/**/*"]
 }

package/template/web-app/react-rspack/package.json

@@ -39,11 +39,11 @@
         "@commitlint/cli": "17.6.1",
         "@commitlint/config-conventional": "17.6.1",
         "@commitlint/cz-commitlint": "17.5.0",
-        "@rsbuild/core": "1.0.4",
-        "@rsbuild/plugin-eslint": "1.0.3",
-        "@rsbuild/plugin-react": "1.0.2",
+        "@rsbuild/core": "1.0.10",
+        "@rsbuild/plugin-eslint": "1.0.4",
+        "@rsbuild/plugin-react": "1.0.3",
         "@rsbuild/plugin-styled-components": "1.0.1",
-        "@rsbuild/plugin-svgr": "1.0.2",
+        "@rsbuild/plugin-svgr": "1.0.3",
         "@rsbuild/plugin-type-check": "1.0.1",
         "@rsdoctor/rspack-plugin": "0.4.2",
         "@types/lodash-es": "4.17.7",

package/template/web-app/react-rspack/rsbuild.config.ts

@@ -11,7 +11,7 @@ import { createChunks } from './scripts/createChunks'
 export default defineConfig(({ envMode, command }) => {
     const { parsed: env } = loadEnv()
     const proxyBaseUrl = env.PUBLIC_API_HOST
-    const publicPath = env.PUBLIC_BASE_URL
+    const baseUrl = env.PUBLIC_BASE_URL
     return {
         html: {
             template: './index.html'
@@ -25,11 +25,10 @@ export default defineConfig(({ envMode, command }) => {
             }
         },
         dev: {
-            assetPrefix: publicPath,
             minify: envMode !== 'dev'
         },
         output: {
-            assetPrefix: publicPath,
+            assetPrefix: baseUrl,
             distPath: {
                 root: 'dist'
             },
@@ -67,15 +66,9 @@ export default defineConfig(({ envMode, command }) => {
             bundleAnalyze: envMode === 'analyse' ? { openAnalyzer: true } : void 0
         },
         server: {
+            base: baseUrl,
             host: '0.0.0.0',
             compress: false,
-            historyApiFallback: {
-                disableDotRule: true,
-                index: publicPath
-            },
-            printUrls({ urls }) {
-                return urls.map(url => url + publicPath)
-            },
             proxy: [
                 {
                     context: [proxyBaseUrl],