diff --git a/global.d.ts b/global.d.ts new file mode 100644 index 0000000000..07aea31ff8 --- /dev/null +++ b/global.d.ts @@ -0,0 +1 @@ +declare module '@magento/pwa-buildpack'; \ No newline at end of file diff --git a/package.json b/package.json index cfed845a4f..87b2d97c06 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-studio", - "version": "14.3.1", + "version": "14.4.0-alpha7", "private": true, "workspaces": [ "packages/babel-preset-peregrine", diff --git a/packages/create-pwa/package.json b/packages/create-pwa/package.json index 74b4c22b5c..f23d42da67 100644 --- a/packages/create-pwa/package.json +++ b/packages/create-pwa/package.json @@ -1,6 +1,6 @@ { "name": "@magento/create-pwa", - "version": "2.5.7", + "version": "2.5.8-alpha7", "publishConfig": { "access": "public" }, @@ -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", diff --git a/packages/extensions/experience-platform-connector/package.json b/packages/extensions/experience-platform-connector/package.json index 7fbd6c62ee..f70036b1c9 100644 --- a/packages/extensions/experience-platform-connector/package.json +++ b/packages/extensions/experience-platform-connector/package.json @@ -1,6 +1,6 @@ { "name": "@magento/experience-platform-connector", - "version": "1.0.10", + "version": "1.0.11-alpha7", "publishConfig": { "access": "public" }, @@ -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": { diff --git a/packages/extensions/upward-security-headers/package.json b/packages/extensions/upward-security-headers/package.json index 1429423a53..b1e384b5b7 100644 --- a/packages/extensions/upward-security-headers/package.json +++ b/packages/extensions/upward-security-headers/package.json @@ -1,6 +1,6 @@ { "name": "@magento/upward-security-headers", - "version": "1.1.18", + "version": "1.1.19-alpha7", "publishConfig": { "access": "public" }, @@ -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": { diff --git a/packages/extensions/venia-pwa-live-search/package.json b/packages/extensions/venia-pwa-live-search/package.json index dc4d6a39e3..44492c2213 100644 --- a/packages/extensions/venia-pwa-live-search/package.json +++ b/packages/extensions/venia-pwa-live-search/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-pwa-live-search", - "version": "1.0.0", + "version": "1.0.1-alpha7", "publishConfig": { "access": "public" }, diff --git a/packages/extensions/venia-sample-backends/package.json b/packages/extensions/venia-sample-backends/package.json index 69e707ef84..67c2b0440d 100644 --- a/packages/extensions/venia-sample-backends/package.json +++ b/packages/extensions/venia-sample-backends/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-backends", - "version": "0.0.12", + "version": "0.0.13-alpha7", "publishConfig": { "access": "public" }, @@ -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": { diff --git a/packages/extensions/venia-sample-eventing/package.json b/packages/extensions/venia-sample-eventing/package.json index 9a5433ca93..19a94583b3 100644 --- a/packages/extensions/venia-sample-eventing/package.json +++ b/packages/extensions/venia-sample-eventing/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-eventing", - "version": "0.0.11", + "version": "0.0.12-alpha7", "publishConfig": { "access": "public" }, @@ -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": { diff --git a/packages/extensions/venia-sample-language-packs/package.json b/packages/extensions/venia-sample-language-packs/package.json index ffd4ebe231..9c52c4a031 100644 --- a/packages/extensions/venia-sample-language-packs/package.json +++ b/packages/extensions/venia-sample-language-packs/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-language-packs", - "version": "0.0.19", + "version": "0.0.20-alpha7", "publishConfig": { "access": "public" }, @@ -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": { diff --git a/packages/extensions/venia-sample-payments-cashondelivery/package.json b/packages/extensions/venia-sample-payments-cashondelivery/package.json index 48cb9c56ab..c961bcb825 100644 --- a/packages/extensions/venia-sample-payments-cashondelivery/package.json +++ b/packages/extensions/venia-sample-payments-cashondelivery/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-payments-cashondelivery", - "version": "0.0.2", + "version": "0.0.3-alpha7", "publishConfig": { "access": "public" }, @@ -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" diff --git a/packages/extensions/venia-sample-payments-checkmo/package.json b/packages/extensions/venia-sample-payments-checkmo/package.json index 5dc41f10ae..1d93751403 100644 --- a/packages/extensions/venia-sample-payments-checkmo/package.json +++ b/packages/extensions/venia-sample-payments-checkmo/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-sample-payments-checkmo", - "version": "0.0.17", + "version": "0.0.18-alpha7", "publishConfig": { "access": "public" }, @@ -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" diff --git a/packages/pagebuilder/package.json b/packages/pagebuilder/package.json index bc0dedbf27..c49b6574b8 100644 --- a/packages/pagebuilder/package.json +++ b/packages/pagebuilder/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pagebuilder", - "version": "9.3.5", + "version": "9.3.6-alpha7", "publishConfig": { "access": "public" }, @@ -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", @@ -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", diff --git a/packages/peregrine/package.json b/packages/peregrine/package.json index 5ea55ba85f..524f483554 100644 --- a/packages/peregrine/package.json +++ b/packages/peregrine/package.json @@ -1,6 +1,6 @@ { "name": "@magento/peregrine", - "version": "15.5.2", + "version": "15.6.2-alpha7", "publishConfig": { "access": "public" }, diff --git a/packages/pwa-buildpack/lib/WebpackTools/targetables/TargetableSet.js b/packages/pwa-buildpack/lib/WebpackTools/targetables/TargetableSet.js index 403493ca88..1119c307cf 100644 --- a/packages/pwa-buildpack/lib/WebpackTools/targetables/TargetableSet.js +++ b/packages/pwa-buildpack/lib/WebpackTools/targetables/TargetableSet.js @@ -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.' ); diff --git a/packages/pwa-buildpack/package.json b/packages/pwa-buildpack/package.json index 1bb5c432f3..22b0efce02 100644 --- a/packages/pwa-buildpack/package.json +++ b/packages/pwa-buildpack/package.json @@ -1,6 +1,6 @@ { "name": "@magento/pwa-buildpack", - "version": "11.5.4", + "version": "11.5.5-alpha7", "publishConfig": { "access": "public" }, @@ -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", diff --git a/packages/upward-js/package.json b/packages/upward-js/package.json index a978068987..8a5937713a 100644 --- a/packages/upward-js/package.json +++ b/packages/upward-js/package.json @@ -1,6 +1,6 @@ { "name": "@magento/upward-js", - "version": "5.4.2", + "version": "5.4.3-alpha7", "publishConfig": { "access": "public" }, diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json index f0ae3ea533..738c20133b 100644 --- a/packages/venia-concept/package.json +++ b/packages/venia-concept/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-concept", - "version": "14.3.1", + "version": "14.4.0-alpha7", "publishConfig": { "access": "public" }, @@ -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" }, @@ -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", diff --git a/packages/venia-ui/lib/targets/venia-ui-intercept.js b/packages/venia-ui/lib/targets/venia-ui-intercept.js index 922f5a2ba2..2fbb8678e1 100644 --- a/packages/venia-ui/lib/targets/venia-ui-intercept.js +++ b/packages/venia-ui/lib/targets/venia-ui-intercept.js @@ -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', diff --git a/packages/venia-ui/package.json b/packages/venia-ui/package.json index f9dfedf14f..56e234a90a 100644 --- a/packages/venia-ui/package.json +++ b/packages/venia-ui/package.json @@ -1,6 +1,6 @@ { "name": "@magento/venia-ui", - "version": "11.7.0", + "version": "11.7.1-alpha7", "publishConfig": { "access": "public" }, @@ -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", diff --git a/pwa-devdocs/package.json b/pwa-devdocs/package.json index 1544138ce8..65a143abbf 100644 --- a/pwa-devdocs/package.json +++ b/pwa-devdocs/package.json @@ -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": {