Configures build to point to the built service worker

mswjs · May 7, 2020 · ec45574 · ec45574
1 parent 241572d
commit ec45574
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -35,8 +35,8 @@ jobs:
           command: yarn build
 
       - run:
-          name: Distributed Service Worker preview
-          command: cat lib/mockServiceWorker.js
+          name: Preview Service Worker build
+          command: cat lib/esm/mockServiceWorker.js
 
       - run:
           name: Unit tests

diff --git a/config/constants.js b/config/constants.js
@@ -10,7 +10,7 @@ const SERVICE_WORKER_SOURCE_PATH = path.resolve(
 const SERVICE_WORKER_BUILD_PATH = path.resolve(
   __dirname,
   '../',
-  path.dirname(packageJson.main),
+  path.dirname(packageJson.module),
   path.basename(SERVICE_WORKER_SOURCE_PATH),
 )
 

diff --git a/rollup.config.ts b/rollup.config.ts
@@ -43,7 +43,7 @@ const buildEsm = {
   output: [
     {
       entryFileNames: '[name].js',
-      chunkFileNames: '[name].js',
+      chunkFileNames: '[name]-deps.js',
       dir: path.dirname(packageJson.module),
       format: 'esm',
     },

diff --git a/src/rest.spec.ts b/src/rest.spec.ts
@@ -1,4 +1,4 @@
-import rest from './rest'
+import { rest } from './rest'
 
 test('Exports all REST API methods', () => {
   expect(rest).not.toBeUndefined()

diff --git a/src/setupWorker/setupWorker.test.ts b/src/setupWorker/setupWorker.test.ts
@@ -1,5 +1,5 @@
 import { setupWorker } from './setupWorker'
-import rest, { restContext } from '../handlers/rest'
+import { rest, restContext } from '../rest'
 import { MockedRequest, ResponseResolver } from '../handlers/requestHandler'
 
 test('Generates schema based on provided handlers', () => {

diff --git a/test/support/spawnServer.ts b/test/support/spawnServer.ts
@@ -5,6 +5,7 @@ import * as chalk from 'chalk'
 import * as webpack from 'webpack'
 import * as WebpackDevServer from 'webpack-dev-server'
 import * as HtmlWebpackPlugin from 'html-webpack-plugin'
+import { SERVICE_WORKER_BUILD_PATH } from '../../config/constants'
 import * as packageJson from '../../package.json'
 
 interface Payload {
@@ -86,7 +87,7 @@ Resolved "msw" module to:
     },
     after(app, server, compiler) {
       app.get('/mockServiceWorker.js', (req, res) => {
-        res.sendFile(path.resolve(__dirname, '../../lib/mockServiceWorker.js'))
+        res.sendFile(SERVICE_WORKER_BUILD_PATH)
       })
 
       if (options?.withRoutes) {