Switch from rollup-plugin-typescript2 to tsc

.gitignore

@@ -18,7 +18,12 @@ local-builds/
 firebase-debug.log
 .firebase
 
-# Generated files from TypeScript source
-packages/workbox-core/**/*.js
+
+# Generated TypeScript files and build data
+tsconfig.tsbuildinfo
+packages/workbox-*/**/*.d.ts
+packages/workbox-*/**/*.js
+
+# Individual package ignores during TypeScript migration
 packages/workbox-core/**/*.mjs
-packages/workbox-core/**/*.d.ts
+packages/workbox-window/**/*.mjs

gulp-tasks/transpile-typescript.js

@@ -8,11 +8,12 @@
 
 const fs = require('fs-extra');
 const gulp = require('gulp');
+const globby = require('globby');
 const ol = require('common-tags').oneLine;
-const path = require('path');
-const {rollup} = require('rollup');
-const resolve = require('rollup-plugin-node-resolve');
-const typescript2 = require('rollup-plugin-typescript2');
+const path = require('upath');
+const util = require('util');
+const exec = util.promisify(require('child_process').exec);
+
 const packageRunnner = require('./utils/package-runner');
 const logHelper = require('../infra/utils/log-helper');
 const {AsyncDebounce} = require('../infra/utils/AsyncDebounce');
@@ -23,77 +24,40 @@ const {AsyncDebounce} = require('../infra/utils/AsyncDebounce');
  */
 const packagesDir = path.join(__dirname, '..', 'packages');
 
