build: adjust for new structure of contentful-sdk-core

Author: axe312ger

.eslintrc.cjs

@@ -3,7 +3,6 @@ module.exports = {
   plugins: ['standard', 'promise'],
   env: {
     node: true,
-    'vitest-globals/env': true,
   },
   globals: {
     __VERSION__: true,

package-lock.json

@@ -7,7 +7,7 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/contentful.cjs.cjs"
+      "require": "./dist/contentful.cjs"
     }
   },
   "browser": "./dist/contentful.browser.min.js",
@@ -56,7 +56,7 @@
     "check": "npm run check:cjs && npm run check:esm && npm run check:browser && npm run check:browser-min",
     "check:browser": "es-check es2018 ./dist/contentful.browser.js",
     "check:browser-min": "es-check es2018 ./dist/contentful.browser.min.js",
-    "check:cjs": "es-check es2017 './dist/contentful.cjs.cjs'",
+    "check:cjs": "es-check es2017 './dist/contentful.cjs'",
     "check:esm": "es-check es2017 --module './dist/esm/*.js'",
     "docs:build": "typedoc --options typedoc.json",
     "docs:watch": "npm run docs:build -- --watch",
@@ -68,7 +68,8 @@
     "test": "npm run test:unit && npm run test:integration && npm run lint && npm run test:types",
     "test:unit": "vitest --run ./test/unit",
     "test:unit:watch": "vitest ./test/unit",
-    "test:integration": "vitest ./test/integration",
+    "test:integration": "vitest --run ./test/integration",
+    "test:integration:watch": "vitest ./test/integration",
     "test:size": "bundlesize",
     "test:demo-projects": "npm run test:demo-node && npm run test:demo-browser",
     "test:demo-node": "rimraf ./test/output-integration/node/node-modules && npm --prefix ./test/output-integration/node ci && vitest --run ./test/output-integration/node",
@@ -92,6 +93,7 @@
     "@babel/preset-env": "^7.24.3",
     "@optimize-lodash/rollup-plugin": "^4.0.4",
     "@rollup/plugin-alias": "^5.1.0",
+    "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
@@ -139,11 +141,11 @@
   "bundlesize": [
     {
       "path": "./dist/contentful.browser.js",
-      "maxSize": "60Kb"
+      "maxSize": "70Kb"
     },
     {
       "path": "./dist/contentful.browser.min.js",
-      "maxSize": "31Kb"
+      "maxSize": "36Kb"
     }
   ],
   "release": {
@@ -177,4 +179,4 @@
   "overrides": {
     "fast-copy": "^3.0.2"
   }
-}
+}

package.json

@@ -11,16 +11,18 @@ import terser from '@rollup/plugin-terser'
 import replace from '@rollup/plugin-replace'
 import { optimizeLodashImports } from '@optimize-lodash/rollup-plugin'
 import { visualizer } from 'rollup-plugin-visualizer'
