Ensure ts output is generated (forgot the tsconfig)

electron · Apr 27, 2018 · c94c8e7 · c94c8e7
1 parent 0545d08
commit c94c8e7
Show file tree

Hide file tree

Showing 31 changed files with 66 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ node_modules
 dist
 yarn-error.log
 packages/.old
-**/tsconfig.json
+**/tsconfig.json
+!/tsconfig.json
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   "scripts": {
     "clean": "bolt ws exec -- rimraf dist",
     "prebuild": "bolt clean && ts-node tools/link-ts.ts && bolt ws exec -- node_modules/.bin/tsc --emitDeclarationOnly",
-    "build": "bolt ws exec -- node_modules/.bin/babel src -d dist/src --quiet --extensions \".ts\"",
+    "build": "bolt ws exec -- node_modules/.bin/babel src -d dist --quiet --extensions \".ts\"",
     "postbuild": "ts-node tools/test-dist",
     "commit": "git-cz",
     "docs:build": "cd docs && gitbook build",

diff --git a/packages/api/cli/src/util/check-system.ts b/packages/api/cli/src/util/check-system.ts
@@ -2,7 +2,7 @@ import { exec } from 'child_process';
 import debug from 'debug';
 import semver from 'semver';
 
-import { hasYarn, yarnOrNpmSpawn } from '@electron-forge/core/dist/src/util/yarn-or-npm';
+import { hasYarn, yarnOrNpmSpawn } from '@electron-forge/core/dist/util/yarn-or-npm';
 import { OraImpl } from '@electron-forge/async-ora';
 
 const d = debug('electron-forge:check-system');

diff --git a/packages/api/core/package.json b/packages/api/core/package.json
@@ -3,8 +3,8 @@
   "version": "6.0.0-beta.3",
   "description": "A complete tool for building modern Electron applications",
   "repository": "https://github.com/electron-userland/electron-forge",
-  "main": "dist/src/api/index.js",
-  "typings": "dist/src/api/index.d.ts",
+  "main": "dist/api/index.js",
+  "typings": "dist/api/index.d.ts",
   "scripts": {
     "docs": "esdoc",
     "test:fast": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts",

diff --git a/packages/installer/base/package.json b/packages/installer/base/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/Installer.js",
-  "typings": "dist/src/Installer.d.ts",
+  "main": "dist/Installer.js",
+  "typings": "dist/Installer.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/installer/darwin/package.json b/packages/installer/darwin/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/InstallerDarwin.js",
+  "main": "dist/InstallerDarwin.js",
   "typings": "dist/InstallerDarwin.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/installer/deb/package.json b/packages/installer/deb/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/InstallerDeb.js",
+  "main": "dist/InstallerDeb.js",
   "typings": "dist/InstallerDeb.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/installer/dmg/package.json b/packages/installer/dmg/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/InstallerDMG.js",
+  "main": "dist/InstallerDMG.js",
   "typings": "dist/InstallerDMG.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/installer/exe/package.json b/packages/installer/exe/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/InstallerExe.js",
+  "main": "dist/InstallerExe.js",
   "typings": "dist/InstallerExe.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/installer/linux/package.json b/packages/installer/linux/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/InstallerLinux.js",
+  "main": "dist/InstallerLinux.js",
   "typings": "dist/InstallerLinux.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/installer/rpm/package.json b/packages/installer/rpm/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/InstallerRpm.js",
+  "main": "dist/InstallerRpm.js",
   "typings": "dist/InstallerRpm.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/installer/zip/package.json b/packages/installer/zip/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/InstallerZip.js",
+  "main": "dist/InstallerZip.js",
   "typings": "dist/InstallerZip.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/maker/appx/package.json b/packages/maker/appx/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/MakerAppX.js",
-  "typings": "dist/src/MakerAppX.d.ts",
+  "main": "dist/MakerAppX.js",
+  "typings": "dist/MakerAppX.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/maker/appx/typings/ambient.ts → packages/maker/appx/typings/ambient.d.ts b/packages/maker/appx/typings/ambient.ts → packages/maker/appx/typings/ambient.d.ts
diff --git a/packages/maker/base/package.json b/packages/maker/base/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/Maker.js",
-  "typings": "dist/src/Maker.d.ts",
+  "main": "dist/Maker.js",
+  "typings": "dist/Maker.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/maker/deb/package.json b/packages/maker/deb/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/MakerDeb.js",
-  "typings": "dist/src/MakerDeb.d.ts",
+  "main": "dist/MakerDeb.js",
+  "typings": "dist/MakerDeb.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/maker/dmg/package.json b/packages/maker/dmg/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/MakerDMG.js",
-  "typings": "dist/src/MakerDMG.d.ts",
+  "main": "dist/MakerDMG.js",
+  "typings": "dist/MakerDMG.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/maker/flatpak/package.json b/packages/maker/flatpak/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/MakerFlatpak.js",
-  "typings": "dist/src/MakerFlatpak.d.ts",
+  "main": "dist/MakerFlatpak.js",
+  "typings": "dist/MakerFlatpak.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/maker/rpm/package.json b/packages/maker/rpm/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/MakerRpm.js",
-  "typings": "dist/src/MakerRpm.d.ts",
+  "main": "dist/MakerRpm.js",
+  "typings": "dist/MakerRpm.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/maker/snap/package.json b/packages/maker/snap/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/MakerSnap.js",
-  "typings": "dist/src/MakerSnap.d.ts",
+  "main": "dist/MakerSnap.js",
+  "typings": "dist/MakerSnap.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/maker/squirrel/package.json b/packages/maker/squirrel/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/MakerSquirrel.js",
+  "main": "dist/MakerSquirrel.js",
   "typings": "dist/MakerSquirrel.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/maker/wix/package.json b/packages/maker/wix/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/MakerWix.js",
-  "typings": "dist/src/MakerWix.d.ts",
+  "main": "dist/MakerWix.js",
+  "typings": "dist/MakerWix.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/maker/zip/package.json b/packages/maker/zip/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/MakerZIP.js",
+  "main": "dist/MakerZIP.js",
   "typings": "dist/MakerZIP.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/publisher/base/package.json b/packages/publisher/base/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/Publisher.js",
-  "typings": "dist/src/Publisher.d.ts",
+  "main": "dist/Publisher.js",
+  "typings": "dist/Publisher.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/publisher/electron-release-server/package.json b/packages/publisher/electron-release-server/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/PublisherERS.js",
+  "main": "dist/PublisherERS.js",
   "typings": "dist/PublisherERS.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/publisher/github/package.json b/packages/publisher/github/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/PublisherGithub.js",
-  "typings": "dist/src/PublisherGithub.d.ts",
+  "main": "dist/PublisherGithub.js",
+  "typings": "dist/PublisherGithub.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/publisher/s3/package.json b/packages/publisher/s3/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/PublisherS3.js",
+  "main": "dist/PublisherS3.js",
   "typings": "dist/PublisherS3.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/publisher/snapcraft/package.json b/packages/publisher/snapcraft/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/PublisherSnapcraft.js",
+  "main": "dist/PublisherSnapcraft.js",
   "typings": "dist/PublisherSnapcraft.d.ts",
   "scripts": {
     "test": "exit 0"

diff --git a/packages/utils/async-ora/package.json b/packages/utils/async-ora/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/index.js",
-  "typings": "dist/src/index.d.ts",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
   },

diff --git a/packages/utils/types/package.json b/packages/utils/types/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/electron-userland/electron-forge",
   "author": "Samuel Attard",
   "license": "MIT",
-  "main": "dist/src/index.js",
+  "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "test": "echo No Tests For Shared Types"

diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,23 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "es6",
+		"outDir": "dist",
+		"lib": [
+			"es6",
+			"dom",
+			"es7"
+		],
+		"sourceMap": true,
+		"rootDir": "src",
+		"experimentalDecorators": true,
+		"strict": true,
+		"esModuleInterop": true,
+		"declaration": true
+	},
+	"exclude": [
+		"node_modules",
+		"dist",
+		"test"
+	]
+}