Skip to content

Commit

Permalink
Merge pull request #289 from metal/release/v2.14.0
Browse files Browse the repository at this point in the history
Release v2.14.0
  • Loading branch information
jbalsas authored Nov 2, 2017
2 parents 8fe3762 + 35eb911 commit d2ccdeb
Show file tree
Hide file tree
Showing 65 changed files with 9,827 additions and 18,842 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["env"]
}
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ jdk:

language: java

script: gulp test:saucelabs
script:
- gulp test:saucelabs
- npm run test:isomorphic
20 changes: 16 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,17 @@ metal.registerTasks({
base: 'SauceLabs',
browserName: 'chrome'
},
sl_safari: {
sl_safari_8: {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.10'
},
sl_safari_10: {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.12',
version: '10'
},
sl_firefox: {
base: 'SauceLabs',
browserName: 'firefox'
Expand All @@ -72,11 +78,11 @@ metal.registerTasks({
platform: 'Windows 8.1',
version: '11'
},
sl_edge_13: {
sl_edge_15: {
base: 'SauceLabs',
browserName: 'microsoftedge',
platform: 'Windows 10',
version: '13'
version: '15'
},
sl_android_4: {
base: 'SauceLabs',
Expand All @@ -102,6 +108,12 @@ gulp.task('soy', function() {
.pipe(gulp.dest('packages/metal-soy/test'));
});

gulp.task('soy:isomorphic', function() {
return gulp.src('packages/metal-isomorphic/test/**/*.soy')
.pipe(compileSoy())
.pipe(gulp.dest('packages/metal-isomorphic/test'));
});

gulp.task('build:cjs', ['soy'], function() {
return compileToLib('packages/metal*/src/**/*.js');
});
Expand Down Expand Up @@ -142,7 +154,7 @@ function calcDestDir(file) {
function compileToLib(src) {
return gulp.src(src)
.pipe(babel({
presets: ['es2015']
presets: ['env']
}))
.pipe(gulp.dest(calcDestDir));
}
26 changes: 21 additions & 5 deletions karma-coverage.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,23 @@ module.exports = function(config) {
served: true
},
{
pattern: 'packages/metal-soy/node_modules/html2incdom/lib/*.js',
pattern: 'packages/metal-web-component/node_modules/babel-polyfill/dist/polyfill.min.js',
watched: false,
included: true,
served: true
},
{
pattern: 'packages/metal-web-component/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js',
watched: false,
included: false,
served: true
},
{
pattern: 'packages/metal-web-component/webcomponents_polyfill.js',
watched: false,
included: true,
served: true
},

{
pattern: 'packages/metal*/test/**/*.js',
watched: false,
Expand All @@ -48,11 +59,12 @@ module.exports = function(config) {
}
],

exclude: ['packages/metal-isomorphic/**/*.js'],

preprocessors: {
'packages/metal-incremental-dom/src/incremental-dom.js': ['browserify'],
'packages/metal-incremental-dom/lib/incremental-dom.js': ['browserify'],
'packages/metal-soy-bundle/lib/bundle.js': ['browserify'],
'packages/metal-soy/node_modules/html2incdom/lib/*.js': ['browserify'],
'packages/metal*/test/**/*.js': ['browserify']
},

Expand All @@ -64,8 +76,12 @@ module.exports = function(config) {
[
'babelify',
{
plugins: ['istanbul'],
presets: ['es2015']
plugins: [
'istanbul'
],
presets: [
'env'
]
}
]
],
Expand Down
27 changes: 23 additions & 4 deletions karma-sauce.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,23 @@ module.exports = function(config) {
served: true
},
{
pattern: 'packages/metal-soy/node_modules/html2incdom/lib/*.js',
pattern: 'packages/metal-web-component/node_modules/babel-polyfill/dist/polyfill.min.js',
watched: false,
included: true,
served: true
},
{
pattern: 'packages/metal-web-component/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js',
watched: false,
included: false,
served: true
},
{
pattern: 'packages/metal-web-component/webcomponents_polyfill.js',
watched: false,
included: true,
served: true
},

{
pattern: 'packages/metal*/test/**/*.js',
watched: false,
Expand All @@ -48,11 +59,12 @@ module.exports = function(config) {
}
],

exclude: ['packages/metal-isomorphic/**/*.js'],

preprocessors: {
'packages/metal-incremental-dom/src/incremental-dom.js': ['browserify'],
'packages/metal-incremental-dom/lib/incremental-dom.js': ['browserify'],
'packages/metal-soy/node_modules/metal-soy-bundle/lib/bundle.js': ['browserify'],
'packages/metal-soy/node_modules/html2incdom/lib/*.js': ['browserify'],
'packages/metal*/test/**/*.js': ['browserify']
},

Expand All @@ -61,7 +73,14 @@ module.exports = function(config) {
browserify: {
debug: true,
transform: [
['babelify', {presets: ['es2015']}]
[
'babelify',
{
presets: [
'env'
]
}
]
],
insertGlobalVars: {
METAL_VERSION: function() {
Expand Down
Loading

0 comments on commit d2ccdeb

Please sign in to comment.