From 99a529d29f3280860a2485b27439415d0ad61c26 Mon Sep 17 00:00:00 2001 From: Tom Wayson Date: Sun, 16 Apr 2017 20:20:58 -0700 Subject: [PATCH 1/4] add NgModule & build FESM output using ngc & rollup base folder structure on https://github.com/jasonaden/simple-ui-lib add an NgModule build FESM output using ngc & rollup remove package.main and have package.module point to FESM --- .gitignore | 5 ++-- index.ts | 1 - package.json | 28 +++++++++++------- src/index.ts | 1 + src/package.json | 28 ++++++++++++++++++ src/services/esri-loader.module.ts | 8 ++++++ src/{ => services}/esri-loader.service.ts | 0 tsconfig.json | 35 +++++++++++++++-------- 8 files changed, 79 insertions(+), 27 deletions(-) delete mode 100644 index.ts create mode 100644 src/index.ts create mode 100644 src/package.json create mode 100644 src/services/esri-loader.module.ts rename src/{ => services}/esri-loader.service.ts (100%) diff --git a/.gitignore b/.gitignore index a8f33ae..686df26 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,5 @@ jspm_packages .node_repl_history # build output -*.js -*.map -*.d.ts +build +dist diff --git a/index.ts b/index.ts deleted file mode 100644 index 84d96b2..0000000 --- a/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { EsriLoaderService } from './src/esri-loader.service'; diff --git a/package.json b/package.json index 84f6289..d270d0e 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,22 @@ { "name": "angular2-esri-loader", "version": "0.1.11", - "description": "An Angular 2 service to help you load ArcGIS API for JavaScript Modules", + "description": "An Angular (2+) service to help you load ArcGIS API for JavaScript Modules", "scripts": { - "test": "tsc", - "prepublish": "tsc" + "build": "npm run clean && npm run ngc && npm run rollup && npm run copy", + "clean": "rm -rf build dist", + "copy": "rsync -a --exclude=*.js build/ dist && cp src/package.json dist/package.json && cp README.md dist/README.md", + "ngc": "ngc -p tsconfig.json", + "rollup": "rollup build/angular2-esri-loader.js -o dist/angular2-esri-loader.js", + "prepublish": "npm run build", + "test": "ngc" }, "repository": { "type": "git", "url": "git+https://github.com/tomwayson/angular2-esri-loader.git" }, "keywords": [ - "Angular2", + "Angular", "Esri", "ArcGIS" ], @@ -21,14 +26,15 @@ "url": "https://github.com/tomwayson/angular2-esri-loader/issues" }, "homepage": "https://github.com/tomwayson/angular2-esri-loader#readme", - "dependencies": { - "@angular/core": "^2.1.0", - "esri-loader": "^0.1.2", - "rxjs": "5.0.0-beta.12", - "zone.js": "^0.6.23" - }, "devDependencies": { - "typescript": "^2.0.10" + "@angular/compiler": "^4.0.2", + "@angular/compiler-cli": "^4.0.2", + "@angular/core": "^4.0.2", + "esri-loader": "^0.3.1", + "rollup": "^0.41.6", + "rxjs": "^5.3.0", + "typescript": "^2.0.10", + "zone.js": "^0.8.5" }, "typings": "index.d.ts" } diff --git a/src/index.ts b/src/index.ts new file mode 100644 index 0000000..1d5d10b --- /dev/null +++ b/src/index.ts @@ -0,0 +1 @@ +export * from './services/esri-loader.module'; diff --git a/src/package.json b/src/package.json new file mode 100644 index 0000000..8dc682b --- /dev/null +++ b/src/package.json @@ -0,0 +1,28 @@ +{ + "name": "angular2-esri-loader", + "version": "0.1.11", + "description": "An Angular (2+) service to help you load ArcGIS API for JavaScript modules", + "repository": { + "type": "git", + "url": "git+https://github.com/tomwayson/angular2-esri-loader.git" + }, + "keywords": [ + "Angular", + "Esri", + "ArcGIS" + ], + "author": "Tom Wayson (https://tomwayson.com)", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/tomwayson/angular2-esri-loader/issues" + }, + "homepage": "https://github.com/tomwayson/angular2-esri-loader#readme", + "peerDependencies": { + "@angular/core": "^4.0.1", + "esri-loader": "^0.3.1", + "rxjs": "^5.3.0", + "zone.js": "^0.8.5" + }, + "module": "angular2-esri-loader.js", + "typings": "angular2-esri-loader.d.ts" +} diff --git a/src/services/esri-loader.module.ts b/src/services/esri-loader.module.ts new file mode 100644 index 0000000..0efb33e --- /dev/null +++ b/src/services/esri-loader.module.ts @@ -0,0 +1,8 @@ +import {NgModule} from '@angular/core'; +import { EsriLoaderService } from './esri-loader.service'; +export * from './esri-loader.service'; + +@NgModule({ + providers: [EsriLoaderService] +}) +export class EsriLoaderModule {} diff --git a/src/esri-loader.service.ts b/src/services/esri-loader.service.ts similarity index 100% rename from src/esri-loader.service.ts rename to src/services/esri-loader.service.ts diff --git a/tsconfig.json b/tsconfig.json index 2d5c639..a2a57f2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,21 +1,32 @@ { "compilerOptions": { - "noImplicitAny": false, - "module": "commonjs", - "target": "es5", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "sourceMap": true, + "baseUrl": "./src", "declaration": true, + "experimentalDecorators": true, + "inlineSources": true, "lib": [ "es2015", "dom" - ] + ], + "module": "es2015", "moduleResolution": "node", + "noImplicitAny": true, + "outDir": "./build", + "rootDir": "./src", + "skipLibCheck": true, + "sourceMap": true, + "stripInternal": true, + "suppressImplicitAnyIndexErrors": true, + "target": "es5", + "types": [] }, "files": [ - "index.ts" + "./src/index.ts" ], - "exclude": [ - "node_modules" - ] -} \ No newline at end of file + "angularCompilerOptions": { + "annotateForClosureCompiler": true, + "strictMetadataEmit": true, + "skipTemplateCodegen": true, + "flatModuleOutFile": "angular2-esri-loader.js", + "flatModuleId": "angular2-esri-loader" + } +} From 897a1a6e7682beb4fcd6317f90051d76bc3b5d38 Mon Sep 17 00:00:00 2001 From: Tom Wayson Date: Mon, 17 Apr 2017 11:18:05 -0700 Subject: [PATCH 2/4] one for the windoz users --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d270d0e..19d6154 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "An Angular (2+) service to help you load ArcGIS API for JavaScript Modules", "scripts": { "build": "npm run clean && npm run ngc && npm run rollup && npm run copy", - "clean": "rm -rf build dist", - "copy": "rsync -a --exclude=*.js build/ dist && cp src/package.json dist/package.json && cp README.md dist/README.md", + "clean": "rimraf build dist", + "copy": "copyfiles -e '*.js' 'build/**/*' dist && copyfiles -f src/package.json README.md dist", "ngc": "ngc -p tsconfig.json", "rollup": "rollup build/angular2-esri-loader.js -o dist/angular2-esri-loader.js", "prepublish": "npm run build", @@ -30,7 +30,9 @@ "@angular/compiler": "^4.0.2", "@angular/compiler-cli": "^4.0.2", "@angular/core": "^4.0.2", + "copyfiles": "^1.2.0", "esri-loader": "^0.3.1", + "rimraf": "^2.6.1", "rollup": "^0.41.6", "rxjs": "^5.3.0", "typescript": "^2.0.10", From 21543fcef35b12d0d5b9edc7a8d22dc28d8cab53 Mon Sep 17 00:00:00 2001 From: Tom Wayson Date: Sun, 7 May 2017 21:25:16 -0700 Subject: [PATCH 3/4] update copy script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9116508..2645f41 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "build": "npm run clean && npm run ngc && npm run rollup && npm run copy", "clean": "rimraf build dist", - "copy": "copyfiles -e '*.js' 'build/**/*' dist && copyfiles -f src/package.json README.md dist", + "copy": "copyfiles -u 1 -e *.js build/**/* dist && copyfiles -f src/package.json README.md dist", "ngc": "ngc -p tsconfig.json", "rollup": "rollup build/angular2-esri-loader.js -o dist/angular2-esri-loader.js", "prepublish": "npm run build", From 68e28f919797ff8a2070ffe0db844d7acfbba119 Mon Sep 17 00:00:00 2001 From: Keith Stewart Date: Fri, 12 May 2017 07:34:23 -0500 Subject: [PATCH 4/4] switch copy script from an exclusion to an inclusion structure --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2645f41..f105e62 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "build": "npm run clean && npm run ngc && npm run rollup && npm run copy", "clean": "rimraf build dist", - "copy": "copyfiles -u 1 -e *.js build/**/* dist && copyfiles -f src/package.json README.md dist", + "copy": "copyfiles -u 1 \"build/**/*{.d.ts,.js.map,.metadata.json}\" dist && copyfiles -f src/package.json README.md dist", "ngc": "ngc -p tsconfig.json", "rollup": "rollup build/angular2-esri-loader.js -o dist/angular2-esri-loader.js", "prepublish": "npm run build",