fix(api-client, react-api-client): update build command in api-client and react-api-client (#18637)

* fix(api-client, react-api-client): update build command in api-client and react-api-client

Author: koji

.cursorignore

@@ -83,12 +83,22 @@ api/docs/dist/v2/
 *.sublime-workspace
 
 # build artifacts
+api-client/dist/
 app/dist/
 app-shell/dist/
 app-shell-odd/dist/
 components/lib
 discovery-client/lib
 labware-designer/dist/
 labware-library/dist/
+opentrons-ai-client/dist/
 protocol-designer/dist/
-opentrons-ai-client/dist/
+react-api-client/dist/
+shared-data/lib/
+step-generation/lib/
+
+# docker
+Dockerfile
+DOCKER.md
+docker-compose.yml
+.dockerignore

api-client/Makefile

@@ -4,6 +4,9 @@
 # TODO(mc, 2021-02-12): this may be unnecessary by using `yarn run` instead
 SHELL := bash
 
+# add node_modules/.bin to PATH
+PATH := $(shell cd .. && yarn bin):$(PATH)
+
 # These variables can be overriden when make is invoked to customize the
 # behavior of jest
 tests ?=
@@ -21,8 +24,9 @@ clean:
 	tsc --build --clean && yarn shx rm -rf \"dist\"
 
 .PHONY: build
+build: export NODE_ENV := production
 build:
-	rollup --config rollup.config.js
+	vite build
 
 .PHONY: test
 test:

api-client/vite.config.mts

@@ -0,0 +1,34 @@
+import path, { resolve } from 'path'
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  plugins: [],
+  build: {
+    // Relative to the root
+    outDir: 'dist',
+    lib: {
+      entry: resolve(__dirname, 'src/index.ts'),
+      name: 'OpentronsApiClient',
+      formats: ['es', 'umd'],
+      fileName: format => `api-client.${format}.js`,
+    },
+    rollupOptions: {
+      external: [],
+      output: {
+        globals: {},
+      },
+    },
+    sourcemap: false,
+    minify: true,
+  },
+  optimizeDeps: {
+    esbuildOptions: {
+      target: 'es2020',
+    },
+  },
+  resolve: {
+    alias: {
+      '@opentrons/shared-data': path.resolve('../shared-data/js/index.ts'),
+    },
+  },
+})

package.json

@@ -42,12 +42,6 @@
     "@eslint-react/eslint-plugin": "1.52.2",
     "@ianvs/prettier-plugin-sort-imports": "4.4.1",
     "@octokit/rest": "^19.0.5",
-    "@rollup/plugin-alias": "^3.1.2",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "@rollup/plugin-replace": "^2.4.2",
     "@storybook/addon-actions": "7.6.17",
     "@storybook/addon-essentials": "7.6.17",
     "@storybook/addon-links": "7.6.17",
@@ -137,9 +131,6 @@
     "redux-mock-store": "1.5.5",
     "rehype": "^9.0.0",
     "rehype-urls": "^1.0.0",
-    "rollup": "^2.44.0",
-    "rollup-plugin-peer-deps-external": "^2.2.4",
-    "rollup-plugin-terser": "^7.0.2",
     "script-ext-html-webpack-plugin": "^2.1.4",
     "semver": "^7.3.8",
     "shx": "^0.3.4",

react-api-client/Makefile

@@ -3,6 +3,8 @@
 # using bash instead of /bin/bash in SHELL prevents macOS optimizing away our PATH update
 # TODO(mc, 2021-02-12): this may be unnecessary by using `yarn run` instead
 SHELL := bash
+# add node_modules/.bin to PATH
+PATH := $(shell cd .. && yarn bin):$(PATH)
 
 # These variables can be overriden when make is invoked to customize the
 # behavior of jest
@@ -21,8 +23,9 @@ clean:
 	yarn shx rm -rf dist
 
 .PHONY: build
+build: export NODE_ENV := production
 build:
-	rollup --config rollup.config.js
+	vite build
 
 .PHONY: test
 test:

react-api-client/vite.config.mts

@@ -0,0 +1,35 @@
+import path, { resolve } from 'path'
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  plugins: [],
+  build: {
+    // Relative to the root
+    outDir: 'dist',
+    lib: {
+      entry: resolve(__dirname, 'src/index.ts'),
+      name: 'OpentronsReactApiClient',
+      formats: ['es', 'umd'],
+      fileName: format => `react-api-client.${format}.js`,
+    },
+    rollupOptions: {
+      external: [],
+      output: {
+        globals: {},
+      },
+    },
+    sourcemap: false,
+    minify: true,
+  },
+  optimizeDeps: {
+    esbuildOptions: {
+      target: 'es2020',
+    },
+  },
+  resolve: {
+    alias: {
+      '@opentrons/shared-data': path.resolve('../shared-data/js/index.ts'),
+      '@opentrons/api-client': path.resolve('../api-client/src/index.ts'),
+    },
+  },
+})