Change PUBLIC_PATH to demo

vkruglikov · Jan 6, 2025 · 9618436 · 9618436
1 parent 827e3e3
commit 9618436
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/connect.yml b/.github/workflows/connect.yml
@@ -5,8 +5,8 @@ on:
     branches: ['master']
 
 jobs:
-  release:
-    name: Build and Release
+  deploy-connect:
+    name: Deploy @msw-devtools/connect
     runs-on: ubuntu-latest
     permissions:
       contents: write

diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
@@ -15,14 +15,16 @@ permissions:
 
 jobs:
   deploy-demo:
-    name: Install dependencies
+    name: Deploy @msw-devtools/demo
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-node
       - uses: ./.github/actions/install-npm-deps
 
       - name: Build all packages
+        env:
+          PUBLIC_PATH: /msw-devtools-extension
         run: npm run build -- --filter=@msw-devtools/demo
 
       - name: Setup Pages

diff --git a/.github/workflows/extension.yml b/.github/workflows/extension.yml
@@ -1,15 +1,11 @@
 name: Deploy @msw-devtools/extension
 
 on:
-  push:
-    branches: ['master']
-    paths:
-      - 'packages/extension/package.json'
   workflow_dispatch:
 
 jobs:
-  release:
-    name: Build and Release
+  deploy-extension:
+    name: Deploy @msw-devtools/extension
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -35,6 +31,5 @@ jobs:
           files: |
             dist.zip
             dist.tar.gz
-          make_latest: true
           name: "@msw-devtools/extension"
           tag_name: "@msw-devtools/extension@latest"
diff --git a/packages/core/src/constants.ts b/packages/core/src/constants.ts
@@ -0,0 +1 @@
+export const STABLE_CONFIG_VERSION = 1
diff --git a/packages/demo/src/msw.ts b/packages/demo/src/msw.ts
@@ -12,9 +12,6 @@ const handlers = [
 setupWorker(...handlers).start({
   onUnhandledRequest: 'bypass',
   serviceWorker: {
-    url:
-      process.env.NODE_ENV === 'production'
-        ? '/msw-devtools-extension/mockServiceWorker.js'
-        : '/mockServiceWorker.js'
+    url: `${process.env.PUBLIC_PATH}mockServiceWorker.js`
   }
 })
diff --git a/turbo.json b/turbo.json
@@ -1,4 +1,5 @@
 {
+  "globalEnv": ["NODE_ENV", "PUBLIC_PATH"],
   "tasks": {
     "build": {
       "dependsOn": ["^build"],

diff --git a/webpack.common.js b/webpack.common.js
@@ -4,6 +4,12 @@ const CopyPlugin = require('copy-webpack-plugin')
 
 const IS_DEV = process.env.NODE_ENV === 'development'
 
+console.log(
+  process.env.PUBLIC_PATH,
+  'PUBLIC_PATHPUBLIC_PATHPUBLIC_PATHPUBLIC_PATHPUBLIC_PATHPUBLIC_PATHPUBLIC_PATH'
+)
+throw {}
+
 module.exports = ({ root, port, wdsClient = true }) => ({
   mode: IS_DEV ? 'development' : 'production',
   module: {
@@ -63,7 +69,7 @@ module.exports = ({ root, port, wdsClient = true }) => ({
   output: {
     filename: '[name].js',
     path: path.resolve(root, 'dist'),
-    publicPath: '/',
+    publicPath: process.env.PUBLIC_PATH || '/',
     clean: true
   },
   plugins: [
@@ -74,6 +80,7 @@ module.exports = ({ root, port, wdsClient = true }) => ({
     }),
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+      'process.env.PUBLIC_PATH': JSON.stringify(process.env.PUBLIC_PATH || '/'),
       'process.env.WDS_EXTENSION_CLIENT_URL': JSON.stringify(
         `ws://localhost:${port}/ws`
       )