+import { babel } from '@rollup/plugin-babel'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 
 const baseConfig = {
   input: 'dist/esm/index.js',
   output: {
-    file: 'dist/contentful.cjs.cjs',
+    file: 'dist/contentful.cjs',
     format: 'cjs',
   },
   plugins: [
+    optimizeLodashImports(),
     replace({
       preventAssignment: true,
       'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
@@ -33,12 +35,7 @@ const baseConfig = {
       ignoreDynamicRequires: true,
       requireReturnsDefault: 'auto',
     }),
-    nodeResolve({
-      preferBuiltins: false,
-      browser: true,
-    }),
     json(),
-    optimizeLodashImports(),
   ],
 }
 
@@ -47,7 +44,33 @@ const cjsConfig = {
   output: {
     ...baseConfig.output,
   },
-  external: ['axios', '@contentful/rich-text-types', 'json-stringify-safe'],
+  plugins: [
+    ...baseConfig.plugins,
+    nodeResolve({
+      preferBuiltins: true,
+      browser: false,
+    }),
+    babel({
+      babelHelpers: 'bundled',
+      // exclude: 'node_modules/**',
+      presets: [
+        [
+          '@babel/preset-env',
+          // Please note: This is set to Node.js v8 in order to satisfy ECMA2017 requirements
+          // However, we cannot ensure it will operate without issues on Node.js v8
+          { targets: { node: 8 }, modules: false, bugfixes: true },
+        ],
+      ],
+    }),
+    alias({
+      entries: [
+        {
+          find: 'axios',
+          replacement: resolve(__dirname, './node_modules/axios/dist/node/axios.cjs'),
+        },
+      ],
+    }),
+  ],
 }
 
 const browserConfig = {
@@ -56,9 +79,12 @@ const browserConfig = {
     file: 'dist/contentful.browser.js',
     format: 'iife',
     name: 'contentful',
-    // intro: 'const global = window;',
   },
   plugins: [
+    nodeResolve({
+      preferBuiltins: false,
+      browser: true,
+    }),
     alias({
       entries: [
         {
@@ -72,6 +98,20 @@ const browserConfig = {
       ],
     }),
     ...baseConfig.plugins,
+    babel({
+      babelHelpers: 'bundled',
+      exclude: 'node_modules/**',
+      presets: [
+        [
+          '@babel/preset-env',
+          {
+            targets: pkg.browserslist,
+            modules: false,
+            bugfixes: true,
+          },
+        ],
+      ],
+    }),
   ],
 }
 
@@ -84,9 +124,14 @@ const browserMinConfig = {
   plugins: [
     ...browserConfig.plugins,
     terser({
+      // sourceMap: {
+      //   content: 'inline',
+      //   includeSources: true,
+      //   url: 'inline'
+      // },
       compress: {
         passes: 5,
-        ecma: 2017,
+        ecma: 2018,
         drop_console: true,
         drop_debugger: true,
         sequences: true,
@@ -105,23 +150,14 @@ const browserMinConfig = {
         keep_fargs: false,
         keep_infinity: false,
       },
-      mangle: {
-        reserved: ['contentful'],
-        toplevel: true,
-        module: true,
-        properties: {
-          reserved: ['contentful'],
-          regex: /^_/, // Only mangle properties that start with an underscore
-        },
-      },
       format: {
         comments: false, // Remove all comments
         beautify: false, // Minify output
       },
     }),
     visualizer({
       emitFile: true,
-      filename: 'stats.browser.min.html',
+      filename: 'stats-browser-min.html',
     }),
   ],
 }

rollup.config.js

@@ -1,18 +1,16 @@
-import { MockedFunction, vi } from 'vitest'
+import { vi, test, expect, describe, MockedFunction, beforeEach, afterEach } from 'vitest'
 import { createClient } from '../../lib/contentful'
-import * as SdkCore from 'contentful-sdk-core'
+import { default as createHttpClient } from 'contentful-sdk-core/dist/create-http-client'
 import * as CreateContentfulApi from '../../lib/create-contentful-api'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const version = require('../../package.json').version
 
 vi.mock('../../lib/create-contentful-api')
+vi.mock('contentful-sdk-core/dist/create-http-client')
 
-// @ts-ignore
-SdkCore.createHttpClient = vi.fn()
-const createHttpClientMock = <MockedFunction<typeof SdkCore.createHttpClient>>(
-  (<unknown>SdkCore.createHttpClient)
-)
+// @todo this is broken now - proper mocks
+const createHttpClientMock = <MockedFunction<typeof createHttpClient>>(<unknown>createHttpClient)
 const createContentfulApiMock = <MockedFunction<typeof CreateContentfulApi.default>>(
   (<unknown>CreateContentfulApi.default)
 )
@@ -58,7 +56,6 @@ describe('contentful', () => {
     expect(createHttpClientMock).toHaveBeenCalledTimes(1)
 
     const callConfig = createHttpClientMock.mock.calls[0][1]
-
     expect(callConfig.headers['Content-Type']).toBeDefined()
     expect(callConfig.headers['X-Contentful-User-Agent']).toBeDefined()