Skip to content

Commit 61d6f98

Browse files
compulimcompulim
committed
ESM build for test harness and page object
1 parent 977736b commit 61d6f98

File tree

6 files changed

+32
-30
lines changed

6 files changed

+32
-30
lines changed

‎__tests__/html2/simple/fatModule/simple.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<html lang="en-US">
33
<head>
44
<link href="/assets/index.css" rel="stylesheet" type="text/css" />
5-
<script crossorigin="anonymous" src="/test-harness.js"></script>
6-
<script crossorigin="anonymous" src="/test-page-object.js"></script>
75
</head>
86
<body>
97
<main id="webchat"></main>
@@ -17,6 +15,8 @@
1715
}
1816
</script>
1917
<script type="module">
18+
import '/test-harness.mjs';
19+
import '/test-page-object.mjs';
2020
import { createDirectLine, createStoreWithOptions, renderWebChat } from 'botframework-webchat';
2121
import { version } from 'react';
2222

‎__tests__/html2/simple/fatModule/simple.react-baseline.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<html lang="en-US">
33
<head>
44
<link href="/assets/index.css" rel="stylesheet" type="text/css" />
5-
<script crossorigin="anonymous" src="/test-harness.js"></script>
6-
<script crossorigin="anonymous" src="/test-page-object.js"></script>
75
</head>
86
<body>
97
<main id="webchat"></main>
@@ -18,6 +16,8 @@
1816
}
1917
</script>
2018
<script type="module">
19+
import '/test-harness.mjs';
20+
import '/test-page-object.mjs';
2121
import { createDirectLine, createStoreWithOptions, renderWebChat } from 'botframework-webchat';
2222
import { createElement, version } from 'react';
2323

