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.

Sign up for GitHub

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

[Extensibility 🤌🏻] Make create-app work with "extended templates" #1205

Merged
merged 327 commits into from
May 26, 2023
Merged

[Extensibility 🤌🏻] Make create-app work with "extended templates" #1205

Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
327 commits
Select commit Hold shift + click to select a range
b2cad1d
Merge branch 'v3' into feature/template-extensibility
bfeister Apr 6, 2023
b4ef5b9
merge feature branch back
yunakim714 Apr 6, 2023
93727d1
resolve merge conflicts
yunakim714 Apr 6, 2023
d664877
Merge branch 'v3' into feature/template-extensibility
bfeister Apr 6, 2023
a11bbcc
merge conflict
bfeister Apr 6, 2023
34dc3f0
resolve merge conflict
bfeister Apr 6, 2023
ca6a625
update spike project's engines / regen v3 lockfiles
bfeister Apr 6, 2023
3863783
regenerate lock files
yunakim714 Apr 6, 2023
c562975
add missing node engines
bfeister Apr 6, 2023
cee6d04
add missing useToast (bad merge)
bfeister Apr 6, 2023
dfb656b
updates from underlying template-retail-react-app
bfeister Apr 6, 2023
5f364df
drop unnecessary pages/product-detail override
bfeister Apr 6, 2023
cc30d3a
Merge branch 'feature/template-extensibility' into extensibility-code…
bfeister Apr 6, 2023
a22ef36
fix dupe useToast
bfeister Apr 6, 2023
74f1d24
progress on making `charles-solution` work
bfeister Apr 6, 2023
8b80436
initial pass at migration to `resolver.getHook('resolve').tapAsync` w…
bfeister Apr 7, 2023
b388e56
restore icons file and add extensible text to home
yunakim714 Apr 7, 2023
6541b8f
add some comments and construct hashmap in new plugin
yunakim714 Apr 10, 2023
a654ef3
working glob sync lookup??
yunakim714 Apr 11, 2023
2cb9cce
resolve lookup when there is no extension
yunakim714 Apr 11, 2023
fcd183b
add component slot for testing
yunakim714 Apr 11, 2023
7adceb1
fix some lookup errors
yunakim714 Apr 11, 2023
de69faa
migrate to new directory
bfeister Apr 12, 2023
592931e
remove unnecessary directory nesting, remove unnecessary files for "m…
bfeister Apr 12, 2023
9e4b187
add example of extending routes non-destructively, add example of qui…
bfeister Apr 12, 2023
32e0ae0
Update example route
bfeister Apr 12, 2023
c751bbf
add some demo examples of overrides
bfeister Apr 12, 2023
d287a16
cleanup
yunakim714 Apr 13, 2023
1dcb461
commit package name change
bfeister Apr 13, 2023
a8b593d
rewrite requests coming from underlying template
yunakim714 Apr 14, 2023
9d79b8e
cleanup
yunakim714 Apr 14, 2023
6ebbe1a
rename plugin file
yunakim714 Apr 14, 2023
38f3b92
resolve merge conflict
yunakim714 Apr 14, 2023
be3bb04
remove unnecessary build files
yunakim714 Apr 19, 2023
0cb80f4
rename to overrides
yunakim714 Apr 19, 2023
2b726b9
fix lookup errors
yunakim714 Apr 20, 2023
1ae6125
Merge branch 'v3' into feature/template-extensibility
bfeister Apr 25, 2023
940565a
Merge branch 'feature/template-extensibility' into extensibility-code…
bfeister Apr 25, 2023
e76ee0a
fix some broken upstream changes, eslint fixes
bfeister Apr 25, 2023
1f9ac65
fix bad merge conflict
bfeister Apr 25, 2023
7345439
Bring back the deleted package.json
vmarta Apr 26, 2023
f9b1477
Install new eslint plugin
vmarta Apr 26, 2023
71f21b2
No more relative imports in retail-react-app
vmarta Apr 26, 2023
16cca08
Create .prettierrc.yaml
vmarta Apr 26, 2023
4fcbf92
restore other deleted package lockfiles
bfeister Apr 26, 2023
a8d9021
fix some eslint issues
bfeister Apr 26, 2023
d3f6860
remove `^` imports and begin migrating logic away from previous API. …
bfeister Apr 26, 2023
ef25c00
bring back deleted package lockfiles
vmarta Apr 26, 2023
f0bed51
short circuit plugin temporarily, get webpack `alias` working for tem…
bfeister Apr 26, 2023
856427d
fix unreachable condition
bfeister Apr 26, 2023
e8cc5b4
wow... freaking works 🚀
bfeister Apr 26, 2023
f2ce238
cleanup, get `template-retail-react-app` working again
bfeister Apr 26, 2023
24622a6
cleanup
bfeister Apr 26, 2023
6df83a6
Create .eslintrc.js
vmarta Apr 27, 2023
edacf34
fix routes.jsx which no longer pulled relative template
bfeister Apr 27, 2023
1862c9e
make routes.jsx more concise
bfeister Apr 27, 2023
20c3042
update lockfiles
bfeister Apr 27, 2023
69fcd79
add jsconfig.json for IDEs to have magic `retail-react-app` be discov…
bfeister Apr 27, 2023
240a9d5
Merge branch 'v3' into feature/template-extensibility
bfeister Apr 28, 2023
78b6c53
Merge branch 'feature/template-extensibility' into feature/template-e…
bfeister Apr 28, 2023
4241eab
more cleanup
bfeister Apr 28, 2023
7bac071
change package.json key from `mobify` => `ccExtensibility`
bfeister Apr 28, 2023
dbaba8b
cleanup
bfeister Apr 28, 2023
06cb1f0
Final cleanup, remove console.logs, make `extendable` dynamic for int…
bfeister Apr 28, 2023
98c382b
fix straggler non-dynamic filepath
bfeister Apr 28, 2023
29e6e58
cleanup
bfeister Apr 28, 2023
c3fa1f3
remove code that shouldn't be in v3+
bfeister Apr 28, 2023
9b39529
sync package.json deps in extended example project
bfeister May 2, 2023
b8fe972
cleanup / pr feedback
bfeister May 2, 2023
148ea0a
pr feedback, great catch @kevinxh
bfeister May 3, 2023
4543a4d
fix problem with bad copy from underlying template file
bfeister May 3, 2023
11701dc
pr feedback / cleanup
bfeister May 3, 2023
e1aabf1
cleanup
bfeister May 3, 2023
2fe771e
Update package-lock.json
vmarta May 3, 2023
83f07fe
WIP
vcua-mobify May 3, 2023
7e3b678
drop unneeded complexity
bfeister May 3, 2023
95488be
lockfiles
bfeister May 3, 2023
8b6f5fb
moving toward an array of `alias`es
bfeister May 4, 2023
a29cc07
Refactor template extensibility functionality to use `resolve.alias` …
bfeister May 5, 2023
d96c107
Merge branch 'feature/template-extensibility-algo-refactor' of github…
vcua-mobify May 5, 2023
ce151a1
add brand-logo with no clash for server side viewBox
bfeister May 5, 2023
034e2d7
add `request-processor.js` (required for worker.js to load) and fix b…
bfeister May 5, 2023
a0086fd
lint fix
bfeister May 9, 2023
a9ec4bf
fix failing pwa-kit-react-sdk tests
bfeister May 9, 2023
2afa605
cleanup
bfeister May 9, 2023
94308c5
Merge branch 'v3' into feature/template-extensibility
bfeister May 9, 2023
2c6be38
regen package lockfiles
bfeister May 9, 2023
de5fd5c
Merge branch 'feature/template-extensibility' into feature/template-e…
bfeister May 9, 2023
5cb9f44
lint:fix
bfeister May 9, 2023
58becd0
fix failing tests in CI re: `TextDecoder is not defined`
bfeister May 9, 2023
344a65e
take 2 attempting to fix TextDecoder global in jest
bfeister May 9, 2023
e7eba97
fix jest module mapper
bfeister May 9, 2023
79a1b55
fix jest moduleMapper config
bfeister May 9, 2023
e0c6c4b
REALLY fix jest moduleNameMapper config for new pathing + fix node `u…
bfeister May 9, 2023
e750b29
add brand-logo
bfeister May 9, 2023
f5b14d0
remove previously added `AbovePDP` Template Hook component
bfeister May 9, 2023
65293a2
replay #1128 from bad merge
bfeister May 9, 2023
a9fae57
eslint:fix for `retail-react-app` base paths
bfeister May 10, 2023
f382362
de-duplicate deps in bundle
bfeister May 10, 2023
eafa3b1
fix path defaulting, don't pass nullish value to path.resolve
bfeister May 10, 2023
151b96b
improve pathing for overridesDir in pwa-kit-dev webapack config + add…
bfeister May 10, 2023
61e32b8
Merge branch 'v3' into feature/template-extensibility-algo-refactor
bfeister May 10, 2023
868f9b2
fix pathing
bfeister May 11, 2023
fe7c3ce
fix pathing issue that was mysteriously UNFIXED
bfeister May 11, 2023
bf921b9
fix `worker.js` path
bfeister May 11, 2023
74d1191
fix app/static pathing in non-extensible builds
bfeister May 12, 2023
d7ee72a
Bump version to 3.0.0-dev.0
bendvc May 12, 2023
9664c8e
Fixup dependencies in `template-retail-react-app`
bendvc May 12, 2023
c977eeb
Create boostrap to replace `my-extended-retail-app`
bendvc May 12, 2023
4cdd197
Update generator to support extensible projects (rough implementation)
bendvc May 12, 2023
cb95ebb
Create boostrap to replace `my-extended-retail-app`*
bendvc May 12, 2023
1ff0804
Ensure that translations are chunked
bendvc May 12, 2023
9ff36ac
Remove `my-extended-retail-app` as it is not required
bendvc May 12, 2023
8a22717
Fix lint errors
bendvc May 12, 2023
fb6b0b8
Fix lint errors
bendvc May 12, 2023
5db4dac
Add Handlebars and update package.json files
bendvc May 12, 2023
8365019
Fix bootstrap folder organization
bendvc May 12, 2023
ca3985b
Make template public
bendvc May 12, 2023
47979df
Fix default overrides folder
bendvc May 12, 2023
74c0f3e
Bump to 3.0.0-dev.0 to align with develop
bendvc May 12, 2023
38ed924
Initial generator refactor
bendvc May 15, 2023
c9516d6
Fix version fetching
bendvc May 15, 2023
2818f7a
Attempt to fix version fetching for extensibility
bendvc May 15, 2023
b00e8ee
Another attempt at fixing the version
bendvc May 15, 2023
835a261
Eek another attempt
bendvc May 15, 2023
9d4e6ba
Bad code completion suggestion
bendvc May 15, 2023
3963a73
Fix some template keys
bendvc May 15, 2023
00ddaf9
Fix version number
bendvc May 15, 2023
ea0c3ea
Update create-mobify-app.js
bendvc May 15, 2023
71b7c08
Fix template keys in override assets
bendvc May 15, 2023
71c2b24
Update create-mobify-app.js
bendvc May 16, 2023
3e57e0b
[Extensibility] Remove Einstein proxy and send Einstein events direct…
vcua-mobify May 16, 2023
f477800
Add context
bendvc May 16, 2023
ee6734b
Fix template key
bendvc May 16, 2023
03b033b
Update package.json.hbs
bendvc May 16, 2023
7e14ab2
Add handlebars json helper
bendvc May 16, 2023
d23aed6
Disabled html encoding for json objects in templates
bendvc May 16, 2023
3b49e9f
Fix formatting in scripts
bendvc May 16, 2023
b57ffa5
Allow demo to use extensibility
bendvc May 16, 2023
1ddad4c
Slugify name
bendvc May 16, 2023
03ae62d
Move boostrap folder
bendvc May 16, 2023
14dfde2
Setting up for bootstrap file reuse
bendvc May 16, 2023
5721f91
debugging
bendvc May 16, 2023
7f78bdd
Update create-mobify-app.js
bendvc May 16, 2023
f4bd1bb
Testing with postGenerate hook
bendvc May 16, 2023
526a7f7
debugging
bendvc May 16, 2023
374ff50
Simplify template sources
bendvc May 16, 2023
fad9719
Fix template keys yet again
bendvc May 16, 2023
412c3f8
Replace ExtendsCircularImportsPlugin with OverridesResolverPlugin (#1…
vcua-mobify May 16, 2023
ad8ed22
Update routes.jsx.hbs
bendvc May 16, 2023
4d696d2
Update create-mobify-app.js
bendvc May 16, 2023
c031e84
Fix things
bendvc May 16, 2023
c0c482d
Fix filter
bendvc May 16, 2023
d7091f0
Fix preset validation
bendvc May 16, 2023
efd6ddd
Update create-mobify-app.js
bendvc May 16, 2023
6dc9321
Update create-mobify-app.js
bendvc May 16, 2023
3c3ecc9
Clean up
bendvc May 16, 2023
6a53a96
remove irrelevant bundlesize check to pass CI
bfeister May 17, 2023
d429521
Fix `vendor.js` inclusion of `retail-react-app` files (#1198)
bfeister May 18, 2023
bddb532
replace relative with absolute path fetchTranslations (#1215)
alexvuong May 18, 2023
f6c5f79
More refactoring
bendvc May 18, 2023
781ca75
Update create-mobify-app.js
bendvc May 18, 2023
523f1d6
Add template level file assets
bendvc May 18, 2023
5fc58c9
debugging
bendvc May 18, 2023
53964f2
Update create-mobify-app.js
bendvc May 18, 2023
bab0f53
Fix templates
bendvc May 18, 2023
7ed9d2e
Fix manifest template keys
bendvc May 18, 2023
4e2a3ae
Rearrange deps
bendvc May 18, 2023
b590eea
Better handling of objects in hbs templates
bendvc May 18, 2023
ee8b98e
Remove hbs json helper
bendvc May 18, 2023
2309035
Fix missing comma
bendvc May 18, 2023
ade3cb3
More handlebars fixes
bendvc May 18, 2023
7986b23
Escape scripts
bendvc May 18, 2023
08408ee
make tempalte scripts work with handlebars escaping
bendvc May 18, 2023
051629b
Merge branch 'feature/template-extensibility-algo-refactor' into gene…
bendvc May 18, 2023
a5feebe
Delete my-exended-template after merging
bendvc May 18, 2023
e1b5bfd
Refactor for unit testing, fix pathing issue from old version of file…
bfeister May 18, 2023
7cd8ab5
More clean up
bendvc May 18, 2023
861e2bb
Remove console log
bendvc May 18, 2023
8d3016d
preset changes
bendvc May 18, 2023
3e19d46
Linting, and change test-project name
bendvc May 18, 2023
1354e1c
Function renames etc
bendvc May 19, 2023
a5865a5
Merge branch 'feature/template-extensibility-algo-refactor' into gene…
bendvc May 19, 2023
0130e7b
debugging
bendvc May 19, 2023
c2efe53
Update create-mobify-app.js
bendvc May 19, 2023
1b804b6
Fix project answers merge
bendvc May 19, 2023
aa0eaa5
Fix CI test 🤞🏻
bendvc May 19, 2023
1075248
Update deps in attempt to fix tests on CI
bendvc May 19, 2023
346e2c0
Lint
bendvc May 19, 2023
9c94720
More dep shuffling
bendvc May 19, 2023
6d157a2
Remove debugger
bendvc May 19, 2023
2d49b1e
More dep wrangling
bendvc May 19, 2023
7fc7df1
Don't use peer deps like I was
bendvc May 19, 2023
76b8c6c
Another iteration of dep organization
bendvc May 19, 2023
80b4a33
Clean up hbs templates
bendvc May 19, 2023
964c7de
Update licences
bendvc May 23, 2023
7dafb99
Merge branch 'develop' into feature/template-extensibility
bfeister May 23, 2023
9585094
remove demo extensible app in light of soon-to-be-merged PR from @bendvc
bfeister May 23, 2023
e2c82d1
lockfiles from reaact18 / chakra2
bfeister May 23, 2023
23c195a
Merge branch 'develop' into feature/template-extensibility-algo-refactor
bfeister May 23, 2023
d73a770
fix merge conflict resolution
bfeister May 23, 2023
e50b67f
remove template extensible demo in prep for @bendvc's pr for generato…
bfeister May 23, 2023
46cff7e
regen lockfiles for react 18 changes
bfeister May 23, 2023
4cd60bf
fix linting
alexvuong May 23, 2023
7859999
Merge branch 'feature/template-extensibility-algo-refactor' into gene…
bendvc May 23, 2023
0fff89b
update package-lock files
bendvc May 23, 2023
4c50101
Fix imports
bendvc May 23, 2023
570223d
Add missing deps
bendvc May 23, 2023
47e1959
Merge branch 'feature/template-extensibility' into feature/template-e…
bfeister May 23, 2023
851366a
Feature/template extensibility (#1162)
bfeister May 23, 2023
e80e33b
Merge branch 'feature/template-extensibility' into generator/extensib…
bfeister May 23, 2023
d77ecc7
Update packages/pwa-kit-create-app/scripts/create-mobify-app.js
bendvc May 23, 2023
73a8ef3
Fix CI workflow project reference
bendvc May 23, 2023
c4c82d8
Update config.js
bendvc May 23, 2023
2b40687
support windows file paths
bfeister May 23, 2023
6b53232
Lint
bendvc May 23, 2023
ba789c1
Fix issue with failed tests because of react query dev tools
bendvc May 23, 2023
336b4e7
Extract default messages script (#1216)
alexvuong May 23, 2023
0e407ee
Add typescript extensions (#1223)
alexvuong May 24, 2023
ec4dc30
fix failing tests
bfeister May 24, 2023
3038067
Update `extract-default-translations` script for extensibility
bendvc May 24, 2023
3cd496d
debugging
bendvc May 24, 2023
fb9114f
Update create-mobify-app.js
bendvc May 24, 2023
f37922c
Merge remote-tracking branch 'origin/feature/template-extensibility' …
bendvc May 24, 2023
05bb624
Fix regex
bendvc May 24, 2023
36b60ae
First pass copying translations
bendvc May 24, 2023
64ed56e
Update create-mobify-app.js
bendvc May 24, 2023
f6a364e
Update create-mobify-app.js
bendvc May 24, 2023
b728a22
Update create-mobify-app.js
bendvc May 24, 2023
707d000
Update create-mobify-app.js
bendvc May 24, 2023
ee26875
Refactor copy assets work
bendvc May 24, 2023
135c691
Remove debugger directive
bendvc May 25, 2023
65e7ee2
Merge branch 'feature/template-extensibility-algo-refactor' into gene…
bendvc May 25, 2023
408d55d
Merge branch 'develop' into generator/extensibility-support-new
bendvc May 25, 2023
ca96a8e
Regenerate package-lock files
bendvc May 25, 2023
f15f3a8
Fix lint errors on generated projects
bendvc May 25, 2023
c6dab4c
Update create-mobify-app.js
bendvc May 25, 2023
e0cc226
Fix some dep versions
bendvc May 25, 2023
5ef60a1
Update create-mobify-app.js
bendvc May 25, 2023
f84d7dd
Update package.json
bendvc May 25, 2023
c43ec99
Fix lint script so it works with windows
bendvc May 25, 2023
704e67d
Merge branch 'develop' into generator/extensibility-support-new
bendvc May 25, 2023
ef0aebd
Regenerate package-lock files and remove my-generated-app again
bendvc May 25, 2023
25ad148
Lint
bendvc May 25, 2023
e4fc371
mv doesnt work the same on windows as unix
bendvc May 25, 2023
234ce56
Same
bendvc May 25, 2023
fe55092
Revert suggested change.
bendvc May 25, 2023
bf1c14d
Add basic eslintignore
bendvc May 26, 2023
17bb33d
Update bundle size limits
bendvc May 26, 2023
822e8b4
Missing dep.
bendvc May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,10 @@ jobs:
strategy:
fail-fast: false
matrix:
template: [test-project, retail-react-app-demo, express-minimal-test-project, typescript-minimal-test-project]
template: [retail-react-app-test-project, retail-react-app-demo, express-minimal-test-project, typescript-minimal-test-project]
runs-on: ubuntu-latest
env:
IS_TEMPLATE_FROM_RETAIL_REACT_APP: ${{ matrix.template == 'test-project' || matrix.template == 'retail-react-app-demo' }}
IS_TEMPLATE_FROM_RETAIL_REACT_APP: ${{ matrix.template == 'retail-react-app-test-project' || matrix.template == 'retail-react-app-demo' }}
PROJECT_DIR: generated-${{ matrix.template }}
steps:
- name: Checkout
Expand Down Expand Up @@ -262,10 +262,10 @@ jobs:
strategy:
fail-fast: false
matrix:
template: [test-project, retail-react-app-demo, express-minimal-test-project, typescript-minimal-test-project]
template: [retail-react-app-test-project, retail-react-app-demo, express-minimal-test-project, typescript-minimal-test-project]
runs-on: windows-latest
env:
IS_TEMPLATE_FROM_RETAIL_REACT_APP: ${{ matrix.template == 'test-project' || matrix.template == 'retail-react-app-demo' }}
IS_TEMPLATE_FROM_RETAIL_REACT_APP: ${{ matrix.template == 'retail-react-app-test-project' || matrix.template == 'retail-react-app-demo' }}
PROJECT_DIR: generated-${{ matrix.template }}
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.8.0-dev",
"version": "3.0.0-dev",
"packages": [
"packages/*"
]
Expand Down
Loading