Merge branch 'fix-pipelines' into 'develop'
Fix pipelines and clean up console output See merge request pleroma/pleroma-fe!804
This commit is contained in:
commit
233506f6c1
3 changed files with 3 additions and 7 deletions
|
@ -58,7 +58,5 @@ exports.cssLoaders = function (options) {
|
||||||
|
|
||||||
// Generate loaders for standalone style files (outside of .vue)
|
// Generate loaders for standalone style files (outside of .vue)
|
||||||
exports.styleLoaders = function (options) {
|
exports.styleLoaders = function (options) {
|
||||||
var output = exports.cssLoaders(options)
|
return exports.cssLoaders(options)
|
||||||
console.log(output)
|
|
||||||
return output
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,8 +14,6 @@ let commitHash = require('child_process')
|
||||||
.execSync('git rev-parse --short HEAD')
|
.execSync('git rev-parse --short HEAD')
|
||||||
.toString();
|
.toString();
|
||||||
|
|
||||||
console.log(commitHash)
|
|
||||||
|
|
||||||
var webpackConfig = merge(baseWebpackConfig, {
|
var webpackConfig = merge(baseWebpackConfig, {
|
||||||
mode: 'production',
|
mode: 'production',
|
||||||
module: {
|
module: {
|
||||||
|
|
|
@ -322,9 +322,9 @@ describe('API Entities normalizer', () => {
|
||||||
|
|
||||||
describe('MastoAPI emoji adder', () => {
|
describe('MastoAPI emoji adder', () => {
|
||||||
const emojis = makeMockEmojiMasto()
|
const emojis = makeMockEmojiMasto()
|
||||||
const imageHtml = '<img src="https://example.com/image.png" alt="image" class="emoji" />'
|
const imageHtml = '<img src="https://example.com/image.png" alt="image" title="image" class="emoji" />'
|
||||||
.replace(/"/g, '\'')
|
.replace(/"/g, '\'')
|
||||||
const thinkHtml = '<img src="https://example.com/think.png" alt="thinking" class="emoji" />'
|
const thinkHtml = '<img src="https://example.com/think.png" alt="thinking" title="thinking" class="emoji" />'
|
||||||
.replace(/"/g, '\'')
|
.replace(/"/g, '\'')
|
||||||
|
|
||||||
it('correctly replaces shortcodes in supplied string', () => {
|
it('correctly replaces shortcodes in supplied string', () => {
|
||||||
|
|
Loading…
Reference in a new issue