Updating TypeScript

TimGeyssens · Jun 3, 2014 · 55854a3 · 55854a3
1 parent a841bd4
commit 55854a3
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 35 deletions.
diff --git a/BuildPackages/Optimus.Providers.TypeScript/Package.build.xml b/BuildPackages/Optimus.Providers.TypeScript/Package.build.xml
@@ -13,9 +13,9 @@
 	<!-- PROPERTIES -->
 	<PropertyGroup>
 		<VersionMajor>1</VersionMajor>
-		<VersionMinor>2</VersionMinor>
-		<VersionPatch>1</VersionPatch>
-		<VersionSuffix></VersionSuffix>
+		<VersionMinor>3</VersionMinor>
+		<VersionPatch>0</VersionPatch>
+		<VersionSuffix>-beta</VersionSuffix>
 		<UmbracoVersion>6.0.6</UmbracoVersion>
 	</PropertyGroup>
 

diff --git a/BundlingAndMinificationForTheMasses.Providers.SCSS/Optimus.Providers.SassAndSCSS.csproj b/BundlingAndMinificationForTheMasses.Providers.SCSS/Optimus.Providers.SassAndSCSS.csproj
@@ -49,6 +49,7 @@
     </Reference>
     <Reference Include="BundleTransformer.Core">
       <HintPath>..\packages\BundleTransformer.Core.1.8.32\lib\net40\BundleTransformer.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="BundleTransformer.SassAndScss">
       <HintPath>..\packages\BundleTransformer.SassAndScss.1.8.32\lib\net40\BundleTransformer.SassAndScss.dll</HintPath>
@@ -82,6 +83,7 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web.Optimization">
       <HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />

diff --git a/BundlingAndMinificationForTheMasses.Providers.Type/BundleTransformer.Configuration.xsd b/BundlingAndMinificationForTheMasses.Providers.Type/BundleTransformer.Configuration.xsd
@@ -506,6 +506,11 @@ Leave all other color names or hex values as-specified.</xs:documentation>
 						<xs:documentation>Flag indicating whether to always escape non-ASCII characters as \uXXXX or to let the output encoding object handle that via the JsEncoderFallback object for the specified output encoding format</xs:documentation>
 					</xs:annotation>				
 				</xs:attribute>
+				<xs:attribute name="amdSupport" type="Boolean_SchemaType" use="optional" default="false">
+					<xs:annotation>
+						<xs:documentation>Flag indicating whether to perform extra tasks on AMD-style defines</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
 				<xs:attribute name="collapseToLiteral" type="Boolean_SchemaType" use="optional" default="true">
 					<xs:annotation>
 						<xs:documentation>Flag for whether to collapse new Array() to [] and new Object() to {} (true) or leave as-is (false)</xs:documentation>
@@ -1144,6 +1149,11 @@ to preserve references to external symbols.</xs:documentation>
 				<xs:documentation>Flag for whether to hoist function declarations</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
+		<xs:attribute name="keepFunctionArgs" type="Boolean_SchemaType" use="optional" default="false">
+			<xs:annotation>
+				<xs:documentation>Flag for whether to drop unused function arguments</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
 		<xs:attribute name="hoistVars" type="Boolean_SchemaType" use="optional" default="false">
 			<xs:annotation>
 				<xs:documentation>Flag for whether to hoist var declarations</xs:documentation>
@@ -1179,6 +1189,16 @@ to preserve references to external symbols.</xs:documentation>
 				<xs:documentation>String representation of the function names list, which UglifyJS will assume that those functions do not produce side effects</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
+		<xs:attribute name="dropConsole" type="Boolean_SchemaType" use="optional" default="false">
+			<xs:annotation>
+				<xs:documentation>Flag for whether to discard calls to `console.*` functions</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="angular" type="Boolean_SchemaType" use="optional" default="false">
+			<xs:annotation>
+				<xs:documentation>Flag for whether to enable support of `@ngInject` annotations</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
 	</xs:complexType>
 
 	<xs:complexType name="UglifyManglingSettings_SchemaType">
@@ -1281,6 +1301,11 @@ to preserve references to external symbols.</xs:documentation>
 				<xs:documentation>Flag for whether to preserve line breaks</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
+		<xs:attribute name="unescapeRegexps" type="Boolean_SchemaType" use="optional" default="false">
+			<xs:annotation>
+				<xs:documentation>Flag for whether to unescape regular expressions</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
 	</xs:complexType>
 	<!-- /UglifyJs settings -->
 
