diff --git a/packages/uni-template-compiler/lib/template/generate.js b/packages/uni-template-compiler/lib/template/generate.js index 403012a25033bfa927fe5e0f587314e0a72e8313..ef64d58a1fbf1ec460dcd03143314cde3bd019e6 100644 --- a/packages/uni-template-compiler/lib/template/generate.js +++ b/packages/uni-template-compiler/lib/template/generate.js @@ -123,7 +123,7 @@ module.exports = function generate (ast, state) { const replaceCodes = state.options.replaceCodes if (replaceCodes) { Object.keys(replaceCodes).forEach(key => { - code = code.replace(key, replaceCodes[key]) + code = code.replace(new RegExp(key.replace('$', '\\$'), 'g'), replaceCodes[key]) }) } diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js index 86f20563123c1758a7583c954bd4a379d9a0d3a2..ce2b0c3b4d8d97c5360a2d8c96b41af00440a370 100644 --- a/packages/vue-cli-plugin-uni/lib/env.js +++ b/packages/vue-cli-plugin-uni/lib/env.js @@ -264,6 +264,10 @@ if (process.env.UNI_USING_V3 && process.env.UNI_PLATFORM === 'app-plus') { moduleAlias.addAlias('vue-style-loader', '@dcloudio/vue-cli-plugin-uni/packages/app-vue-style-loader') } +if (process.env.UNI_PLATFORM === 'h5') { + moduleAlias.addAlias('vue-style-loader', '@dcloudio/vue-cli-plugin-uni/packages/h5-vue-style-loader') +} + // vue cache if ( // 非 h5 ,非 v3,非 native process.env.UNI_PLATFORM !== 'h5' && diff --git a/packages/vue-cli-plugin-uni/packages/vue-template-compiler/index.js b/packages/vue-cli-plugin-uni/packages/vue-template-compiler/index.js index dcc7e6cbe9c045048b5aa04b2b17c2c8bb06b362..81b4a1205c3d04a4d1b7596459c3cffdc4c250c0 100644 --- a/packages/vue-cli-plugin-uni/packages/vue-template-compiler/index.js +++ b/packages/vue-cli-plugin-uni/packages/vue-template-compiler/index.js @@ -1,20 +1,20 @@ -try { - var vueVersion = require('vue').version -} catch (e) {} +// try { +// var vueVersion = require('vue').version +// } catch (e) {} -var packageName = require('./package.json').name -var packageVersion = require('./package.json').version -if (vueVersion && vueVersion !== packageVersion) { - var vuePath = require.resolve('vue') - var packagePath = require.resolve('./package.json') - throw new Error( - '\n\nVue packages version mismatch:\n\n' + - '- vue@' + vueVersion + ' (' + vuePath + ')\n' + - '- ' + packageName + '@' + packageVersion + ' (' + packagePath + ')\n\n' + - 'This may cause things to work incorrectly. Make sure to use the same version for both.\n' + - 'If you are using vue-loader@>=10.0, simply update vue-template-compiler.\n' + - 'If you are using vue-loader@<10.0 or vueify, re-installing vue-loader/vueify should bump ' + packageName + ' to the latest.\n' - ) -} +// var packageName = require('./package.json').name +// var packageVersion = require('./package.json').version +// if (vueVersion && vueVersion !== packageVersion) { +// var vuePath = require.resolve('vue') +// var packagePath = require.resolve('./package.json') +// throw new Error( +// '\n\nVue packages version mismatch:\n\n' + +// '- vue@' + vueVersion + ' (' + vuePath + ')\n' + +// '- ' + packageName + '@' + packageVersion + ' (' + packagePath + ')\n\n' + +// 'This may cause things to work incorrectly. Make sure to use the same version for both.\n' + +// 'If you are using vue-loader@>=10.0, simply update vue-template-compiler.\n' + +// 'If you are using vue-loader@<10.0 or vueify, re-installing vue-loader/vueify should bump ' + packageName + ' to the latest.\n' +// ) +// } module.exports = require('./build')