Skip to content

Commit 18577cf

Browse files
author
Wykks
committed
feat: full upgrade to angular 6 (& rxjs 6)
BREAKING CHANGES: Now angular 6 compatible only NgxMapboxGLModule.forRoot changed to NgxMapboxGLModule.withConfig
1 parent f8795df commit 18577cf

File tree

157 files changed

+2939
-2541
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+2939
-2541
lines changed

.angular-cli.json

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

.gitignore

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
/dist
55
/tmp
66
/out-tsc
7-
/.ng_build
8-
/dist.tgz
97

108
# dependencies
11-
/node_modules
9+
node_modules
1210

1311
# IDEs and editors
1412
/.idea
@@ -37,11 +35,6 @@ package-lock.json
3735
testem.log
3836
/typings
3937

40-
# e2e
41-
/e2e/*.js
42-
/e2e/*.map
43-
4438
# System Files
4539
.DS_Store
4640
Thumbs.db
47-

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
include:
1515
- stage: validation
1616
script: yarn build --no-progress
17-
- script: xvfb-run -a yarn test --single-run --no-progress --browser=ChromeNoSandbox
18-
- script: xvfb-run -a yarn e2e --no-progress --config=protractor-ci.conf.js
17+
- script: xvfb-run -a yarn test --watch=false --no-progress --browsers=ChromeNoSandbox
18+
- script: xvfb-run -a yarn e2e --no-progress
1919
- script: yarn lint
2020

2121
stages:

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"**/.DS_Store": true,
88
".ng_build": true
99
},
10-
"typescript.tsdk": "node_modules/typescript/lib"
10+
"typescript.tsdk": "node_modules/typescript/lib",
11+
"eslint.enable": false
1112
}

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
<a name="1.2.1-beta.0"></a>
6+
## [1.2.1-beta.0](https://github.com/Wykks/ngx-mapbox-gl/compare/v1.2.0...v1.2.1-beta.0) (2018-06-16)
7+
8+
9+
510
<a name="1.2.0"></a>
611
# [1.2.0](https://github.com/Wykks/ngx-mapbox-gl/compare/v1.1.0...v1.2.0) (2018-05-21)
712

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
[![Build Status](https://travis-ci.org/Wykks/ngx-mapbox-gl.svg?branch=master)](https://travis-ci.org/Wykks/ngx-mapbox-gl)
44
[![npm version](https://img.shields.io/npm/v/ngx-mapbox-gl.svg?style=flat)](https://www.npmjs.com/package/ngx-mapbox-gl)
55

6-
Angular (5+) wrapper for [mapbox-gl-js](https://www.mapbox.com/mapbox-gl-js/api/). Expose a bunch of component meant to be simple to use for Angular.
6+
Angular wrapper for [mapbox-gl-js](https://www.mapbox.com/mapbox-gl-js/api/). Expose a bunch of component meant to be simple to use for Angular.
7+
8+
v1.X : Angular 5 & 6 (rxjs 5)
9+
v2.X : Angular 6+ (rxjs 6)
710

811
Include the following components:
912
- [mgl-map](https://github.com/Wykks/ngx-mapbox-gl/wiki/API-Documentation#mgl-map-mapbox-gl-api)
@@ -31,7 +34,7 @@ Include the following components:
3134
```
3235
npm install ngx-mapbox-gl mapbox-gl --save
3336
```
34-
Also add mapbox-gl types if using typescript
37+
If using typescript add mapbox-gl types
3538
```
3639
npm install @types/mapbox-gl --save-dev
3740
```
@@ -61,7 +64,7 @@ import { NgxMapboxGLModule } from 'ngx-mapbox-gl';
6164
@NgModule({
6265
imports: [
6366
...
64-
NgxMapboxGLModule.forRoot({
67+
NgxMapboxGLModule.withConfig({
6568
accessToken: 'TOKEN', // Can also be set per map (accessToken input of mgl-map)
6669
geocoderAccessToken: 'TOKEN' // Optionnal, specify if different from the map access token, can also be set per mgl-geocoder (accessToken input of mgl-geocoder)
6770
})

angular.json

Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"ngx-mapbox-gl": {
7+
"root": "projects/ngx-mapbox-gl",
8+
"sourceRoot": "projects/ngx-mapbox-gl/src",
9+
"projectType": "library",
10+
"prefix": "mgl",
11+
"architect": {
12+
"build": {
13+
"builder": "@angular-devkit/build-ng-packagr:build",
14+
"options": {
15+
"tsConfig": "projects/ngx-mapbox-gl/tsconfig.lib.json",
16+
"project": "projects/ngx-mapbox-gl/ng-package.json"
17+
},
18+
"configurations": {
19+
"production": {
20+
"project": "projects/ngx-mapbox-gl/ng-package.prod.json"
21+
}
22+
}
23+
},
24+
"test": {
25+
"builder": "@angular-devkit/build-angular:karma",
26+
"options": {
27+
"main": "projects/ngx-mapbox-gl/src/test.ts",
28+
"tsConfig": "projects/ngx-mapbox-gl/tsconfig.spec.json",
29+
"karmaConfig": "projects/ngx-mapbox-gl/karma.conf.js"
30+
}
31+
},
32+
"lint": {
33+
"builder": "@angular-devkit/build-angular:tslint",
34+
"options": {
35+
"tsConfig": [
36+
"projects/ngx-mapbox-gl/tsconfig.lib.json",
37+
"projects/ngx-mapbox-gl/tsconfig.spec.json"
38+
],
39+
"exclude": [
40+
"**/node_modules/**"
41+
],
42+
"format": "stylish"
43+
}
44+
}
45+
}
46+
},
47+
"showcase": {
48+
"root": "projects/showcase/",
49+
"sourceRoot": "projects/showcase/src",
50+
"projectType": "application",
51+
"prefix": "showcase",
52+
"schematics": {},
53+
"architect": {
54+
"build": {
55+
"builder": "@angular-devkit/build-angular:browser",
56+
"options": {
57+
"outputPath": "dist/showcase",
58+
"index": "projects/showcase/src/index.html",
59+
"main": "projects/showcase/src/main.ts",
60+
"polyfills": "projects/showcase/src/polyfills.ts",
61+
"tsConfig": "projects/showcase/tsconfig.app.json",
62+
"assets": [
63+
"projects/showcase/src/favicon.ico",
64+
"projects/showcase/src/assets"
65+
],
66+
"styles": [
67+
"projects/showcase/src/styles.css"
68+
],
69+
"scripts": []
70+
},
71+
"configurations": {
72+
"production": {
73+
"fileReplacements": [
74+
{
75+
"replace": "projects/showcase/src/environments/environment.ts",
76+
"with": "projects/showcase/src/environments/environment.prod.ts"
77+
}
78+
],
79+
"optimization": true,
80+
"outputHashing": "all",
81+
"sourceMap": false,
82+
"extractCss": true,
83+
"namedChunks": false,
84+
"aot": true,
85+
"extractLicenses": true,
86+
"vendorChunk": false,
87+
"buildOptimizer": true,
88+
"showCircularDependencies": false
89+
}
90+
}
91+
},
92+
"serve": {
93+
"builder": "@angular-devkit/build-angular:dev-server",
94+
"options": {
95+
"browserTarget": "showcase:build"
96+
},
97+
"configurations": {
98+
"production": {
99+
"browserTarget": "showcase:build:production"
100+
}
101+
}
102+
},
103+
"extract-i18n": {
104+
"builder": "@angular-devkit/build-angular:extract-i18n",
105+
"options": {
106+
"browserTarget": "showcase:build"
107+
}
108+
},
109+
"test": {
110+
"builder": "@angular-devkit/build-angular:karma",
111+
"options": {
112+
"main": "projects/showcase/src/test.ts",
113+
"polyfills": "projects/showcase/src/polyfills.ts",
114+
"tsConfig": "projects/showcase/tsconfig.spec.json",
115+
"karmaConfig": "projects/showcase/karma.conf.js",
116+
"styles": [
117+
"projects/showcase/src/styles.css"
118+
],
119+
"scripts": [],
120+
"assets": [
121+
"projects/showcase/src/favicon.ico",
122+
"projects/showcase/src/assets"
123+
]
124+
}
125+
},
126+
"lint": {
127+
"builder": "@angular-devkit/build-angular:tslint",
128+
"options": {
129+
"tsConfig": [
130+
"projects/showcase/tsconfig.app.json",
131+
"projects/showcase/tsconfig.spec.json"
132+
],
133+
"exclude": [
134+
"**/node_modules/**"
135+
],
136+
"format": "stylish"
137+
}
138+
}
139+
}
140+
},
141+
"showcase-e2e": {
142+
"root": "projects/showcase-e2e/",
143+
"projectType": "application",
144+
"architect": {
145+
"e2e": {
146+
"builder": "@angular-devkit/build-angular:protractor",
147+
"options": {
148+
"protractorConfig": "projects/showcase-e2e/protractor.conf.js",
149+
"devServerTarget": "showcase:serve"
150+
},
151+
"configurations": {
152+
"production": {
153+
"devServerTarget": "showcase:serve:production"
154+
}
155+
}
156+
},
157+
"lint": {
158+
"builder": "@angular-devkit/build-angular:tslint",
159+
"options": {
160+
"tsConfig": "projects/showcase-e2e/tsconfig.e2e.json",
161+
"exclude": [
162+
"**/node_modules/**"
163+
],
164+
"format": "stylish"
165+
}
166+
}
167+
}
168+
}
169+
},
170+
"defaultProject": "ngx-mapbox-gl"
171+
}

e2e/tsconfig.e2e.json

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

fix-package.patch

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

ngcli-comparisons-false.patch

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

0 commit comments

Comments
 (0)