update SystemJS

flyover · Jan 9, 2020 · 041f592 · 041f592
1 parent 9170d46
commit 041f592
Show file tree

Hide file tree

Showing 19 changed files with 5,059 additions and 7,898 deletions.
diff --git a/demo/dist/demo/atlas.js → demo/atlas.js b/demo/dist/demo/atlas.js → demo/atlas.js
diff --git a/demo/dist/demo/main.js b/demo/dist/demo/main.js
diff --git a/demo/dist/demo/render-ctx2d.js b/demo/dist/demo/render-ctx2d.js
diff --git a/demo/dist/demo/render-webgl.js b/demo/dist/demo/render-webgl.js
diff --git a/demo/dist/spine.js b/demo/dist/spine.js
diff --git a/demo/index.html b/demo/index.html
@@ -5,42 +5,17 @@
 		<meta charset="utf-8" />
 		<title>Spine TypeScript Demo</title>
 		<style>body { background-image: url("bg.png"); background-repeat: repeat; }</style>
-		<script type="text/javascript" src="https://unpkg.com/systemjs@0.21.3/dist/system.js"></script>
-		<!--script type="text/javascript" src="../node_modules/systemjs/dist/system.js"></script-->
+		<script type="systemjs-importmap">
+			{
+				"imports": {
+					"@spine": "../index.js"
+			  	}
+			}
+		  </script>
+		<script src="https://unpkg.com/systemjs@6.1.7/dist/system.js"></script>
 		<script type="text/javascript">
 		function boot(event) {
-			var transpile = false;
-			if (transpile) {
-				SystemJS.config({
-					packages: { "typescript": { main: "lib/typescript.js", meta: { "lib/typescript.js": { exports: "ts" } } } },
-					// map: { "typescript": "../../node_modules/typescript", }
-					map: { "typescript": "https://unpkg.com/typescript@2.8.3", }
-				});
-				SystemJS.config({
-					packages: { "plugin-typescript": { main: "lib/plugin.js" } },
-					// map: { "plugin-typescript": "../../node_modules/plugin-typescript" },
-					map: { "plugin-typescript": "https://unpkg.com/plugin-typescript@8.0.0" },
-					transpiler: "plugin-typescript",
-					typescriptOptions: { tsconfig: true, module: "system" }
-				});
-				SystemJS.config({
-					packages: {
-						"..": { defaultExtension: "ts" },
-						".": { defaultExtension: "ts" }
-					}
-				});
-			} else {
-				SystemJS.config({
-					baseURL: "dist/demo"
-				});
-				SystemJS.config({
-					packages: {
-						"..": { defaultExtension: "js" },
-						".": { defaultExtension: "js" }
-					}
-				});
-			}
-			SystemJS.import("main").then(function(module) {
+			System.import("./main.js").then(function(module) {
 				module.start();
 			}).catch(function (error) {
 				console.error(error);

diff --git a/demo/main.js b/demo/main.js
diff --git a/demo/main.ts b/demo/main.ts
@@ -1,8 +1,8 @@
-import * as Spine from "../spine";
-import * as Atlas from "./atlas";
-import { RenderCtx2D } from "./render-ctx2d";
-import { RenderWebGL } from "./render-webgl";
-import { mat4x4Identity, mat4x4Ortho, mat4x4Translate, mat4x4Scale } from "./render-webgl";
+import * as Spine from "@spine";
+import * as Atlas from "./atlas.js";
+import { RenderCtx2D } from "./render-ctx2d.js";
+import { RenderWebGL } from "./render-webgl.js";
+import { mat4x4Identity, mat4x4Ortho, mat4x4Translate, mat4x4Scale } from "./render-webgl.js";
 
 interface File {
   path: string;

diff --git a/demo/render-ctx2d.js b/demo/render-ctx2d.js
diff --git a/demo/render-ctx2d.ts b/demo/render-ctx2d.ts
@@ -1,6 +1,6 @@
-import * as Spine from "../spine";
-import * as Atlas from "./atlas";
-import { mat3x3Identity, mat3x3Scale, mat3x3Transform, mat3x3ApplyAtlasPageTexcoord, mat3x3ApplyAtlasSiteTexcoord } from "./render-webgl";
+import * as Spine from "@spine";
+import * as Atlas from "./atlas.js";
+import { mat3x3Identity, mat3x3Scale, mat3x3Transform, mat3x3ApplyAtlasPageTexcoord, mat3x3ApplyAtlasSiteTexcoord } from "./render-webgl.js";
 
 export class RenderCtx2D {
   public ctx: CanvasRenderingContext2D;