Skip to content

PWA-3610: Fixed targetables call #4560

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

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

PWA-3610: Fixed targetables call #4560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ca47f5b
PWA-3610: Fixed targetables call
glo82145 Oct 7, 2025
d3c8287
PWA-3610: Fixed targetables call
glo82145 Oct 7, 2025
cf25fd6
PWA-3610: Fixed targetables call
glo82145 Oct 7, 2025
7ac90cb
PWA-3610: Fixed targetables call
glo82145 Oct 7, 2025
17b6351
PWA-3610: Fixed targetables call
glo82145 Oct 7, 2025
4b8ffaa
PWA-3610: Fixed targetables call
glo82145 Oct 7, 2025
2bd4a67
PWA-3610: Fixed targetables call
glo82145 Oct 7, 2025
c3ad2d6
PWA-3610: Fixed targetables call
glo82145 Oct 7, 2025
3dfff8a
Testing TargetProvider logic
del22123 Oct 8, 2025
31015b6
v14.4.0-alpha7
devops-pwa-codebuild Oct 8, 2025
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
1 change: 1 addition & 0 deletions global.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module '@magento/pwa-buildpack';
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/pwa-studio",
"version": "14.3.1",
"version": "14.4.0-alpha7",
"private": true,
"workspaces": [
"packages/babel-preset-peregrine",
Expand Down
6 changes: 3 additions & 3 deletions packages/create-pwa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/create-pwa",
"version": "2.5.7",
"version": "2.5.8-alpha7",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -29,8 +29,8 @@
},
"homepage": "https://github.com/magento/pwa-studio/tree/main/packages/create-pwa#readme",
"dependencies": {
"@magento/pwa-buildpack": "~11.5.4",
"@magento/venia-concept": "~14.3.1",
"@magento/pwa-buildpack": "11.5.5-alpha7",
"@magento/venia-concept": "14.4.0-alpha7",
"chalk": "^2.4.2",
"change-case": "^3.1.0",
"compression": "~1.7.4",
Expand Down
6 changes: 3 additions & 3 deletions packages/extensions/experience-platform-connector/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/experience-platform-connector",
"version": "1.0.10",
"version": "1.0.11-alpha7",
"publishConfig": {
"access": "public"
},
Expand All @@ -18,8 +18,8 @@
"devDependencies": {},
"peerDependencies": {
"@apollo/client": "~3.5.0",
"@magento/peregrine": "~15.5.2",
"@magento/pwa-buildpack": "~11.5.4",
"@magento/peregrine": "15.6.2-alpha7",
"@magento/pwa-buildpack": "11.5.5-alpha7",
"react": "~17.0.1"
},
"pwa-studio": {
Expand Down
6 changes: 3 additions & 3 deletions packages/extensions/upward-security-headers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/upward-security-headers",
"version": "1.1.18",
"version": "1.1.19-alpha7",
"publishConfig": {
"access": "public"
},
Expand All @@ -13,8 +13,8 @@
"author": "Adobe Commerce",
"license": "(OSL-3.0 OR AFL-3.0)",
"peerDependencies": {
"@magento/pwa-buildpack": "~11.5.4",
"@magento/venia-ui": "~11.7.0",
"@magento/pwa-buildpack": "11.5.5-alpha7",
"@magento/venia-ui": "11.7.1-alpha7",
"webpack": "~4.46.0"
},
"pwa-studio": {
Expand Down
2 changes: 1 addition & 1 deletion packages/extensions/venia-pwa-live-search/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/venia-pwa-live-search",
"version": "1.0.0",
"version": "1.0.1-alpha7",
"publishConfig": {
"access": "public"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/extensions/venia-sample-backends/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/venia-sample-backends",
"version": "0.0.12",
"version": "0.0.13-alpha7",
"publishConfig": {
"access": "public"
},
Expand All @@ -13,7 +13,7 @@
"repository": "github:magento/pwa-studio",
"license": "(OSL-3.0 OR AFL-3.0)",
"peerDependencies": {
"@magento/pwa-buildpack": "~11.5.4",
"@magento/pwa-buildpack": "11.5.5-alpha7",
"node-fetch": "~2.3.0"
},
"pwa-studio": {
Expand Down
6 changes: 3 additions & 3 deletions packages/extensions/venia-sample-eventing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/venia-sample-eventing",
"version": "0.0.11",
"version": "0.0.12-alpha7",
"publishConfig": {
"access": "public"
},
Expand All @@ -12,8 +12,8 @@
"repository": "github:magento/pwa-studio",
"license": "(OSL-3.0 OR AFL-3.0)",
"peerDependencies": {
"@magento/peregrine": "~15.5.2",
"@magento/pwa-buildpack": "~11.5.4",
"@magento/peregrine": "15.6.2-alpha7",
"@magento/pwa-buildpack": "11.5.5-alpha7",
"react": "~17.0.1"
},
"pwa-studio": {
Expand Down
6 changes: 3 additions & 3 deletions packages/extensions/venia-sample-language-packs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/venia-sample-language-packs",
"version": "0.0.19",
"version": "0.0.20-alpha7",
"publishConfig": {
"access": "public"
},
Expand All @@ -12,8 +12,8 @@
"repository": "github:magento/pwa-studio",
"license": "(OSL-3.0 OR AFL-3.0)",
"peerDependencies": {
"@magento/pwa-buildpack": "~11.5.4",
"@magento/venia-ui": "~11.7.0"
"@magento/pwa-buildpack": "11.5.5-alpha7",
"@magento/venia-ui": "11.7.1-alpha7"
},
"pwa-studio": {
"targets": {
Expand Down
8 changes: 4 additions & 4 deletions packages/extensions/venia-sample-payments-cashondelivery/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/venia-sample-payments-cashondelivery",
"version": "0.0.2",
"version": "0.0.3-alpha7",
"publishConfig": {
"access": "public"
},
Expand All @@ -12,9 +12,9 @@
"repository": "github:magento/pwa-studio",
"license": "(OSL-3.0 OR AFL-3.0)",
"peerDependencies": {
"@magento/peregrine": "~15.5.2",
"@magento/pwa-buildpack": "~11.5.4",
"@magento/venia-ui": "~11.7.0",
"@magento/peregrine": "15.6.2-alpha7",
"@magento/pwa-buildpack": "11.5.5-alpha7",
"@magento/venia-ui": "11.7.1-alpha7",
"react": "~17.0.1",
"react-intl": "~5.20.0",
"react-router-dom": "~5.2.0"
Expand Down
8 changes: 4 additions & 4 deletions packages/extensions/venia-sample-payments-checkmo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/venia-sample-payments-checkmo",
"version": "0.0.17",
"version": "0.0.18-alpha7",
"publishConfig": {
"access": "public"
},
Expand All @@ -12,9 +12,9 @@
"repository": "github:magento/pwa-studio",
"license": "(OSL-3.0 OR AFL-3.0)",
"peerDependencies": {
"@magento/peregrine": "~15.5.2",
"@magento/pwa-buildpack": "~11.5.4",
"@magento/venia-ui": "~11.7.0",
"@magento/peregrine": "15.6.2-alpha7",
"@magento/pwa-buildpack": "11.5.5-alpha7",
"@magento/venia-ui": "11.7.1-alpha7",
"react": "~17.0.1",
"react-intl": "~5.20.0",
"react-router-dom": "~5.2.0"
Expand Down
14 changes: 7 additions & 7 deletions packages/pagebuilder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/pagebuilder",
"version": "9.3.5",
"version": "9.3.6-alpha7",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -34,9 +34,9 @@
"homepage": "https://github.com/magento/pwa-studio/tree/main/packages/pagebuilder#readme",
"dependencies": {},
"devDependencies": {
"@magento/peregrine": "~15.5.2",
"@magento/pwa-buildpack": "~11.5.4",
"@magento/venia-ui": "~11.7.0",
"@magento/peregrine": "15.6.2-alpha7",
"@magento/pwa-buildpack": "11.5.5-alpha7",
"@magento/venia-ui": "11.7.1-alpha7",
"@storybook/react": "~6.3.7",
"jarallax": "~1.11.1",
"load-google-maps-api": "~2.0.1",
Expand All @@ -50,9 +50,9 @@
"peerDependencies": {
"@apollo/client": "~3.5.0",
"@magento/babel-preset-peregrine": "~1.3.3",
"@magento/peregrine": "~15.5.2",
"@magento/pwa-buildpack": "~11.5.4",
"@magento/venia-ui": "~11.7.0",
"@magento/peregrine": "15.6.2-alpha7",
"@magento/pwa-buildpack": "11.5.5-alpha7",
"@magento/venia-ui": "11.7.1-alpha7",
"jarallax": "~1.11.1",
"load-google-maps-api": "~2.0.1",
"lodash.escape": "~4.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/peregrine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/peregrine",
"version": "15.5.2",
"version": "15.6.2-alpha7",
"publishConfig": {
"access": "public"
},
Expand Down
9 changes: 8 additions & 1 deletion packages/pwa-buildpack/lib/WebpackTools/targetables/TargetableSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@ class TargetableSet {
}
/** @hideconstructor */
constructor(targetProvider) {
if (!(targetProvider instanceof TargetProvider)) {
const isValidTargetProvider = targetProvider instanceof TargetProvider ||
(targetProvider &&
typeof targetProvider === 'object' &&
typeof targetProvider.of === 'function' &&
typeof targetProvider.name === 'string' &&
targetProvider.constructor.name === 'TargetProvider');

if (!isValidTargetProvider) {
throw new Error(
'Must supply a TargetProvider to a new TargetableSet.'
);
Expand Down
4 changes: 2 additions & 2 deletions packages/pwa-buildpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/pwa-buildpack",
"version": "11.5.4",
"version": "11.5.5-alpha7",
"publishConfig": {
"access": "public"
},
Expand All @@ -27,7 +27,7 @@
"homepage": "https://github.com/magento/pwa-studio/tree/main/packages/pwa-buildpack#readme",
"dependencies": {
"@magento/directive-parser": "~0.1.7",
"@magento/upward-js": "~5.4.2",
"@magento/upward-js": "5.4.3-alpha7",
"@pmmmwh/react-refresh-webpack-plugin": "~0.4.3",
"@yarnpkg/lockfile": "~1.1.0",
"apicache": "~1.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/upward-js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/upward-js",
"version": "5.4.2",
"version": "5.4.3-alpha7",
"publishConfig": {
"access": "public"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/venia-concept/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/venia-concept",
"version": "14.3.1",
"version": "14.4.0-alpha7",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -35,7 +35,7 @@
},
"homepage": "https://github.com/magento/pwa-studio/tree/main/packages/venia-concept#readme",
"dependencies": {
"@magento/experience-platform-connector": "~1.0.10",
"@magento/experience-platform-connector": "1.0.11-alpha7",
"@magento/pwa-buildpack": "~11.5.3",
"dompurify": "~3.2.4"
},
Expand All @@ -55,11 +55,11 @@
"@babel/runtime": "~7.15.3",
"@magento/babel-preset-peregrine": "~1.3.3",
"@magento/eslint-config": "~1.5.0",
"@magento/pagebuilder": "~9.3.5",
"@magento/peregrine": "~15.5.2",
"@magento/pagebuilder": "9.3.6-alpha7",
"@magento/peregrine": "15.6.2-alpha7",
"@magento/pwa-theme-venia": "~2.4.0",
"@magento/upward-security-headers": "~1.1.18",
"@magento/venia-ui": "~11.7.0",
"@magento/upward-security-headers": "1.1.19-alpha7",
"@magento/venia-ui": "11.7.1-alpha7",
"@pmmmwh/react-refresh-webpack-plugin": "0.4.1",
"@storybook/react": "~6.3.7",
"@types/node": "16",
Expand Down
3 changes: 2 additions & 1 deletion packages/venia-ui/lib/targets/venia-ui-intercept.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ const SummaryPaymentTypes = require('./SummaryPaymentTypes');
const RootShimmerTypes = require('./RootShimmerTypes');

module.exports = veniaTargets => {
const venia = new Targetables(veniaTargets);
console.log('targets:', veniaTargets);
const venia = Targetables.using(veniaTargets);

venia.setSpecialFeatures(
'cssModules',
Expand Down
6 changes: 3 additions & 3 deletions packages/venia-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/venia-ui",
"version": "11.7.0",
"version": "11.7.1-alpha7",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -80,8 +80,8 @@
"peerDependencies": {
"@apollo/client": "~3.5.0",
"@magento/babel-preset-peregrine": "~1.3.3",
"@magento/peregrine": "~15.5.2",
"@magento/pwa-buildpack": "~11.5.4",
"@magento/peregrine": "15.6.2-alpha7",
"@magento/pwa-buildpack": "11.5.5-alpha7",
"apollo-cache-persist": "~0.1.1",
"braintree-web-drop-in": "~1.43.0",
"graphql": "~15.5.0",
Expand Down
2 changes: 1 addition & 1 deletion pwa-devdocs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pwa-devdocs",
"private": true,
"version": "14.3.1",
"version": "14.4.0-alpha7",
"description": "A documentation site for Magento PWA",
"main": "gulpfile.js",
"dependencies": {
Expand Down