Publish version (#2292)

* Upgrade lerna

* Ensure version strings are updated during publish

Author: philipwalton

gulp-tasks/build-browser-packages.js

@@ -8,12 +8,16 @@
 
 const gulp = require('gulp');
 
+const {transpilePackageOrSkip} = require('./transpile-typescript');
 const buildBrowserBundle = require('./utils/build-browser-bundle');
 const versionModule = require('./utils/version-module');
 const constants = require('./utils/constants');
 const packageRunnner = require('./utils/package-runner');
 
+
 gulp.task('build-browser-packages:browser-bundle', gulp.series(
+    packageRunnner('build-browser-packages:transpile-typescript',
+        'browser', transpilePackageOrSkip),
     Object.keys(constants.BUILD_TYPES).map((buildKey) => packageRunnner(
         'build-browser-packages:browser-bundle',
         'browser',
@@ -23,12 +27,10 @@ gulp.task('build-browser-packages:browser-bundle', gulp.series(
 ));
 
 gulp.task('build-browser-packages:version-module', gulp.series(
-    Object.keys(constants.BUILD_TYPES).map((buildKey) => packageRunnner(
+    packageRunnner(
         'build-browser-packages:version-module',
         'browser',
-        versionModule,
-        constants.BUILD_TYPES[buildKey],
-    ))
+        versionModule)
 ));
 
 gulp.task('build-browser-packages', gulp.series(

gulp-tasks/build-packages.js

@@ -48,7 +48,6 @@ gulp.task('build-packages:clean', gulp.series(
 ));
 
 gulp.task('build-packages:build', gulp.series(
-    'transpile-typescript',
     gulp.parallel(
         'build-node-packages',
         'build-browser-packages',

gulp-tasks/build-window-packages.js

@@ -8,12 +8,16 @@
 
 const gulp = require('gulp');
 
+const {transpilePackageOrSkip} = require('./transpile-typescript');
 const buildWindowBundle = require('./utils/build-window-bundle');
 const versionModule = require('./utils/version-module');
 const constants = require('./utils/constants');
 const packageRunnner = require('./utils/package-runner');
 
+
 gulp.task('build-window-packages:window-bundle', gulp.series(
+    packageRunnner('build-window-packages:transpile-typescript',
+        'window', transpilePackageOrSkip),
     Object.keys(constants.BUILD_TYPES).map((buildKey) => packageRunnner(
         'build-window-packages:window-bundle',
         'window',
@@ -23,12 +27,10 @@ gulp.task('build-window-packages:window-bundle', gulp.series(
 ));
 
 gulp.task('build-window-packages:version-module', gulp.series(
-    Object.keys(constants.BUILD_TYPES).map((buildKey) => packageRunnner(
+    packageRunnner(
         'build-window-packages:version-module',
         'window',
-        versionModule,
-        constants.BUILD_TYPES[buildKey],
-    ))
+        versionModule)
 ));
 
 gulp.task('build-window-packages', gulp.series(

gulp-tasks/build.js

@@ -19,7 +19,7 @@ gulp.task('lerna-bootstrap', () => {
 
   // If it's not a star, we can scope the build to a specific project.
   return lernaWrapper.bootstrap(
-      '--include-filtered-dependencies',
+      '--include-dependencies',
       '--scope', global.packageOrStar
   );
 });

gulp-tasks/transpile-typescript.js

@@ -65,7 +65,7 @@ const transpilePackage = async (packageName) => {
  *
  * @param {string} packagePath
  */
-const transpilePackagesOrSkip = async (packagePath) => {
+const transpilePackageOrSkip = async (packagePath) => {
   // `packagePath` will be posix style because it comes from `glog()`.
   const packageName = packagePath.split('/').slice(-1)[0];
 
@@ -88,7 +88,7 @@ const debouncedTranspilerMap = {};
 /**
  * Takes a package name and schedules that package's source TypeScript code
  * to be converted to JavaScript. If a transpilation is already scheduled, it
- * won't be queued twice, so this function is safe to call as frequenty as
+ * won't be queued twice, so this function is safe to call as frequently as
  * needed.
  *
  * @param {string} packageName
@@ -121,10 +121,10 @@ const needsTranspile = (packageName) => {
 };
 
 gulp.task('transpile-typescript', gulp.series(packageRunnner(
-    'transpile-typescript', 'all', transpilePackagesOrSkip)));
+    'transpile-typescript', 'all', transpilePackageOrSkip)));
 
 gulp.task('transpile-typescript:watch', gulp.series(packageRunnner(
-    'transpile-typescript', 'all', transpilePackagesOrSkip)));
+    'transpile-typescript', 'all', transpilePackageOrSkip)));
 
 gulp.task('transpile-typescript:watch', () => {
   const watcher = gulp.watch(`./${global.packageOrStar}/workbox-*/src/**/*.ts`);
@@ -138,6 +138,7 @@ gulp.task('transpile-typescript:watch', () => {
 });
 
 module.exports = {
+  transpilePackageOrSkip,
   queueTranspile,
   needsTranspile,
 };

gulp-tasks/utils/version-module.js

@@ -19,7 +19,7 @@ const getDetails = (packagePath) => {
   return ['workbox', name, pkgJson.version].join(':');
 };
 
-module.exports = async (packagePath, buildType) => {
+module.exports = async (packagePath) => {
   const versionString =
       `try{self['${getDetails(packagePath)}']&&_()}catch(e){}`;