-
 /**
- * Returns a Rollup plugin that generates both `.js` and `.mjs` files for each
- * `.ts` source file. This is a bit of a hack, but it's needed until to solve:
- * https://github.com/rollup/rollup/issues/2847
- */
-const generateMjsOutputFiles = () => {
-  return {
-    generateBundle: (options, bundle) => {
-      const importPattern =
-          new RegExp(`((?:import|export)[^']+')([^']+?)\\.ts';`, 'g');
-
-      for (const chunkInfo of Object.values(bundle)) {
-        if (chunkInfo.fileName.endsWith('.ts')) {
-          // Rename the `.ts` imports and filenames to `.js`;
-          const assetBasename = chunkInfo.fileName.replace(/.ts$/, '');
-
-          chunkInfo.fileName = assetBasename + '.js';
-          chunkInfo.code = chunkInfo.code.replace(importPattern, `$1$2.js';`);
-
-          // Create mirror `.mjs` files for each `.js` file.
-          const mjsSource =
-              `export * from './${path.basename(assetBasename)}.js';`;
-
-          fs.outputFileSync(
-              path.join(options.dir, assetBasename + '.mjs'), mjsSource);
-        }
-      }
-    },
-  };
-};
-
-/**
- * @type {RollupCache}
- */
-let moduleBundleCache;
-
-/**
- * Transpiles a package's source TypeScript files to `.mjs` JavaScript files
- * in the root package directory, along with the corresponding definition
- * files.
+ * Transpiles a package's source TypeScript files to `.js` and `.mjs` files
+ * in the root package directory, along with the corresponding `.d.ts` files.
  *
  * @param {string} packageName
  */
 const transpilePackage = async (packageName) => {
-  const packagePath = path.join(packagesDir, packageName);
-  const input = path.join(packagePath, 'src', 'index.ts');
+  try {
+    // Compile Typescript for the given project.
+    // Reference the local `node_modules` version of `tsc` since on Windows
+    // it will call the version in `Microsoft SDKs/TypeScript`.
+    await exec(`npm run local-tsc -- -b packages/${packageName}`);
 
-  const plugins = [
-    resolve(),
-    typescript2(),
-    generateMjsOutputFiles(),
-  ];
+    // Mirror all `.ts` files with `.mjs` files.
+    const tsFiles = await globby(`**/*.ts`, {
+      cwd: path.join('packages', packageName, 'src'),
+    });
 
-  const bundle = await rollup({
-    input,
-    plugins,
-    cache: moduleBundleCache,
-    preserveModules: true,
-    // We don't need to tree shake the TS to JS conversion, as that'll happen
-    // later, and we don't need to add to the transpilation time.
-    treeshake: false,
-  });
+    for (const tsFile of tsFiles) {
+      const assetBasename = path.basename(tsFile, '.ts');
+      const mjsFile = path.join('packages',
+          packageName, path.dirname(tsFile), assetBasename + '.mjs');
 
-  // Ensure rebuilds are as fast as possible in watch mode.
-  moduleBundleCache = bundle.cache;
+      if (!(await fs.pathExists(mjsFile))) {
+        const mjsSource = `export * from './${assetBasename}.js';`;
 
-  await bundle.write({
-    dir: packagePath,
-    format: 'esm',
-  });
+        // console.log({mjsFile, tsFile, assetBasename})
+        fs.outputFileSync(mjsFile, mjsSource);
+      }
+    }
+  } catch (error) {
+    logHelper.error(error.stdout);
+    throw error;
+  }
 };
 
 /**
@@ -105,7 +69,7 @@ const transpilePackagesOrSkip = async (packagePath) => {
   // `packagePath` will be posix style because it comes from `glog()`.
   const packageName = packagePath.split('/').slice(-1)[0];
 
-  if (await fs.pathExists(path.join(packagePath, 'src'))) {
+  if (await fs.pathExists(path.join(packagePath, 'tsconfig.json'))) {
     await queueTranspile(packageName);
   } else {
     logHelper.log(ol`Skipping package '${packageName}'
@@ -157,10 +121,10 @@ const needsTranspile = (packageName) => {
 };
 
 gulp.task('transpile-typescript', gulp.series(packageRunnner(
-    'transpile-typescript', 'browser', transpilePackagesOrSkip)));
+    'transpile-typescript', 'all', transpilePackagesOrSkip)));
 
 gulp.task('transpile-typescript:watch', gulp.series(packageRunnner(
-    'transpile-typescript', 'browser', transpilePackagesOrSkip)));
+    'transpile-typescript', 'all', transpilePackagesOrSkip)));
 
 gulp.task('transpile-typescript:watch', () => {
   const watcher = gulp.watch(`./${global.packageOrStar}/workbox-*/src/**/*.ts`);

package-lock.json

@@ -18480,9 +18480,9 @@
       "dev": true
     },
     "upath": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
       "dev": true
     },
     "update-notifier": {

package.json

@@ -12,6 +12,7 @@
     "lint": "eslint \"**/*.{js,mjs}\" --ignore-path .gitignore",
     "local-jsdoc": "jsdoc",
     "local-lerna": "lerna",
+    "local-tsc": "tsc",
     "test": "nyc --clean false --silent mocha --timeout 60000"
   },
   "nyc": {
@@ -106,6 +107,7 @@
     "sinon": "^6.3.4",
     "tempy": "^0.2.1",
     "typescript": "^3.4.5",
+    "upath": "^1.1.2",
     "url-search-params": "^1.1.0",
     "webpack": "^4.19.1",
     "worker-plugin": "^3.1.0"

packages/workbox-core/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig",
+  "compilerOptions": {
+    "outDir": "./",
+    "rootDir": "./src"
+  },
+  "include": [
+    "src/**/*.ts"
+  ]
+}

packages/workbox-window/package.json

@@ -27,6 +27,7 @@
   },
   "main": "build/workbox-window.prod.umd.js",
   "module": "build/workbox-window.prod.es5.mjs",
+  "types": "index.d.ts",
   "dependencies": {
     "workbox-core": "^4.3.1"
   }

packages/workbox-window/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig",
+  "compilerOptions": {
+    "lib": ["es2017", "dom"],
+    "outDir": "./",
+    "rootDir": "./src"
+  },
+  "include": [
+    "src/**/*.ts"
+  ]
+}

tsconfig.json

@@ -4,6 +4,7 @@
     "target": "esnext",
     "module": "esnext",
     "moduleResolution": "node",
+    "composite": true,
     "declaration": true,
     "noFallthroughCasesInSwitch": true,
     "noImplicitAny": true,
@@ -14,8 +15,12 @@
     "preserveConstEnums": true,
     "strictNullChecks": true
   },
-  "include": [
-    "infra/type-overrides.d.ts",
-    "packages/*/src/**/*.ts"
+  "files": [
+    "./infra/type-overrides.d.ts",
+  ],
+  "exclude": [],
+  "references": [
+    { "path": "./packages/workbox-core/" },
+    { "path": "./packages/workbox-window/" }
   ]
 }