Skip to content

Commit 83a264c

Browse files
authored
Merge pull request #261 from Robert-Frampton/webcomponents
Automates creation of CustomElements for Metal components. Fixes #268
2 parents 8fe3762 + b71e390 commit 83a264c

14 files changed

+2401
-752
lines changed

gulpfile.js

+9-3
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',

karma-coverage.conf.js

+21-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,24 @@ module.exports = function(config) {
3333
included: true,
3434
served: true
3535
},
36-
36+
{
37+
pattern: 'packages/metal-web-component/node_modules/babel-polyfill/dist/polyfill.min.js',
38+
watched: false,
39+
included: true,
40+
served: true
41+
},
42+
{
43+
pattern: 'packages/metal-web-component/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js',
44+
watched: false,
45+
included: false,
46+
served: true
47+
},
48+
{
49+
pattern: 'packages/metal-web-component/webcomponents_polyfill.js',
50+
watched: false,
51+
included: true,
52+
served: true
53+
},
3754
{
3855
pattern: 'packages/metal*/test/**/*.js',
3956
watched: false,
@@ -64,7 +81,9 @@ module.exports = function(config) {
6481
[
6582
'babelify',
6683
{
67-
plugins: ['istanbul'],
84+
plugins: [
85+
'istanbul'
86+
],
6887
presets: ['es2015']
6988
}
7089
]

karma-sauce.conf.js

+22-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,24 @@ module.exports = function(config) {
3333
included: true,
3434
served: true
3535
},
36-
36+
{
37+
pattern: 'packages/metal-web-component/node_modules/babel-polyfill/dist/polyfill.min.js',
38+
watched: false,
39+
included: true,
40+
served: true
41+
},
42+
{
43+
pattern: 'packages/metal-web-component/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js',
44+
watched: false,
45+
included: false,
46+
served: true
47+
},
48+
{
49+
pattern: 'packages/metal-web-component/webcomponents_polyfill.js',
50+
watched: false,
51+
included: true,
52+
served: true
53+
},
3754
{
3855
pattern: 'packages/metal*/test/**/*.js',
3956
watched: false,
@@ -61,8 +78,10 @@ module.exports = function(config) {
6178
browserify: {
6279
debug: true,
6380
transform: [
64-
['babelify', {presets: ['es2015']}]
65-
],
81+
['babelify', {
82+
presets: ['es2015']
83+
}
84+
]],
6685
insertGlobalVars: {
6786
METAL_VERSION: function() {
6887
return '\'' + lernaJson.version + '\'';

0 commit comments

Comments
 (0)