Merge pull request #3482 from alibaba/fix/miniapp-env

fix: miniapp env
alibaba · Aug 27, 2020 · bffc4bf · bffc4bf
2 parents eb19354 + da3867f
commit bffc4bf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/packages/create-app-shared/package.json b/packages/create-app-shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-app-shared",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "",
   "author": "[email protected]",
   "homepage": "https://github.com/alibaba/ice#readme",

diff --git a/packages/create-app-shared/src/env.ts b/packages/create-app-shared/src/env.ts
@@ -1,4 +1,4 @@
-import { isMiniApp, isWeChatMiniProgram, isByteDanceMicroApp } from 'universal-env';
+import { isMiniApp, isWeChatMiniProgram, isByteDanceMicroApp, isWeb } from 'universal-env';
 
-export const isMiniAppPlatform = isMiniApp || isWeChatMiniProgram || isByteDanceMicroApp;
+export const isMiniAppPlatform = (isMiniApp || isWeChatMiniProgram || isByteDanceMicroApp) && !isWeb;
 export * from 'universal-env';
diff --git a/packages/icejs/package.json b/packages/icejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ice.js",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "command line interface and builtin plugin for icejs",
   "author": "[email protected]",
   "homepage": "",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@alib/build-scripts": "^0.1.13",
     "build-plugin-ice-config": "1.7.0",
-    "build-plugin-app-core": "0.1.12",
+    "build-plugin-app-core": "0.1.13",
     "build-plugin-ice-helpers": "1.7.0",
     "build-plugin-ice-logger": "1.7.0",
     "build-plugin-ice-mpa": "1.7.0",

diff --git a/packages/plugin-app-core/package.json b/packages/plugin-app-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-app-core",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "the core plugin for icejs and raxjs.",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/plugin-app-core/src/generator/templates/common/runApp.ts.ejs b/packages/plugin-app-core/src/generator/templates/common/runApp.ts.ejs
@@ -1,5 +1,5 @@
 import { createElement, useEffect, Component } from '<%- framework %>';
-import { isMiniApp, isWeChatMiniProgram, isByteDanceMicroApp } from 'universal-env';
+import { isMiniApp, isWeChatMiniProgram, isByteDanceMicroApp, isWeb } from 'universal-env';
 import miniappRenderer from 'miniapp-renderer';
 import createShareAPI, { history } from 'create-app-shared';
 
@@ -51,7 +51,7 @@ export function runApp(appConfig) {
   <% if(isRax){ %>
     renderer = raxAppRenderer;
   <% } %>
-  if (isMiniApp || isWeChatMiniProgram || isByteDanceMicroApp) {
+  if ((isMiniApp || isWeChatMiniProgram || isByteDanceMicroApp) && !isWeb) {
     renderer = miniappRenderer;
   }<% if(isReact){ %> else {
     renderer = reactAppRenderer;