update to jspm 0.17

This commit is contained in:
casperlamboo 2016-07-18 18:28:47 +02:00 committed by Simon Voordouw
parent b82380fff0
commit ef09d7216a
5 changed files with 90 additions and 70 deletions

View File

@ -1,63 +0,0 @@
System.config({
baseURL: "/",
defaultJSExtensions: true,
transpiler: "babel",
babelOptions: {
"optional": [
"runtime"
]
},
paths: {
"github:*": "jspm_packages/github/*",
"npm:*": "jspm_packages/npm/*"
},
bundles: {
"bundle.js": []
},
map: {
"Doodle3D/clipper-js": "github:Doodle3D/clipper-js@master",
"babel": "npm:babel-core@5.8.38",
"babel-runtime": "npm:babel-runtime@5.8.38",
"casperlamboo/EventDispatcher": "github:casperlamboo/EventDispatcher@master",
"core-js": "npm:core-js@0.9.18",
"json": "github:systemjs/plugin-json@0.1.0",
"three.js": "github:mrdoob/three.js@r72",
"github:Doodle3D/clipper-js@master": {
"clipper-lib": "npm:clipper-lib@1.0.0"
},
"github:jspm/nodelibs-assert@0.1.0": {
"assert": "npm:assert@1.3.0"
},
"github:jspm/nodelibs-process@0.1.2": {
"process": "npm:process@0.11.2"
},
"github:jspm/nodelibs-util@0.1.0": {
"util": "npm:util@0.10.3"
},
"npm:assert@1.3.0": {
"util": "npm:util@0.10.3"
},
"npm:babel-runtime@5.8.38": {
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:clipper-lib@1.0.0": {
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:core-js@0.9.18": {
"fs": "github:jspm/nodelibs-fs@0.1.2",
"process": "github:jspm/nodelibs-process@0.1.2",
"systemjs-json": "github:systemjs/plugin-json@0.1.2"
},
"npm:inherits@2.0.1": {
"util": "github:jspm/nodelibs-util@0.1.0"
},
"npm:process@0.11.2": {
"assert": "github:jspm/nodelibs-assert@0.1.0"
},
"npm:util@0.10.3": {
"inherits": "npm:inherits@2.0.1",
"process": "github:jspm/nodelibs-process@0.1.2"
}
}
});

View File

@ -11,7 +11,7 @@
</style>
<script type="text/javascript" src="../jspm_packages/system.js"></script>
<script type="text/javascript" src="../config.js"></script>
<script type="text/javascript" src="../jspm.config.js"></script>
<script type="text/javascript">
System.import('example/app.js');
@ -24,4 +24,4 @@
<p id="gcode"></p>
</body>
</html>
</html>

70
jspm.config.js Normal file
View File

@ -0,0 +1,70 @@
SystemJS.config({
paths: {
"github:": "jspm_packages/github/",
"npm:": "jspm_packages/npm/",
"slicer/": "src/"
},
browserConfig: {
"baseURL": "/"
},
devConfig: {
"map": {
"babel-runtime": "npm:babel-runtime@5.8.38",
"core-js": "npm:core-js@0.9.18",
"process": "github:jspm/nodelibs-process@0.2.0-alpha",
"fs": "github:jspm/nodelibs-fs@0.2.0-alpha",
"plugin-babel": "npm:systemjs-plugin-babel@0.0.12"
},
"packages": {
"npm:babel-runtime@5.8.38": {
"map": {}
},
"npm:core-js@0.9.18": {
"map": {
"systemjs-json": "github:systemjs/plugin-json@0.1.2"
}
}
}
},
transpiler: "plugin-babel",
babelOptions: {
"optional": [
"runtime"
]
},
packages: {
"slicer": {
"main": "index.js"
}
},
bundles: {
"bundle.js": []
},
map: {
"babel": "npm:babel-core@5.8.38"
}
});
SystemJS.config({
packageConfigPaths: [
"npm:@*/*.json",
"npm:*.json",
"github:*/*.json"
],
map: {
"json": "github:systemjs/plugin-json@0.1.2",
"Doodle3D/clipper-js": "github:Doodle3D/clipper-js@master",
"casperlamboo/EventDispatcher": "github:casperlamboo/EventDispatcher@master",
"three.js": "github:mrdoob/three.js@r72"
},
packages: {
"github:Doodle3D/clipper-js@master": {
"map": {
"clipper-lib": "npm:clipper-lib@1.0.0"
}
},
"npm:clipper-lib@1.0.0": {
"map": {}
}
}
});

View File

@ -1,18 +1,31 @@
{
"jspm": {
"main": "index",
"name": "slicer",
"main": "index.js",
"directories": {
"lib": "src"
},
"dependencies": {
"Doodle3D/clipper-js": "github:Doodle3D/clipper-js@master",
"casperlamboo/EventDispatcher": "github:casperlamboo/EventDispatcher@master",
"json": "github:systemjs/plugin-json@^0.1.2",
"three.js": "github:mrdoob/three.js@r72"
},
"devDependencies": {
"babel": "npm:babel-core@^5.1.13",
"babel-runtime": "npm:babel-runtime@^5.1.13",
"core-js": "npm:core-js@^0.9.4"
"core-js": "npm:core-js@^0.9.4",
"fs": "github:jspm/nodelibs-fs@^0.2.0-alpha",
"plugin-babel": "npm:systemjs-plugin-babel@^0.0.12",
"process": "github:jspm/nodelibs-process@^0.2.0-alpha"
},
"overrides": {
"npm:babel-runtime@5.8.38": {
"main": false,
"dependencies": {},
"optionalDependencies": {
"core-js": "^1.2.0"
}
}
}
}
}

View File

@ -1,6 +1,6 @@
import Slicer from './slicer.js';
import Settings from './settings.js';
import printerSettings from './settings/printer_settings.json!';
import userSettings from './settings/user_settings.json!';
import printerSettings from './settings/printer_settings.json!json';
import userSettings from './settings/user_settings.json!json';
export { Slicer, Settings, printerSettings, userSettings };