‎package-lock.json‎

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/test/harness/package.json‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
"node": ">= 14.0.0"
1313
},
1414
"scripts": {
15-
"build": "npm run build:babel && npm run build:esbuild",
16-
"build:babel": "babel --config-file ./babel.config.json --out-dir lib src",
17-
"build:esbuild": "esbuild lib/browser/index.js --bundle --define:define=undefined --define:process.env.CI=undefined --outfile=dist/test-harness.js --sourcemap --target=chrome100",
15+
"build": "npm run build:esbuild:esm && npm run build:esbuild:iife",
16+
"build:esbuild:base": "esbuild test-harness=./src/browser/index.js --bundle --define:define=undefined --define:process.env.CI=undefined --minify --outdir=dist --sourcemap --target=chrome100",
17+
"build:esbuild:esm": "npm run build:esbuild:base -- --format=esm --out-extension:.js=.mjs",
18+
"build:esbuild:iife": "npm run build:esbuild:base -- --format=iife",
1819
"bump": "npm run bump:prod && npm run bump:dev && (npm audit fix || exit 0)",
1920
"bump:dev": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localDependencies // {} | keys) as $L | (.devDependencies // {}) | to_entries | map(select(.key as $K | $L | contains([$K]) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
2021
"bump:prod": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localDependencies // {} | keys) as $L | (.dependencies // {}) | to_entries | map(select(.key as $K | $L | contains([$K]) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install --save-exact $PACKAGES_TO_BUMP || true",
@@ -24,8 +25,8 @@
2425
"precommit:eslint": "../../../node_modules/.bin/eslint --report-unused-disable-directives --max-warnings 0",
2526
"preversion": "cat package.json | jq '(.localDependencies // {} | to_entries | map([if .value == \"production\" then \"dependencies\" else \"devDependencies\" end, .key])) as $P | delpaths($P)' > package-temp.json && mv package-temp.json package.json",
2627
"start": "concurrently --kill-others --prefix-colors \"auto\" \"npm:start:*\"",
27-
"start:babel": "npm run build:babel -- --skip-initial-build --watch",
28-
"start:esbuild": "npm run build:esbuild -- --watch",
28+
"start:esbuild:esm": "npm run build:esbuild:esm -- --watch",
29+
"start:esbuild:iife": "npm run build:esbuild:iife -- --watch",
2930
"test": "node node_modules/.bin/jest --maxWorkers=4"
3031
},
3132
"localDependencies": {},
@@ -62,10 +63,6 @@
6263
"math-random": "2.0.1"
6364
},
6465
"devDependencies": {
65-
"@babel/cli": "^7.28.0",
66-
"@babel/core": "^7.28.0",
67-
"@babel/preset-env": "^7.28.0",
68-
"babel-plugin-istanbul": "^7.0.0",
6966
"concurrently": "^9.2.0",
7067
"esbuild": "^0.25.8",
7168
"express": "^5.1.0",

‎packages/test/page-object/package.json‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
"node": ">= 14.0.0"
1010
},
1111
"scripts": {
12-
"build": "npm run build:babel && npm run build:esbuild",
13-
"build:babel": "babel --out-dir lib/ src/",
14-
"build:esbuild": "esbuild lib/index.js --bundle --define:define=undefined --outfile=dist/test-page-object.js --sourcemap --target=chrome100",
12+
"build": "npm run build:esbuild:esm && npm run build:esbuild:iife",
13+
"build:esbuild:base": "esbuild test-page-object=./src/index.js --bundle --define:define=undefined --loader:.js=jsx --minify --outdir=dist --sourcemap --target=chrome100",
14+
"build:esbuild:esm": "npm run build:esbuild:base -- --format=esm --out-extension:.js=.mjs",
15+
"build:esbuild:iife": "npm run build:esbuild:base -- --format=iife",
1516
"bump": "npm run bump:prod && npm run bump:dev && (npm audit fix || exit 0)",
1617
"bump:dev": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localDependencies // {} | keys) as $L | (.devDependencies // {}) | to_entries | map(select(.key as $K | $L | contains([$K]) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
1718
"bump:prod": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localDependencies // {} | keys) as $L | (.dependencies // {}) | to_entries | map(select(.key as $K | $L | contains([$K]) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install --save-exact $PACKAGES_TO_BUMP || true",
@@ -21,8 +22,8 @@
2122
"precommit:eslint": "../../../node_modules/.bin/eslint --report-unused-disable-directives --max-warnings 0",
2223
"preversion": "cat package.json | jq '(.localDependencies // {} | to_entries | map([if .value == \"production\" then \"dependencies\" else \"devDependencies\" end, .key])) as $P | delpaths($P)' > package-temp.json && mv package-temp.json package.json",
2324
"start": "concurrently --kill-others --prefix-colors \"auto\" \"npm:start:*\"",
24-
"start:babel": "npm run build:babel -- --skip-initial-build --watch",
25-
"start:esbuild": "npm run build:esbuild -- --watch"
25+
"start:esbuild:esm": "npm run build:esbuild:esm -- --watch",
26+
"start:esbuild:iife": "npm run build:esbuild:iife -- --watch"
2627
},
2728
"localDependencies": {},
2829
"pinDependencies": {},
@@ -40,10 +41,6 @@
4041
"simple-update-in": "2.2.0"
4142
},
4243
"devDependencies": {
43-
"@babel/cli": "^7.28.0",
44-
"@babel/core": "^7.28.0",
45-
"@babel/preset-env": "^7.28.0",
46-
"@babel/preset-react": "^7.27.1",
4744
"concurrently": "^9.2.0",
4845
"esbuild": "^0.25.8"
4946
}

‎serve-test.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@
103103
"source": "/test-harness.js.map",
104104
"destination": "packages/test/harness/dist/test-harness.js.map"
105105
},
106+
{
107+
"source": "/test-harness.mjs",
108+
"destination": "packages/test/harness/dist/test-harness.mjs"
109+
},
110+
{
111+
"source": "/test-harness.mjs.map",
112+
"destination": "packages/test/harness/dist/test-harness.mjs.map"
113+
},
106114
{
107115
"source": "/test-page-object.js",
108116
"destination": "packages/test/page-object/dist/test-page-object.js"
@@ -111,6 +119,14 @@
111119
"source": "/test-page-object.js.map",
112120
"destination": "packages/test/page-object/dist/test-page-object.js.map"
113121
},
122+
{
123+
"source": "/test-page-object.mjs",
124+
"destination": "packages/test/page-object/dist/test-page-object.mjs"
125+
},
126+
{
127+
"source": "/test-page-object.mjs.map",
128+
"destination": "packages/test/page-object/dist/test-page-object.mjs.map"
129+
},
114130
{
115131
"source": "/:page.css",
116132
"destination": "__tests__/html/:page.css"

0 commit comments

Comments
 (0)