feat(h5): respect import.meta.env.BASE_URL

8cf16992 · fxy060608 · e92bbf82 · e92bbf82 · 8cf16992 · 8cf16992
15 changed file
--- a/.size-limit.js
+++ b/.size-limit.js
-module.exports = [
-  {
-    path: 'packages/size-check/dist/assets',
-    running: false,
-  },
-  {
-    path: 'packages/uni-h5-vue/dist',
-    running: false,
-  },
-  {
-    path: 'packages/uni-mp-vue/dist',
-    running: false,
-  },
-  {
-    path: 'packages/uni-mp-alipay/dist',
-    running: false,
-  },
-  {
-    path: 'packages/uni-mp-baidu/dist',
-    running: false,
-  },
-  {
-    path: 'packages/uni-mp-qq/dist',
-    running: false,
-  },
-  {
-    path: 'packages/uni-mp-toutiao/dist',
-    running: false,
-  },
-  {
-    path: 'packages/uni-mp-weixin/dist',
-    running: false,
-  },
-  {
-    path: 'packages/uni-quickapp-webview/dist',
-    running: false,
-  },
-]
--- a/package.json
+++ b/package.json
@@ -44,7 +44,6 @@
    "@rollup/plugin-node-resolve": "^11.0.1",
    "@rollup/plugin-replace": "^2.3.4",
    "@rollup/plugin-strip": "^2.0.0",
-    "@size-limit/preset-app": "^4.10.1",
    "@types/css-font-loading-module": "^0.0.4",
    "@types/debug": "^4.1.5",
    "@types/es-module-lexer": "^0.3.0",
@@ -73,7 +72,6 @@
    "rollup-plugin-typescript2": "^0.29.0",
    "rollup-plugin-vue": "^6.0.0",
    "semver": "^7.3.4",
-    "size-limit": "^4.10.1",
    "ts-jest": "^26.4.4",
    "typescript": "~4.1.3",
    "vite": "^2.2.4",

--- a/packages/global.d.ts
+++ b/packages/global.d.ts
@@ -6,6 +6,11 @@ declare var __PLATFORM__: UniApp.PLATFORM
 declare var __PLATFORM_PREFIX__: 'wx' | 'qq' | 'my' | 'swan' | 'tt' | 'qa'
 declare var __GLOBAL__: Record<string, any>
+// importMeta(es|cjs)
+declare var __IMPORT_META_ENV_BASE_URL__:
+  | 'import.meta.env.BASE_URL'
+  | '__IMPORT_META_ENV_BASE_URL__'
 // Global compile-time constants
 declare var __DEV__: boolean
 declare var __TEST__: boolean