@@ -1354,6 +1379,11 @@ to preserve references to external symbols.</xs:documentation>
 				<xs:documentation>Flag for whether to enable usual minification</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
+		<xs:attribute name="ejectCharset" type="Boolean_SchemaType" use="optional" default="true">
+			<xs:annotation>
+				<xs:documentation>Flag for whether to eject the `@charset` rules before minification</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
 	</xs:complexType>
 	<!-- /WebGrease settings -->
 
@@ -1406,18 +1436,23 @@ to preserve references to external symbols.</xs:documentation>
 				<xs:documentation>Flag for whether to disable advanced optimizations (selector and property merging, reduction, etc)</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="selectorsMergeMode" use="optional" default="Ie8Compatible">
+		<xs:attribute name="compatibility" use="optional" default="Ie7">
 			<xs:annotation>
-				<xs:documentation>Selectors merge mode</xs:documentation>
+				<xs:documentation>Compatibility mode</xs:documentation>
 			</xs:annotation>
 			<xs:simpleType>
 				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="MergeAll">
+					<xs:enumeration value="None">
+						<xs:annotation>
+							<xs:documentation>None</xs:documentation>
+						</xs:annotation>
+					</xs:enumeration>
+					<xs:enumeration value="Ie7">
 						<xs:annotation>
-							<xs:documentation>Merge all selectors</xs:documentation>
+							<xs:documentation>IE7 compatibility mode</xs:documentation>
 						</xs:annotation>
 					</xs:enumeration>
-					<xs:enumeration value="Ie8Compatible">
+					<xs:enumeration value="Ie8">
 						<xs:annotation>
 							<xs:documentation>IE8 compatibility mode</xs:documentation>
 						</xs:annotation>

diff --git a/BundlingAndMinificationForTheMasses.Providers.Type/Optimus.Providers.TypeScript.csproj b/BundlingAndMinificationForTheMasses.Providers.Type/Optimus.Providers.TypeScript.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -47,26 +47,25 @@
       <HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="BundleTransformer.Core, Version=1.8.17.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="BundleTransformer.Core">
+      <HintPath>..\packages\BundleTransformer.Core.1.8.32\lib\net40\BundleTransformer.Core.dll</HintPath>
       <Private>False</Private>
-      <HintPath>..\packages\BundleTransformer.Core.1.8.17\lib\net40\BundleTransformer.Core.dll</HintPath>
     </Reference>
     <Reference Include="BundleTransformer.TypeScript, Version=1.8.12.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\BundleTransformer.TypeScript.1.8.12\lib\net40\BundleTransformer.TypeScript.dll</HintPath>
     </Reference>
     <Reference Include="JavaScriptEngineSwitcher.Core">
-      <HintPath>..\packages\JavaScriptEngineSwitcher.Core.0.9.2\lib\net40\JavaScriptEngineSwitcher.Core.dll</HintPath>
+      <HintPath>..\packages\JavaScriptEngineSwitcher.Core.1.1.3\lib\net40\JavaScriptEngineSwitcher.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="JavaScriptEngineSwitcher.Msie">
-      <HintPath>..\packages\JavaScriptEngineSwitcher.Msie.0.9.2\lib\net40\JavaScriptEngineSwitcher.Msie.dll</HintPath>
+      <HintPath>..\packages\JavaScriptEngineSwitcher.Msie.1.1.6\lib\net40\JavaScriptEngineSwitcher.Msie.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="MsieJavaScriptEngine">
-      <HintPath>..\packages\MsieJavaScriptEngine.1.1.3\lib\net40\MsieJavaScriptEngine.dll</HintPath>
+      <HintPath>..\packages\MsieJavaScriptEngine.1.4.3\lib\net40\MsieJavaScriptEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -83,9 +82,8 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.2\lib\net40\System.Web.Optimization.dll</HintPath>
+    <Reference Include="System.Web.Optimization">
+      <HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />

diff --git a/BundlingAndMinificationForTheMasses.Providers.Type/Web.config b/BundlingAndMinificationForTheMasses.Providers.Type/Web.config
@@ -8,11 +8,11 @@
         <sectionGroup name="bundleTransformer">
 
 
