Skip to content

Commit ec6f8c8

Browse files
Merge pull request #21274 from emberjs/nvp/package-json-updates
Re-run build / re-sync package.json
2 parents 9e7b80b + 2bdc06a commit ec6f8c8

3 files changed

Lines changed: 20 additions & 7 deletions

File tree

.github/workflows/ci-jobs.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,20 @@ jobs:
6161
- name: Check published types
6262
run: pnpm type-check:types
6363

64+
build-test:
65+
name: package preparation test
66+
runs-on: ubuntu-latest
67+
steps:
68+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
69+
with:
70+
persist-credentials: false
71+
- uses: ./.github/actions/setup
72+
with:
73+
use_lockfile: "false"
74+
- name: build
75+
run: pnpm build
76+
- uses: wyvox/action-no-git-diff@6d1f5759a221e2ea447974af795e395672e33328 # v1.0.1
77+
6478
basic-test:
6579
name: Basic Test
6680
runs-on: ubuntu-latest
@@ -150,7 +164,7 @@ jobs:
150164
smoke-test:
151165
name: Smoke tests (Full Ember Apps)
152166
runs-on: ubuntu-latest
153-
needs: [basic-test, lint, types]
167+
needs: [basic-test, lint, types, build-test]
154168
strategy:
155169
fail-fast: false
156170
matrix: ${{fromJson(needs.lint.outputs.matrix)}}
@@ -169,11 +183,11 @@ jobs:
169183
${MATRIX_COMMAND}
170184
env:
171185
MATRIX_COMMAND: ${{ matrix.command }}
172-
186+
173187
smoke-test-with-deprecations-removed:
174188
name: Smoke tests with Deprecations Removed (Full Ember Apps)
175189
runs-on: ubuntu-latest
176-
needs: [basic-test, lint, types]
190+
needs: [basic-test, lint, types, build-test]
177191
strategy:
178192
fail-fast: false
179193
matrix: ${{fromJson(needs.lint.outputs.matrix)}}
@@ -197,7 +211,7 @@ jobs:
197211
node-test:
198212
name: Node.js Tests
199213
runs-on: ubuntu-latest
200-
needs: [basic-test, lint, types]
214+
needs: [basic-test, lint, types, build-test]
201215
steps:
202216
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
203217
with:

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@
202202
"@ember/-internals/views/lib/views/states.js": "ember-source/@ember/-internals/views/lib/views/states.js",
203203
"@ember/application/index.js": "ember-source/@ember/application/index.js",
204204
"@ember/application/instance.js": "ember-source/@ember/application/instance.js",
205-
"@ember/application/lib/lazy_load.js": "ember-source/@ember/application/lib/lazy_load.js",
206205
"@ember/application/namespace.js": "ember-source/@ember/application/namespace.js",
207206
"@ember/array/-internals.js": "ember-source/@ember/array/-internals.js",
208207
"@ember/array/index.js": "ember-source/@ember/array/index.js",
@@ -334,12 +333,12 @@
334333
"@simple-dom/document/index.js": "ember-source/@simple-dom/document/index.js",
335334
"backburner.js/index.js": "ember-source/backburner.js/index.js",
336335
"dag-map/index.js": "ember-source/dag-map/index.js",
336+
"ember-template-compiler/index.js": "ember-source/ember-template-compiler/index.js",
337337
"ember-testing/index.js": "ember-source/ember-testing/index.js",
338338
"ember-testing/lib/adapters/adapter.js": "ember-source/ember-testing/lib/adapters/adapter.js",
339339
"ember-testing/lib/public-api.js": "ember-source/ember-testing/lib/public-api.js",
340340
"ember-testing/lib/test.js": "ember-source/ember-testing/lib/test.js",
341341
"ember-testing/lib/test/adapter.js": "ember-source/ember-testing/lib/test/adapter.js",
342-
"ember-testing/lib/test/helpers.js": "ember-source/ember-testing/lib/test/helpers.js",
343342
"ember-testing/lib/test/pending_requests.js": "ember-source/ember-testing/lib/test/pending_requests.js",
344343
"ember-testing/lib/test/waiters.js": "ember-source/ember-testing/lib/test/waiters.js",
345344
"ember/barrel.js": "ember-source/ember/barrel.js",

rollup.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ function packageMeta() {
530530
pkg['ember-addon'] = {};
531531
}
532532
pkg['ember-addon']['renamed-modules'] = renamedModules;
533-
writeFileSync('package.json', JSON.stringify(pkg, null, 2));
533+
writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
534534
},
535535
};
536536
}

0 commit comments

Comments
 (0)