--- a/packages/playground/ssr/src/manifest.json
+++ b/packages/playground/ssr/src/manifest.json
 {
-    "name" : "hello",
+  "name": "hello",
-    "appid" : "__UNI__4DCD124",
+  "appid": "__UNI__4DCD124",
-    "description" : "",
+  "description": "",
-    "versionName" : "1.0.0",
+  "versionName": "1.0.0",
-    "versionCode" : "100",
+  "versionCode": "100",
-    "transformPx" : false,
+  "transformPx": false,
-    /* 5+App特有相关 */
+  /* 5+App特有相关 */
-    "app-plus" : {
+  "app-plus": {
-        "usingComponents" : true,
+    "usingComponents": true,
-		"nvueStyleCompiler" : "uni-app",
+    "nvueStyleCompiler": "uni-app",
-        "compilerVersion" : 3,
+    "compilerVersion": 3,
-        "splashscreen" : {
+    "splashscreen": {
-            "alwaysShowBeforeRender" : true,
+      "alwaysShowBeforeRender": true,
-            "waiting" : true,
+      "waiting": true,
-            "autoclose" : true,
+      "autoclose": true,
-            "delay" : 0
+      "delay": 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {}
-        }
    },
-    /* 快应用特有相关 */
+    /* 模块配置 */
-    "quickapp" : {},
+    "modules": {},
-    /* 小程序特有相关 */
+    /* 应用发布信息 */
-    "mp-weixin" : {
+    "distribute": {
-        "appid" : "",
+      /* android打包配置 */
-        "setting" : {
+      "android": {
-            "urlCheck" : false
+        "permissions": [
-        },
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-        "usingComponents" : true
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-    },
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-    "mp-alipay" : {
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-        "usingComponents" : true
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-    },
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-    "mp-baidu" : {
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-        "usingComponents" : true
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-    },
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-    "mp-toutiao" : {
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-        "usingComponents" : true
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-    },
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-    "uniStatistics": {  
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-        "enable": false
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+        ]
+      },
+      /* ios打包配置 */
+      "ios": {},
+      /* SDK配置 */
+      "sdkConfigs": {}
    }
+  },
+  /* 快应用特有相关 */
+  "quickapp": {},
+  /* 小程序特有相关 */
+  "mp-weixin": {
+    "appid": "",
+    "setting": {
+      "urlCheck": false
+    },
+    "usingComponents": true
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "uniStatistics": {
+    "enable": false
+  }
 }
--- a/packages/playground/ssr/yarn.lock
+++ b/packages/playground/ssr/yarn.lock
@@ -1917,9 +1917,9 @@ postcss-modules@^4.0.0:
    string-hash "^1.1.1"
 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.5"
+  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz#042d74e137db83e6f294712096cb413f5aa612c4"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
-  integrity sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==
+  integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
  dependencies:
    cssesc "^3.0.0"
    util-deprecate "^1.0.2"

--- a/packages/uni-h5/dist/uni-h5.cjs.js
+++ b/packages/uni-h5/dist/uni-h5.cjs.js
--- a/packages/uni-h5/dist/uni-h5.es.js
+++ b/packages/uni-h5/dist/uni-h5.es.js
--- a/packages/uni-h5/src/platform/dom.ts
+++ b/packages/uni-h5/src/platform/dom.ts
 import { ComponentPublicInstance } from 'vue'
 import { getRealRoute } from '@dcloudio/uni-core'
+declare global {
+  interface ImportMeta {
+    env: {
+      BASE_URL: string
+    }
+  }
+}
 export function findElem(vm: ComponentPublicInstance) {
  return vm.$el
 }
@@ -8,18 +16,9 @@ export function findElem(vm: ComponentPublicInstance) {
 const SCHEME_RE = /^([a-z-]+:)?\/\//i
 const DATA_RE = /^data:.*,.*/
+const baseUrl = __IMPORT_META_ENV_BASE_URL__
 function addBase(filePath: string) {
-  const base = __uniConfig.router.base
+  return baseUrl + filePath
-  if (!base) {
-    return filePath
-  }
-  if (base !== '/') {
-    // 部分地址已经带了base(如被webpack处理过的资源自动带了publicPath)
-    if (('/' + filePath).indexOf(base) === 0) {
-      return '/' + filePath
-    }
-  }
-  return base + filePath
 }
 export function getRealPath(filePath: string) {

--- a/packages/uni-h5/vite.config.ts
+++ b/packages/uni-h5/vite.config.ts
@@ -30,6 +30,10 @@ const rollupPlugins = [
      defineTaskApi: `/*#__PURE__*/ defineTaskApi`,
      defineSyncApi: `/*#__PURE__*/ defineSyncApi`,
      defineAsyncApi: `/*#__PURE__*/ defineAsyncApi`,
+      __IMPORT_META_ENV_BASE_URL__:
+        FORMAT === 'cjs'
+          ? '__IMPORT_META_ENV_BASE_URL__'
+          : 'import.meta.env.BASE_URL', //直接使用import.meta.env.BASE_URL会被vite替换成'/'
    },
    preventAssignment: true,
  }),
@@ -90,6 +94,7 @@ export default defineConfig({
    vueJsx({ optimize: true, isCustomElement }),
  ],
  build: {
+    target: 'es2020', // keep import.meta...
    emptyOutDir: FORMAT === 'es',
    minify: false,
    lib: {

--- a/packages/vite-plugin-uni/src/cli/server.ts
+++ b/packages/vite-plugin-uni/src/cli/server.ts
@@ -84,8 +84,16 @@ export async function createSSRServer(options: CliOptions & ServerOptions) {
    ? 'https'
    : 'http'
  let port = options.port || serverOptions.port || 3000
-  const hostname = options.host
+  let hostname: string | undefined
+  if (options.host === undefined || options.host === 'localhost') {
+    // Use a secure default
+    hostname = '127.0.0.1'
+  } else if (options.host === true) {
+    // probably passed --host in the CLI, without arguments
+    hostname = undefined // undefined typically means 0.0.0.0 or :: (listen on all IPs)
+  } else {
+    hostname = options.host as string
+  }
  return new Promise((resolve, reject) => {
    const onSuccess = () => {
      const interfaces = os.networkInterfaces()

--- a/packages/vite-plugin-uni/src/config/index.ts
+++ b/packages/vite-plugin-uni/src/config/index.ts
@@ -2,7 +2,7 @@ import path from 'path'
 import { extend } from '@vue/shared'
 import { Plugin, UserConfig } from 'vite'
-import { normalizePath } from '@dcloudio/uni-cli-shared'
+import { normalizePath, parseManifestJsonOnce } from '@dcloudio/uni-cli-shared'
 import { VitePluginUniResolvedOptions } from '..'
 import { createCss } from './css'
@@ -28,7 +28,9 @@ export function createConfig(
    options.inputDir = normalizeInputDir(config)
    options.compiler.init()
    const define = createDefine(options, config, env)
+    const { h5 } = parseManifestJsonOnce(options.inputDir)
    return {
+      base: (h5 && h5.router && h5.router.base) || '',
      define: extend(define, options.compiler.define()),
      resolve: createResolve(options, config),
      optimizeDeps: createOptimizeDeps(options),

--- a/packages/vite-plugin-uni/src/config/server.ts
+++ b/packages/vite-plugin-uni/src/config/server.ts
@@ -5,6 +5,7 @@ export function createServer(
  _options: VitePluginUniResolvedOptions
 ): UserConfig['server'] {
  return {
+    host: true,
    watch: {
      ignored: ['**/uniCloud**'],
    },

--- a/packages/vite-plugin-uni/src/configResolved/config.ts
+++ b/packages/vite-plugin-uni/src/configResolved/config.ts
 import { ResolvedConfig } from 'vite'
-import { isSsr, rewriteSsrNativeTag, rewriteSsrRenderStyle } from '../utils'
+import {
+  isSsr,
+  initSsrDefine,
+  rewriteSsrNativeTag,
+  rewriteSsrRenderStyle,
+} from '../utils'
 // import alias from 'module-alias'
 export function initConfig(config: ResolvedConfig) {
  if (isSsr(config.command, config)) {
+    initSsrDefine(config)
    rewriteSsrNativeTag()
    rewriteSsrRenderStyle(process.env.UNI_INPUT_DIR)
  }

--- a/packages/vite-plugin-uni/src/utils/ssr.ts
+++ b/packages/vite-plugin-uni/src/utils/ssr.ts
 import path from 'path'
 import fs from 'fs-extra'
-import { isString, NormalizedStyle } from '@vue/shared'
+import { extend, isString, NormalizedStyle } from '@vue/shared'
 import {
  isNativeTag,
  createRpx2Unit,
@@ -32,6 +32,10 @@ export function isSsrManifest(
  return false
 }
+export function initSsrDefine(config: ResolvedConfig) {
+  extend(globalThis, { __IMPORT_META_ENV_BASE_URL__: config.env.BASE_URL })
+}
 function serializeDefine(define: Record<string, any>): string {
  let res = `{`
  for (const key in define) {

--- a/yarn.lock
+++ b/yarn.lock