-        <section name="core" type="BundleTransformer.Core.Configuration.CoreSettings, BundleTransformer.Core" /><section name="typeScript" type="BundleTransformer.TypeScript.Configuration.TypeScriptSettings, BundleTransformer.TypeScript" /></sectionGroup>
-        <sectionGroup name="jsEngineSwitcher">
-          <section name="core" type="JavaScriptEngineSwitcher.Core.Configuration.CoreConfiguration, JavaScriptEngineSwitcher.Core" />
-        </sectionGroup>
-    </configSections>
+        <section name="typeScript" type="BundleTransformer.TypeScript.Configuration.TypeScriptSettings, BundleTransformer.TypeScript" /><section name="core" type="BundleTransformer.Core.Configuration.CoreSettings, BundleTransformer.Core" /></sectionGroup>
+
+    <sectionGroup name="jsEngineSwitcher">
+			<section name="core" type="JavaScriptEngineSwitcher.Core.Configuration.CoreConfiguration, JavaScriptEngineSwitcher.Core" />
+		<section name="msie" type="JavaScriptEngineSwitcher.Msie.Configuration.MsieConfiguration, JavaScriptEngineSwitcher.Msie" /></sectionGroup></configSections>
     <appSettings>
         <add key="webpages:Version" value="2.0.0.0" />
         <add key="webpages:Enabled" value="false" />
@@ -52,7 +52,7 @@
           <translators>
 
 
-          <add name="NullTranslator" type="BundleTransformer.Core.Translators.NullTranslator, BundleTransformer.Core" enabled="false" /><add name="TypeScriptTranslator" type="BundleTransformer.TypeScript.Translators.TypeScriptTranslator, BundleTransformer.TypeScript" enabled="true" /></translators>
+          <add name="TypeScriptTranslator" type="BundleTransformer.TypeScript.Translators.TypeScriptTranslator, BundleTransformer.TypeScript" enabled="true" /><add name="NullTranslator" type="BundleTransformer.Core.Translators.NullTranslator, BundleTransformer.Core" enabled="false" /></translators>
 
         <minifiers>
 					<add name="NullMinifier" type="BundleTransformer.Core.Minifiers.NullMinifier, BundleTransformer.Core" />
@@ -111,10 +111,10 @@
       </assemblyBinding>
     </runtime>
     <jsEngineSwitcher xmlns="http://tempuri.org/JavaScriptEngineSwitcher.Configuration.xsd">
-        <core>
-            <engines>
-                <add name="MsieJsEngine" type="JavaScriptEngineSwitcher.Msie.MsieJsEngine, JavaScriptEngineSwitcher.Msie" />
-            </engines>
-        </core>
-    </jsEngineSwitcher>
+
+    <core>
+			<engines>
+				<add name="MsieJsEngine" type="JavaScriptEngineSwitcher.Msie.MsieJsEngine, JavaScriptEngineSwitcher.Msie" />
+			</engines>
+		</core></jsEngineSwitcher>
 </configuration>
diff --git a/BundlingAndMinificationForTheMasses.Providers.Type/packages.config b/BundlingAndMinificationForTheMasses.Providers.Type/packages.config
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
-  <package id="BundleTransformer.Core" version="1.8.17" targetFramework="net45" />
+  <package id="BundleTransformer.Core" version="1.8.32" targetFramework="net45" />
   <package id="BundleTransformer.TypeScript" version="1.8.12" targetFramework="net45" />
-  <package id="JavaScriptEngineSwitcher.Core" version="0.9.2" targetFramework="net45" />
-  <package id="JavaScriptEngineSwitcher.Msie" version="0.9.2" targetFramework="net45" />
+  <package id="JavaScriptEngineSwitcher.Core" version="1.1.3" targetFramework="net45" />
+  <package id="JavaScriptEngineSwitcher.Msie" version="1.1.6" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Web.Optimization" version="1.1.2" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi" version="4.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="MsieJavaScriptEngine" version="1.1.3" targetFramework="net45" />
+  <package id="MsieJavaScriptEngine" version="1.4.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
   <package id="WebGrease" version="1.5.2" targetFramework="net45" />
 </packages>
