Skip to content

Commit aa3be46

Browse files
committed
simplify & focus
1 parent 79c363c commit aa3be46

Some content is hidden

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

57 files changed

+12415
-15829
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,17 @@ jobs:
3131
with:
3232
python-version: ${{ matrix.python-version }}
3333
- name: Install dependencies
34-
run: npm ci && npm run build
34+
run: |
35+
echo "@wq:registry=https://npm.pkg.github.com/wq" > .npmrc
36+
echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" >> .npmrc
37+
npm ci && npm run build
3538
- name: Install native dependencies
3639
if: matrix.package == 'map-gl-native'
37-
run: cd packages/$PACKAGE && npm ci
40+
run: |
41+
cd packages/$PACKAGE
42+
echo "@wq:registry=https://npm.pkg.github.com/wq" > .npmrc
43+
echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" >> .npmrc
44+
npm ci
3845
- name: Lint with ESLint
3946
run: npm run lint
4047
- name: Start test server

package-lock.json

Lines changed: 4211 additions & 5476 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/map-gl-native/jest.config.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
export default {
22
preset: "jest-expo",
3-
setupFiles: [
4-
"./node_modules/@maplibre/maplibre-react-native/setup-jest.js",
5-
"./setup-jest.js",
6-
],
3+
setupFiles: ["./setup-jest.js"],
74
testMatch: ["**/__tests__/**/*.js?(x)"],
85
transformIgnorePatterns: [],
9-
moduleNameMapper: { "@wq/material": "<rootDir>/setup-jest.js" },
106
};

packages/map-gl-native/package-lock.json

Lines changed: 7090 additions & 8044 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/map-gl-native/package.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,15 @@
3030
},
3131
"homepage": "https://wq.io/@wq/map-gl",
3232
"dependencies": {
33-
"@turf/circle": "^6.5.0",
34-
"@wq/map": "^2.0.0"
33+
"@wq/react": "^3.0.0-a1-dev1.g760eb56"
3534
},
3635
"peerDependencies": {
3736
"@maplibre/maplibre-react-native": "*",
38-
"expo-location": "*",
39-
"react-native-paper": "*"
37+
"expo-location": "*"
4038
},
4139
"devDependencies": {
42-
"@maplibre/maplibre-react-native": "github:maplibre/maplibre-react-native#a2b72b6",
43-
"expo-location": "^16.1.0",
44-
"jest-expo": "^49.0.0",
45-
"react-native-paper": "^5.10.3"
40+
"@maplibre/maplibre-react-native": "^10.0.1",
41+
"expo-location": "^18.0.5",
42+
"jest-expo": "^52.0.3"
4643
}
4744
}

packages/map-gl-native/setup-jest.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { NativeModules } from "react-native";
22

3-
if (!NativeModules.MGLLogging) {
4-
NativeModules.MGLLogging = {};
5-
}
6-
for (const name of ["MGLLogging", "MGLOfflineModule", "MGLLocationModule"]) {
3+
for (const name of ["MLRNModule", "MLRNLocationModule", "MLRNOfflineModule"]) {
4+
if (!NativeModules[name]) {
5+
NativeModules[name] = {};
6+
}
77
const module = NativeModules[name];
88
if (!module.addListener) {
99
module.addListener = jest.fn();
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import mapgl from "../index.js";
1+
import { MapProvider } from "../index.js";
22

33
test("it loads", () => {
4-
expect(mapgl.name).toBe("map-gl");
4+
expect(MapProvider.displayName).toBe("MapProvider:wq");
55
});

packages/map-gl-native/src/basemaps/Tile.js

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

packages/map-gl-native/src/basemaps/VectorTile.js

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

packages/map-gl-native/src/basemaps/index.js

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

0 commit comments

Comments
 (0)