dashboard-shell-shell 0.0.1 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pkg/tsconfig.json

@@ -27,25 +27,25 @@
     ],
     "paths": {
       "@shell/core/*": [
-        "../../node_modules/@rancher/shell/core/*"
+        "../../node_modules/dashboard-shell-shell/core/*"
       ],
       "@shell/config/*": [
-        "../../node_modules/@rancher/shell/config/*"
+        "../../node_modules/dashboard-shell-shell/config/*"
       ],
       "@shell/store/*": [
-        "../../node_modules/@rancher/shell/store/*"
+        "../../node_modules/dashboard-shell-shell/store/*"
       ],
       "@shell/plugins/*": [
-        "../../node_modules/@rancher/shell/plugins/*"
+        "../../node_modules/dashboard-shell-shell/plugins/*"
       ],
       "@shell/utils/*": [
-        "../../node_modules/@rancher/shell/utils/*"
+        "../../node_modules/dashboard-shell-shell/utils/*"
       ],
       "@shell/models/*": [
-        "../../node_modules/@rancher/shell/models/*"
+        "../../node_modules/dashboard-shell-shell/models/*"
       ],
       "@shell/mixins/*": [
-        "../../node_modules/@rancher/shell/mixins/*"
+        "../../node_modules/dashboard-shell-shell/mixins/*"
       ],
       "@pkg/*": [
         "./*"
@@ -56,8 +56,8 @@
     "**/*.ts",
     "**/*.tsx",
     "**/*.vue",
-    "../../node_modules/@rancher/shell/types/*.d.ts",
-    "../../node_modules/@rancher/shell/core/types.ts"
+    "../../node_modules/dashboard-shell-shell/types/*.d.ts",
+    "../../node_modules/dashboard-shell-shell/core/types.ts"
   ],
   "exclude": [
     "node_modules"

package/pkg/vue.config.js

@@ -117,7 +117,7 @@ module.exports = function(dir) {
         if (p.use) {
           p.use.forEach((u) => {
             if (u.loader.includes('babel-loader')) {
-              p.exclude = /node_modules\/(?!@rancher\/shell\/).*/;
+              p.exclude = /node_modules\/(?!dashboard-shell-shell\/).*/;
             }
           });
         }

package/vue.config.js

@@ -37,79 +37,27 @@ const perfTest = (process.env.PERF_TEST === 'true'); // Enable performance testi
  * Paths to the shell folder when it is included as a node dependency
  */
 const getShellPaths = (dir) => {
-  // 设置初始路径
-  let SHELL_ABS = path.join(dir, 'node_modules/dashboard-shell/shell');
-  let COMPONENTS_DIR = path.join(SHELL_ABS, 'rancher-components'); // 默认组件路径
-  
-  console.log('初始SHELL_ABS:', SHELL_ABS);
-  console.log('初始COMPONENTS_DIR:', COMPONENTS_DIR);
-  
-  // 检查初始路径是否存在
+  let SHELL_ABS = path.join(dir, 'node_modules/dashboard-shell-shell');
+  let COMPONENTS_DIR = path.join(SHELL_ABS, 'rancher-components');
+
   if (fs.existsSync(SHELL_ABS)) {
     const stat = fs.lstatSync(SHELL_ABS);
-    
-    console.log('SHELL_ABS 存在，是否为符号链接:', stat.isSymbolicLink());
-    
-    // 处理符号链接情况
+
+    // If @rancher/shell is a symlink, then use the components folder for it
     if (stat.isSymbolicLink()) {
-      const REAL_SHELL_ABS = fs.realpathSync(SHELL_ABS);
-      console.log('符号链接的真实路径:', REAL_SHELL_ABS);
-      
-      // 根据实际项目结构调整符号链接后的组件路径
-      // 这里假设符号链接指向项目根目录，组件在 pkg/rancher-components/src/components
-      COMPONENTS_DIR = path.join(REAL_SHELL_ABS, 'pkg', 'rancher-components', 'src', 'components');
-      
-      // 如果上述路径不存在，尝试其他可能的路径
-      if (!fs.existsSync(COMPONENTS_DIR)) {
-        console.log('备选路径1不存在，尝试备选路径2');
-        COMPONENTS_DIR = path.join(REAL_SHELL_ABS, '..', 'pkg', 'rancher-components', 'src', 'components');
-      }
-    }
-    
-    // 验证组件目录是否存在
-    if (!fs.existsSync(COMPONENTS_DIR)) {
-      console.log('警告: 计算出的组件目录不存在:', COMPONENTS_DIR);
-      
-      // 尝试备选路径
-      const altComponentsDir = path.join(SHELL_ABS,'..', 'pkg', 'rancher-components', 'src', 'components');
-      if (fs.existsSync(altComponentsDir)) {
-        console.log('使用备选组件目录:', altComponentsDir);
-        COMPONENTS_DIR = altComponentsDir;
-      }
+      const REAL_SHELL_ABS = fs.realpathSync(SHELL_ABS); // In case the shell is being linked via 'yarn link'
+
+      COMPONENTS_DIR = path.join(REAL_SHELL_ABS, '..', 'pkg', 'rancher-components', 'src', 'components');
     }
-  } else {
-    console.log('警告: SHELL_ABS 路径不存在:', SHELL_ABS);
   }
-  
-  // 检查本地是否有 shell 目录（用于主仓库开发）
-  const localShellPath = path.join(dir, 'shell');
-  if (fs.existsSync(localShellPath)) {
-    console.log('找到本地 shell 目录:', localShellPath);
-    SHELL_ABS = localShellPath;
-    
-    // 根据实际项目结构调整本地开发时的组件路径
+
+  // If we have a local folder named 'shell' then use that rather than the one in node_modules
+  // This will be the case in the main dashboard repository.
+  if (fs.existsSync(path.join(dir, 'shell'))) {
+    SHELL_ABS = path.join(dir, 'shell');
     COMPONENTS_DIR = path.join(dir, 'pkg', 'rancher-components', 'src', 'components');
-    
-    // 验证路径是否存在
-    if (!fs.existsSync(COMPONENTS_DIR)) {
-      console.log('警告: 本地开发组件目录不存在:', COMPONENTS_DIR);
-      
-      // 尝试备选路径
-      const altLocalComponentsDir = path.join(SHELL_ABS, 'rancher-components');
-      if (fs.existsSync(altLocalComponentsDir)) {
-        console.log('使用本地备选组件目录:', altLocalComponentsDir);
-        COMPONENTS_DIR = altLocalComponentsDir;
-      }
-    }
   }
-  
-  console.log('最终SHELL_ABS:', SHELL_ABS);
-  console.log('最终COMPONENTS_DIR:', COMPONENTS_DIR);
-  
-  // 验证关键组件是否存在
-  const testComponentPath = path.join(COMPONENTS_DIR, 'Banner.vue');
-  console.log('测试组件 (Banner.vue) 是否存在:', fs.existsSync(testComponentPath));
-  
+
   return { SHELL_ABS, COMPONENTS_DIR };
 };
 
@@ -209,7 +157,7 @@ const getLoaders = (SHELL_ABS) => [
     test:    /\.m?[tj]sx?$/,
     // This excludes no modules except for node_modules/@rancher/... so that plugins can properly compile
     // when referencing @rancher/shell
-    exclude: /node_modules\/(?!(@rancher)\/).*/,
+    exclude: /node_modules\/(?!(dashboard-shell-shell)\/).*/,
     use:     [
       {
         loader:  'cache-loader',
@@ -590,11 +538,6 @@ module.exports = function(dir, appConfig = {}) {
       config.resolve.alias['@shell'] = SHELL_ABS;
       config.resolve.alias['@pkg'] = path.join(dir, 'pkg');
       config.resolve.alias['./node_modules'] = path.join(dir, 'node_modules');
-
-      console.log('SHELL_ABS 路径:', SHELL_ABS);
-      console.log('@components 路径:', COMPONENTS_DIR);
-      console.log('Radio 组件是否存在:', fs.existsSync(path.join(COMPONENTS_DIR, 'Form/Radio.vue')));
-
       config.resolve.alias['@components'] = COMPONENTS_DIR;
       config.resolve.alias['vue$'] = dev ? path.resolve(process.cwd(), 'node_modules', 'vue') : 'vue';
       config.resolve.modules.push(__dirname);
@@ -610,17 +553,6 @@ module.exports = function(dir, appConfig = {}) {
 
       config.plugins.push(new webpack.IgnorePlugin({ resourceRegExp: /\/__tests__\// }));
 
-      // 添加模块替换插件用于调试
-    config.plugins.push(
-      new webpack.NormalModuleReplacementPlugin(/.*/, (resource) => {
-        if (resource.request.startsWith('@components/Form/Radio')) {
-          console.log('尝试解析组件:', resource.request);
-          console.log('解析路径:', path.join(COMPONENTS_DIR, resource.request.substr('@components/'.length)));
-        }
-      })
-    )
-
-
       config.resolve.extensions.push(...['.tsx', '.ts', '.js', '.vue', '.scss']);
       config.watchOptions = {
         ...(config.watchOptions || {}),
@@ -642,4 +574,4 @@ module.exports = function(dir, appConfig = {}) {
   };
 
   return config;
-};
+};