Fixing build and tests

types · May 19, 2016 · 4b51fbd · 4b51fbd
1 parent ca44c01
commit 4b51fbd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/generators/beta/index.js b/generators/beta/index.js
@@ -629,7 +629,7 @@ module.exports = yeoman.Base.extend({
         this.destinationPath('typings.json'),
         {
           name: this.props.sourceDeliveryPackageName,
-          main: this.props.sourceMain + '.d.ts',
+          main: this.props.sourceMain,
           homepage: this.props.sourceHomepage,
           version: this.props.sourceVersion
         });
@@ -690,9 +690,12 @@ module.exports = yeoman.Base.extend({
         this.destinationPath('source-test')
       );
 
-      this.fs.copy(
-        this.templatePath('test/*'),
-        this.destinationPath('test')
+      this.fs.copyTpl(
+        this.templatePath('template/test_tsconfig.json`),
+        this.destinationPath('test/tsconfig.json'),
+        {
+          sourceMain: this.props.sourceMain
+        }
       );
 
       if (~this.props.sourceUsages.indexOf('commonjs')) {

diff --git a/generators/beta/templates/template/package.json b/generators/beta/templates/template/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "build": "echo building... && typings bundle<%- ambient %> -o out/<%- sourceMain %>",
+    "build": "echo building... && typings bundle<%- ambient %> -o out/<%- sourceMain %>.d.ts",
     "lint": "echo linting... && tslint \"**/*.ts\" -e \"source/**\" -e \"source-test/**\" -e \"out/**\" -e \"node_modules/**\" -e \"typings/**\"",
     "browser-test": "echo running browser tests... && <%- browserTest %>",
     "source-test": "echo running source tests... &&  <%- sourceTest %>",

diff --git a/generators/beta/templates/test/tsconfig.json → ...eta/templates/template/test_tsconfig.json b/generators/beta/templates/test/tsconfig.json → ...eta/templates/template/test_tsconfig.json
@@ -4,7 +4,7 @@
     "moduleResolution": "node"
   },
   "files": [
-    "../typings/main.d.ts",
-    "../out/main.d.ts"
+    "../typings/index.d.ts",
+    "../out/<%- sourceMain %>.d.ts"
   ]
 }
diff --git a/generators/beta/templates/template/typings.json b/generators/beta/templates/template/typings.json
@@ -1,6 +1,6 @@
 {
   "name": "<%- name %>",
-  "main": "<%- main %>",
+  "main": "<%- main %>.d.ts",
   "homepage": "<%- homepage %>",
   "version": "<%- version %>"
 }
diff --git a/generators/beta/templates/tsconfig.json b/generators/beta/templates/tsconfig.json
@@ -6,9 +6,9 @@
   },
   "exclude": [
     "node_modules",
-    "typings/browser",
-    "typings/browser.d.ts",
-    "out/browser.d.ts",
+    "typings/globals",
+    "typings/modules",
+    "out",
     "source"
   ]
 }
diff --git a/generators/current/templates/tsconfig.json b/generators/current/templates/tsconfig.json
@@ -9,8 +9,8 @@
   },
   "exclude": [
     "node_modules",
-    "typings/globals",
-    "typings/modules",
+    "typings/browser",
+    "typings/browser.d.ts",
     "out",
     "source"
   ]