Skip to content

Commit 1486226

Browse files
mansonamansona
authoredJun 13, 2024
Merge pull request #1985 from embroider-build/move-rewritten-app
Move rewritten app to ./tmp
2 parents 718cc64 + e89f94b commit 1486226

12 files changed

+31
-31
lines changed
 

‎packages/compat/src/compat-addons.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default class CompatAddons implements Stage {
3535

3636
async ready(): Promise<{ outputPath: string }> {
3737
return {
38-
outputPath: resolve(locateEmbroiderWorkingDir(this.compatApp.root), 'rewritten-app'),
38+
outputPath: resolve(locateEmbroiderWorkingDir(this.compatApp.root), '..', '..', 'tmp', 'rewritten-app'),
3939
};
4040
}
4141

‎packages/compat/src/standalone-addon-build.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ function buildAddonIndex(compatApp: CompatApp, appPackage: Package, packages: Se
9292
// yet. This directory lives outside our rewritten-pacakges directory because
9393
// it's produced by a separate build stage, and it's easier to have them
9494
// writing into separate directories.
95-
content.packages[compatApp.root] = join('..', 'rewritten-app');
95+
content.packages[compatApp.root] = join('..', '..', '..', 'tmp', 'rewritten-app');
9696

9797
let nonResolvableDeps = appPackage.nonResolvableDeps;
9898
if (nonResolvableDeps) {
9999
let extraRoots = [...nonResolvableDeps.values()].map(v => v.root);
100100

101101
// the app gets extraResolutions support just like every addon does
102-
content.extraResolutions[join('..', 'rewritten-app')] = extraRoots;
102+
content.extraResolutions[join('..', '..', '..', 'tmp', 'rewritten-app')] = extraRoots;
103103

104104
// but it also gets extraResolutions registered against its *original*
105105
// location, because the app is unique because stage2 needs a Package

‎tests/addon-template/vite.config.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
import { resolve } from "path";
1313
import { babel } from "@rollup/plugin-babel";
1414

15-
const root = "node_modules/.embroider/rewritten-app";
15+
const root = "tmp/rewritten-app";
1616

1717
export default defineConfig(({ mode }) => {
1818
return {
@@ -43,7 +43,7 @@ export default defineConfig(({ mode }) => {
4343
server: {
4444
port: 4200,
4545
watch: {
46-
ignored: ["!**/node_modules/.embroider/rewritten-app/**"],
46+
ignored: ["!**/tmp/rewritten-app/**"],
4747
},
4848
},
4949
// If the "app" is a classic addon dummy app, the public directory is tests/dummy/public,

‎tests/app-template/vite.config.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
import { resolve } from "path";
1313
import { babel } from "@rollup/plugin-babel";
1414

15-
const root = "node_modules/.embroider/rewritten-app";
15+
const root = "tmp/rewritten-app";
1616

1717
export default defineConfig(({ mode }) => {
1818
return {
@@ -44,7 +44,7 @@ export default defineConfig(({ mode }) => {
4444
server: {
4545
port: 4200,
4646
watch: {
47-
ignored: ["!**/node_modules/.embroider/rewritten-app/**"],
47+
ignored: ["!**/tmp/**"],
4848
},
4949
},
5050
build: {

‎tests/scenarios/compat-app-html-attributes-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ appScenarios
5151
let app = await scenario.prepare();
5252
let result = await app.execute('ember build', { env: { EMBROIDER_PREBUILD: 'true' } });
5353
assert.equal(result.exitCode, 0, result.output);
54-
expectFile = expectFilesAt(join(app.dir, 'node_modules', '.embroider', 'rewritten-app'), { qunit: assert });
54+
expectFile = expectFilesAt(join(app.dir, 'tmp', 'rewritten-app'), { qunit: assert });
5555
});
5656

5757
test('custom HTML attributes are passed through', () => {

‎tests/scenarios/compat-exclude-dot-files-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ appScenarios
7474

7575
// but not be picked up in the entrypoint
7676
expectAudit
77-
.module('./node_modules/.embroider/rewritten-app/index.html')
77+
.module('./tmp/rewritten-app/index.html')
7878
.resolves('/@embroider/core/entrypoint')
7979
.toModule()
8080
.withContents(content => {

‎tests/scenarios/compat-renaming-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ appScenarios
255255
});
256256
test('renamed modules keep their classic runtime name when used as implicit-modules', function () {
257257
expectAudit
258-
.module('./node_modules/.embroider/rewritten-app/index.html')
258+
.module('./tmp/rewritten-app/index.html')
259259
.resolves('/@embroider/core/entrypoint')
260260
.toModule()
261261
.resolves('./-embroider-implicit-modules.js')

‎tests/scenarios/compat-stage2-test.ts

+14-14
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ stage2Scenarios
130130

131131
// check that the app trees with in repo addon are combined correctly
132132
expectAudit
133-
.module('./node_modules/.embroider/rewritten-app/index.html')
133+
.module('./tmp/rewritten-app/index.html')
134134
.resolves('/@embroider/core/entrypoint')
135135
.toModule()
136136
.resolves('./service/in-repo.js')
@@ -140,7 +140,7 @@ stage2Scenarios
140140
test('incorporates in-repo-addons of in-repo-addons correctly', function () {
141141
// secondary in-repo-addon was correctly detected and activated
142142
expectAudit
143-
.module('./node_modules/.embroider/rewritten-app/index.html')
143+
.module('./tmp/rewritten-app/index.html')
144144
.resolves('/@embroider/core/entrypoint')
145145
.toModule()
146146
.resolves('./services/secondary.js')
@@ -206,7 +206,7 @@ stage2Scenarios
206206

207207
test('verifies that the correct lexigraphically sorted addons win', function () {
208208
let expectModule = expectAudit
209-
.module('./node_modules/.embroider/rewritten-app/index.html')
209+
.module('./tmp/rewritten-app/index.html')
210210
.resolves('/@embroider/core/entrypoint')
211211
.toModule();
212212
expectModule.resolves('./service/in-repo.js').to('./lib/in-repo-b/_app_/service/in-repo.js');
@@ -216,7 +216,7 @@ stage2Scenarios
216216

217217
test('addons declared as dependencies should win over devDependencies', function () {
218218
expectAudit
219-
.module('./node_modules/.embroider/rewritten-app/index.html')
219+
.module('./tmp/rewritten-app/index.html')
220220
.resolves('/@embroider/core/entrypoint')
221221
.toModule()
222222
.resolves('./service/dep-wins-over-dev.js')
@@ -225,7 +225,7 @@ stage2Scenarios
225225

226226
test('in repo addons declared win over dependencies', function () {
227227
expectAudit
228-
.module('./node_modules/.embroider/rewritten-app/index.html')
228+
.module('./tmp/rewritten-app/index.html')
229229
.resolves('/@embroider/core/entrypoint')
230230
.toModule()
231231
.resolves('./service/in-repo-over-deps.js')
@@ -234,7 +234,7 @@ stage2Scenarios
234234

235235
test('ordering with before specified', function () {
236236
expectAudit
237-
.module('./node_modules/.embroider/rewritten-app/index.html')
237+
.module('./tmp/rewritten-app/index.html')
238238
.resolves('/@embroider/core/entrypoint')
239239
.toModule()
240240
.resolves('./service/test-before.js')
@@ -243,7 +243,7 @@ stage2Scenarios
243243

244244
test('ordering with after specified', function () {
245245
expectAudit
246-
.module('./node_modules/.embroider/rewritten-app/index.html')
246+
.module('./tmp/rewritten-app/index.html')
247247
.resolves('/@embroider/core/entrypoint')
248248
.toModule()
249249
.resolves('./service/test-after.js')
@@ -672,7 +672,7 @@ stage2Scenarios
672672

673673
test('non-static other paths are included in the entrypoint', function (assert) {
674674
expectAudit
675-
.module('./node_modules/.embroider/rewritten-app/index.html')
675+
.module('./tmp/rewritten-app/index.html')
676676
.resolves('/@embroider/core/entrypoint')
677677
.toModule()
678678
.withContents(contents => {
@@ -696,7 +696,7 @@ stage2Scenarios
696696

697697
test('static other paths are not included in the entrypoint', function () {
698698
expectAudit
699-
.module('./node_modules/.embroider/rewritten-app/index.html')
699+
.module('./tmp/rewritten-app/index.html')
700700
.resolves('/@embroider/core/entrypoint')
701701
.toModule()
702702
.withContents(content => {
@@ -706,7 +706,7 @@ stage2Scenarios
706706

707707
test('top-level static other paths are not included in the entrypoint', function () {
708708
expectAudit
709-
.module('./node_modules/.embroider/rewritten-app/index.html')
709+
.module('./tmp/rewritten-app/index.html')
710710
.resolves('/@embroider/core/entrypoint')
711711
.toModule()
712712
.withContents(content => {
@@ -716,7 +716,7 @@ stage2Scenarios
716716

717717
test('staticAppPaths do not match partial path segments', function () {
718718
expectAudit
719-
.module('./node_modules/.embroider/rewritten-app/index.html')
719+
.module('./tmp/rewritten-app/index.html')
720720
.resolves('/@embroider/core/entrypoint')
721721
.toModule()
722722
.withContents(content => {
@@ -788,9 +788,9 @@ dummyAppScenarios
788788
});
789789

790790
test('dummy app sees that its being developed', function () {
791-
let assertFile = expectFile(
792-
'../../node_modules/.embroider/rewritten-app/components/inside-dummy-app.js'
793-
).transform(build.transpile);
791+
let assertFile = expectFile('../../tmp/rewritten-app/components/inside-dummy-app.js').transform(
792+
build.transpile
793+
);
794794
assertFile.matches(/console\.log\(true\)/);
795795
});
796796

‎tests/scenarios/compat-template-colocation-test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ scenarios
261261

262262
test(`app's colocated components are not implicitly included`, function (assert) {
263263
expectAudit
264-
.module('./node_modules/.embroider/rewritten-app/index.html')
264+
.module('./tmp/rewritten-app/index.html')
265265
.resolves('/@embroider/core/entrypoint')
266266
.toModule()
267267
.withContents(content => {
@@ -354,7 +354,7 @@ appScenarios
354354

355355
test(`app's pod components and templates are implicitly included correctly`, function (assert) {
356356
expectAudit
357-
.module('./node_modules/.embroider/rewritten-app/index.html')
357+
.module('./tmp/rewritten-app/index.html')
358358
.resolves('/@embroider/core/entrypoint')
359359
.toModule()
360360
.withContents(content => {

‎tests/scenarios/watch-mode-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ app.forEachScenario(scenario => {
222222

223223
hooks.beforeEach(assert => {
224224
assertRewrittenFile = (rewrittenPath: string) => {
225-
let fullPath = path.join(app.dir, 'node_modules', '.embroider', 'rewritten-app', ...rewrittenPath.split('/'));
225+
let fullPath = path.join(app.dir, 'tmp', 'rewritten-app', ...rewrittenPath.split('/'));
226226
let file = new File(rewrittenPath, fullPath);
227227
return new AssertFile(assert, file);
228228
};

‎tests/ts-app-template-classic/vite.config.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { resolver, hbs, scripts, templateTag, optimizeDeps, compatPrebuild, cont
33
import { resolve } from 'path';
44
import { babel } from '@rollup/plugin-babel';
55

6-
const root = 'node_modules/.embroider/rewritten-app';
6+
const root = 'tmp/rewritten-app';
77

88
export default defineConfig({
99
root,
@@ -32,7 +32,7 @@ export default defineConfig({
3232
server: {
3333
port: 4200,
3434
watch: {
35-
ignored: ['!**/node_modules/.embroider/rewritten-app/**'],
35+
ignored: ['!**/tmp/rewritten-app/**'],
3636
},
3737
},
3838
build: {

‎tests/ts-app-template/vite.config.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { resolver, hbs, scripts, templateTag, optimizeDeps, compatPrebuild, cont
33
import { resolve } from 'path';
44
import { babel } from '@rollup/plugin-babel';
55

6-
const root = 'node_modules/.embroider/rewritten-app';
6+
const root = 'tmp/rewritten-app';
77

88
export default defineConfig({
99
root,
@@ -32,7 +32,7 @@ export default defineConfig({
3232
server: {
3333
port: 4200,
3434
watch: {
35-
ignored: ['!**/node_modules/.embroider/rewritten-app/**'],
35+
ignored: ['!**/tmp/rewritten-app/**'],
3636
},
3737
},
3838
build: {

0 commit comments

Comments
 (0)
Failed to load comments.