From 97c3930235fb3466b26502914f0579dc5faea65e Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Mon, 26 Jul 2021 15:30:09 +0800 Subject: [PATCH] fix: alias --- packages/uni-cli-shared/src/easycom.ts | 4 ++-- packages/uni-h5/dist/uni-h5.cjs.js | 4 ++-- packages/uni-h5/dist/uni-h5.es.js | 12 ++++++------ packages/uni-h5/vite.config.ts | 3 +++ packages/vite-plugin-uni/src/config/resolve.ts | 16 ++++++++++++---- packages/vite-plugin-uni/src/index.ts | 4 ++-- 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/packages/uni-cli-shared/src/easycom.ts b/packages/uni-cli-shared/src/easycom.ts index d10a4c3c2..e8e2e64ac 100644 --- a/packages/uni-cli-shared/src/easycom.ts +++ b/packages/uni-cli-shared/src/easycom.ts @@ -172,13 +172,13 @@ function initAutoScanEasycom( if (!isDir(folder)) { return } - const importDir = slash(path.relative(rootDir, folder)) + const importDir = slash(folder) const files = fs.readdirSync(folder) // 读取文件夹文件列表，比对文件名（fs.existsSync在大小写不敏感的系统会匹配不准确） for (let i = 0; i < extensions.length; i++) { const ext = extensions[i] if (files.includes(name + ext)) { - easycoms[`^${name}$`] = `@/${importDir}/${name}${ext}` + easycoms[`^${name}$`] = `${importDir}/${name}${ext}` break } } diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js index e5ce54d6f..1da8e8a44 100644 --- a/packages/uni-h5/dist/uni-h5.cjs.js +++ b/packages/uni-h5/dist/uni-h5.cjs.js @@ -9643,7 +9643,7 @@ const setNavigationBarTitle = /* @__PURE__ */ defineAsyncApi(API_SET_NAVIGATION_ }, SetNavigationBarTitleProtocol); require("localstorage-polyfill"); global.XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; -var api = /* @__PURE__ */ Object.freeze({ +var api = { __proto__: null, [Symbol.toStringTag]: "Module", setNavigationBarTitle, @@ -9659,7 +9659,7 @@ var api = /* @__PURE__ */ Object.freeze({ getStorageInfoSync, getStorageInfo, getSystemInfoSync -}); +}; const uni$1 = api; const UniServiceJSBridge$1 = /* @__PURE__ */ shared.extend(ServiceJSBridge, { publishHandler(event, args, pageId) { diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index 3e47791e5..290136645 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -1177,12 +1177,12 @@ function normalizeTouchEvent(touches, top) { } return res; } -var instance = /* @__PURE__ */ Object.freeze({ +var instance = { __proto__: null, [Symbol.toStringTag]: "Module", $nne, createNativeEvent -}); +}; const CLASS_RE = /^\s+|\s+$/g; const WXS_CLASS_RE = /\s+/; function getWxsClsArr(clsArr, classList, isAdd) { @@ -1456,7 +1456,7 @@ function selectComponent(selector) { function selectAllComponents(selector) { return querySelectorAll(this, selector); } -var wxInstance = /* @__PURE__ */ Object.freeze({ +var wxInstance = { __proto__: null, [Symbol.toStringTag]: "Module", createSelectorQuery: createSelectorQuery$1, @@ -1464,7 +1464,7 @@ var wxInstance = /* @__PURE__ */ Object.freeze({ createIntersectionObserver: createIntersectionObserver$1, selectComponent, selectAllComponents -}); +}; function getOpenerEventChannel() { { if (this.$route) { @@ -18977,7 +18977,7 @@ const API_LOGIN = "login"; const login = /* @__PURE__ */ defineAsyncApi(API_LOGIN, createUnsupportedAsyncApi(API_LOGIN)); const API_GET_PROVIDER = "getProvider"; const getProvider = /* @__PURE__ */ defineAsyncApi(API_GET_PROVIDER, createUnsupportedAsyncApi(API_GET_PROVIDER)); -var api = /* @__PURE__ */ Object.freeze({ +var api = { __proto__: null, [Symbol.toStringTag]: "Module", upx2px, @@ -19119,7 +19119,7 @@ var api = /* @__PURE__ */ Object.freeze({ addPhoneContact, login, getProvider -}); +}; const CONTEXT_ID = "MAP_LOCATION"; const ICON_PATH = "data:image/png;base64,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"; var MapLocation = /* @__PURE__ */ defineSystemComponent({ diff --git a/packages/uni-h5/vite.config.ts b/packages/uni-h5/vite.config.ts index 390c14e6c..1a54798bf 100644 --- a/packages/uni-h5/vite.config.ts +++ b/packages/uni-h5/vite.config.ts @@ -116,6 +116,9 @@ export default defineConfig({ }, assetsDir: '.', rollupOptions: { + output: { + freeze: false, // uni 对象需要可被修改 + }, external(source) { if ( [ diff --git a/packages/vite-plugin-uni/src/config/resolve.ts b/packages/vite-plugin-uni/src/config/resolve.ts index acfad9616..f0b4fd40b 100644 --- a/packages/vite-plugin-uni/src/config/resolve.ts +++ b/packages/vite-plugin-uni/src/config/resolve.ts @@ -1,3 +1,4 @@ +import path from 'path' import { UserConfig } from 'vite' import { EXTNAME_VUE } from '@dcloudio/uni-cli-shared' import { VitePluginUniResolvedOptions } from '..' @@ -7,10 +8,17 @@ export function createResolve( _config: UserConfig ): UserConfig['resolve'] { return { - // alias: { - // '@': '', - // '~@': '', // src: url('~@/static/uni.ttf') format('truetype'); - // }, + // 必须使用alias解析，插件定制的resolveId，不会被应用到css等预处理器中 + alias: [ + // @ts-ignore because @rollup/plugin-alias' type doesn't allow function + // replacement, but its implementation does work with function values. + { + find: /^(~@|@)\/(.*)/, + replacement(_str: string, _$1: string, $2: string) { + return path.resolve(options.inputDir, $2) + }, + }, + ], extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json'].concat( EXTNAME_VUE ), diff --git a/packages/vite-plugin-uni/src/index.ts b/packages/vite-plugin-uni/src/index.ts index a2a9dedf0..6cde3d2eb 100644 --- a/packages/vite-plugin-uni/src/index.ts +++ b/packages/vite-plugin-uni/src/index.ts @@ -14,7 +14,7 @@ import { createConfigResolved } from './configResolved' import { createConfigureServer } from './configureServer' import { initExtraPlugins } from './utils' import { initPluginVueOptions } from './vue' -import { createResolveId } from './resolveId' +// import { createResolveId } from './resolveId' const debugUni = debug('vite:uni:plugin') @@ -93,7 +93,7 @@ export default function uniPlugin( plugins.push({ name: 'vite:uni', config: createConfig(options, uniPlugins), - resolveId: createResolveId(options), + // resolveId: createResolveId(options), configResolved: createConfigResolved(options), configureServer: createConfigureServer(options), }) -- GitLab