Skip to content

Commit

Permalink
Merge pull request #811 from nickcastel50/geometry_coverage
Browse files Browse the repository at this point in the history
Geometry Coverage
  • Loading branch information
nickcastel50 authored Nov 7, 2023
2 parents f1bef73 + 8441cd2 commit f98da25
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .cosmos.webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules\/(?!bldrs-conway)/, // Exclude all of node_modules except bldrs-conway
exclude: /node_modules\/(?!@bldrs-ai\\conway)/, // Exclude all of node_modules except @bldrs-ai
use: {
loader: 'babel-loader',
options: {
Expand Down
Binary file added bldrs-ai-conway-v0.1.0.tgz
Binary file not shown.
Binary file removed bldrs-conway-v0.0.1.tgz
Binary file not shown.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bldrs",
"version": "1.0.0-r749",
"version": "1.0.0-r760",
"main": "src/index.jsx",
"license": "MIT",
"homepage": "https://github.com/bldrs-ai/Share",
Expand All @@ -16,7 +16,7 @@
"build-share-conway": "USE_WEBIFC_SHIM=true yarn build-share",
"build-share-webifc": "USE_WEBIFC_SHIM=false yarn build-share && yarn build-share-copy-wasm-webifc",
"build-share-copy-wasm-webifc": "shx cp node_modules/web-ifc/*.wasm docs/static/js",
"build-share-copy-wasm-conway": "shx cp node_modules/bldrs-conway/compiled/dependencies/conway-geom/Dist/*.wasm docs/static/js",
"build-share-copy-wasm-conway": "shx cp node_modules/@bldrs-ai/conway/compiled/dependencies/conway-geom/Dist/*.wasm docs/static/js",
"clean": "shx rm -rf docs",
"cypress:open": "cypress run",
"cypress-spec": "cypress run --spec",
Expand All @@ -38,6 +38,7 @@
"dependencies": {
"@auth0/auth0-react": "^2.0.0",
"@babel/core": "^7.18.10",
"@bldrs-ai/conway": "./bldrs-ai-conway-v0.1.0.tgz",
"@bldrs-ai/ifclib": "^5.3.3",
"@emotion/react": "^11.10.0",
"@emotion/styled": "^11.10.0",
Expand All @@ -50,7 +51,6 @@
"@octokit/rest": "^19.0.3",
"@sentry/react": "^7.61.0",
"@sentry/tracing": "^7.61.0",
"bldrs-conway": "./bldrs-conway-v0.0.1.tgz",
"clsx": "^1.2.1",
"cypress-react-router": "^2.0.1",
"js-cookie": "^3.0.5",
Expand Down
2 changes: 1 addition & 1 deletion tools/esbuild/bundle-analysis.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/esbuild/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const webIfcShimAliasPlugin = {
setup(build) {
build.onResolve({filter: /^web-ifc$/}, (args) => {
return {
path: path.resolve(__root, 'node_modules/bldrs-conway/compiled/src/shim/ifc_api.js'),
path: path.resolve(__root, 'node_modules/@bldrs-ai/conway/compiled/src/shim/ifc_api.js'),
}
})
},
Expand Down
1 change: 0 additions & 1 deletion tools/jest/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ const esModules = [
'vfile',
'vfile-message',
'web-ifc',
'bldrs-conway',
'web-ifc-three',
'web-ifc-viewer',
'use-double-tap',
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2085,6 +2085,16 @@
resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

"@bldrs-ai/conway@./bldrs-ai-conway-v0.1.0.tgz":
version "0.1.0"
resolved "./bldrs-ai-conway-v0.1.0.tgz#c96d6fd8ce31991a38034043da81679805a90a81"
dependencies:
buffer "^6.0.3"
gl-matrix "^3.4.3"
seedrandom "^3.0.5"
smart-buffer "^4.2.0"
yargs "^17.7.1"

"@bldrs-ai/ifclib@^5.3.3":
version "5.3.3"
resolved "https://registry.npmjs.org/@bldrs-ai/ifclib/-/ifclib-5.3.3.tgz"
Expand Down Expand Up @@ -4541,16 +4551,6 @@ bl@^4.1.0:
inherits "^2.0.4"
readable-stream "^3.4.0"

bldrs-conway@./bldrs-conway-v0.0.1.tgz:
version "0.0.1"
resolved "./bldrs-conway-v0.0.1.tgz#fb515339a20d717d414936f39d629bd64f06cda9"
dependencies:
buffer "^6.0.3"
gl-matrix "^3.4.3"
seedrandom "^3.0.5"
smart-buffer "^4.2.0"
yargs "^17.7.1"

blob-util@^2.0.2:
version "2.0.2"
resolved "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz"
Expand Down

0 comments on commit f98da25

Please sign in to comment.