Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tracespace/tracespace
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: MacroFab/tracespace
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 15, 2023

  1. before force

    shaneblaser-macrofab committed Dec 15, 2023
    Copy the full SHA
    85ee952 View commit details
  2. Copy the full SHA
    5f11cd2 View commit details

Commits on Dec 18, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    dc1d49a View commit details
  2. Copy the full SHA
    faea868 View commit details
  3. Merge pull request #2 from MacroFab/dependabot_fixes

    more CVEs removed
    shaneblaser-macrofab authored Dec 18, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d357fa6 View commit details
Showing with 7,853 additions and 9,056 deletions.
  1. +10 −2 apps/view/package.json
  2. +12 −9 package.json
  3. +7,831 −9,045 yarn.lock
12 changes: 10 additions & 2 deletions apps/view/package.json
Original file line number Diff line number Diff line change
@@ -46,17 +46,22 @@
"common-prefix": "^1.1.0",
"contrast": "^1.0.1",
"core-js": "^3.2.1",
"css-loader": "6.8.1",
"dexie": "3.0.0-alpha.8",
"file-saver": "^2.0.2",
"filemanager-webpack-plugin": "8.0.0",
"filereader-stream": "^2.0.0",
"formik": "^1.5.8",
"formik": "^2.4.5",
"gerber-parser": "^4.2.7",
"gerber-plotter": "^4.2.8",
"gerber-to-svg": "^4.2.8",
"jszip": "3.2.2",
"jszip": "^3.10.1",
"lerna": "8.0.1",
"md5.js": "^1.3.5",
"mini-svg-data-uri": "^1.1.3",
"mixpanel-browser": "^2.29.1",
"mocha": "10.2.0",
"optimize-css-assets-webpack-plugin": "6.0.1",
"pcb-stackup": "^4.2.8",
"pcb-stackup-core": "^4.2.8",
"pump": "^3.0.0",
@@ -65,8 +70,11 @@
"react-dom": "^16.13.1",
"react-hot-loader": "^4.12.21",
"react-transition-group": "^4.3.0",
"snap-shot-it": "^7.4.1",
"tachyons": "^4.11.1",
"viewbox": "^1.0.0",
"webpack-bundle-analyzer": "4.10.1",
"webpack-dev-server": "4.15.1",
"whats-that-gerber": "^4.2.7"
}
}
21 changes: 12 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@
"chai-as-promised": "^7.1.1",
"concat-stream": "^2.0.0",
"cross-env": "^7.0.2",
"css-loader": "^3.6.0",
"css-loader": "^6.8.1",
"cz-conventional-changelog": "^3.2.0",
"debug": "^4.1.1",
"enzyme": "^3.11.0",
@@ -107,16 +107,16 @@
"eslint-plugin-standard": "^4.0.1",
"express": "^4.17.1",
"file-loader": "^6.0.0",
"filemanager-webpack-plugin": "^2.0.5",
"filemanager-webpack-plugin": "^8.0.0",
"globby": "^11.0.1",
"html-webpack-plugin": "^4.3.0",
"lerna": "^3.22.1",
"lerna": "^8.0.1",
"lodash": "^4.17.15",
"mime": "^2.4.6",
"mini-css-extract-plugin": "^0.9.0",
"mocha": "^7.2.0",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"optimize-css-assets-webpack-plugin": "^6.0.1",
"portfinder": "^1.0.26",
"prettier": "^1.19.1",
"proxyquire": "^2.1.3",
@@ -129,18 +129,21 @@
"semver": "^7.3.2",
"sinon": "^9.0.2",
"sinon-chai": "^3.5.0",
"snap-shot-it": "^7.9.3",
"snap-shot-it": "^7.9.10",
"source-map-loader": "^1.0.0",
"style-loader": "^1.2.1",
"terser-webpack-plugin": "^3.0.6",
"testdouble": "^3.16.0",
"to-readable-stream": "^2.1.0",
"typescript": "^3.9.5",
"webpack": "^4.43.0",
"webpack-bundle-analyzer": "^3.8.0",
"webpack": "^5.89.0",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^4.2.2",
"worker-loader": "^2.0.0"
},
"dependencies": {
"jszip": "3.10.1"
}
}
Loading