From d192943d65b2dd6fdd72a0ca7d6c2a392c86a2ad Mon Sep 17 00:00:00 2001 From: Ajima Chukwuemeka <32770340+ajimae@users.noreply.github.com> Date: Tue, 6 Aug 2024 18:35:16 +0100 Subject: [PATCH] [Chore] Fix Issues with Browser Example (#751) * chore(browser.html): fix issues browser example - fix issues with browser example - replace webpack module bundle in favour of esbuild - minor refactor * chore(esbuild): remove unused variable - remove unused variable exec * chore(node-engine): ignore node engine ignore node engine check for now * chore(node-engine): ignore node engine ignore node engine check for now * chore(esbuild): fix typo errors - assign esbuild config to the correct variable name --- .circleci/config.yml | 2 +- .nvmrc | 2 +- esbuild.cjs | 31 +++++++ examples/browser/browser.html | 10 ++- package.json | 3 +- webpack.config.js | 86 ------------------- yarn.lock | 150 ++++++++++++++++++++++++++++++++++ 7 files changed, 191 insertions(+), 93 deletions(-) create mode 100644 esbuild.cjs delete mode 100644 webpack.config.js diff --git a/.circleci/config.yml b/.circleci/config.yml index 8299749cf..2479ea484 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,7 +75,7 @@ jobs: - restore_cache: *restore_yarn_cache_node_16 - run: name: Installing dependencies - command: yarn install --frozen-lockfile + command: yarn install --ignore-engines --frozen-lockfile # temp ignore engine checks [will deprecate node v16 soon] - save_cache: *save_yarn_cache_node_16 - run: name: Install example dependencies diff --git a/.nvmrc b/.nvmrc index 805efa9f6..645ae0c87 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.14.0 \ No newline at end of file +20.15.0 \ No newline at end of file diff --git a/esbuild.cjs b/esbuild.cjs new file mode 100644 index 000000000..e1b5c02b3 --- /dev/null +++ b/esbuild.cjs @@ -0,0 +1,31 @@ +const esbuild = require('esbuild'); + +const generalConfig = { minify: true, bundle: true, write: true } + +const sdkClientConfig = esbuild.build( + Object.assign({}, generalConfig, { + entryPoints: ['packages/sdk-client/src/index.ts'], + globalName: 'window["@commercetools/sdk-client-v2"]', + outfile: 'packages/sdk-client/dist/commercetools-sdk-client-v2.umd.js' + }) +) + +const sdkClientV3Config = esbuild.build( + Object.assign({}, generalConfig, { + entryPoints: ['packages/sdk-client-v3/src/index.ts'], + globalName: 'window["@commercetools/ts-client"]', + outfile: 'packages/sdk-client-v3/dist/commercetools-ts-client.umd.js' + }) +) + +const platformSdkConfig = esbuild.build( + Object.assign({}, generalConfig, { + entryPoints: ['packages/platform-sdk/src/index.ts'], + globalName: 'window["@commercetools/platform-sdk"]', + outfile: 'packages/platform-sdk/dist/commercetools-platform-sdk.umd.js', + }) +) + +Promise.all([ + sdkClientConfig, sdkClientV3Config, platformSdkConfig +]).catch(console.error); diff --git a/examples/browser/browser.html b/examples/browser/browser.html index e0c5a88ce..31ba3b218 100644 --- a/examples/browser/browser.html +++ b/examples/browser/browser.html @@ -14,10 +14,12 @@ -

+ 
+    

+
diff --git a/package.json b/package.json index 4923af16e..d0b608fef 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "changeset": "changeset", "test:unit": "yarn test --testPathIgnorePatterns='packages/platform-sdk/test/integration-tests'", "test:integration": "jest --testPathPattern='packages/platform-sdk/test/integration-tests'", - "postbuild": "webpack --mode=production", + "postbuild": "node esbuild.cjs", "changeset:version-and-format": "changeset version && prettier --write --parser json '**/package.json'", "docs": "rm -rf docs;typedoc" }, @@ -35,6 +35,7 @@ "buffer": "^6.0.3", "clean-webpack-plugin": "^4.0.0", "codecov": "^3.2.5", + "esbuild": "^0.23.0", "husky": "^8.0.0", "ignore-loader": "^0.1.2", "jest": "29.7.0", diff --git a/webpack.config.js b/webpack.config.js deleted file mode 100644 index 0d8e57b7b..000000000 --- a/webpack.config.js +++ /dev/null @@ -1,86 +0,0 @@ -const path = require('path') -const webpack = require('webpack') -const { CleanWebpackPlugin } = require('clean-webpack-plugin') -const NodePolyfillPlugin = require('node-polyfill-webpack-plugin') - -const generalConfig = { - stats: 'errors-only', - watchOptions: { - aggregateTimeout: 600, - ignored: /node_modules/, - }, - plugins: [ - new CleanWebpackPlugin({ - cleanStaleWebpackAssets: false, - protectWebpackAssets: false, - cleanOnceBeforeBuildPatterns: ['dist'], - cleanAfterEveryBuildPatterns: ['*.LICENSE.txt'], - }), - new NodePolyfillPlugin(), - // Work around for Buffer is undefined: - // https://github.com/webpack/changelog-v5/issues/10 - new webpack.ProvidePlugin({ - process: 'process/browser', - Buffer: ['buffer', 'Buffer'], - }), - ], - module: { - rules: [ - { - test: /\.(js|jsx)$/, - loader: 'ignore-loader', - exclude: /examples/, - }, - { - test: /\.ts?$/, - use: 'ts-loader', - // loader: 'awesome-typescript-loader', - exclude: /node_modules|\.d\.ts$/, - }, - { - test: /\.d\.ts$/, - loader: 'ignore-loader', - }, - ], - }, - resolve: { - extensions: ['.ts', '.js', 'jsx'], - fallback: { - path: require.resolve('path-browserify'), - 'crypto-browserify': require.resolve('crypto-browserify'), - buffer: require.resolve('buffer/'), - }, - }, -} - -// build for sdk-client-v2 -const sdkClientConfig = Object.assign({}, generalConfig, { - entry: path.resolve(__dirname, 'packages', 'sdk-client', 'src', 'index.ts'), - target: 'web', - output: { - path: path.resolve(__dirname, 'packages', 'sdk-client', 'dist'), - filename: 'commercetools-sdk-client-v2.umd.js', - library: { - name: '@commercetools/sdk-client-v2', - type: 'umd', - }, - }, -}) - -// build for platform-sdk -const platformSdkConfig = Object.assign({}, generalConfig, { - entry: path.resolve(__dirname, 'packages', 'platform-sdk', 'src', 'index.ts'), - target: 'web', - output: { - path: path.resolve(__dirname, 'packages', 'platform-sdk', 'dist'), - filename: 'commercetools-platform-sdk.umd.js', - library: { - name: '@commercetools/platform-sdk', - type: 'umd', - }, - }, -}) - -module.exports = () => { - return [sdkClientConfig, platformSdkConfig] -} diff --git a/yarn.lock b/yarn.lock index ee4e319aa..7e8cb8e60 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1700,6 +1700,126 @@ resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== +"@esbuild/aix-ppc64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz#145b74d5e4a5223489cabdc238d8dad902df5259" + integrity sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ== + +"@esbuild/android-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz#453bbe079fc8d364d4c5545069e8260228559832" + integrity sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ== + +"@esbuild/android-arm@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.23.0.tgz#26c806853aa4a4f7e683e519cd9d68e201ebcf99" + integrity sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g== + +"@esbuild/android-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.23.0.tgz#1e51af9a6ac1f7143769f7ee58df5b274ed202e6" + integrity sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ== + +"@esbuild/darwin-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz#d996187a606c9534173ebd78c58098a44dd7ef9e" + integrity sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow== + +"@esbuild/darwin-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz#30c8f28a7ef4e32fe46501434ebe6b0912e9e86c" + integrity sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ== + +"@esbuild/freebsd-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz#30f4fcec8167c08a6e8af9fc14b66152232e7fb4" + integrity sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw== + +"@esbuild/freebsd-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz#1003a6668fe1f5d4439e6813e5b09a92981bc79d" + integrity sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ== + +"@esbuild/linux-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz#3b9a56abfb1410bb6c9138790f062587df3e6e3a" + integrity sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw== + +"@esbuild/linux-arm@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz#237a8548e3da2c48cd79ae339a588f03d1889aad" + integrity sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw== + +"@esbuild/linux-ia32@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz#4269cd19cb2de5de03a7ccfc8855dde3d284a238" + integrity sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA== + +"@esbuild/linux-loong64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz#82b568f5658a52580827cc891cb69d2cb4f86280" + integrity sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A== + +"@esbuild/linux-mips64el@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz#9a57386c926262ae9861c929a6023ed9d43f73e5" + integrity sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w== + +"@esbuild/linux-ppc64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz#f3a79fd636ba0c82285d227eb20ed8e31b4444f6" + integrity sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw== + +"@esbuild/linux-riscv64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz#f9d2ef8356ce6ce140f76029680558126b74c780" + integrity sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw== + +"@esbuild/linux-s390x@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz#45390f12e802201f38a0229e216a6aed4351dfe8" + integrity sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg== + +"@esbuild/linux-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz#c8409761996e3f6db29abcf9b05bee8d7d80e910" + integrity sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ== + +"@esbuild/netbsd-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz#ba70db0114380d5f6cfb9003f1d378ce989cd65c" + integrity sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw== + +"@esbuild/openbsd-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz#72fc55f0b189f7a882e3cf23f332370d69dfd5db" + integrity sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ== + +"@esbuild/openbsd-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz#b6ae7a0911c18fe30da3db1d6d17a497a550e5d8" + integrity sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg== + +"@esbuild/sunos-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz#58f0d5e55b9b21a086bfafaa29f62a3eb3470ad8" + integrity sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA== + +"@esbuild/win32-arm64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz#b858b2432edfad62e945d5c7c9e5ddd0f528ca6d" + integrity sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ== + +"@esbuild/win32-ia32@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz#167ef6ca22a476c6c0c014a58b4f43ae4b80dec7" + integrity sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA== + +"@esbuild/win32-x64@0.23.0": + version "0.23.0" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz#db44a6a08520b5f25bbe409f34a59f2d4bcc7ced" + integrity sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g== + "@grpc/grpc-js@^1.7.1": version "1.10.7" resolved "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.10.7.tgz" @@ -4906,6 +5026,36 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" +esbuild@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.23.0.tgz#de06002d48424d9fdb7eb52dbe8e95927f852599" + integrity sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA== + optionalDependencies: + "@esbuild/aix-ppc64" "0.23.0" + "@esbuild/android-arm" "0.23.0" + "@esbuild/android-arm64" "0.23.0" + "@esbuild/android-x64" "0.23.0" + "@esbuild/darwin-arm64" "0.23.0" + "@esbuild/darwin-x64" "0.23.0" + "@esbuild/freebsd-arm64" "0.23.0" + "@esbuild/freebsd-x64" "0.23.0" + "@esbuild/linux-arm" "0.23.0" + "@esbuild/linux-arm64" "0.23.0" + "@esbuild/linux-ia32" "0.23.0" + "@esbuild/linux-loong64" "0.23.0" + "@esbuild/linux-mips64el" "0.23.0" + "@esbuild/linux-ppc64" "0.23.0" + "@esbuild/linux-riscv64" "0.23.0" + "@esbuild/linux-s390x" "0.23.0" + "@esbuild/linux-x64" "0.23.0" + "@esbuild/netbsd-x64" "0.23.0" + "@esbuild/openbsd-arm64" "0.23.0" + "@esbuild/openbsd-x64" "0.23.0" + "@esbuild/sunos-x64" "0.23.0" + "@esbuild/win32-arm64" "0.23.0" + "@esbuild/win32-ia32" "0.23.0" + "@esbuild/win32-x64" "0.23.0" + escalade@^3.1.1: version "3.1.2" resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz"