Skip to content

Commit 4abca82

Browse files
authored
Merge pull request #20908 from emberjs/glimmervm-submodule
Working toward glimmer-vm repo integration
2 parents fd76ed5 + ba01774 commit 4abca82

File tree

724 files changed

+120284
-5085
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

724 files changed

+120284
-5085
lines changed

.env.development

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
VM_LOCAL_DEV = true

.github/workflows/alpha-releases.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v4
2121
with:
2222
persist-credentials: false
23-
- uses: ./.github/actions/setup
23+
- uses: ./.github/actions/setup
2424
- name: setup git
2525
run: |
2626
git config --local user.email 'tomster@emberjs.com'
@@ -33,7 +33,7 @@ jobs:
3333
- name: bump version
3434
run: npm version ${{env.NEXT_ALPHA}} --allow-same-version --no-git-tag-version
3535
- name: create tag
36-
run: git tag v${{env.NEXT_ALPHA}}-ember-source
36+
run: git tag v${{env.NEXT_ALPHA}}-ember-source
3737
- name: push tag
3838
# Push in a way that WILL trigger other workflows
39-
run: git push https://${GITHUB_ACTOR}:${{ secrets.PERSONAL_TOKEN }}@github.com/${GITHUB_REPOSITORY} v${{env.NEXT_ALPHA}}-ember-source
39+
run: git push https://${GITHUB_ACTOR}:${{ secrets.PERSONAL_TOKEN }}@github.com/${GITHUB_REPOSITORY} v${{env.NEXT_ALPHA}}-ember-source

.github/workflows/ci-jobs.yml

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
permissions:
77
contents: read
8-
8+
99
jobs:
1010
lint:
1111
name: Linting
@@ -31,26 +31,28 @@ jobs:
3131
- uses: ./.github/actions/setup
3232
- name: build types
3333
run: pnpm build:types
34-
- name: Check published and internal types
35-
run: pnpm type-check
36-
34+
- name: Check internal types
35+
run: pnpm type-check:internals
36+
- name: Check published types
37+
run: pnpm type-check:types
38+
3739
types-range:
3840
name: Type Checking (other supported versions)
3941
runs-on: ubuntu-latest
40-
needs: [ 'types' ]
42+
needs: ["types"]
4143
strategy:
4244
matrix:
43-
ts-version: [ '5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9' ]
45+
ts-version: ["5.2", "5.3", "5.4", "5.5", "5.6", "5.7", "5.8", "5.9"]
4446
steps:
4547
- uses: actions/checkout@v4
4648
- uses: ./.github/actions/setup
4749
- name: build stable type definitions
4850
run: pnpm build:types
4951
- name: install TS@${{matrix.ts-version}}
5052
run: pnpm add --save-dev --workspace-root typescript@${{ matrix.ts-version }}
51-
- name: Check published and internal types with TS@${{matrix.ts-version}}
52-
run: pnpm type-check
53-
53+
- name: Check published types
54+
run: pnpm type-check:types
55+
5456
basic-test:
5557
name: Basic Test
5658
runs-on: ubuntu-latest
@@ -59,14 +61,17 @@ jobs:
5961
- uses: ./.github/actions/setup
6062
- name: build
6163
run: pnpm vite build --mode=development
64+
env:
65+
NODE_ENV: development
6266
- name: test
6367
run: pnpm test
64-
68+
6569
variant-tests:
6670
name: ${{ matrix.name }}
6771
runs-on: ubuntu-latest
68-
needs: [ basic-test, lint, types ]
72+
needs: [basic-test, lint, types]
6973
strategy:
74+
fail-fast: false
7075
matrix:
7176
include:
7277
- name: "All deprecations enabled"
@@ -90,6 +95,8 @@ jobs:
9095
- uses: ./.github/actions/setup
9196
- name: build
9297
run: pnpm vite build --mode=${{ matrix.BUILD || 'development' }}
98+
env:
99+
NODE_ENV: ${{ matrix.BUILD || 'development' }}
93100
- name: test
94101
env:
95102
ALL_DEPRECATIONS_ENABLED: ${{ matrix.ALL_DEPRECATIONS_ENABLED }}
@@ -98,17 +105,18 @@ jobs:
98105
RAISE_ON_DEPRECATION: ${{ matrix.RAISE_ON_DEPRECATION }}
99106

