refactor(demo): change vue-loader dependency judgement

Tencent · Mar 21, 2023 · a5dd1b6 · a5dd1b6
1 parent cf739c0
commit a5dd1b6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/examples/hippy-vue-demo/scripts/hippy-webpack.android-vendor.js b/examples/hippy-vue-demo/scripts/hippy-webpack.android-vendor.js
@@ -8,7 +8,8 @@ const platform = 'android';
 let vueLoader = '@hippy/vue-loader';
 let VueLoaderPlugin;
 const hippyVueLoaderPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib');
-if (fs.existsSync(hippyVueLoaderPath)) {
+const hippyVueLoaderNodeModulesPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/node_modules');
+if (fs.existsSync(hippyVueLoaderNodeModulesPath) && fs.existsSync(hippyVueLoaderPath)) {
   console.warn(`* Using the @hippy/vue-loader in ${hippyVueLoaderPath}`);
   vueLoader = hippyVueLoaderPath;
   VueLoaderPlugin = require(path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib/plugin'));

diff --git a/examples/hippy-vue-demo/scripts/hippy-webpack.android.js b/examples/hippy-vue-demo/scripts/hippy-webpack.android.js
@@ -19,7 +19,8 @@ if (fs.existsSync(hippyVueCssLoaderPath)) {
 let vueLoader = '@hippy/vue-loader';
 let VueLoaderPlugin;
 const hippyVueLoaderPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib');
-if (fs.existsSync(hippyVueLoaderPath)) {
+const hippyVueLoaderNodeModulesPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/node_modules');
+if (fs.existsSync(hippyVueLoaderNodeModulesPath) && fs.existsSync(hippyVueLoaderPath)) {
   console.warn(`* Using the @hippy/vue-loader in ${hippyVueLoaderPath}`);
   vueLoader = hippyVueLoaderPath;
   VueLoaderPlugin = require(path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib/plugin'));

diff --git a/examples/hippy-vue-demo/scripts/hippy-webpack.dev.js b/examples/hippy-vue-demo/scripts/hippy-webpack.dev.js
@@ -17,7 +17,8 @@ if (fs.existsSync(hippyVueCssLoaderPath)) {
 let vueLoader = '@hippy/vue-loader';
 let VueLoaderPlugin;
 const hippyVueLoaderPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib');
-if (fs.existsSync(hippyVueLoaderPath)) {
+const hippyVueLoaderNodeModulesPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/node_modules');
+if (fs.existsSync(hippyVueLoaderNodeModulesPath) && fs.existsSync(hippyVueLoaderPath)) {
   console.warn(`* Using the @hippy/vue-loader in ${hippyVueLoaderPath}`);
   vueLoader = hippyVueLoaderPath;
   VueLoaderPlugin = require(path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib/plugin'));

diff --git a/examples/hippy-vue-demo/scripts/hippy-webpack.ios-vendor.js b/examples/hippy-vue-demo/scripts/hippy-webpack.ios-vendor.js
@@ -8,7 +8,8 @@ const platform = 'ios';
 let vueLoader = '@hippy/vue-loader';
 let VueLoaderPlugin;
 const hippyVueLoaderPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib');
-if (fs.existsSync(hippyVueLoaderPath)) {
+const hippyVueLoaderNodeModulesPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/node_modules');
+if (fs.existsSync(hippyVueLoaderNodeModulesPath) && fs.existsSync(hippyVueLoaderPath)) {
   console.warn(`* Using the @hippy/vue-loader in ${hippyVueLoaderPath}`);
   vueLoader = hippyVueLoaderPath;
   VueLoaderPlugin = require(path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib/plugin'));

diff --git a/examples/hippy-vue-demo/scripts/hippy-webpack.ios.js b/examples/hippy-vue-demo/scripts/hippy-webpack.ios.js
@@ -19,7 +19,8 @@ if (fs.existsSync(hippyVueCssLoaderPath)) {
 let vueLoader = '@hippy/vue-loader';
 let VueLoaderPlugin;
 const hippyVueLoaderPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib');
-if (fs.existsSync(hippyVueLoaderPath)) {
+const hippyVueLoaderNodeModulesPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/node_modules');
+if (fs.existsSync(hippyVueLoaderNodeModulesPath) && fs.existsSync(hippyVueLoaderPath)) {
   console.warn(`* Using the @hippy/vue-loader in ${hippyVueLoaderPath}`);
   vueLoader = hippyVueLoaderPath;
   VueLoaderPlugin = require(path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib/plugin'));

diff --git a/examples/hippy-vue-demo/scripts/hippy-webpack.web-renderer.dev.js b/examples/hippy-vue-demo/scripts/hippy-webpack.web-renderer.dev.js
@@ -18,7 +18,8 @@ if (fs.existsSync(hippyVueCssLoaderPath)) {
 let vueLoader = '@hippy/vue-loader';
 let VueLoaderPlugin;
 const hippyVueLoaderPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib');
-if (fs.existsSync(hippyVueLoaderPath)) {
+const hippyVueLoaderNodeModulesPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/node_modules');
+if (fs.existsSync(hippyVueLoaderNodeModulesPath) && fs.existsSync(hippyVueLoaderPath)) {
   console.warn(`* Using the @hippy/vue-loader in ${hippyVueLoaderPath}`);
   vueLoader = hippyVueLoaderPath;
   VueLoaderPlugin = require(path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib/plugin'));

diff --git a/examples/hippy-vue-demo/scripts/hippy-webpack.web-renderer.js b/examples/hippy-vue-demo/scripts/hippy-webpack.web-renderer.js
@@ -18,7 +18,8 @@ if (fs.existsSync(hippyVueCssLoaderPath)) {
 let vueLoader = '@hippy/vue-loader';
 let VueLoaderPlugin;
 const hippyVueLoaderPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib');
-if (fs.existsSync(hippyVueLoaderPath)) {
+const hippyVueLoaderNodeModulesPath = path.resolve(__dirname, '../../../packages/hippy-vue-loader/node_modules');
+if (fs.existsSync(hippyVueLoaderNodeModulesPath) && fs.existsSync(hippyVueLoaderPath)) {
   console.warn(`* Using the @hippy/vue-loader in ${hippyVueLoaderPath}`);
   vueLoader = hippyVueLoaderPath;
   VueLoaderPlugin = require(path.resolve(__dirname, '../../../packages/hippy-vue-loader/lib/plugin'));