Skip to content

fix(build): 1：windows环境反斜杠导致的几个问题;2：props中使用模板字符串小程序中props中的值会变成"{{"; #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OOMError wants to merge 3 commits into
base: 0.3.x
Choose a base branch
from
Open

fix(build): 1：windows环境反斜杠导致的几个问题;2：props中使用模板字符串小程序中props中的值会变成"{{"; #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed34bf7
fix(build): 1：windows环境反斜杠导致的几个问题;2：props中使用模板字符串小程序中props中的值会变成"{{";
Aug 19, 2020
eb7a0e2
修改mars的mixin与业务代码中的mixin的顺序
OOMError Nov 5, 2020
d556cea
修改mars的mixin与业务代码中的mixin的顺序
OOMError Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/mars-build/src/compiler/file/compileModules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,16 @@ async function compileUIModules(uiModules, destPath) {
const coreEntry = require.resolve(realName + '/mars-core', {
paths: [process.cwd()]
});
const entry = coreEntry.replace('mars-core/index.js', '');
// 获取当前操作系统的路径分隔符，否则windwos环境替换不成功
const entry = coreEntry.replace(`mars-core${path.sep}index.js`, '');
const dest = path.resolve(destPath, modPath);
const coreDestPath = path.resolve(destPath, 'mars-core');
const uiCoreDestPath = path.resolve(dest, 'mars-core');
// 修改windows环境反斜杠为斜杠
const coreRelativePath = path.relative(
uiCoreDestPath,
coreDestPath
);
).replace(/\\/g, '/');
if (fs.existsSync(uiCoreDestPath + '/index.js')) {
return;
}
Expand Down
3 changes: 2 additions & 1 deletion packages/mars-build/src/gulp-mars-h5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ async function compile(file, opt) {
}

// 持续集成 main.js pageTitleMap
let filePathKey = rPath.replace(/\.vue$/, '');
// windwos环境下的反斜杠替换为斜杠，否则输出的pageTitleMap为空
let filePathKey = rPath.replace(/\.vue$/, '').replace(/\\/g, '/');
const isComp = config.component;
if (!isComp) {
pagesInfo[filePathKey] = config;
Expand Down
3 changes: 2 additions & 1 deletion packages/mars-core/src/base/createComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import config from '../config';

export function makeVueCompCreator(getCompMixin) {
return function vueCompCreator(options) {
options.mixins = [getCompMixin(options)];
// 如果 options(vue组件的代码)中已有 mixins，则同时保留 options中的 mixins
options.mixins = [getCompMixin(options), ...options.mixins || []];
return options;
};
}
Expand Down
3 changes: 2 additions & 1 deletion packages/mars-core/src/base/createPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ export function makeCreatePage(pageMixin, {handleProxy, handleModel}, setData, c
$api
}) {
return function (options) {
options.mixins = [pageMixin];
// 如果 options(vue页面的代码)中已有 mixins，则同时保留 options中的 mixins
options.mixins = [pageMixin, ...options.mixins || []];

let initData = typeof options.data === 'function' ? options.data.call({
$api
Expand Down