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

Commit be69881

Browse files
mhegazymhegazy
authored
Merge pull request #106 from guybedford/master
jspm beta latest update
2 parents 0ef446c + 2fe96cc commit be69881

5 files changed

Lines changed: 52 additions & 62 deletions

File tree

‎jspm/index.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<head>
33
<title>Jspm sample</title>
44
<script src="jspm_packages/system.src.js"></script>
5-
<script src="jspm.browser.js"></script>
65
<script src="jspm.config.js"></script>
76
</head>
87
<body>

‎jspm/jspm.browser.js‎

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

‎jspm/jspm.config.js‎

Lines changed: 32 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,35 @@
11
SystemJS.config({
22
transpiler: "plugin-typescript",
33
packages: {
4-
"src": {
5-
"defaultExtension": "ts",
4+
"app": {
5+
"main": "app.ts",
6+
"defaultExtension": "ts"
7+
}
8+
},
9+
browserConfig: {
10+
baseURL: "/",
11+
paths: {
12+
"app/": "src/",
13+
"github:": "jspm_packages/github/",
14+
"npm:": "jspm_packages/npm/"
15+
}
16+
},
17+
devConfig: {
18+
"map": {
19+
"plugin-typescript": "github:frankwallis/plugin-typescript@4.0.6",
20+
"os": "github:jspm/nodelibs-os@0.2.0-alpha"
21+
},
22+
"packages": {
23+
"github:frankwallis/plugin-typescript@4.0.6": {
24+
"map": {
25+
"typescript": "npm:typescript@1.8.10"
26+
}
27+
},
28+
"github:jspm/nodelibs-os@0.2.0-alpha": {
29+
"map": {
30+
"os-browserify": "npm:os-browserify@0.2.1"
31+
}
32+
}
633
}
734
}
835
});
@@ -14,47 +41,10 @@ SystemJS.config({
1441
"github:*/*.json"
1542
],
1643
map: {
17-
"buffer": "github:jspm/nodelibs-buffer@0.2.0-alpha",
18-
"child_process": "github:jspm/nodelibs-child_process@0.2.0-alpha",
19-
"core-js": "npm:core-js@0.9.18",
44+
"core-js": "npm:core-js@2.4.0",
2045
"fs": "github:jspm/nodelibs-fs@0.2.0-alpha",
21-
"os": "github:jspm/nodelibs-os@0.2.0-alpha",
2246
"path": "github:jspm/nodelibs-path@0.2.0-alpha",
23-
"plugin-typescript": "github:frankwallis/plugin-typescript@4.0.6",
24-
"process": "github:jspm/nodelibs-process@0.2.0-alpha",
25-
"readline": "github:jspm/nodelibs-readline@0.2.0-alpha",
26-
"typescript": "npm:typescript@1.5.3"
47+
"process": "github:jspm/nodelibs-process@0.2.0-alpha"
2748
},
28-
packages: {
29-
"github:frankwallis/plugin-typescript@4.0.6": {
30-
"map": {
31-
"typescript": "npm:typescript@1.8.10"
32-
}
33-
},
34-
"github:jspm/nodelibs-buffer@0.2.0-alpha": {
35-
"map": {
36-
"buffer-browserify": "npm:buffer@4.5.1"
37-
}
38-
},
39-
"github:jspm/nodelibs-os@0.2.0-alpha": {
40-
"map": {
41-
"os-browserify": "npm:os-browserify@0.2.1"
42-
}
43-
},
44-
"npm:buffer@4.5.1": {
45-
"map": {
46-
"base64-js": "npm:base64-js@1.1.2",
47-
"ieee754": "npm:ieee754@1.1.6",
48-
"isarray": "npm:isarray@1.0.0"
49-
}
50-
},
51-
"npm:core-js@0.9.18": {
52-
"map": {
53-
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
54-
}
55-
},
56-
"npm:typescript@1.5.3": {
57-
"map": {}
58-
}
59-
}
49+
packages: {}
6050
});

‎jspm/package.json‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
11
{
22
"jspm": {
3-
"directories": {},
43
"dependencies": {
5-
"core-js": "npm:core-js@^0.9.4"
4+
"core-js": "npm:core-js@^2.4.0"
65
},
76
"devDependencies": {
8-
"buffer": "github:jspm/nodelibs-buffer@^0.2.0-alpha",
9-
"child_process": "github:jspm/nodelibs-child_process@^0.2.0-alpha",
10-
"fs": "github:jspm/nodelibs-fs@^0.2.0-alpha",
117
"os": "github:jspm/nodelibs-os@^0.2.0-alpha",
8+
"plugin-typescript": "github:frankwallis/plugin-typescript@^4.0.6"
9+
},
10+
"peerDependencies": {
11+
"fs": "github:jspm/nodelibs-fs@^0.2.0-alpha",
1212
"path": "github:jspm/nodelibs-path@^0.2.0-alpha",
13-
"plugin-typescript": "github:frankwallis/plugin-typescript@^4.0.6",
14-
"process": "github:jspm/nodelibs-process@^0.2.0-alpha",
15-
"readline": "github:jspm/nodelibs-readline@^0.2.0-alpha",
16-
"typescript": "npm:typescript@1.8.10"
13+
"process": "github:jspm/nodelibs-process@^0.2.0-alpha"
14+
},
15+
"overrides": {
16+
"npm:typescript@1.8.10": {
17+
"browser": {},
18+
"map": {
19+
"buffer": "@empty",
20+
"child_process": "@empty",
21+
"fs": "@empty",
22+
"path": "@empty",
23+
"process": "@empty",
24+
"readline": "@empty"
25+
}
26+
}
1727
}
1828
}
1929
}

‎jspm/src/app.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Greeter } from 'greeter'
1+
import { Greeter } from './greeter'
22

33
export function main(el: HTMLElement): void {
44
let greeter = new Greeter(el);

0 commit comments

Comments
 (0)