Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js
		
			
				
	
	
		
			13 lines
		
	
	
	
		
			356 B
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			13 lines
		
	
	
	
		
			356 B
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
| const { resolve } = require('path');
 | |
| 
 | |
| const env = process.env.NODE_ENV || 'development';
 | |
| 
 | |
| module.exports = {
 | |
|   test: /\.js$/,
 | |
|   exclude: /node_modules/,
 | |
|   loader: 'babel-loader',
 | |
|   options: {
 | |
|     sourceRoot: 'app/javascript',
 | |
|     cacheDirectory: env === 'development' ? false : resolve(__dirname, '..', '..', '..', 'tmp', 'cache', 'babel-loader'),
 | |
|   },
 | |
| };
 |