Skip to content

Commit f94e225

Browse files
jwertsjwerts
committed
made updates to support standard modules names, but not working yet
1 parent 7ae331f commit f94e225

14 files changed

+116
-51
lines changed

‎app/app.component.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ import { MapComponent } from './map.component';
33
import { AttributeComponent } from './attribute.component';
44
import { PointsModel } from './points.model';
55

6-
import { Point, Graphic, SimpleMarkerSymbol, Color } from 'esri';
6+
//import { Point, Graphic, SimpleMarkerSymbol, Color } from 'esri';
7+
import Point from 'esri/geometry/Point';
8+
import Graphic from 'esri/Graphic';
9+
import SimpleMarkerSymbol from 'esri/symbols/SimpleMarkerSymbol';
10+
import Color from 'esri';
11+
712

813
@Component({
914
directives: [MapComponent, AttributeComponent],

‎app/attribute.component.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { Component, OnInit } from '@angular/core';
22

3-
import { Graphic, Collection, Point } from "esri";
3+
//import { Graphic, Collection, Point } from "esri";
4+
import Graphic from 'esri/Graphic';
5+
import Collection from 'esri/core/Collection';
6+
import Point from 'esri/geometry/Point';
47

58
import { PointsModel } from './points.model';
69

‎app/map.component.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import { Component, ElementRef, Output, EventEmitter } from '@angular/core';
22
import { MapService } from './map.service';
3-
import { MapView, Point, SpatialReference } from 'esri';
3+
//import { MapView, Point, SpatialReference } from 'esri';
4+
import MapView from 'esri/views/MapView';
5+
import Point from 'esri/geometry/Point';
6+
import SpatialReference from 'esri/geometry/SpatialReference';
7+
48

59
@Component({
610
selector: 'esri-map',

‎app/map.service.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { Injectable, Inject } from '@angular/core';
2-
import { Map, GraphicsLayer } from 'esri';
2+
//import { Map, GraphicsLayer } from 'esri';
3+
4+
import Map from 'esri/Map';
5+
import GraphicsLayer from 'esri/layers/GraphicsLayer';
36

47
import { PointsModel } from './points.model';
58

‎app/points.model.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import { Injectable } from '@angular/core';
22

3-
import { Graphic, Point, GraphicsLayer, Collection } from 'esri';
3+
//import { Graphic, Point, GraphicsLayer, Collection } from 'esri';
4+
import Graphic from 'esri/Graphic';
5+
import Point from 'esri/geometry/Point';
6+
import GraphicsLayer from 'esri/layers/GraphicsLayer';
7+
import Collection from 'esri/core/Collection';
48

59
@Injectable()
610
export class PointsModel {
@@ -23,7 +27,7 @@ export class PointsModel {
2327
this._points.removeAll();
2428
}
2529
getIndexSum() {
26-
var sum:number = 0;
30+
let sum = 0;
2731
if (this._points !== null) {
2832
this._points.forEach(p => sum += p.attributes.index);
2933
}

‎esriLoadConfig.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
'esri/geometry/SpatialReference',
1111
'esri/symbols/SimpleMarkerSymbol',
1212
'esri/Color'
13-
],
14-
outModuleName: 'esri',
15-
moduleNameOverrides: {
16-
'esri/arcgis/utils': 'arcgisUtils'
17-
}
13+
],
14+
maintainModuleNames: true
15+
// outModuleName: 'esri',
16+
// moduleNameOverrides: {
17+
// 'esri/arcgis/utils': 'arcgisUtils'
18+
// }
1819
};
1920
}(window))

‎esriSystemLoadBrowser.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ esriSystem.register(esriLoadConfig.modules, function () {
88
}, function (error) {
99
console.log("Esri system error:", error);
1010
});
11-
}, {
12-
outModuleName: esriLoadConfig.outModuleName,
13-
moduleNameOverrides: esriLoadConfig.moduleNameOverrides
14-
});
11+
},
12+
{
13+
maintainModuleNames: true
14+
}
15+
// {
16+
// outModuleName: esriLoadConfig.outModuleName,
17+
// moduleNameOverrides: esriLoadConfig.moduleNameOverrides
18+
// }
19+
);

‎esriSystemLoadTest.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
// into a System.js module called esri
33
esriSystem.register(esriLoadConfig.modules, function () {
44
console.log('loaded esri modules');
5-
}, {
6-
outModuleName: esriLoadConfig.outModuleName,
7-
moduleNameOverrides: esriLoadConfig.moduleNameOverrides
8-
});
5+
},
6+
{
7+
maintainModuleNames: true
8+
}
9+
// {
10+
// outModuleName: esriLoadConfig.outModuleName,
11+
// moduleNameOverrides: esriLoadConfig.moduleNameOverrides
12+
// }
13+
);

