Skip to content

Commit

Permalink
[V2] Merge back release-v2.0.x into v2 & Bump to version `2.0.0-d…
Browse files Browse the repository at this point in the history
…ev.5` (#547)

* Fix lint errors

* Review release 2.0.0-dev.3 (#499)

* Bump V2 (aka V2 develop) to 2.0.0-dev.3 (#486)

* Bump version

* Fix lint errors

* [BFH] Make hello-world public in the generator, give it a presentable README (#393)

* Rename hello-world -> express-minimal, make public in generator

* Format

* Format

* [v2] Rename template-1c -> template-typescript-minimal (#494)

* Rename template-1c -> template-typescript-minimal

* Format

* [V2] Fix rejected 3PP (#488)

* Remove `lodash.debounce` & Bump `njwt` to latest

* Bump `sinon` to latest

* Solve merge conflicts

* Update lighthouse score thresholds (#491)

* [V2]add eslintrc.js to project templates (#495)

* add eslintrc.js to project templates

* [V2] Hide webpack perf warnings for `pwa` and use `bundlesize` instead (#471)

* [V2] allow custom webpack config in projects (#462)

* Allow projects to build or start dev server with a custom webpack config

* Add webpack config placeholders in app templates

* Cleanup optional webpack config in PWA

* Update packages/pwa-kit-build/bin/mrt.js

Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>

Co-authored-by: Oliver Brook <o.brook@salesforce.com>
Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>

Co-authored-by: Ben Chypak <bchypak@mobify.com>
Co-authored-by: Oliver Brook <o.brook@salesforce.com>
Co-authored-by: Adam Raya <adamraya@users.noreply.github.com>
Co-authored-by: Alex Vuong <52219283+alexvuong@users.noreply.github.com>
Co-authored-by: Vincent Marta <vmarta@salesforce.com>
Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>

* Preview release `2.0.0-dev.4` (#544)

* Bump V2 (aka V2 develop) to 2.0.0-dev.3 (#486)

* Bump version

* Fix lint errors

* [BFH] Make hello-world public in the generator, give it a presentable README (#393)

* Rename hello-world -> express-minimal, make public in generator

* Format

* Format

* [v2] Rename template-1c -> template-typescript-minimal (#494)

* Rename template-1c -> template-typescript-minimal

* Format

* [V2] Fix rejected 3PP (#488)

* Remove `lodash.debounce` & Bump `njwt` to latest

* Bump `sinon` to latest

* Solve merge conflicts

* Update lighthouse score thresholds (#491)

* [V2]add eslintrc.js to project templates (#495)

* add eslintrc.js to project templates

* [V2] Hide webpack perf warnings for `pwa` and use `bundlesize` instead (#471)

* [V2] allow custom webpack config in projects (#462)

* Allow projects to build or start dev server with a custom webpack config

* Add webpack config placeholders in app templates

* Cleanup optional webpack config in PWA

* Update packages/pwa-kit-build/bin/mrt.js

Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>

Co-authored-by: Oliver Brook <o.brook@salesforce.com>
Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>

* bump 2.0.0-dev.4 (#502)

* bump

* fix version

* Optimize visibility-off.svg (#512)

* [V2] Rename 'pwa' directory into 'template-retail-react-app' (#485)

* Rename pwa directory to template-retail-react-app

* Update readme and circleci config

* Update pwa references in generator to template-retail-react-app

* Clean up comments

* Update report-bundle-size.js

* Rename pwa directory to template-retail-react-app

* Update readme and circleci config

* Update pwa references in generator to template-retail-react-app

* Clean up comments

* Update report-bundle-size.js

* Rename pwa-kit-build package and mrt CLI to pwa-kit-cli (package + CLI) (#481)

* Rename pwa-kit-build/mrt to sf-mrt.

* Rename sf-mrt to pwa-kit-cli

* Rename mrt file to cli

* Rename sf-mrt directory to pwa-kit-cli

* Use pwa-kit-cli instead of pwa-kit-build.

* Move loading screen from pwa-kit-build to pwa-kit-cli

* Update CLI human-readable name.

* [V2] Reinstate `pwa-kit-build` Test(s) (#492)

* Reinstate build test

* Add regenerator-runtime to internal-lib-build

Co-authored-by: vcua-mobify <vcua@salesforce.com>

* [V2]Generate different reports for different bundles (#508)

* generate different reports for different bundles
* fix report bundle size script

* Remove old config implementation from bad merge (#513)

* [V2] Re-Enable Windows Node 14 CI Workflow (#487)

* Re-enable windows node 14 workflow

* Fix glob string cross environment

* Testing removing restore_cache

* Testing forceExit flag

* Testing not running lint

* Debugging using double quotes

* Force crlf line ending for mrt.js file

* Revert "Force crlf line ending for mrt.js file"

This reverts commit b249e0f.

* Test not running tests on templates

* Re-enable lint

* Testing adding eslint at root

* Revert "Testing adding eslint at root"

This reverts commit 531fe6a.

* clean up

* Try again crlf on mrt.js

* Revert "Try again crlf on mrt.js"

This reverts commit 301826c.

* Lint fix template-typescript-minimal

* Enable eslint debug flag

* Remove silent flag

* Enable eslint debug flag for internal-lib-build

* Fix glob string cross env on internal-lib-build script

* Remove lerna parallel flag on lint script

* Remove eslint debug flags

* Exclude tsx files from lint

* Debug mrt eslint

* Re-enable eslint debug flags

* Testing Windows xlarge

* Fix mrt pkgRoot

* Print more logs

* Testing npm ci on Windows

* Clean up

* Testing lerna link

* Add lerna link to setup_windows circle ci step

* Add docs to Circle CI config

* typo

Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com>

* Bump Verdaccio to latest (#518)

* [V2] Fix Circular Dependency Warnings (#514)

* Remove CLI dev dependency causing circular dependency warnings

Co-authored-by: Oliver Brook <olibrook@gmail.com>

* Update copyrights and template. (#516)

* v2 fix old naming (#521)

* v2 replace old name mobify-platform-sdk references to pwa-kit

* fix typo in readme and jsdoc (#530)

* [V2] Fix source maps cannot be found when debugging the server (#526)

* fix source map not working for server-side debugging

* [V2] Loading page: avoid seeing infinite reloads (#532)

* [V2] Fix invalid refresh token (#528)

* fix tests

* fix merge issue

* fix test

* [V2] Allow pass thru cli options for test command (#537)

* Allow jest option to pass thru

* remove useless test env

* Remove lodash and bluebird. (#534)

* Don't count untestable line towards code coverage.

* Remove lodash and bluebird.

* Oops, a semi!

* Revert to util.promisify so tests pass.

* Refactor to fix tests.

* Fix l10n scripts to use and output to the correct file (#539)

This hardcoding of the default locale was done in V1, but it was not done in V2 yet.. until now.

* Merge branch `release 2.0.x` into `v2` (#542)

* Fix lint errors

* Review release 2.0.0-dev.3 (#499)

* Bump V2 (aka V2 develop) to 2.0.0-dev.3 (#486)

* Bump version

* Fix lint errors

* [BFH] Make hello-world public in the generator, give it a presentable README (#393)

* Rename hello-world -> express-minimal, make public in generator

* Format

* Format

* [v2] Rename template-1c -> template-typescript-minimal (#494)

* Rename template-1c -> template-typescript-minimal

* Format

* [V2] Fix rejected 3PP (#488)

* Remove `lodash.debounce` & Bump `njwt` to latest

* Bump `sinon` to latest

* Solve merge conflicts

* Update lighthouse score thresholds (#491)

* [V2]add eslintrc.js to project templates (#495)

* add eslintrc.js to project templates

* [V2] Hide webpack perf warnings for `pwa` and use `bundlesize` instead (#471)

* [V2] allow custom webpack config in projects (#462)

* Allow projects to build or start dev server with a custom webpack config

* Add webpack config placeholders in app templates

* Cleanup optional webpack config in PWA

* Update packages/pwa-kit-build/bin/mrt.js

Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>

Co-authored-by: Oliver Brook <o.brook@salesforce.com>
Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>

Co-authored-by: Ben Chypak <bchypak@mobify.com>
Co-authored-by: Oliver Brook <o.brook@salesforce.com>
Co-authored-by: Adam Raya <adamraya@users.noreply.github.com>
Co-authored-by: Alex Vuong <52219283+alexvuong@users.noreply.github.com>
Co-authored-by: Vincent Marta <vmarta@salesforce.com>
Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>

* Solve merge conflicts

Co-authored-by: Ben Chypak <bchypak@salesforce.com>
Co-authored-by: Kevin He <kevin.he@salesforce.com>
Co-authored-by: Ben Chypak <bchypak@mobify.com>
Co-authored-by: Oliver Brook <o.brook@salesforce.com>
Co-authored-by: Alex Vuong <52219283+alexvuong@users.noreply.github.com>
Co-authored-by: Vincent Marta <vmarta@salesforce.com>
Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>

* Solve merge conflicts

Co-authored-by: Ben Chypak <bchypak@mobify.com>
Co-authored-by: Oliver Brook <o.brook@salesforce.com>
Co-authored-by: Alex Vuong <52219283+alexvuong@users.noreply.github.com>
Co-authored-by: Vincent Marta <vmarta@salesforce.com>
Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>
Co-authored-by: Kevin He <kevin.he@salesforce.com>
Co-authored-by: vcua-mobify <vcua@salesforce.com>
Co-authored-by: Oliver Brook <olibrook@gmail.com>
Co-authored-by: Ben Chypak <bchypak@salesforce.com>

* Bump version `2.0.0-dev.5`

* Bump root package-lock.json file version to 2.0.0-dev.5

Co-authored-by: Ben Chypak <bchypak@salesforce.com>
Co-authored-by: Kevin He <kevin.he@salesforce.com>
Co-authored-by: Ben Chypak <bchypak@mobify.com>
Co-authored-by: Oliver Brook <o.brook@salesforce.com>
Co-authored-by: Alex Vuong <52219283+alexvuong@users.noreply.github.com>
Co-authored-by: Vincent Marta <vmarta@salesforce.com>
Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>
Co-authored-by: vcua-mobify <vcua@salesforce.com>
Co-authored-by: Oliver Brook <olibrook@gmail.com>
  • Loading branch information
11 people committed Apr 27, 2022
1 parent 6feb6f7 commit 3a34f14
Show file tree
Hide file tree
Showing 22 changed files with 40 additions and 34 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Expand Up @@ -3,7 +3,7 @@
"packages": [
"packages/*"
],
"version": "2.0.0-dev.4",
"version": "2.0.0-dev.5",
"publish": {
"allowBranch": [
"master"
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "pwa-kit",
"version": "2.0.0-dev.4",
"version": "2.0.0-dev.5",
"engines": {
"node": "^12.0.0 || ^14.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0"
Expand All @@ -23,4 +23,4 @@
"format": "lerna run --parallel --stream format",
"bump-version": "node ./scripts/bump-version.js"
}
}
}
2 changes: 1 addition & 1 deletion packages/internal-lib-build/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/internal-lib-build/package.json
@@ -1,6 +1,6 @@
{
"name": "internal-lib-build",
"version": "2.0.0-dev.4",
"version": "2.0.0-dev.5",
"engines": {
"node": "^12.0.0 || ^14.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0"
Expand Down
2 changes: 2 additions & 0 deletions packages/pwa-kit-cli/CHANGELOG.md
@@ -1,3 +1,5 @@
## v2.0.0-dev.5 (Apr 26, 2022)
## v2.0.0-dev.5 (Apr 26, 2022)
## v2.0.0-dev.4 (Apr 06, 2022)

- Loading page: avoid seeing infinite reloads [#532](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/532)
Expand Down
2 changes: 1 addition & 1 deletion packages/pwa-kit-cli/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/pwa-kit-cli/package.json
@@ -1,6 +1,6 @@
{
"name": "pwa-kit-cli",
"version": "2.0.0-dev.4",
"version": "2.0.0-dev.5",
"description": "Build tools for pwa-kit",
"repository": {
"type": "git",
Expand Down Expand Up @@ -112,9 +112,9 @@
},
"devDependencies": {
"@loadable/component": "^5.15.0",
"internal-lib-build": "^2.0.0-dev.4",
"internal-lib-build": "^2.0.0-dev.5",
"nock": "^13.1.1",
"pwa-kit-runtime": "^2.0.0-dev.4",
"pwa-kit-runtime": "^2.0.0-dev.5",
"superagent": "^6.1.0",
"supertest": "^4.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/pwa-kit-create-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/pwa-kit-create-app/package.json
@@ -1,6 +1,6 @@
{
"name": "pwa-kit-create-app",
"version": "2.0.0-dev.4",
"version": "2.0.0-dev.5",
"description": "Salesforce's project generator tool",
"author": "dev@mobify.com",
"license": "See license in LICENSE",
Expand Down Expand Up @@ -40,7 +40,7 @@
"tar": "^6.1.11"
},
"devDependencies": {
"internal-lib-build": "^2.0.0-dev.4",
"internal-lib-build": "^2.0.0-dev.5",
"verdaccio": "^5.9.0"
}
}
2 changes: 2 additions & 0 deletions packages/pwa-kit-react-sdk/CHANGELOG.md
@@ -1,3 +1,5 @@
## v2.0.0-dev.5 (Apr 26, 2022)
## v2.0.0-dev.5 (Apr 26, 2022)
## v2.0.0-dev.4 (Apr 06, 2022)
## v2.0.0-dev.3 (Apr 01, 2022)
## v2.0.0-dev.2 (Feb 10, 2022)
Expand Down
2 changes: 1 addition & 1 deletion packages/pwa-kit-react-sdk/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/pwa-kit-react-sdk/package.json
@@ -1,6 +1,6 @@
{
"name": "pwa-kit-react-sdk",
"version": "2.0.0-dev.4",
"version": "2.0.0-dev.5",
"description": "A library that supports the isomorphic React rendering pipeline for Commerce Cloud Managed Runtime apps",
"main": "dist/index.js",
"engines": {
Expand Down Expand Up @@ -54,7 +54,7 @@
"minimatch": "3.0.4",
"mkdirp": "^1.0.4",
"prop-types": "^15.6.0",
"pwa-kit-runtime": "^2.0.0-dev.4",
"pwa-kit-runtime": "^2.0.0-dev.5",
"react-uid": "^2.2.0",
"serialize-javascript": "^6.0.0",
"svg-sprite-loader": "^6.0.11",
Expand All @@ -66,7 +66,7 @@
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "1.15.2",
"internal-lib-build": "^2.0.0-dev.4",
"internal-lib-build": "^2.0.0-dev.5",
"node-html-parser": "^3.3.4",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
2 changes: 2 additions & 0 deletions packages/pwa-kit-runtime/CHANGELOG.md
@@ -1,3 +1,5 @@
## v2.0.0-dev.5 (Apr 26, 2022)
## v2.0.0-dev.5 (Apr 26, 2022)
## v2.0.0-dev.4 (Apr 06, 2022)
## v2.0.0-dev.3 (Apr 01, 2022)
## v2.0.0-dev.2 (Feb 10, 2022)
Expand Down
2 changes: 1 addition & 1 deletion packages/pwa-kit-runtime/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/pwa-kit-runtime/package.json
@@ -1,6 +1,6 @@
{
"name": "pwa-kit-runtime",
"version": "2.0.0-dev.4",
"version": "2.0.0-dev.5",
"description": "The PWAKit Runtime",
"repository": {
"type": "git",
Expand Down Expand Up @@ -54,7 +54,7 @@
"@loadable/component": "^5.15.0",
"aws-lambda-test-utils": "^1.3.0",
"fs-extra": "^10.0.1",
"internal-lib-build": "^2.0.0-dev.4",
"internal-lib-build": "^2.0.0-dev.5",
"nock": "^13.1.1",
"node-fetch": "2.6.1",
"s3rver": "^3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/template-express-minimal/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/template-express-minimal/package.json
@@ -1,11 +1,11 @@
{
"name": "template-express-minimal",
"version": "2.0.0-dev.4",
"version": "2.0.0-dev.5",
"license": "See license in LICENSE",
"private": true,
"devDependencies": {
"pwa-kit-cli": "^2.0.0-dev.4",
"pwa-kit-runtime": "^2.0.0-dev.4"
"pwa-kit-cli": "^2.0.0-dev.5",
"pwa-kit-runtime": "^2.0.0-dev.5"
},
"scripts": {
"test": "pwa-kit-cli test",
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/template-retail-react-app/package.json
@@ -1,6 +1,6 @@
{
"name": "scaffold-pwa",
"version": "2.0.0-dev.4",
"version": "2.0.0-dev.5",
"license": "See license in LICENSE",
"private": true,
"engines": {
Expand Down Expand Up @@ -41,9 +41,9 @@
"njwt": "^1.2.0",
"node-fetch": "^2.3.0",
"prop-types": "^15.6.0",
"pwa-kit-cli": "^2.0.0-dev.4",
"pwa-kit-react-sdk": "^2.0.0-dev.4",
"pwa-kit-runtime": "^2.0.0-dev.4",
"pwa-kit-cli": "^2.0.0-dev.5",
"pwa-kit-react-sdk": "^2.0.0-dev.5",
"pwa-kit-runtime": "^2.0.0-dev.5",
"query-string": "^7.0.1",
"raf": "^3.4.0",
"randomstring": "^1.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/template-typescript-minimal/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/template-typescript-minimal/package.json
@@ -1,6 +1,6 @@
{
"name": "typescript-minimal",
"version": "2.0.0-dev.4",
"version": "2.0.0-dev.5",
"engines": {
"node": "^12.0.0 || ^14.0.0",
"npm": "^6.14.4 || ^7.0.0 || ^8.0.0"
Expand All @@ -10,9 +10,9 @@
"@loadable/component": "^5.15.0",
"cross-env": "^5.2.0",
"cross-fetch": "^3.1.4",
"pwa-kit-cli": "^2.0.0-dev.4",
"pwa-kit-react-sdk": "^2.0.0-dev.4",
"pwa-kit-runtime": "^2.0.0-dev.4",
"pwa-kit-cli": "^2.0.0-dev.5",
"pwa-kit-react-sdk": "^2.0.0-dev.5",
"pwa-kit-runtime": "^2.0.0-dev.5",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
Expand Down

0 comments on commit 3a34f14

Please sign in to comment.