@shijiu/jsview 1.9.825 → 1.9.829

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "1.9.825",
+  "version": "1.9.829",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"

package/patches/node_modules/react-scripts/config/paths.js

@@ -25,7 +25,11 @@ const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
 // like /todos/42/static/js/bundle.7289d.js. We have to know the root.
 const publicUrlOrPath = getPublicUrlOrPath(
   process.env.NODE_ENV === 'development',
-  require(resolveApp('package.json')).homepage,
+// JsView Modified >>>
+// index.html 使用相对路径
+  //require(resolveApp('package.json')).homepage,
+  require(resolveApp('package.json')).homepage ?? './',
+// JsView Modified <<<
   process.env.PUBLIC_URL
 );
 

package/patches/node_modules/vite/dist/node/jsview-vite-extension.js

@@ -6,6 +6,7 @@ import fullReload from 'vite-plugin-full-reload';
 // https://vitejs.dev/config/
 const jsviewConfig = defineConfig({
   assetsInclude: ['**/*.bmp'],
+  base: './', // index.html 使用相对路径
   build: {
     assetsInlineLimit: 0,
     //cssTarget: 'css/', // 未生效
@@ -152,4 +153,4 @@ function jsvSaveUrlToCache(urls) {
 export {
   jsvCreateJsViewViteConfig,
   jsvSaveUrlToCache,
-}
+}

package/tools/jsview-common.js

@@ -244,7 +244,7 @@ function cpSync(workDir, srcPath, destPath, ignore=[])
 
 function rmSync(workDir, filePath)
 {
-  const desc = '  -x ' + path.relative(workDir, filePath);
+  const desc = '  -* ' + path.relative(workDir, filePath);
   console.info(desc);
   fs.rmSync(filePath, { recursive: true, force: true });
 }
@@ -255,7 +255,7 @@ function symlinkSync(workDir, targetPath, toPath)
 
   const relativePath = path.relative(path.dirname(toPath), targetPath);
 
-  const desc = '  ' + path.relative(workDir, toPath) + ' -* ' + path.relative(workDir, relativePath);
+  const desc = '  ' + path.relative(workDir, toPath) + ' -< ' + path.relative(workDir, relativePath);
   console.info(desc);
   fs.symlinkSync(relativePath, toPath, 'dir');
 }

package/tools/jsview-post-install.js

@@ -33,9 +33,16 @@ function checkNpmCommand()
 
 function checkNpmLinkForDebug(options, linkablePkgNames)
 {
+  const pkgObj = getPackageObject(options.projectDir);
+
   // node 16 不会安装本地包的二次依赖, 需要手动安装。
   let missingDepPkgs = '';
   for (const linkableName of linkablePkgNames) {
+    let linkableTarget = pkgObj.dependencies?.[linkableName];
+    if (!linkableTarget || !linkableTarget.startsWith('file:')) {
+      continue;
+    }
+
     const linkablePath = path.resolve(options.modulesDir, linkableName);
     const linkablePkgObj = getPackageObject(linkablePath);
 
@@ -59,11 +66,12 @@ function checkNpmLinkForDebug(options, linkablePkgNames)
       missingDepPkgs += ' ' + devDepPkg;
     }
   }
-  console.log('Install missing dependencies')
-  execCommand('npm install --no-save ' + missingDepPkgs);
+  if (missingDepPkgs !== '') {
+    console.log('Install missing dependencies')
+    execCommand('npm install --no-save ' + missingDepPkgs);
+  }
 
   // node 18 不会将本地依赖安装成链接，需要手动改成链接。
-  const pkgObj = getPackageObject(options.projectDir);
   for (const linkableName of linkablePkgNames) {
     let linkableTarget = pkgObj.dependencies?.[linkableName];
     if (!linkableTarget || !linkableTarget.startsWith('file:')) {
@@ -161,24 +169,11 @@ function doPostInstall(framework, pkgNeedPatch, skipCheckVersion)
 
   const linkablePkgNames = [
     '@shijiu/jsview',
+    '@shijiu/jsview-vue',
+    '@shijiu/jsview-vue-samples',
+    '@shijiu/jsview-react',
+    '@shijiu/jsview-react-samples',
   ];
-  switch (framework) {
-    case 'vue':
-      linkablePkgNames.push(
-        '@shijiu/jsview-vue',
-        '@shijiu/jsview-vue-samples',
-      )
-      break;
-    case 'react':
-      linkablePkgNames.push(
-        '@shijiu/jsview-react',
-        '@shijiu/jsview-react-samples',
-      )
-      break;
-    default:
-      console.error('JsView Error: Bad framework: ' + framework);
-      break;
-  }
 
   checkNpmCommand();