‎npm-debug.log‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
0 info it worked if it ends with ok
2+
1 verbose cli [ 'C:\\Program Files\\nodejs\\node.exe',
3+
1 verbose cli 'C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js',
4+
1 verbose cli 'run',
5+
1 verbose cli 'tsc' ]
6+
2 info using npm@3.9.5
7+
3 info using node@v6.2.2
8+
4 verbose run-script [ 'pretsc', 'tsc', 'posttsc' ]
9+
5 info lifecycle jsapi4angular2@1.0.0~pretsc: jsapi4angular2@1.0.0
10+
6 silly lifecycle jsapi4angular2@1.0.0~pretsc: no script for pretsc, continuing
11+
7 info lifecycle jsapi4angular2@1.0.0~tsc: jsapi4angular2@1.0.0
12+
8 verbose lifecycle jsapi4angular2@1.0.0~tsc: unsafe-perm in lifecycle true
13+
9 verbose lifecycle jsapi4angular2@1.0.0~tsc: PATH: C:\Program Files\nodejs\node_modules\npm\bin\node-gyp-bin;C:\Projects\jsapi4-angular2\node_modules\.bin;C:\Program Files\nodejs;C:\ProgramData\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\WINDOWS\system32\config\systemprofile\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Users\joshw\AppData\Local\atom\bin;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\_computer_setup\hugo;C:\Python34;C:\Python34\Scripts;C:\Program Files (x86)\Microsoft VS Code\bin;C:\Users\joshw\AppData\Local\Microsoft\WindowsApps;C:\Users\joshw\AppData\Roaming\npm;
14+
10 verbose lifecycle jsapi4angular2@1.0.0~tsc: CWD: C:\Projects\jsapi4-angular2
15+
11 silly lifecycle jsapi4angular2@1.0.0~tsc: Args: [ '/d /s /c', 'tsc' ]
16+
12 silly lifecycle jsapi4angular2@1.0.0~tsc: Returned: code: 2 signal: null
17+
13 info lifecycle jsapi4angular2@1.0.0~tsc: Failed to exec tsc script
18+
14 verbose stack Error: jsapi4angular2@1.0.0 tsc: `tsc`
19+
14 verbose stack Exit status 2
20+
14 verbose stack at EventEmitter.<anonymous> (C:\Program Files\nodejs\node_modules\npm\lib\utils\lifecycle.js:245:16)
21+
14 verbose stack at emitTwo (events.js:106:13)
22+
14 verbose stack at EventEmitter.emit (events.js:191:7)
23+
14 verbose stack at ChildProcess.<anonymous> (C:\Program Files\nodejs\node_modules\npm\lib\utils\spawn.js:24:14)
24+
14 verbose stack at emitTwo (events.js:106:13)
25+
14 verbose stack at ChildProcess.emit (events.js:191:7)
26+
14 verbose stack at maybeClose (internal/child_process.js:852:16)
27+
14 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:215:5)
28+
15 verbose pkgid jsapi4angular2@1.0.0
29+
16 verbose cwd C:\Projects\jsapi4-angular2
30+
17 error Windows_NT 10.0.14372
31+
18 error argv "C:\\Program Files\\nodejs\\node.exe" "C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js" "run" "tsc"
32+
19 error node v6.2.2
33+
20 error npm v3.9.5
34+
21 error code ELIFECYCLE
35+
22 error jsapi4angular2@1.0.0 tsc: `tsc`
36+
22 error Exit status 2
37+
23 error Failed at the jsapi4angular2@1.0.0 tsc script 'tsc'.
38+
23 error Make sure you have the latest version of node.js and npm installed.
39+
23 error If you do, this is most likely a problem with the jsapi4angular2 package,
40+
23 error not with npm itself.
41+
23 error Tell the author that this fails on your system:
42+
23 error tsc
43+
23 error You can get information on how to open an issue for this project with:
44+
23 error npm bugs jsapi4angular2
45+
23 error Or if that isn't available, you can get their info via:
46+
23 error npm owner ls jsapi4angular2
47+
23 error There is likely additional logging output above.
48+
24 verbose exit [ 1, true ]

‎package.json‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,26 @@
3333
"rxjs": "5.0.0-beta.6",
3434
"zone.js": "^0.6.12",
3535
"angular2-in-memory-web-api": "0.0.14",
36-
37-
"esri-system-js": "0.0.3",
36+
"esri-system-js": "1.0.0-beta.0",
3837
"bootstrap": "^3.3.6"
3938
},
4039
"devDependencies": {
41-
"concurrently": "^2.0.0",
42-
"lite-server": "^2.2.0",
43-
"typescript": "^1.8.10",
44-
"typings": "^1.0.4",
45-
4640
"canonical-path": "0.0.2",
41+
"concurrently": "^2.0.0",
42+
"eslint": "^3.0.0",
4743
"http-server": "^0.9.0",
48-
"tslint": "^3.7.4",
49-
"lodash": "^4.11.1",
5044
"jasmine-core": "~2.4.1",
5145
"karma": "^0.13.22",
5246
"karma-chrome-launcher": "^0.2.3",
5347
"karma-cli": "^0.1.2",
5448
"karma-htmlfile-reporter": "^0.2.2",
5549
"karma-jasmine": "^0.3.8",
56-
"rimraf": "^2.5.2"
50+
"lite-server": "^2.2.0",
51+
"lodash": "^4.11.1",
52+
"rimraf": "^2.5.2",
53+
"tslint": "^3.7.4",
54+
"typescript": "^1.8.10",
55+
"typings": "^1.0.4"
5756
},
5857
"repository": {}
5958
}

0 commit comments

Comments
 (0)