Skip to content

Commit 7ff40be

Browse files
sheppardsheppard
committed
update dependencies
(other than @wq/material-web & @wq/map-gl-web)
1 parent 5bc6ae8 commit 7ff40be

File tree

15 files changed

+8027
-12337
lines changed

15 files changed

+8027
-12337
lines changed

‎.eslintignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
packages/*/node_modules
1+
build
2+
static/app/js

‎.eslintrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"no-console": "off",
3030
"no-redeclare": "off",
3131
"no-prototype-builtins": "off",
32-
"require-atomic-updates": "off"
32+
"require-atomic-updates": "off",
33+
"react/prop-types": [2, { "skipUndeclared": true }]
3334
}
3435
}

‎.github/workflows/test.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
env:
1010
PACKAGE: ${{ matrix.package }}
1111
strategy:
12+
fail-fast: false
1213
matrix:
1314
python-version: ["3.10"]
1415
node-version: [18]
@@ -52,12 +53,12 @@ jobs:
5253
cd packages/$PACKAGE
5354
npm run test
5455
- uses: smartsquaregmbh/[email protected]
55-
if: github.event_name == 'push'
56+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
5657
with:
5758
keep: 5
5859
names: ${{ matrix.package }}
5960
- name: Publish to Github Packages
60-
if: github.event_name == 'push'
61+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
6162
run: |
6263
./set_dev_version.sh
6364
echo "registry=https://npm.pkg.github.com/wq" > .npmrc

‎.husky/pre-commit

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
npm run precise-commits

‎babel.config.js

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ module.exports = {
66
['@babel/preset-env', { targets: { node: 'current' } }],
77
'@babel/preset-react'
88
]
9-
},
10-
test_native: {
11-
presets: ['module:metro-react-native-babel-preset']
129
}
1310
}
1411
};

‎jest.config.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
module.exports = {
2+
testEnvironment: 'jsdom',
3+
setupFiles: ['fake-indexeddb/auto', 'whatwg-fetch'],
24
testMatch: ['**/__tests__/**/*.js?(x)'],
35
testPathIgnorePatterns: ['/node_modules/', '.mock.js'],
46
transformIgnorePatterns: [
5-
'/node_modules/(?!(redux-orm|@mapbox/mapbox-gl-draw|@wq))'
7+
'/node_modules/(?!(redux-orm|@mapbox/mapbox-gl-draw|@wq|query-string|decode-uri-component|split-on-first|filter-obj))'
68
]
79
};

‎package-lock.json

+7,969-12,272
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+30-32
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "wq.app",
23
"scripts": {
34
"test": "npm test --workspaces",
45
"build": "npm run build --workspaces --if-present",
@@ -10,41 +11,38 @@
1011
"prettier": "prettier",
1112
"prettier-all": "prettier --write .",
1213
"eslint": "eslint",
13-
"lint": "eslint *.js packages/*/{,src/,src/*/}*.js"
14+
"lint": "eslint .",
15+
"prepare": "husky install"
1416
},
1517
"devDependencies": {
16-
"@babel/cli": "^7.10.5",
17-
"@babel/eslint-parser": "^7.11.3",
18-
"@babel/plugin-transform-runtime": "^7.11.0",
19-
"@babel/preset-env": "^7.11.0",
20-
"@babel/preset-react": "^7.10.4",
21-
"@babel/preset-typescript": "^7.10.4",
22-
"@babel/runtime": "^7.11.2",
23-
"@rollup/plugin-babel": "^5.2.0",
24-
"@rollup/plugin-commonjs": "^15.1.0",
25-
"@rollup/plugin-json": "^4.1.0",
26-
"@rollup/plugin-node-resolve": "^9.0.0",
27-
"@rollup/plugin-replace": "^2.3.3",
28-
"@wq/jest-env-jsdom-idb": "^0.1.2",
29-
"eslint": "^7.7.0",
30-
"eslint-plugin-jest": "^23.20.0",
31-
"eslint-plugin-react": "^7.20.6",
32-
"husky": "^4.2.5",
33-
"jest": "^26.4.0",
34-
"metro-react-native-babel-preset": "^0.72.1",
18+
"@babel/cli": "^7.20.7",
19+
"@babel/eslint-parser": "^7.19.1",
20+
"@babel/plugin-transform-runtime": "^7.19.6",
21+
"@babel/preset-env": "^7.20.2",
22+
"@babel/preset-react": "^7.18.6",
23+
"@babel/preset-typescript": "^7.18.6",
24+
"@babel/runtime": "^7.20.7",
25+
"@rollup/plugin-babel": "^6.0.3",
26+
"@rollup/plugin-commonjs": "^24.0.0",
27+
"@rollup/plugin-json": "^6.0.0",
28+
"@rollup/plugin-node-resolve": "^15.0.1",
29+
"@rollup/plugin-replace": "^5.0.2",
30+
"@rollup/plugin-terser": "^0.3.0",
31+
"eslint": "^8.32.0",
32+
"eslint-plugin-jest": "^27.2.1",
33+
"eslint-plugin-react": "^7.32.1",
34+
"fake-indexeddb": "^4.0.1",
35+
"husky": "^8.0.0",
36+
"jest": "^29.3.1",
37+
"jest-environment-jsdom": "^29.3.1",
38+
"metro-react-native-babel-preset": "^0.74.0",
3539
"precise-commits": "^1.0.2",
36-
"prettier": "^2.0.5",
37-
"requirejs": "^2.3.6",
38-
"rollup": "^2.26.3",
39-
"rollup-plugin-analyzer": "^3.3.0",
40-
"rollup-plugin-ignore": "^1.0.9",
41-
"rollup-plugin-license": "^2.3.0",
42-
"rollup-plugin-terser": "^7.0.2"
43-
},
44-
"husky": {
45-
"hooks": {
46-
"pre-commit": "npm run precise-commits"
47-
}
40+
"prettier": "^2.8.3",
41+
"rollup": "^3.10.0",
42+
"rollup-plugin-analyzer": "^4.0.0",
43+
"rollup-plugin-ignore": "^1.0.10",
44+
"rollup-plugin-license": "^3.0.1",
45+
"whatwg-fetch": "^3.6.2"
4846
},
4947
"prettier": {
5048
"trailingComma": "none",

‎packages/model/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"dependencies": {
3030
"@wq/store": "^1.3.0",
3131
"deepcopy": "^2.1.0",
32-
"redux-orm": "https://github.com/redux-orm/redux-orm/archive/29f1826.tar.gz"
33-
},
34-
"devDependencies": {}
32+
"redux-orm": "^0.17.0-rc.0"
33+
}
3534
}

