Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade npms #109

Merged
merged 62 commits into from
Feb 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
750e719
Merge pull request #2 from buildrs/main
pablo-mayrgundter Dec 14, 2021
b2b6917
Merge pull request #3 from pablo-mayrgundter/jest-js2
pablo-mayrgundter Dec 14, 2021
c3117c2
Merge branch 'main' of https://github.com/buildrs/Share
pablo-mayrgundter Dec 15, 2021
e347670
draft on new urls
pablo-mayrgundter Jan 10, 2022
f7443fd
Merge branch 'main' of https://github.com/buildrs/Share
pablo-mayrgundter Jan 11, 2022
b02a9ab
Merge remote-tracking branch 'upstream/main'
pablo-mayrgundter Jan 27, 2022
77cfd0a
ItemProperties: destructure HasProperties.
pablo-mayrgundter Jan 27, 2022
80d155b
ItemProperties: more unpacking PSets and tests.
pablo-mayrgundter Jan 28, 2022
0d07cb5
urls: First merge with prop3. More tbd.
pablo-mayrgundter Jan 30, 2022
9f758b3
Merge branch 'main' of https://github.com/buildrs/Share
pablo-mayrgundter Jan 30, 2022
952d9d6
Merge branch 'main' of https://github.com/buildrs/Share
pablo-mayrgundter Jan 30, 2022
b60513e
urls: upstream merge in prep for staging.
pablo-mayrgundter Jan 30, 2022
774fd42
urls: First merge of bounce with new urls.
pablo-mayrgundter Jan 30, 2022
072d1e3
urls: merge with bounce, test 1
pablo-mayrgundter Jan 30, 2022
79dc1d1
urls: merge with bounce, test 2
pablo-mayrgundter Jan 30, 2022
33bdaab
urls: merge with bounce, test 3
pablo-mayrgundter Jan 30, 2022
c47e247
urls: merge with bounce, test 4
pablo-mayrgundter Jan 31, 2022
5c4ac42
urls: merge with bounce, test 5
pablo-mayrgundter Jan 31, 2022
ae0a5ee
urls: merge with bounce, test 6
pablo-mayrgundter Jan 31, 2022
8f89841
urls: merge with bounce, test 6
pablo-mayrgundter Jan 31, 2022
7ceec87
urls: merge with bounce, test 7
pablo-mayrgundter Jan 31, 2022
999b94e
urls: merge with bounce, test 8
pablo-mayrgundter Jan 31, 2022
7a05d52
urls: merge with bounce, test 9
pablo-mayrgundter Jan 31, 2022
a065afb
urls: merge with bounce, test 10
pablo-mayrgundter Jan 31, 2022
ef66030
urls: merge with bounce, test 11
pablo-mayrgundter Jan 31, 2022
87a4321
urls: merge with bounce, test 12
pablo-mayrgundter Jan 31, 2022
bab6f04
urls: merge with bounce, test 13
pablo-mayrgundter Jan 31, 2022
f9b383d
urls: merge with bounce, test 14
pablo-mayrgundter Jan 31, 2022
b2178a4
urls: merge with bounce, test 15
pablo-mayrgundter Jan 31, 2022
6fce371
urls: merge with bounce, test 16
pablo-mayrgundter Jan 31, 2022
6213e33
urls: final test.
pablo-mayrgundter Jan 31, 2022
beee660
urls: cleanup debug output on test.
pablo-mayrgundter Jan 31, 2022
9ca2337
urls: load local file also works.
pablo-mayrgundter Feb 2, 2022
dcf250a
urls: with local load. test 2.
pablo-mayrgundter Feb 2, 2022
a3247d8
urls: with local load. test 3.
pablo-mayrgundter Feb 2, 2022
3d1729d
urls: with local load. test 4.
pablo-mayrgundter Feb 2, 2022
8e79057
urls: converting most arrow funcs to functions.
pablo-mayrgundter Feb 3, 2022
3287827
urls: using helper for first useEffect and cleaned up some debug logs.
pablo-mayrgundter Feb 3, 2022
b842765
urls: fixed newScene bug.
pablo-mayrgundter Feb 3, 2022
7bb0f91
urls: better commenting.
pablo-mayrgundter Feb 3, 2022
15b98d7
Rename tinyhouse.ifc to index.ifc and update with better model from SP.
pablo-mayrgundter Feb 8, 2022
79451bc
search: passing state through url working. Remove jsonata for now.
pablo-mayrgundter Feb 8, 2022
08536c2
index.ifc: merge to main for PR.
pablo-mayrgundter Feb 8, 2022
6577ed8
index.ifc: rebuild for serve.
pablo-mayrgundter Feb 8, 2022
5023c80
Merge branch 'main' of https://github.com/buildrs/Share
pablo-mayrgundter Feb 8, 2022
c5c3a8c
Merge branch 'main' of https://github.com/buildrs/Share
pablo-mayrgundter Feb 8, 2022
439496d
eslint: testing git hook requiring eslint to pass
pablo-mayrgundter Feb 9, 2022
3f68f94
eslint: fix IconGroup button display.
pablo-mayrgundter Feb 10, 2022
950047d
eslint: build for pr.
pablo-mayrgundter Feb 10, 2022
e685c90
Merge branch 'main' of https://github.com/buildrs/Share
pablo-mayrgundter Feb 11, 2022
48438f4
Refactor routes into ShareRoutes to prepare for more flexible search …
pablo-mayrgundter Feb 14, 2022
12732d0
Refactor routes: merge from upstream/main.
pablo-mayrgundter Feb 14, 2022
2092e58
search: working with tests. preparing for big eslint merge.
pablo-mayrgundter Feb 16, 2022
4430cdf
Refactor routes: merged. Search working.
pablo-mayrgundter Feb 16, 2022
130eb43
precommit: introduce single precommit command
pablo-mayrgundter Feb 18, 2022
a53cef9
debug: lint
pablo-mayrgundter Feb 18, 2022
f126876
Merge from upstream/main.
pablo-mayrgundter Feb 18, 2022
d860b83
fix navtree toggle
pablo-mayrgundter Feb 18, 2022
49d8848
Merge remote-tracking branch 'upstream/main'
pablo-mayrgundter Feb 19, 2022
b6ab2f3
Fixed a small bug in ItemProperties triggered by new model.
pablo-mayrgundter Feb 19, 2022
0dda7f9
- Upgrade NPMs.
pablo-mayrgundter Feb 19, 2022
7071dda
Merge branch 'upgrade-npms' of https://github.com/pablo-mayrgundter/S…
pablo-mayrgundter Feb 19, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
module.exports = {
"presets": [
"@babel/preset-env",
"@babel/preset-react"
]
};
'presets': [
'@babel/preset-env',
'@babel/preset-react'
],
'env': {
'test': {
'presets': [
['@babel/preset-env', { 'targets': { 'node': 'current' } }],
],
},
}
}
132,277 changes: 63,711 additions & 68,566 deletions docs/index.ifc