100107
run: pnpm test
101-
108+
102109
browserstack-test:
103110
name: Browserstack Tests (Safari, Edge)
104111
runs-on: ubuntu-latest
105-
needs: [ basic-test, lint, types ]
112+
needs: [basic-test, lint, types]
106113
steps:
107114
- uses: actions/checkout@v4
108115
- uses: ./.github/actions/setup
109116
- name: build
110117
env:
111118
ALL_SUPPORTED_BROWSERS: true
119+
NODE_ENV: development
112120
run: pnpm vite build --mode=development
113121

114122
- name: Set BrowserStack Local Identifier

.github/workflows/publish-to-npm.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
tags:
66
- 'v*'
7-
7+
88
jobs:
99
tests:
1010
uses: ./.github/workflows/ci-jobs.yml
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
needs: [ tests ]
1515
permissions:
16-
contents: read
16+
contents: read
1717
id-token: write
1818
steps:
1919
- uses: actions/checkout@v4
@@ -29,7 +29,7 @@ jobs:
2929
OVERRIDE_FEATURES: ''
3030
run: node bin/build-for-publishing.js
3131
- name: Build for Publish
32-
if: ${{ !contains(github.ref, 'alpha') }}
32+
if: ${{ !contains(github.ref, 'alpha') }}
3333
run: node bin/build-for-publishing.js
3434
- name: publish to npm
3535
run: npm publish
@@ -58,6 +58,6 @@ jobs:
5858
webhook: ${{ secrets.FRAMEWORK_WEBHOOK }}
5959
status: 'Success'
6060
title: 'Released ember-source ${{ github.ref_name }}'
61-
color: 0x2ecc71
61+
color: 0x2ecc71
6262
url: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
6363
username: GitHub Actions

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ docs/
1010
CHANGELOG.md
1111
package.json
1212
pnpm-lock.yaml
13+
glimmer-vm/**/*.md
14+
glimmer-vm/**/*.yaml

babel.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default {
2929
{
3030
compilerPath: resolve(
3131
dirname(fileURLToPath(import.meta.url)),
32-
'./broccoli/glimmer-template-compiler'
32+
'./broccoli/glimmer-template-compiler.mjs'
3333
),
3434
},
3535
],

babel.test.config.mjs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99

1010
import { createRequire } from 'node:module';
11-
import vmBabelPlugins from '@glimmer/vm-babel-plugins';
1211
import baseConfig from './babel.config.mjs';
1312

1413
// eslint-disable-next-line no-redeclare
@@ -28,9 +27,5 @@ export default {
2827
],
2928
],
3029

31-
plugins: [
32-
...baseConfig.plugins,
33-
buildDebugMacroPlugin(!isProduction),
34-
...vmBabelPlugins({ isDebug: !isProduction }),
35-
],
30+
plugins: [...baseConfig.plugins, buildDebugMacroPlugin(!isProduction)],
3631
};

bin/link-glimmer-vm-packages.mjs

Lines changed: 0 additions & 47 deletions
This file was deleted.

bin/minify-assets.mjs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import nodeGzip from 'node-gzip';
4848
import { join } from 'node:path';
4949
import { readFileSync, writeFileSync } from 'node:fs';
5050
import { minify } from 'terser';
51-
import { transformSync } from '@babel/core';
51+
import { transformAsync } from '@babel/core';
5252
import * as brotli from 'brotli';
5353
import { partial } from 'filesize';
5454
const size = partial({ standard: 'jedec' });
@@ -94,10 +94,12 @@ for (const pkg of packages) {
9494

9595
for (let file of jsFiles) {
9696
let source = readFileSync(file, 'utf8');
97-
let transformed = transformSync(source, {
98-
...babelOptions,
99-
filename: file,
100-
}).code;
97+
let transformed = (
98+
await transformAsync(source, {
99+
...babelOptions,
100+
filename: file,
101+
})
102+
).code;
101103
let result = await minify(transformed, {
102104
module: true,
103105
mangle: false,

bin/unlink-all.mjs

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)