Skip to content

Commit dc86d4f

Browse files
songyumengsongyumeng
committed
升级ES6
1 parent 73c9ca2 commit dc86d4f

File tree

405 files changed

+130067
-108919
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

405 files changed

+130067
-108919
lines changed

‎build/webpack.config.leaflet.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,22 @@ module.exports = {
2323
extensions: ['.js', '.json', '.css']
2424
},
2525
externals: {
26-
'echarts': 'echarts',
2726
'leaflet': 'L',
28-
'mapv': 'mapv',
29-
'elasticsearch': 'elasticsearch'
27+
'echarts': 'function(){try{return echarts}catch(e){return {}}}()',
28+
'mapv': "function(){try{return mapv}catch(e){return {}}}()",
29+
'elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()'
3030
},
3131

3232
module: {
3333
rules: [{
34-
test: /MapVRenderer\.js/,
35-
exclude: /node_modules/,
34+
test: /\.js/,
35+
exclude: /node_modules[\/\\]proj4|legacy/,
3636
loader: 'babel-loader',
3737
query: {
38-
presets: ['es2015']
38+
presets: ['es2015'],
39+
plugins: [
40+
'transform-class-properties',
41+
]
3942
}
4043
}, {
4144
test: /\.css$/,

‎build/webpack.config.legacy.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,21 @@ module.exports = {
2121
extensions: ['.js', '.json', '.css']
2222
},
2323
externals: {
24-
'echarts': 'echarts',
25-
'mapv': 'mapv',
26-
'elasticsearch': 'elasticsearch',
24+
'echarts': 'function(){try{return echarts}catch(e){return {}}}()',
25+
'mapv': "function(){try{return mapv}catch(e){return {}}}()",
26+
'elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()',
2727
'../legacy/libs/SuperMap_Basic-8.1.1-15125.js': 'SuperMap',
2828
'../legacy/libs/SuperMap_Visualization-8.1.1-15125.js': 'SuperMap'
2929
},
3030
module: {
3131
rules: [{
3232
test: /\.js/,
33-
exclude: /node_modules/,
3433
loader: 'babel-loader',
3534
query: {
36-
presets: ['es2015']
35+
presets: ['es2015'],
36+
plugins: [
37+
'transform-class-properties',
38+
]
3739
}
3840
}]
3941
},

‎build/webpack.config.mapboxgl.js‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var banner = `
66
license: ${pkg.license}
77
version: v${pkg.version}
88
`;
9+
910
module.exports = {
1011
//页面入口文件配置
1112
entry: {},
@@ -20,20 +21,23 @@ module.exports = {
2021
extensions: ['.js', '.json', '.css']
2122
},
2223
externals: {
23-
'echarts': 'echarts',
24-
'mapbox-gl': 'mapbox-gl',
25-
'mapv': 'mapv',
26-
'elasticsearch': 'elasticsearch'
24+
'echarts': 'function(){try{return echarts}catch(e){return {}}}()',
25+
'mapbox-gl': 'mapboxgl',
26+
'mapv': "function(){try{return mapv}catch(e){return {}}}()",
27+
'elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()'
2728
},
2829

2930
module: {
3031
noParse: /[\/\\]node_modules[\/\\]mapbox-gl[\/\\]dist[\/\\]mapbox-gl\.js$/,
3132
rules: [{
3233
test: /\.js/,
33-
exclude: /node_modules/,
34+
exclude: /legacy/,
3435
loader: 'babel-loader',
3536
query: {
36-
presets: ['es2015']
37+
presets: ['es2015'],
38+
plugins: [
39+
'transform-class-properties',
40+
]
3741
}
3842
}]
3943
},

‎build/webpack.config.openlayers.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,23 @@ module.exports = {
2222
extensions: ['.js', '.json', '.css']
2323
},
2424
externals: {
25-
'echarts': 'echarts',
2625
'openlayers/dist/ol-debug': 'ol',
27-
'mapv': 'mapv',
28-
'elasticsearch': 'elasticsearch'
26+
'echarts': 'function(){try{return echarts}catch(e){return {}}}()',
27+
'mapv': "function(){try{return mapv}catch(e){return {}}}()",
28+
'elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()'
2929
},
3030

3131
module: {
3232
noParse: /[\/\\]node_modules[\/\\]openlayers[\/\\]dist[\/\\]ol\.js$/,
3333
rules: [{
34-
test: /MapvLayer\.js/,
35-
exclude: /node_modules/,
34+
test: /\.js/,
35+
exclude: /legacy/,
3636
loader: 'babel-loader',
3737
query: {
38-
presets: ['es2015']
38+
presets: ['es2015'],
39+
plugins: [
40+
'transform-class-properties',
41+
]
3942
}
4043
}, {
4144
test: /\.css$/,

0 commit comments

Comments
 (0)