Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 5253d34

Browse files
mythzmythz
committed
Upgrade to jspm@beta and remove typings + deps
1 parent ce90306 commit 5253d34

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+34400
-14825
lines changed

‎build/build.bat

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,9 @@ MD ..\ServiceStack.Admin\ss_admin\img
2424

2525
XCOPY /E img ..\ServiceStack.Admin\ss_admin\img
2626

27-
jspm bundle -m src\main ..\ServiceStack.Admin\ss_admin\app.js
27+
REM jspm bundle src/app.js - [./src/**/*] ./deps.lib.js
2828

29+
REM old-style bundling
30+
REM jspm bundle -m src/app.js ../ServiceStack.Admin/ss_admin/app.js
31+
32+
REM jspm build -m src/app.js ../ServiceStack.Admin/ss_admin/app.js

‎src/ServiceStack.Admin.WebHost/ServiceStack.Admin.WebHost.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<IISExpressWindowsAuthentication />
2424
<IISExpressUseClassicPipelineMode />
2525
<UseGlobalApplicationHostFile />
26-
<TypeScriptToolsVersion>1.8</TypeScriptToolsVersion>
26+
<TypeScriptToolsVersion>2.0</TypeScriptToolsVersion>
2727
<NuGetPackageImportStamp>
2828
</NuGetPackageImportStamp>
2929
</PropertyGroup>
@@ -97,8 +97,10 @@
9797
<Content Include="img\roboto\roboto-v15-latin-regular.woff2" />
9898
<Content Include="img\octicon\octicons.ttf" />
9999
<Content Include="img\octicon\octicons.woff" />
100+
<Content Include="jspm.config.js" />
100101
<Content Include="packages.config" />
101102
<Content Include="tsconfig.json" />
103+
<Content Include="package.json" />
102104
<None Include="Web.Debug.config">
103105
<DependentUpon>Web.config</DependentUpon>
104106
</None>
@@ -111,15 +113,13 @@
111113
<Link>sqlite3.dll</Link>
112114
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
113115
</Content>
114-
<Content Include="config.js" />
115116
<Content Include="deps.lib.js" />
116117
<Content Include="Global.asax" />
117118
<Content Include="img\iconfont\material-icons.css" />
118119
<Content Include="img\iconfont\MaterialIcons-Regular.svg" />
119120
<Content Include="default.css" />
120121
<Content Include="img\octicon\octicon.css" />
121122
<Content Include="index.html" />
122-
<Content Include="jspm_packages\system.js" />
123123
<Content Include="Web.config" />
124124
</ItemGroup>
125125
<ItemGroup>
@@ -141,13 +141,12 @@
141141
<SubType>Code</SubType>
142142
</TypeScriptCompile>
143143
<TypeScriptCompile Include="src\core.ts" />
144-
<TypeScriptCompile Include="src\deps.tsx" />
145144
<TypeScriptCompile Include="src\Content.tsx" />
146145
<TypeScriptCompile Include="src\Results.tsx" />
147146
<TypeScriptCompile Include="src\ColumnPrefsDialog.tsx" />
148147
<TypeScriptCompile Include="src\Sidebar.tsx" />
149148
<TypeScriptCompile Include="src\Header.tsx" />
150-
<TypeScriptCompile Include="src\main.tsx">
149+
<TypeScriptCompile Include="src\app.tsx">
151150
<SubType>Code</SubType>
152151
</TypeScriptCompile>
153152
</ItemGroup>

‎src/ServiceStack.Admin.WebHost/config.js

Lines changed: 0 additions & 146 deletions
This file was deleted.

‎src/ServiceStack.Admin.WebHost/default.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ form:focus {
267267
@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }
268268

269269
::-webkit-scrollbar {
270-
width: 5px;
271-
height: 5px;
270+
width: 7px;
271+
height: 7px;
272272
}
273273

274274
::-webkit-scrollbar-track {

‎src/ServiceStack.Admin.WebHost/deps.lib.js

Lines changed: 33843 additions & 14 deletions
Large diffs are not rendered by default.

‎src/ServiceStack.Admin.WebHost/deps.lib.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ServiceStack.Admin.WebHost/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<link href="/img/octicon/octicon.css" rel="stylesheet" />
99
<link href="/default.css" rel="stylesheet" />
1010
<script src="/jspm_packages/system.js"></script>
11-
<script src="/config.js"></script>
11+
<script src="/jspm.config.js"></script>
1212
<script src="/deps.lib.js"></script>
1313
</head>
1414
<body>
1515
<div id="app" style="height:100%;"></div>
1616
<script>
17-
System.import("/src/main");
17+
System.import("app").catch(console.error.bind(console));
1818
</script>
1919
</body>
2020
</html>

0 commit comments

Comments
 (0)