Large diffs are not rendered by default.

5,541 changes: 1,478 additions & 4,063 deletions docs/index.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/index.js.map

Large diffs are not rendered by default.

Binary file added docs/static/js/web-ifc-mt.wasm
Binary file not shown.
17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "buildrs",
"version": "0.1.0-r296",
"version": "0.1.0-r299",
"main": "src/index.jsx",
"homepage": "https://github.com/buildrs/Share",
"scripts": {
"clean": "rm -rf docs ; cp -r public docs",
"new-version": "node --experimental-json-modules src/utils/version.mjs > package.json.new && mv package.json.new package.json",
"copy-web-asm": "cp node_modules/web-ifc/web-ifc.wasm public/static/js",
"copy-web-asm": "cp node_modules/web-ifc/*.wasm public/static/js",
"build": "yarn copy-web-asm && yarn clean && yarn new-version && node config/build.js",
"serve": "yarn build && node config/serve.js",
"lint": "yarn eslint --fix `find src -name '*.jsx'` `find src -name '*.js'`",
Expand All @@ -27,7 +27,7 @@
"react-dom": "^17.0.2",
"react-router-dom": "^6.0.2",
"three": "^0.135",
"web-ifc-viewer": "^1.0.106",
"web-ifc-viewer": "^1.0.137",
"web-vitals": "^2.1.0"
},
"devDependencies": {
Expand All @@ -37,19 +37,18 @@
"@testing-library/jest-dom": "^5.15.0",
"@testing-library/react": "^12.1.2",
"babel-jest": "^27.4.4",
"canvas": "^2.8.0",
"esbuild": "^0.13.14",
"esbuild-plugin-svgr": "^0.0.3",
"canvas": "~2.8.0",
"esbuild": "^0.14.22",
"esbuild-plugin-svgr": "^1.0.0",
"eslint": "^8.8.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"gl": "^4.9.2",
"gl": "^5.0.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^27.4.3",
"jsdom": "^18.0.1",
"regenerator-runtime": "^0.13.9"
"jsdom": "^19.0.0"
},
"jest": {
"verbose": false,
Expand Down
132,277 changes: 63,711 additions & 68,566 deletions public/index.ifc

Large diffs are not rendered by default.

Binary file added public/static/js/web-ifc-mt.wasm
Binary file not shown.
2 changes: 1 addition & 1 deletion src/Components/ItemProperties.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ async function hasProperties(key, hasPropertiesArr, viewer, serial) {
}
return await unpackHelper(hasPropertiesArr, viewer, serial, (dObj, rows) => {
const name = decodeIFCString(dObj.Name.value)
const value = dObj.NominalValue === undefined ?
const value = (dObj.NominalValue === undefined || dObj.NominalValue == null) ?
'<error>' :
decodeIFCString(dObj.NominalValue.value)
rows.push(row(name, value, serial++ + '-row'))
Expand Down
1,050 changes: 557 additions & 493 deletions yarn.lock

Large diffs are not rendered by default.