Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb
		
			
				
	
	
		
			19 lines
		
	
	
		
			561 B
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			19 lines
		
	
	
		
			561 B
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
| const { resolve } = require('path');
 | |
| 
 | |
| const env = process.env.NODE_ENV || 'development';
 | |
| 
 | |
| module.exports = {
 | |
|   test: /\.js$/,
 | |
|   // include react-intl because transform-react-remove-prop-types needs to apply to it
 | |
|   exclude: {
 | |
|     test: /node_modules/,
 | |
|     exclude: /react-intl[\/\\](?!locale-data)/,
 | |
|   },
 | |
|   loader: 'babel-loader',
 | |
|   options: {
 | |
|     forceEnv: process.env.NODE_ENV || 'development',
 | |
|     sourceRoot: 'app/javascript',
 | |
|     cacheDirectory: env === 'development' ? false : resolve(__dirname, '..', '..', '..', 'tmp', 'cache', 'babel-loader'),
 | |
|   },
 | |
| };
 |