Merge branch 'master' into strict-template-policy

Polymer · Jul 24, 2018 · f318661 · f318661
2 parents 376f44c + 4f0337a
commit f318661
Show file tree

Hide file tree

Showing 6 changed files with 5,386 additions and 8,254 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,11 +11,6 @@ cache:
 before_script:
 - npm install -g gulp-cli@1
 - gulp lint-eslint
-# TODO(dfreedm): re-enable after making update-types work
-#- >-
-#  npm run update-types && git diff --exit-code || (echo -e
-#  '\n\033[31mERROR:\033[0m Typings are stale. Please run "npm run
-#  update-types".' && false)
 script:
 - node ./node_modules/.bin/polymer test --npm --module-resolution=node -l chrome
 - node ./node_modules/.bin/polymer test --npm --module-resolution=node -l firefox

diff --git a/externs/.gitignore b/externs/.gitignore
@@ -0,0 +1,4 @@
+# TODO(timvdlippe): Ignore all files here once we can generate them.
+# *
+!.gitignore
+!.npmignore
diff --git a/externs/.npmignore b/externs/.npmignore
diff --git a/gulpfile.js b/gulpfile.js
@@ -13,7 +13,6 @@
 
 const gulp = require('gulp');
 const gulpif = require('gulp-if');
-const runseq = require('run-sequence');
 const del = require('del');
 const eslint = require('gulp-eslint');
 const fs = require('fs-extra');
@@ -31,8 +30,7 @@ const replace = require('gulp-replace');
 const DIST_DIR = 'dist';
 const BUNDLED_DIR = path.join(DIST_DIR, 'bundled');
 const COMPILED_DIR = path.join(DIST_DIR, 'compiled');
-const POLYMER_LEGACY = 'polymer.html';
-const POLYMER_ELEMENT = 'polymer-element.html';
+const POLYMER_LEGACY = 'polymer-legacy.js';
 
 const {PolymerProject, HtmlSplitter} = require('polymer-build');
 
@@ -64,8 +62,6 @@ class BackfillStream extends Transform {
   }
 }
 
-let CLOSURE_LINT_ONLY = false;
-
 let firstImportFinder = dom5.predicates.AND(
   dom5.predicates.hasTagName('link'), dom5.predicates.hasAttrValue('rel', 'import')
 );
@@ -129,8 +125,7 @@ gulp.task('generate-typescript', async () => {
   }
 });
 
-gulp.task('closure', gulp.series('generate-externs', () => {
-
+const runClosureOnly = ({lintOnly}) => () => {
   let entry, splitRx, joinRx, addClosureTypes;
 
   function config(path) {
@@ -164,7 +159,7 @@ gulp.task('closure', gulp.series('generate-externs', () => {
 
   let closurePluginOptions;
 
-  if (CLOSURE_LINT_ONLY) {
+  if (lintOnly) {
     closurePluginOptions = {
       logger: closureLintLogger
     };
@@ -179,7 +174,7 @@ gulp.task('closure', gulp.series('generate-externs', () => {
     assume_function_wrapper: true,
     rewrite_polyfills: false,
     new_type_inf: true,
-    checks_only: CLOSURE_LINT_ONLY,
+    checks_only: lintOnly,
     polymer_version: 2,
     externs: [
       'bower_components/shadycss/externs/shadycss-externs.js',
@@ -219,12 +214,15 @@ gulp.task('closure', gulp.series('generate-externs', () => {
     .pipe(gulpif(joinRx, minimalDocument()))
     .pipe(gulpif(joinRx, size({title: 'closure size', gzip: true, showTotal: false, showFiles: true})))
     .pipe(gulp.dest(COMPILED_DIR));
-}));
+};
 
-gulp.task('lint-closure', (done) => {
-  CLOSURE_LINT_ONLY = true;
-  runseq('closure', done);
-});
+gulp.task('closure', gulp.series('generate-externs', runClosureOnly({
+  lintOnly: false
+})));
+
+gulp.task('lint-closure', runClosureOnly({
+  lintOnly: true
+}));
 
 gulp.task('estimate-size', gulp.series('clean', () => {
 
@@ -272,13 +270,11 @@ gulp.task('lint-eslint', function() {
     .pipe(eslint.failAfterError());
 });
 
-gulp.task('lint', (done) => {
-  runseq('lint-eslint', 'lint-closure', done);
-});
+// TODO(timvdlippe): Add back `, 'lint-closure'` once closure lint works again
+gulp.task('lint', gulp.series('lint-eslint'));
 
-gulp.task('update-types', (done) => {
-  runseq('generate-externs', 'generate-typescript', done);
-});
+// TODO(timvdlippe): Add back `'generate-externs',` once we can generate externs again
+gulp.task('generate-types', gulp.series('generate-typescript'));
 
 gulp.task('update-version', () => {
   return gulp.src('lib/utils/boot.js')