Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes
		
			
				
	
	
		
			31 lines
		
	
	
		
			857 B
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			31 lines
		
	
	
		
			857 B
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
module.exports = {
 | 
						|
  projects: [
 | 
						|
    '<rootDir>/app/javascript/mastodon',
 | 
						|
  ],
 | 
						|
  testPathIgnorePatterns: [
 | 
						|
    '<rootDir>/node_modules/',
 | 
						|
    '<rootDir>/vendor/',
 | 
						|
    '<rootDir>/config/',
 | 
						|
    '<rootDir>/log/',
 | 
						|
    '<rootDir>/public/',
 | 
						|
    '<rootDir>/tmp/',
 | 
						|
    '<rootDir>/app/javascript/themes/',
 | 
						|
  ],
 | 
						|
  setupFiles: [
 | 
						|
    'raf/polyfill',
 | 
						|
  ],
 | 
						|
  setupTestFrameworkScriptFile: '<rootDir>/app/javascript/mastodon/test_setup.js',
 | 
						|
  collectCoverageFrom: [
 | 
						|
    'app/javascript/mastodon/**/*.js',
 | 
						|
    '!app/javascript/mastodon/features/emoji/emoji_compressed.js',
 | 
						|
    '!app/javascript/mastodon/locales/locale-data/*.js',
 | 
						|
    '!app/javascript/mastodon/service_worker/entry.js',
 | 
						|
    '!app/javascript/mastodon/test_setup.js',
 | 
						|
  ],
 | 
						|
  coverageDirectory: '<rootDir>/coverage',
 | 
						|
  moduleDirectories: [
 | 
						|
    '<rootDir>/node_modules',
 | 
						|
    '<rootDir>/app/javascript',
 | 
						|
  ],
 | 
						|
};
 |