Skip to content

U
uni-app

yangkaifeng / uni-app
与 Fork 源项目一致

Fork自 DCloud / uni-app

通知 3
Star 1
Fork 0
U
uni-app

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 a391cdaf 编写于 作者: fxy060608's avatar fxy060608
浏览文件
操作

wip(app): uni-app-vite

上级 cb81e195
展开全部 隐藏空白更改
内联 并排
Showing with 20682 addition and 106 deletion
packages/shims-uni-app.d.ts
浏览文件 @ a391cdaf
...@@ -148,6 +148,7 @@ declare namespace UniApp { ...@@ -148,6 +148,7 @@ declare namespace UniApp {
navigationBar: PageNavigationBar navigationBar: PageNavigationBar
refreshOptions?: PageRefreshOptions refreshOptions?: PageRefreshOptions
onReachBottomDistance?: number onReachBottomDistance?: number
pageOrientation?: 'auto' | 'portrait' | 'landscape'
} }
interface PageRouteMeta extends PagesJsonPageStyle { interface PageRouteMeta extends PagesJsonPageStyle {
id?: number id?: number
...@@ -194,6 +195,10 @@ declare namespace UniApp { ...@@ -194,6 +195,10 @@ declare namespace UniApp {
[name: string]: string [name: string]: string
} }
} }
condition?: {
current?: number
list?: { name?: string; path: string; query?: string }[]
}
} }
interface TabBarItemBaseOptions { interface TabBarItemBaseOptions {
......
packages/uni-app-plus/dist/uni-app-view.umd.js
浏览文件 @ a391cdaf
...@@ -705,7 +705,7 @@ ...@@ -705,7 +705,7 @@
} }
}; };
} }
const ServiceJSBridge = /* @__PURE__ */ extend(initBridge("service"), { /* @__PURE__ */ extend(initBridge("service"), {
invokeOnCallback(name, res) { invokeOnCallback(name, res) {
return UniServiceJSBridge.emit("api." + name, res); return UniServiceJSBridge.emit("api." + name, res);
} }
...@@ -1489,20 +1489,8 @@ ...@@ -1489,20 +1489,8 @@
resetSize resetSize
}; };
} }
const canvasEventCallbacks = createCallbacks("canvasEvent"); createCallbacks("canvasEvent");
ServiceJSBridge.subscribe("onCanvasMethodCallback", ({ callbackId, data }) => { createCallbacks("getSelectedTextRangeEvent");
const callback = canvasEventCallbacks.pop(callbackId);
if (callback) {
callback(data);
}
});
const getSelectedTextRangeEventCallbacks = createCallbacks("getSelectedTextRangeEvent");
ServiceJSBridge.subscribe && ServiceJSBridge.subscribe("onGetSelectedTextRange", ({ callbackId, data }) => {
const callback = getSelectedTextRangeEventCallbacks.pop(callbackId);
if (callback) {
callback(data);
}
});
function _isSlot(s) { function _isSlot(s) {
return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s); return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
} }
......
packages/uni-app-vite/dist/index.js
浏览文件 @ a391cdaf
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
const plugin_1 = require("./plugin"); const plugin_1 = require("./plugin");
const copy_1 = require("./plugins/copy");
const mainJs_1 = require("./plugins/mainJs"); const mainJs_1 = require("./plugins/mainJs");
const manifestJson_1 = require("./plugins/manifestJson"); const manifestJson_1 = require("./plugins/manifestJson");
const pagesJson_1 = require("./plugins/pagesJson"); const pagesJson_1 = require("./plugins/pagesJson");
exports.default = [ exports.default = [
copy_1.uniCopyPlugin(),
mainJs_1.uniMainJsPlugin(), mainJs_1.uniMainJsPlugin(),
manifestJson_1.uniManifestJsonPlugin(), manifestJson_1.uniManifestJsonPlugin(),
pagesJson_1.uniPagesJsonPlugin(), pagesJson_1.uniPagesJsonPlugin(),
......
packages/uni-app-vite/dist/plugins/copy.js 0 → 100644
浏览文件 @ a391cdaf
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.uniCopyPlugin = void 0;
const path_1 = __importDefault(require("path"));
const slash_1 = __importDefault(require("slash"));
const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared");
function uniCopyPlugin() {
return uni_cli_shared_1.uniViteCopyPlugin({
targets: [
{
src: slash_1.default(path_1.default.resolve(__dirname, '../../lib/template/')),
dest: process.env.UNI_OUTPUT_DIR,
},
{
src: slash_1.default(require.resolve('@dcloudio/uni-app-plus/dist/style.css')),
dest: process.env.UNI_OUTPUT_DIR,
},
{
src: slash_1.default(require.resolve('@dcloudio/uni-app-plus/dist/uni-app-view.umd.js')),
dest: process.env.UNI_OUTPUT_DIR,
},
],
hook: 'writeBundle',
verbose: process.env.DEBUG ? true : false,
});
}
exports.uniCopyPlugin = uniCopyPlugin;
packages/uni-app-vite/lib/template/__uniapppicker.js 0 → 100644
浏览文件 @ a391cdaf
此差异已折叠。
packages/uni-app-vite/lib/template/__uniappquill.js 0 → 100644
浏览文件 @ a391cdaf
此差异已折叠。
packages/uni-app-vite/lib/template/__uniappscan.js 0 → 100644
浏览文件 @ a391cdaf
此差异已折叠。
packages/uni-app-vite/lib/template/__uniappview.html 0 → 100644
浏览文件 @ a391cdaf
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>View</title>
<link rel="stylesheet" href="style.css" />
</head>
<body>
<div id="app"></div>
<script src="uni-app-view.umd.js"></script>
</body>
</html>
packages/uni-app-vite/package.json
浏览文件 @ a391cdaf
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
"files": [ "files": [
"dist/**/*.js", "dist/**/*.js",
"dist/**/*.d.ts" "dist/**/*.d.ts",
"lib"
], ],
"repository": { "repository": {
"type": "git", "type": "git",
......
packages/uni-app-vite/src/index.ts
浏览文件 @ a391cdaf
import { UniAppPlugin } from './plugin' import { UniAppPlugin } from './plugin'
import { uniCopyPlugin } from './plugins/copy'
import { uniMainJsPlugin } from './plugins/mainJs' import { uniMainJsPlugin } from './plugins/mainJs'
import { uniManifestJsonPlugin } from './plugins/manifestJson' import { uniManifestJsonPlugin } from './plugins/manifestJson'
import { uniPagesJsonPlugin } from './plugins/pagesJson' import { uniPagesJsonPlugin } from './plugins/pagesJson'
export default [ export default [
uniCopyPlugin(),
uniMainJsPlugin(), uniMainJsPlugin(),
uniManifestJsonPlugin(), uniManifestJsonPlugin(),
uniPagesJsonPlugin(), uniPagesJsonPlugin(),
......
packages/uni-app-vite/src/plugins/copy.ts 0 → 100644
浏览文件 @ a391cdaf
import path from 'path'
import slash from 'slash'
import { uniViteCopyPlugin } from '@dcloudio/uni-cli-shared'
export function uniCopyPlugin() {
return uniViteCopyPlugin({
targets: [
{
src: slash(path.resolve(__dirname, '../../lib/template/')),
dest: process.env.UNI_OUTPUT_DIR,
},
{
src: slash(require.resolve('@dcloudio/uni-app-plus/dist/style.css')),
dest: process.env.UNI_OUTPUT_DIR,
},
{
src: slash(
require.resolve('@dcloudio/uni-app-plus/dist/uni-app-view.umd.js')
),
dest: process.env.UNI_OUTPUT_DIR,
},
],
hook: 'writeBundle',
verbose: process.env.DEBUG ? true : false,
})
}
packages/uni-cli-shared/package.json
浏览文件 @ a391cdaf
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"jsonc-parser": "^3.0.0", "jsonc-parser": "^3.0.0",
"merge": "^2.1.1", "merge": "^2.1.1",
"rollup-plugin-copy": "^3.4.0",
"slash": "^3.0.0", "slash": "^3.0.0",
"tapable": "^2.2.0", "tapable": "^2.2.0",
"xregexp": "3.1.0" "xregexp": "3.1.0"
......
packages/uni-cli-shared/src/json/app/manifest/arguments.ts
浏览文件 @ a391cdaf
export function initArguments( export function initArguments(
manifestJson: Record<string, any>, manifestJson: Record<string, any>,
pagesJson: Record<string, any> pagesJson: UniApp.PagesJson
) { ) {
if (process.env.NODE_ENV !== 'development') { if (process.env.NODE_ENV !== 'development') {
return return
} }
// 指定了入口
if (process.env.UNI_CLI_LAUNCH_PAGE_PATH) {
manifestJson.plus.arguments = JSON.stringify({
path: process.env.UNI_CLI_LAUNCH_PAGE_PATH,
query: process.env.UNI_CLI_LAUNCH_PAGE_QUERY,
})
return
}
const condition = pagesJson.condition const condition = pagesJson.condition
if (condition && Array.isArray(condition.list) && condition.list.length) { if (condition && condition.list?.length) {
const list = condition.list const list = condition.list
let current = parseInt(condition.current) || 0 let current = condition.current || 0
if (current < 0) { if (current < 0) {
current = 0 current = 0
} }
......
packages/uni-cli-shared/src/json/app/manifest/confusion.ts 0 → 100644
浏览文件 @ a391cdaf
import path from 'path'
export function initConfusion(manifestJson: Record<string, any>) {
if (!manifestJson.plus.confusion?.resources) {
return
}
const resources = manifestJson.plus.confusion.resources as Record<
string,
string
>
manifestJson.plus.confusion.resources = Object.keys(resources).reduce(
(res, name) => {
const extname = path.extname(name)
if (extname === '.nvue') {
res[name.replace('.nvue', '.js')] = resources[name]
} else if (extname === '.js') {
// 仅指定目录的js允许加密
if (
name.indexOf('hybrid/html') === 0 ||
name.indexOf('static/') === 0 ||
name.indexOf('/static/') !== -1 // subpackages, uni_modules 中的 static 目录
) {
res[name] = resources[name]
}
} else {
throw new Error(`原生混淆仅支持 nvue 页面，错误的页面路径：${name}`)
}
// TODO 旧编译器会检查要加密的 nvue 页面（包括subnvue）是否被使用？后续有时间再考虑支持吧，意义不太大
return res
},
{} as Record<string, string>
)
}
packages/uni-cli-shared/src/json/app/manifest/defaultManifestJson.ts
浏览文件 @ a391cdaf
...@@ -15,7 +15,6 @@ const defaultManifestJson = `{ ...@@ -15,7 +15,6 @@ const defaultManifestJson = `{
"code": "" "code": ""
}, },
"description": "", "description": "",
"launch_path": "__uniappservice.html",
"developer": { "developer": {
"name": "", "name": "",
"email": "", "email": "",
......
packages/uni-cli-shared/src/json/app/manifest/index.ts
浏览文件 @ a391cdaf
...@@ -6,20 +6,29 @@ import { initNVue } from './nvue' ...@@ -6,20 +6,29 @@ import { initNVue } from './nvue'
import { initArguments } from './arguments' import { initArguments } from './arguments'
import { initSafearea } from './safearea' import { initSafearea } from './safearea'
import { initSplashscreen } from './splashscreen' import { initSplashscreen } from './splashscreen'
import { initConfusion } from './confusion'
import { initUniApp } from './uniApp'
import { initLaunchwebview } from './launchwebview'
import { initTabBar } from './tabBar'
export function normalizeAppManifestJson( export function normalizeAppManifestJson(
userManifestJson: Record<string, any>, userManifestJson: Record<string, any>,
pagesJson: Record<string, any> pagesJson: UniApp.PagesJson
) { ) {
const manifestJson = initDefaultManifestJson() const manifestJson = initRecursiveMerge(
initAppStatusbar(initDefaultManifestJson(), pagesJson),
userManifestJson
)
initAppStatusbar(manifestJson, pagesJson)
initRecursiveMerge(manifestJson, userManifestJson)
initArguments(manifestJson, pagesJson) initArguments(manifestJson, pagesJson)
initPlus(manifestJson, userManifestJson) initPlus(manifestJson, pagesJson)
initNVue(manifestJson, pagesJson) initNVue(manifestJson, pagesJson)
initSafearea(manifestJson, pagesJson) initSafearea(manifestJson, pagesJson)
initSplashscreen(manifestJson, userManifestJson) initSplashscreen(manifestJson, userManifestJson)
initConfusion(manifestJson)
initUniApp(manifestJson)
initLaunchwebview(manifestJson, pagesJson) // 依赖 initArguments 先执行
initTabBar(manifestJson, pagesJson) // 依赖 initLaunchwebview 先执行
return manifestJson return manifestJson
} }
......
packages/uni-cli-shared/src/json/app/manifest/launchwebview.ts 0 → 100644
浏览文件 @ a391cdaf
import { extend } from '@vue/shared'
export function initLaunchwebview(
manifestJson: Record<string, any>,
pagesJson: UniApp.PagesJson
) {
let entryPagePath = pagesJson.pages[0].path
// 依赖前置执行initArguments
if (manifestJson.plus.arguments) {
try {
const args = JSON.parse(manifestJson.plus.arguments)
if (args.path) {
entryPagePath = args.path
}
} catch (e) {}
}
// 标记入口页，方便后边的 initTabBar 使用
process.env.UNI_ENTRY_PAGE_PATH = entryPagePath
manifestJson.plus.useragent.value = 'uni-app'
manifestJson.launch_path = '__uniappview.html'
extend(manifestJson.plus.launchwebview, {
id: '1',
kernel: 'WKWebview',
})
// TODO 纯原生渲染
// TODO 首页为nvue
// manifestJson.plus.launchwebview.uniNView = {path:'.js'}
// manifestJson.plus.launchwebview.id = '2'
}
packages/uni-cli-shared/src/json/app/manifest/merge.ts
浏览文件 @ a391cdaf
...@@ -3,8 +3,8 @@ import { recursive } from 'merge' ...@@ -3,8 +3,8 @@ import { recursive } from 'merge'
export function initRecursiveMerge( export function initRecursiveMerge(
manifestJson: Record<string, any>, manifestJson: Record<string, any>,
userManifestJson: Record<string, any> userManifestJson: Record<string, any>
) { ): Record<string, any> {
recursive( return recursive(
true, true,
manifestJson, manifestJson,
{ {
......
packages/uni-cli-shared/src/json/app/manifest/nvue.ts
浏览文件 @ a391cdaf
export function initNVue( export function initNVue(
manifestJson: Record<string, any>, manifestJson: Record<string, any>,
pagesJson: Record<string, any> pagesJson: UniApp.PagesJson
) {} ) {}
export function getNVueCompiler(manifestJson: Record<string, any>) { export function getNVueCompiler(manifestJson: Record<string, any>) {
......
packages/uni-cli-shared/src/json/app/manifest/plus.ts
浏览文件 @ a391cdaf
...@@ -11,7 +11,7 @@ const wxPageOrientationMapping = { ...@@ -11,7 +11,7 @@ const wxPageOrientationMapping = {
export function initPlus( export function initPlus(
manifestJson: Record<string, any>, manifestJson: Record<string, any>,
pagesJson: Record<string, any> pagesJson: UniApp.PagesJson
) { ) {
// 转换为老版本配置 // 转换为老版本配置
if (manifestJson.plus.modules) { if (manifestJson.plus.modules) {
...@@ -39,7 +39,7 @@ export function initPlus( ...@@ -39,7 +39,7 @@ export function initPlus(
// app平台优先使用 manifest 配置 // app平台优先使用 manifest 配置
manifestJson.screenOrientation = manifestJson.plus.screenOrientation manifestJson.screenOrientation = manifestJson.plus.screenOrientation
delete manifestJson.plus.screenOrientation delete manifestJson.plus.screenOrientation
} else if (pagesJson.globalStyle && pagesJson.globalStyle.pageOrientation) { } else if (pagesJson.globalStyle?.pageOrientation) {
// 兼容微信小程序 // 兼容微信小程序
const pageOrientationValue = const pageOrientationValue =
wxPageOrientationMapping[ wxPageOrientationMapping[
...@@ -69,4 +69,26 @@ export function initPlus( ...@@ -69,4 +69,26 @@ export function initPlus(
// 允许内联播放视频 // 允许内联播放视频
manifestJson.plus.allowsInlineMediaPlayback = true manifestJson.plus.allowsInlineMediaPlayback = true
if (!manifestJson.plus.distribute) {
manifestJson.plus.distribute = {
plugins: {},
}
}
if (!manifestJson.plus.distribute.plugins) {
manifestJson.plus.distribute.plugins = {}
}
// 录音支持 mp3
manifestJson.plus.distribute.plugins.audio = {
mp3: {
description: 'Android平台录音支持MP3格式文件',
},
}
// 有效值为 close,none
if (!['close', 'none'].includes(manifestJson.plus.popGesture)) {
manifestJson.plus.popGesture = 'close'
}
} }
packages/uni-cli-shared/src/json/app/manifest/safearea.ts
浏览文件 @ a391cdaf
export function initSafearea( export function initSafearea(
manifestJson: Record<string, any>, manifestJson: Record<string, any>,
pagesJson: Record<string, any> pagesJson: UniApp.PagesJson
) { ) {
if ( if (pagesJson.tabBar?.list?.length) {
pagesJson.tabBar &&
pagesJson.tabBar.list &&
pagesJson.tabBar.list.length
) {
// 安全区配置 仅包含 tabBar 的时候才配置 // 安全区配置 仅包含 tabBar 的时候才配置
if (!manifestJson.plus.safearea) { if (!manifestJson.plus.safearea) {
manifestJson.plus.safearea = { manifestJson.plus.safearea = {
......
packages/uni-cli-shared/src/json/app/manifest/statusbar.ts
浏览文件 @ a391cdaf
export function initAppStatusbar( export function initAppStatusbar(
manifestJson: Record<string, any>, manifestJson: Record<string, any>,
pagesJson: Record<string, any> pagesJson: UniApp.PagesJson
) { ) {
const { const { titleColor = '#000', backgroundColor = '#000000' } =
navigationBarTextStyle = 'white', pagesJson.globalStyle?.navigationBar || {}
navigationBarBackgroundColor = '#000000',
} = pagesJson.globalStyle || {}
manifestJson.plus.statusbar = { manifestJson.plus.statusbar = {
immersed: 'supportedDevice', immersed: 'supportedDevice',
style: navigationBarTextStyle === 'black' ? 'dark' : 'light', style: titleColor === '#000' ? 'dark' : 'light',
background: navigationBarBackgroundColor, background: backgroundColor,
} }
return manifestJson
} }
packages/uni-cli-shared/src/json/app/manifest/tabBar.ts 0 → 100644
浏览文件 @ a391cdaf
此差异已折叠。
packages/uni-cli-shared/src/json/app/manifest/uniApp.ts 0 → 100644
浏览文件 @ a391cdaf
此差异已折叠。
packages/uni-cli-shared/src/json/app/pages/uniConfig.ts
浏览文件 @ a391cdaf
...@@ -55,5 +55,6 @@ export function normalizeAppUniConfig( ...@@ -55,5 +55,6 @@ export function normalizeAppUniConfig(
entryPagePath: '', //TODO entryPagePath: '', //TODO
networkTimeout: normalizeNetworkTimeout(manifestJson.networkTimeout), networkTimeout: normalizeNetworkTimeout(manifestJson.networkTimeout),
} }
// TODO 待支持分包
return JSON.stringify(config) return JSON.stringify(config)
} }
packages/uni-cli-shared/src/vite/plugins/copy.ts 0 → 100644
浏览文件 @ a391cdaf
此差异已折叠。
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @ a391cdaf
此差异已折叠。
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @ a391cdaf
此差异已折叠。
yarn.lock
浏览文件 @ a391cdaf
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或