mirror of
				https://github.com/fspc/workstand.git
				synced 2025-11-04 00:45:35 -05:00 
			
		
		
		
	Use babel-runtime instead of babel-polyfill.
This commit is contained in:
		
							parent
							
								
									7c2df81c6a
								
							
						
					
					
						commit
						e521abfa17
					
				@ -60,7 +60,7 @@
 | 
				
			|||||||
{% endblock %}
 | 
					{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block scripts %}
 | 
					{% block scripts %}
 | 
				
			||||||
    {% render_bundle 'babelPolyfill' %}
 | 
					{#    {% render_bundle 'babelPolyfill' %}#}
 | 
				
			||||||
    {% if DEBUG %}
 | 
					    {% if DEBUG %}
 | 
				
			||||||
        {% render_bundle 'webpack' %}
 | 
					        {% render_bundle 'webpack' %}
 | 
				
			||||||
    {% endif %}
 | 
					    {% endif %}
 | 
				
			||||||
 | 
				
			|||||||
@ -11,6 +11,7 @@
 | 
				
			|||||||
  "author": "",
 | 
					  "author": "",
 | 
				
			||||||
  "license": "ISC",
 | 
					  "license": "ISC",
 | 
				
			||||||
  "dependencies": {
 | 
					  "dependencies": {
 | 
				
			||||||
 | 
					    "babel-runtime": "^6.23.0",
 | 
				
			||||||
    "isomorphic-fetch": "^2.2.1",
 | 
					    "isomorphic-fetch": "^2.2.1",
 | 
				
			||||||
    "js-cookie": "^2.1.3",
 | 
					    "js-cookie": "^2.1.3",
 | 
				
			||||||
    "json-loader": "^0.5.4",
 | 
					    "json-loader": "^0.5.4",
 | 
				
			||||||
@ -26,8 +27,10 @@
 | 
				
			|||||||
  },
 | 
					  },
 | 
				
			||||||
  "devDependencies": {
 | 
					  "devDependencies": {
 | 
				
			||||||
    "babel": "^6.5.2",
 | 
					    "babel": "^6.5.2",
 | 
				
			||||||
    "babel-core": "^6.9.1",
 | 
					    "babel-cli": "^6.23.0",
 | 
				
			||||||
    "babel-loader": "^6.2.4",
 | 
					    "babel-core": "^6.23.1",
 | 
				
			||||||
 | 
					    "babel-loader": "^6.3.2",
 | 
				
			||||||
 | 
					    "babel-plugin-transform-runtime": "^6.23.0",
 | 
				
			||||||
    "babel-polyfill": "^6.22.0",
 | 
					    "babel-polyfill": "^6.22.0",
 | 
				
			||||||
    "babel-preset-latest": "^6.22.0",
 | 
					    "babel-preset-latest": "^6.22.0",
 | 
				
			||||||
    "babel-preset-react": "^6.5.0",
 | 
					    "babel-preset-react": "^6.5.0",
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,6 @@
 | 
				
			|||||||
const webpack = require('webpack');
 | 
					const webpack = require('webpack');
 | 
				
			||||||
const BundleTracker = require('webpack-bundle-tracker');
 | 
					const BundleTracker = require('webpack-bundle-tracker');
 | 
				
			||||||
const ExtractTextPlugin = require('extract-text-webpack-plugin');
 | 
					const ExtractTextPlugin = require('extract-text-webpack-plugin');
 | 
				
			||||||
require('babel-polyfill');
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
const config = require('./webpack.base.config.js');
 | 
					const config = require('./webpack.base.config.js');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -13,7 +12,6 @@ config.entry = {
 | 
				
			|||||||
  ],
 | 
					  ],
 | 
				
			||||||
  signin: './assets/js/index',
 | 
					  signin: './assets/js/index',
 | 
				
			||||||
  members: './assets/js/members/index',
 | 
					  members: './assets/js/members/index',
 | 
				
			||||||
  babelPolyfill: 'babel-polyfill',
 | 
					 | 
				
			||||||
  bikes: './assets/js/bikes/index',
 | 
					  bikes: './assets/js/bikes/index',
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -38,6 +36,7 @@ config.module.loaders.push(
 | 
				
			|||||||
    loader: 'babel-loader',
 | 
					    loader: 'babel-loader',
 | 
				
			||||||
    query: {
 | 
					    query: {
 | 
				
			||||||
      presets: ['latest', 'react', 'stage-3'],
 | 
					      presets: ['latest', 'react', 'stage-3'],
 | 
				
			||||||
 | 
					      plugins: ['transform-runtime'],
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user