Skip to content

Commit

Permalink
feat: merge changes from master and fix poc-subapp (electrode-io#1919)
Browse files Browse the repository at this point in the history
* add two options for improving webpack performance (electrode-io#1904)

Co-authored-by: Steve Herzog <[email protected]>

* feature: open browser when proxy is ready (electrode-io#1905)

Co-authored-by: Steve Herzog <[email protected]>

* Fix broken reporter link (electrode-io#1908)

* Update changelog

* [Publish]

 - @xarc/[email protected]
 - @xarc/[email protected]
 - @xarc/[email protected]

* Upgrade poc-subapp and poc-subapp-redux to react18 with rr6 (electrode-io#1913)

* Upgrade POC-SUBAPP-REDUX to React 18 and RR6

* Upgrade poc-subapp to react 16 and RR6

* fix types issues in multiple packages (electrode-io#1918)

* fix types issues in multiple packages

Co-authored-by: Arun Vishnu <[email protected]>

* fix: poc-subapp and merge changes from master

* fix: update devtool to use eval-cheap-module-source-map

* chore: remove debug statement

Co-authored-by: Steve Herzog <[email protected]>
Co-authored-by: Steve Herzog <[email protected]>
Co-authored-by: Ashu Verma <[email protected]>
Co-authored-by: smuthya <[email protected]>
Co-authored-by: mristic505 <[email protected]>
Co-authored-by: Arun Vishnu <[email protected]>
  • Loading branch information
7 people committed Mar 24, 2023
1 parent fb0eaff commit c05a970
Show file tree
Hide file tree
Showing 8 changed files with 1,315 additions and 11,393 deletions.
3,185 changes: 1,287 additions & 1,898 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions packages/xarc-app-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@
"@xarc/dev-base": "^0.1.0",
"@xarc/run": "^1.0.5",
"@xarc/subapp": "^0.3.4",
<<<<<<< HEAD
"@xarc/webpack": "^11.1.4",
=======
"@xarc/webpack": "^11.1.3",
>>>>>>> ae5a6cea (feat: merge changes from master and fix poc-subapp (#1919))
"ansi-to-html": "^0.7.2",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-minify-dead-code-elimination": "^0.5.2",
Expand All @@ -73,6 +77,7 @@
"fast-async": "^7.0.5",
"filter-scan-dir": "1.5.5",
"fs-extra": "^10.1.0",
"glob": "^8.0.3",
"identity-obj-proxy": "^3.0.0",
"is-ci": "^2.0.0",
"lodash": "^4.17.21",
Expand Down
4 changes: 2 additions & 2 deletions packages/xarc-create-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@
"shcmd": "^0.8.4",
"sinon": "^7.2.6",
"sinon-chai": "^3.3.0",
"webpack": "^4.41.0",
"webpack": "~5.74.0",
"webpack-bundle-analyzer": "^3.5.2",
"webpack-cli": "^3.3.9",
"webpack-cli": "4.8.0",
"xclap": "^0.2.51"
},
"prettier": {
Expand Down
4 changes: 2 additions & 2 deletions packages/xarc-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"optional-require": "^1.1.8",
"require-at": "^1.0.6",
"url-loader": "^4.1.0",
"webpack": "^5.74.0",
"webpack": "~5.74.0",
"webpack-cli": "4.8.0",
"webpack-config-composer": "^1.1.7",
"webpack-stats-plugin": "^1.0.3",
Expand All @@ -65,7 +65,7 @@
"@istanbuljs/nyc-config-typescript": "^1.0.2",
"@types/chai": "^4.3.1",
"@types/mocha": "^10.0.0",
"@types/node": "^13.7.6",
"@types/node": "^18.11.9",
"@types/sinon": "^9.0.0",
"@types/sinon-chai": "^3.2.4",
"@typescript-eslint/eslint-plugin": "^2.21.0",
Expand Down
8 changes: 8 additions & 0 deletions rush.json
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,14 @@
"projectFolder": "packages/xarc-webpack",
"shouldPublish": true,
"skipRushCheck": true
},

// Sample apps
{
"packageName": "poc-subapp",
"projectFolder": "samples/poc-subapp",
"shouldPublish": false,
"skipRushCheck": true
}
]
}
Loading

0 comments on commit c05a970

Please sign in to comment.