3.0.0-pre.4-lit-html.8.4 with [WIP] Issue #60, Issue #61 Merge 3.0.0-…

…pre.4 into lit-html branch
t2ym · Jan 6, 2019 · 89a0800 · 89a0800
2 parents 8aeeb0d + a44cac8
commit 89a0800
Show file tree

Hide file tree

Showing 88 changed files with 13,168 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,5 +21,7 @@ addons:
       - google-chrome-stable
   sauce_connect: true
 script:
-  - wct --module-resolution=node --npm
+  - gulp patch-wct-browser-legacy # cp -vf test/browser.js node_modules/wct-browser-legacy/browser.js
+  - wct --npm --module-resolution=node --skip-plugin=sauce
+  - wct --npm --module-resolution=node --skip-plugin=istanbul
   - 'if [ "${TRAVIS_BRANCH}" != "" ]; then lcov-result-merger ''test/coverage-report*/lcov.info'' | ./node_modules/coveralls/bin/coveralls.js || echo success; fi'
diff --git a/define-element.js b/define-element.js
@@ -85,7 +85,7 @@ if (!window.Define) {
         }
       }
 
-      previous = current.previousSibling;
+      previous = current && current.previousSibling;
       while (previous && !previous.tagName) {
         previous = previous.previousSibling;
       }
@@ -94,7 +94,7 @@ if (!window.Define) {
       }
       if (!previous) {
         // search for cousin template
-        if (current.parentNode.tagName === 'body'.toUpperCase()) {
+        if (current && current.parentNode.tagName === 'body'.toUpperCase()) {
           previous = current.parentNode.previousSibling;
           while (previous && !previous.tagName) {
             previous = previous.previousSibling;

diff --git a/gulpfile.js b/gulpfile.js
@@ -791,5 +791,10 @@ gulp.task('pretest2', ['clean2'], function(cb) {
     cb);
 });
 
-require('web-component-tester').gulp.init(gulp, [ 'pretest2' ]);
+//require('web-component-tester').gulp.init(gulp, [ 'pretest2' ]);
+
+gulp.task('patch-wct-browser-legacy', () => {
+  return gulp.src([ 'test/browser.js' ], { base: 'test' })
+    .pipe(gulp.dest('node_modules/wct-browser-legacy'));
+});
 
diff --git a/i18n-dom-bind.js b/i18n-dom-bind.js
@@ -18,7 +18,7 @@ import deepcopy from 'deepcopy/dist/deepcopy.js';
 // i18n-dom-bind based on Polymer/polymer#2.0-preview src/templatizer/dom-bind.html
 class I18nDomBind extends Mixins.Localizable(LegacyElementMixin(HTMLElement)) {
   static get importMeta() {
-    return import.meta;
+    return { url: new URL(BehaviorsStore.I18nControllerBehavior.properties.startUrl.value, location.href).href };
   }
 
   static get is() { return 'i18n-dom-bind'; }

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/t2ym/i18n-element#readme",
   "name": "i18n-element",
-  "version": "3.0.0-pre.1-lit-html.8.4",
+  "version": "3.0.0-pre.4-lit-html.8.4",
   "main": "i18n-element.js",
   "directories": {
     "test": "test"