‎packages/model/src/__tests__/model.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import store from '@wq/store';
22
import { model } from '../model';
3-
import { URLSearchParams } from 'url';
4-
global.URLSearchParams = URLSearchParams;
3+
4+
global.structuredClone = val => val;
55

66
var ds = store.getStore('model-test');
77

‎packages/outbox/src/__tests__/batch.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
/**
2-
* @jest-environment @wq/jest-env-jsdom-idb
3-
*/
4-
51
import store from '@wq/store';
62
import router from '@wq/router';
73
import outboxMod from '../outbox';
84
import { model } from '@wq/model';
95

6+
global.structuredClone = val => val;
7+
108
const ds = store.getStore('batch-test');
119
const outbox = outboxMod.getOutbox(ds);
1210

@@ -56,7 +54,7 @@ beforeAll(async () => {
5654
batchSizeMin: 0
5755
});
5856
outbox.app = mockApp;
59-
router.jqmInit();
57+
router.start();
6058
});
6159

6260
beforeEach(async () => {

‎packages/outbox/src/__tests__/outbox.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
/**
2-
* @jest-environment @wq/jest-env-jsdom-idb
3-
*/
4-
51
import store from '@wq/store';
62
import outboxMod from '../outbox';
73
import { model } from '@wq/model';
84

5+
global.structuredClone = val => val;
6+
97
const ds = store.getStore('outbox-test');
108
const outbox = outboxMod.getOutbox(ds);
119

‎packages/outbox/vendor/json-forms.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict';
22

3-
var Gn={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"}
4-
53
function isNumeric(value) {
64
return /^\d+$/.test(value);
75
}
@@ -186,7 +184,7 @@ function collectEntries(formEl) {
186184
return { name: el.name, value: el.value };
187185
}))
188186
.filter(function(entry) { return entry;});
189-
};
187+
}
190188

191189
function parent(el, tagName) {
192190
tagName = tagName.toLowerCase();

‎packages/store/package.json

+4-6
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@
2626
},
2727
"homepage": "https://wq.io/@wq/store",
2828
"dependencies": {
29-
"localforage": "^1.9.0",
30-
"redux": "^4.0.5",
29+
"localforage": "^1.10.0",
30+
"redux": "^4.2.0",
3131
"redux-logger": "^3.0.6",
32-
"redux-persist": "^6.0.0",
33-
"whatwg-fetch": "^3.4.0"
34-
},
35-
"devDependencies": {}
32+
"redux-persist": "^6.0.0"
33+
}
3634
}

‎packages/store/src/store.js

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import { persistStore, persistReducer, createTransform } from 'redux-persist';
1010
import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2';
1111
import { createStorage, serialize, deserialize } from './storage';
1212

13-
import 'whatwg-fetch';
14-
1513
const REMOVE = '@@KVP_REMOVE';
1614
const SET = '@@KVP_SET';
1715
const CLEAR = '@@KVP_CLEAR';

0 commit comments

Comments
 (0)