Skip to content

Commit d2ccdeb

Browse files
authored
Merge pull request #289 from metal/release/v2.14.0
Release v2.14.0
2 parents 8fe3762 + 35eb911 commit d2ccdeb

Some content is hidden

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

65 files changed

+9827
-18842
lines changed

.babelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["env"]
3+
}

.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ jdk:
1818

1919
language: java
2020

21-
script: gulp test:saucelabs
21+
script:
22+
- gulp test:saucelabs
23+
- npm run test:isomorphic

gulpfile.js

+16-4
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,17 @@ metal.registerTasks({
4545
base: 'SauceLabs',
4646
browserName: 'chrome'
4747
},
48-
sl_safari: {
48+
sl_safari_8: {
4949
base: 'SauceLabs',
5050
browserName: 'safari',
5151
platform: 'OS X 10.10'
5252
},
53+
sl_safari_10: {
54+
base: 'SauceLabs',
55+
browserName: 'safari',
56+
platform: 'OS X 10.12',
57+
version: '10'
58+
},
5359
sl_firefox: {
5460
base: 'SauceLabs',
5561
browserName: 'firefox'
@@ -72,11 +78,11 @@ metal.registerTasks({
7278
platform: 'Windows 8.1',
7379
version: '11'
7480
},
75-
sl_edge_13: {
81+
sl_edge_15: {
7682
base: 'SauceLabs',
7783
browserName: 'microsoftedge',
7884
platform: 'Windows 10',
79-
version: '13'
85+
version: '15'
8086
},
8187
sl_android_4: {
8288
base: 'SauceLabs',
@@ -102,6 +108,12 @@ gulp.task('soy', function() {
102108
.pipe(gulp.dest('packages/metal-soy/test'));
103109
});
104110

111+
gulp.task('soy:isomorphic', function() {
112+
return gulp.src('packages/metal-isomorphic/test/**/*.soy')
113+
.pipe(compileSoy())
114+
.pipe(gulp.dest('packages/metal-isomorphic/test'));
115+
});
116+
105117
gulp.task('build:cjs', ['soy'], function() {
106118
return compileToLib('packages/metal*/src/**/*.js');
107119
});
@@ -142,7 +154,7 @@ function calcDestDir(file) {
142154
function compileToLib(src) {
143155
return gulp.src(src)
144156
.pipe(babel({
145-
presets: ['es2015']
157+
presets: ['env']
146158
}))
147159
.pipe(gulp.dest(calcDestDir));
148160
}

karma-coverage.conf.js

+21-5
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,23 @@ module.exports = function(config) {
2828
served: true
2929
},
3030
{
31-
pattern: 'packages/metal-soy/node_modules/html2incdom/lib/*.js',
31+
pattern: 'packages/metal-web-component/node_modules/babel-polyfill/dist/polyfill.min.js',
32+
watched: false,
33+
included: true,
34+
served: true
35+
},
36+
{
37+
pattern: 'packages/metal-web-component/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js',
38+
watched: false,
39+
included: false,
40+
served: true
41+
},
42+
{
43+
pattern: 'packages/metal-web-component/webcomponents_polyfill.js',
3244
watched: false,
3345
included: true,
3446
served: true
3547
},
36-
3748
{
3849
pattern: 'packages/metal*/test/**/*.js',
3950
watched: false,
@@ -48,11 +59,12 @@ module.exports = function(config) {
4859
}
4960
],
5061

62+
exclude: ['packages/metal-isomorphic/**/*.js'],
63+
5164
preprocessors: {
5265
'packages/metal-incremental-dom/src/incremental-dom.js': ['browserify'],
5366
'packages/metal-incremental-dom/lib/incremental-dom.js': ['browserify'],
5467
'packages/metal-soy-bundle/lib/bundle.js': ['browserify'],
55-
'packages/metal-soy/node_modules/html2incdom/lib/*.js': ['browserify'],
5668
'packages/metal*/test/**/*.js': ['browserify']
5769
},
5870

@@ -64,8 +76,12 @@ module.exports = function(config) {
6476
[
6577
'babelify',
6678
{
67-
plugins: ['istanbul'],
68-
presets: ['es2015']
79+
plugins: [
80+
'istanbul'
81+
],
82+
presets: [
83+
'env'
84+
]
6985
}
7086
]
7187
],

karma-sauce.conf.js

+23-4
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,23 @@ module.exports = function(config) {
2828
served: true
2929
},
3030
{
31-
pattern: 'packages/metal-soy/node_modules/html2incdom/lib/*.js',
31+
pattern: 'packages/metal-web-component/node_modules/babel-polyfill/dist/polyfill.min.js',
32+
watched: false,
33+
included: true,
34+
served: true
35+
},
36+
{
37+
pattern: 'packages/metal-web-component/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js',
38+
watched: false,
39+
included: false,
40+
served: true
41+
},
42+
{
43+
pattern: 'packages/metal-web-component/webcomponents_polyfill.js',
3244
watched: false,
3345
included: true,
3446
served: true
3547
},
36-
3748
{
3849
pattern: 'packages/metal*/test/**/*.js',
3950
watched: false,
@@ -48,11 +59,12 @@ module.exports = function(config) {
4859
}
4960
],
5061

62+
exclude: ['packages/metal-isomorphic/**/*.js'],
63+
5164
preprocessors: {
5265
'packages/metal-incremental-dom/src/incremental-dom.js': ['browserify'],
5366
'packages/metal-incremental-dom/lib/incremental-dom.js': ['browserify'],
5467
'packages/metal-soy/node_modules/metal-soy-bundle/lib/bundle.js': ['browserify'],
55-
'packages/metal-soy/node_modules/html2incdom/lib/*.js': ['browserify'],
5668
'packages/metal*/test/**/*.js': ['browserify']
5769
},
5870

@@ -61,7 +73,14 @@ module.exports = function(config) {
6173
browserify: {
6274
debug: true,
6375
transform: [
64-
['babelify', {presets: ['es2015']}]
76+
[
77+
'babelify',
78+
{
79+
presets: [
80+
'env'
81+
]
82+
}
83+
]
6584
],
6685
insertGlobalVars: {
6786
METAL_VERSION: function() {

0 commit comments

Comments
 (0)