Angular now gets compiled by tsc, everything else is compiled by babe…

…l-typescript

TODO: need to migrate app/angular/server to TS in order to work with tsc

.babelrc.js

@@ -11,7 +11,6 @@ module.exports = {
     '@babel/plugin-proposal-class-properties',
     '@babel/plugin-proposal-object-rest-spread',
     '@babel/plugin-proposal-export-default-from',
-    ['@babel/plugin-proposal-decorators', { legacy: true }],
   ],
   env: {
     test: {

app/angular/tsconfig.json

@@ -5,6 +5,7 @@
   ],
   "compileOnSave": false,
   "compilerOptions": {
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "outDir": "./dist"
   }
 }

scripts/compile-js.js

@@ -48,7 +48,11 @@ function handleExit(code, errorCallback) {
 }
 
 function babelify(options = {}) {
-  const { watch = false, silent = true, errorCallback } = options;
+  if (process.cwd().includes(path.join('app', 'angular'))) {
+    return;
+  }
+
+  const { watch = false, silent = false, errorCallback } = options;
 
   if (!fs.existsSync('src')) {
     if (!silent) console.log('No src dir');

scripts/compile-ts.js

@@ -6,7 +6,11 @@ const shell = require('shelljs');
 function getCommand(watch) {
   const tsc = path.join(__dirname, '..', 'node_modules', '.bin', 'tsc');
 
-  const args = ['--outDir ./dist', '--emitDeclarationOnly', '--listEmittedFiles true'];
+  const args = ['--outDir ./dist', '--listEmittedFiles true'];
+
+  if (!process.cwd().includes(path.join('app', 'angular'))) {
+    args.push('--emitDeclarationOnly');
+  }
 
   if (watch) {
     args.push('-w');
@@ -25,7 +29,7 @@ function handleExit(code, errorCallback) {
   }
 }
 
-function generateTSDefinitionFiles(options = {}) {
+function tscfy(options = {}) {
   const { watch = false, silent = true, errorCallback } = options;
   const tsConfigFile = 'tsconfig.json';
 
@@ -49,5 +53,5 @@ function generateTSDefinitionFiles(options = {}) {
 }
 
 module.exports = {
-  generateTSDefinitionFiles,
+  tscfy,
 };

scripts/prepare.js

@@ -2,9 +2,10 @@
 const path = require('path');
 const shell = require('shelljs');
 const chalk = require('chalk');
+const fs = require('fs');
 const log = require('npmlog');
 const { babelify } = require('./compile-js');
-const { generateTSDefinitionFiles } = require('./compile-ts');
+const { tscfy } = require('./compile-ts');
 
 function getPackageJson() {
   const modulePath = path.resolve('./');
@@ -21,11 +22,11 @@ function cleanup() {
   // add .ts filtering to babel args and remove after babel - 7 is adopted
   // --copy-files option doesn't work with --ignore
   // https://github.com/babel/babel/issues/5404
-
-  const files = shell.find('dist').filter(tsFile => tsFile.match(/\.(ts|tsx)$/));
-
-  if (files.length) {
-    shell.rm(files);
+  if (fs.existsSync(path.join(process.cwd(), 'dist'))) {
+    const files = shell.find('dist').filter(tsFile => tsFile.match(/\.(ts|tsx)$/));
+    if (files.length) {
+      shell.rm(files);
+    }
   }
 }
 
@@ -38,13 +39,8 @@ function logError(type, packageJson) {
 const packageJson = getPackageJson();
 
 removeDist();
-// if (packageJson && packageJson.types && packageJson.types.indexOf('d.ts') !== -1) {
-//   tscfy({ errorCallback: () => logError('ts', packageJson) });
-// } else {
 babelify({ errorCallback: () => logError('js', packageJson) });
 cleanup();
-generateTSDefinitionFiles({ errorCallback: () => logError('ts', packageJson) });
-
-// }
+tscfy({ errorCallback: () => logError('ts', packageJson) });
 
 console.log(chalk.gray(`Built: ${chalk.bold(`${packageJson.name}@${packageJson.version}`)}`));