Add support for class properties, fix usage of TypeScript declare

package.json

@@ -14,8 +14,8 @@
   ],
   "scripts": {
     "build": "npm run -s build:babel && npm run -s build:self",
-    "build:babel": "babel-node --extensions \".ts\" src/cli.ts \"src/{cli,index}.ts\" --target=10 --output=dist --compress --types=types",
-    "build:self": "node dist/cli.js \"src/{cli,index}.ts\" --target=10 --output=dist --compress --types=types",
+    "build:babel": "babel-node --extensions \".ts\" src/cli.ts \"src/{cli,index}.ts\" --target=10 --output=dist --compress --types=types --external=@babel",
+    "build:self": "node dist/cli.js \"src/{cli,index}.ts\" --target=10 --output=dist --compress --types=types --external=@babel",
     "prerelease": "npm run build",
     "release": "np --no-yarn",
     "test": "echo \"Error: no test specified\" && exit 0",
@@ -39,9 +39,10 @@
   },
   "homepage": "https://github.com/rdmurphy/typebundle#readme",
   "dependencies": {
-    "@babel/core": "^7.6.4",
-    "@babel/preset-env": "^7.8.3",
-    "@babel/preset-typescript": "^7.6.0",
+    "@babel/core": "^7.9.0",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-typescript": "^7.9.0",
     "@rollup/plugin-commonjs": "^11.0.1",
     "@rollup/plugin-json": "^4.0.1",
     "@rollup/plugin-node-resolve": "^7.0.0",

src/cli.ts

@@ -13,20 +13,30 @@ const mriConfig = {
     output: 'dist',
     watch: false,
   },
+  string: ['external'],
 };
 
 async function main(argv_: string[]) {
   const args = mri(argv_.slice(2), mriConfig);
 
   const input = args._[0];
-  const outputDir = args.output;
+
   const compress = args.compress;
+
+  let external;
+
+  if (args.external) {
+    external = Array.isArray(args.external) ? args.external : [args.external];
+  }
+
   const nodeTarget = args.target;
+  const outputDir = args.output;
   const typesDir = args.types;
   const watchBuild = args.watch;
 
   await bundler({
     compress,
+    external,
     input,
     nodeTarget,
     outputDir,

src/index.ts

@@ -4,7 +4,8 @@ import { basename, dirname, format, parse, resolve } from 'path';
 
 // packages
 import babelPresetEnv from '@babel/preset-env';
-import babelPresetTypescript from '@babel/preset-typescript';
+import babelPluginTransformTypeScript from '@babel/plugin-transform-typescript';
+import babelPluginClassProperties from '@babel/plugin-proposal-class-properties';
 import builtinModules from 'builtin-modules';
 import { rollup, watch } from 'rollup';
 import babel from 'rollup-plugin-babel';
@@ -105,10 +106,13 @@ async function createRollupConfig({
         extensions,
         presets: [
           [babelPresetEnv, { bugfixes: true, targets: { node: nodeTarget } }],
+        ],
+        plugins: [
           [
-            babelPresetTypescript,
+            babelPluginTransformTypeScript,
             { allowDeclareFields: true, onlyRemoveTypeImports: true },
           ],
+          babelPluginClassProperties,
         ],
       }),
       compress &&
@@ -199,6 +203,7 @@ async function createTypes({
 
 interface BundlerOptions {
   compress: boolean;
+  external?: string[];
   input: string;
   nodeTarget: string;
   outputDir: string;
@@ -208,6 +213,7 @@ interface BundlerOptions {
 
 export async function bundler({
   compress,
+  external = [],
   input,
   nodeTarget,
   outputDir,
@@ -239,7 +245,8 @@ export async function bundler({
     const entry = inputs[idx];
 
     const externalDependencies = pkgDependencies.concat(
-      inputs.filter((e) => e !== entry)
+      inputs.filter((e) => e !== entry),
+      external
     );
 
     const options = await createRollupConfig({

src/vendor.d.ts

@@ -1,3 +1,5 @@
+declare module '@babel/plugin-proposal-class-properties';
+declare module '@babel/plugin-transform-typescript';
 declare module '@babel/preset-env';
 declare module '@babel/preset-typescript';
 declare module 'rollup-plugin-babel';