Merge pull request #1420 from glimmerjs/chore/cleanup-syntax

.github/workflows/perf.yml

@@ -19,8 +19,8 @@ jobs:
       - name: Build Control
         run: |
           git checkout ${{ github.event.pull_request.base.sha }}
-          yarn install --frozen-lockfile
-          yarn ember build --env production --suppress-sizes --output-path control-dist
+          pnpm install --frozen-lockfile
+          pnpm ember build --env production --suppress-sizes --output-path control-dist
       - name: Build Experiment
         run: |
           git checkout ${{ github.sha }}

bin/run-browserstack-tests.mjs

@@ -0,0 +1,55 @@
+// @ts-check
+
+import chalk from 'chalk';
+import { execa } from 'execa';
+
+/**
+ * @param {string} command
+ * @param {string[]} args
+ * @returns {Promise<import('execa').ExecaReturnValue<string>>}
+ */
+function run(command, args = []) {
+  console.log(chalk.dim('$ ' + command + ' ' + args.join(' ')));
+
+  let p = execa(command, args);
+
+  p.stdout?.pipe(process.stdout);
+  p.stderr?.pipe(process.stderr);
+
+  return p;
+}
+
+(async function () {
+  await run('ember', ['browserstack:connect']);
+
+  try {
+    try {
+      // Calling testem directly here instead of `ember test` so that
+      // we do not have to do a double build (by the time this is run
+      // we have already ran `ember build`).
+      await run('testem', [
+        'ci',
+        '-f',
+        'testem-browserstack.js',
+        '--host',
+        '127.0.0.1',
+        '--port',
+        '7774',
+      ]);
+
+      console.log('success');
+      // eslint-disable-next-line n/no-process-exit
+      process.exit(0);
+    } finally {
+      if (process.env.GITHUB_RUN_ID) {
+        await run('ember', ['browserstack:results']);
+      }
+      await run('ember', ['browserstack:disconnect']);
+    }
+  } catch (error) {
+    console.log('error');
+    console.log(error);
+    // eslint-disable-next-line n/no-process-exit
+    process.exit(1);
+  }
+})();

browserstack-local.pid

@@ -0,0 +1 @@
+304995

browserstack.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+function cleanup() {
+  pnpm ember browserstack:disconnect
+}
+
+export BROWSERSTACK_ACCESS_KEY="xbxZSukWqzaEEWTg9HQg"
+export BROWSERSTACK_USERNAME="wycats"
+
+trap cleanup EXIT
+trap cleanup SIGINT
+
+pnpm ember build --environment=development
+pnpm ember browserstack:connect
+pnpm ember test --path ./dist --test-port=7774 --host 127.0.0.1 --config-file=browserstack.testem.js
+pnpm ember browserstack:results

packages/@glimmer/syntax/index.ts

@@ -32,9 +32,9 @@ export { NodeVisitor } from './lib/traversal/visitor';
 export { default as Walker } from './lib/traversal/walker';
 export * as ASTv1 from './lib/v1/api';
 export { default as builders } from './lib/v1/public-builders';
-export * as ASTv2 from './lib/v2-a/api';
-export { normalize } from './lib/v2-a/normalize';
-export { node } from './lib/v2-a/objects/node';
+export * as ASTv2 from './lib/v2/api';
+export { normalize } from './lib/v2/normalize';
+export { node } from './lib/v2/objects/node';
 
 /** @deprecated use WalkerPath instead */
 export { default as Path } from './lib/traversal/walker';