diff --git a/Optimus.sln b/Optimus.sln
@@ -73,6 +73,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Optimus.Providers.CoffeeScr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Optimus.Providers.SassAndSCSS", "BundlingAndMinificationForTheMasses.Providers.SCSS\Optimus.Providers.SassAndSCSS.csproj", "{9FE56583-994F-4286-9BE5-C2F0237D6FB7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Optimus.Providers.TypeScript", "BundlingAndMinificationForTheMasses.Providers.Type\Optimus.Providers.TypeScript.csproj", "{034575BA-E003-4C09-BDD2-ECC66B6589C2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -111,6 +113,10 @@ Global
 		{9FE56583-994F-4286-9BE5-C2F0237D6FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9FE56583-994F-4286-9BE5-C2F0237D6FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9FE56583-994F-4286-9BE5-C2F0237D6FB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{034575BA-E003-4C09-BDD2-ECC66B6589C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{034575BA-E003-4C09-BDD2-ECC66B6589C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{034575BA-E003-4C09-BDD2-ECC66B6589C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{034575BA-E003-4C09-BDD2-ECC66B6589C2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/TestSiteV7/Web.config b/TestSiteV7/Web.config
@@ -18,6 +18,7 @@
       <section name="less" type="BundleTransformer.Less.Configuration.LessSettings, BundleTransformer.Less" />
       <section name="coffeeScript" type="BundleTransformer.CoffeeScript.Configuration.CoffeeScriptSettings, BundleTransformer.CoffeeScript" />
       <section name="sassAndScss" type="BundleTransformer.SassAndScss.Configuration.SassAndScssSettings, BundleTransformer.SassAndScss" />
+      <section name="typeScript" type="BundleTransformer.TypeScript.Configuration.TypeScriptSettings, BundleTransformer.TypeScript" />
     </sectionGroup>
     <sectionGroup name="jsEngineSwitcher">
       <section name="core" type="JavaScriptEngineSwitcher.Core.Configuration.CoreConfiguration, JavaScriptEngineSwitcher.Core" />
@@ -121,6 +122,7 @@
       <add path="*.coffee.md" verb="GET" type="BundleTransformer.CoffeeScript.HttpHandlers.CoffeeScriptAssetHandler, BundleTransformer.CoffeeScript" validate="true" />
       <add path="*.sass" verb="GET" type="BundleTransformer.SassAndScss.HttpHandlers.SassAndScssAssetHandler, BundleTransformer.SassAndScss" validate="true" />
       <add path="*.scss" verb="GET" type="BundleTransformer.SassAndScss.HttpHandlers.SassAndScssAssetHandler, BundleTransformer.SassAndScss" validate="true" />
+      <add path="*.ts" verb="GET" type="BundleTransformer.TypeScript.HttpHandlers.TypeScriptAssetHandler, BundleTransformer.TypeScript" validate="true" />
     </httpHandlers>
     <compilation defaultLanguage="c#" debug="false" batch="false" targetFramework="4.5">
       <assemblies>
@@ -196,6 +198,8 @@
       <add name="SassAssetHandler" path="*.sass" verb="GET" type="BundleTransformer.SassAndScss.HttpHandlers.SassAndScssAssetHandler, BundleTransformer.SassAndScss" preCondition="integratedMode" />
       <remove name="ScssAssetHandler" />
       <add name="ScssAssetHandler" path="*.scss" verb="GET" type="BundleTransformer.SassAndScss.HttpHandlers.SassAndScssAssetHandler, BundleTransformer.SassAndScss" preCondition="integratedMode" />
+      <remove name="TypeScriptAssetHandler" />
+      <add name="TypeScriptAssetHandler" path="*.ts" verb="GET" type="BundleTransformer.TypeScript.HttpHandlers.TypeScriptAssetHandler, BundleTransformer.TypeScript" preCondition="integratedMode" />
     </handlers>
     <!-- Adobe AIR mime type -->
     <staticContent>
@@ -291,6 +295,7 @@
         <translators>
           <add name="NullTranslator" type="BundleTransformer.Core.Translators.NullTranslator, BundleTransformer.Core" enabled="false" />
           <add name="CoffeeScriptTranslator" type="BundleTransformer.CoffeeScript.Translators.CoffeeScriptTranslator, BundleTransformer.CoffeeScript" />
+          <add name="TypeScriptTranslator" type="BundleTransformer.TypeScript.Translators.TypeScriptTranslator, BundleTransformer.TypeScript" />
         </translators>
       </js>
     </core>
@@ -300,6 +305,9 @@
     <coffeeScript>
       <jsEngine name="MsieJsEngine" />
     </coffeeScript>
+    <typeScript>
+      <jsEngine name="MsieJsEngine" />
+    </typeScript>
   </bundleTransformer>
   <jsEngineSwitcher xmlns="http://tempuri.org/JavaScriptEngineSwitcher.Configuration.xsd">
     <core>