@embroider/compat 3.8.1 → 4.0.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/babel.js +1 -0
- package/package.json +20 -14
- package/src/audit/babel-visitor.js +7 -1
- package/src/audit/babel-visitor.js.map +1 -1
- package/src/audit/build.js.map +1 -1
- package/src/audit/options.d.ts +2 -1
- package/src/audit/options.js.map +1 -1
- package/src/audit.d.ts +7 -57
- package/src/audit.js +101 -301
- package/src/audit.js.map +1 -1
- package/src/babel-plugin-adjust-imports.js +19 -18
- package/src/babel-plugin-adjust-imports.js.map +1 -1
- package/src/babel.d.ts +17 -0
- package/src/babel.js +146 -0
- package/src/babel.js.map +1 -0
- package/src/compat-adapters/@ember-data/store.d.ts +1 -5
- package/src/compat-adapters/@ember-data/store.js +3 -15
- package/src/compat-adapters/@ember-data/store.js.map +1 -1
- package/src/compat-adapters/active-model-adapter.d.ts +1 -1
- package/src/compat-adapters/ember-asset-loader.d.ts +1 -1
- package/src/compat-adapters/ember-cli-addon-docs.d.ts +1 -1
- package/src/compat-adapters/ember-cli-fastboot.js +0 -1
- package/src/compat-adapters/ember-cli-fastboot.js.map +1 -1
- package/src/compat-adapters/ember-cli-mirage.js +0 -1
- package/src/compat-adapters/ember-cli-mirage.js.map +1 -1
- package/src/compat-adapters/ember-decorators.d.ts +1 -1
- package/src/compat-adapters/ember-fetch.d.ts +5 -0
- package/src/compat-adapters/{ember-macro-helpers.js → ember-fetch.js} +5 -4
- package/src/compat-adapters/ember-fetch.js.map +1 -0
- package/src/compat-adapters/ember-percy.d.ts +1 -1
- package/src/compat-adapters/ember-resolver.d.ts +4 -0
- package/src/compat-adapters/ember-resolver.js +21 -0
- package/src/compat-adapters/ember-resolver.js.map +1 -0
- package/src/compat-adapters/ember-scroll-modifiers.d.ts +1 -1
- package/src/compat-adapters/ember-source.d.ts +3 -6
- package/src/compat-adapters/ember-source.js +26 -41
- package/src/compat-adapters/ember-source.js.map +1 -1
- package/src/compat-adapters/ember-test-selectors.d.ts +1 -1
- package/src/compat-addons.js +1 -1
- package/src/compat-addons.js.map +1 -1
- package/src/compat-app-builder.d.ts +9 -67
- package/src/compat-app-builder.js +108 -1299
- package/src/compat-app-builder.js.map +1 -1
- package/src/compat-app.d.ts +4 -22
- package/src/compat-app.js +78 -221
- package/src/compat-app.js.map +1 -1
- package/src/content-for-config.d.ts +11 -0
- package/src/content-for-config.js +66 -0
- package/src/content-for-config.js.map +1 -0
- package/src/default-pipeline.d.ts +4 -5
- package/src/default-pipeline.js +21 -46
- package/src/default-pipeline.js.map +1 -1
- package/src/dependency-rules.d.ts +1 -0
- package/src/dependency-rules.js +19 -11
- package/src/dependency-rules.js.map +1 -1
- package/src/detect-babel-plugins.d.ts +1 -0
- package/src/detect-babel-plugins.js +14 -0
- package/src/detect-babel-plugins.js.map +1 -1
- package/src/http-audit.d.ts +13 -0
- package/src/http-audit.js +60 -0
- package/src/http-audit.js.map +1 -0
- package/src/index.d.ts +2 -2
- package/src/index.js +3 -4
- package/src/index.js.map +1 -1
- package/src/module-visitor.d.ts +52 -0
- package/src/module-visitor.js +285 -0
- package/src/module-visitor.js.map +1 -0
- package/src/options.d.ts +4 -43
- package/src/options.js +35 -12
- package/src/options.js.map +1 -1
- package/src/resolver-transform.d.ts +1 -1
- package/src/resolver-transform.js +71 -43
- package/src/resolver-transform.js.map +1 -1
- package/src/standalone-addon-build.js +6 -15
- package/src/standalone-addon-build.js.map +1 -1
- package/src/v1-addon.js +6 -35
- package/src/v1-addon.js.map +1 -1
- package/src/v1-config.d.ts +0 -8
- package/src/v1-config.js +1 -51
- package/src/v1-config.js.map +1 -1
- package/src/audit-cli.d.ts +0 -2
- package/src/audit-cli.js +0 -150
- package/src/audit-cli.js.map +0 -1
- package/src/compat-adapters/@ember-data/debug.d.ts +0 -6
- package/src/compat-adapters/@ember-data/debug.js +0 -22
- package/src/compat-adapters/@ember-data/debug.js.map +0 -1
- package/src/compat-adapters/ember-macro-helpers.d.ts +0 -4
- package/src/compat-adapters/ember-macro-helpers.js.map +0 -1
- package/src/rename-require-plugin.d.ts +0 -1
- package/src/rename-require-plugin.js +0 -15
- package/src/rename-require-plugin.js.map +0 -1
- package/src/sync-dir.d.ts +0 -8
- package/src/sync-dir.js +0 -68
- package/src/sync-dir.js.map +0 -1
- package/src/template-tag-codemod.d.ts +0 -13
- package/src/template-tag-codemod.js +0 -302
- package/src/template-tag-codemod.js.map +0 -1
- package/src/v1-appboot.d.ts +0 -14
- package/src/v1-appboot.js +0 -47
- package/src/v1-appboot.js.map +0 -1
|
@@ -1,246 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
2
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
19
3
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
4
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
21
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
22
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
7
|
};
|
|
24
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
25
|
-
if (mod && mod.__esModule) return mod;
|
|
26
|
-
var result = {};
|
|
27
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
28
|
-
__setModuleDefault(result, mod);
|
|
29
|
-
return result;
|
|
30
|
-
};
|
|
31
8
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
32
9
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
33
10
|
};
|
|
34
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
12
|
exports.CompatAppBuilder = void 0;
|
|
36
13
|
const core_1 = require("@embroider/core");
|
|
37
|
-
const walk_sync_1 = __importDefault(require("walk-sync"));
|
|
38
|
-
const path_1 = require("path");
|
|
39
14
|
const dependency_rules_1 = require("./dependency-rules");
|
|
40
|
-
const flatMap_1 = __importDefault(require("lodash/flatMap"));
|
|
41
|
-
const sortBy_1 = __importDefault(require("lodash/sortBy"));
|
|
42
|
-
const flatten_1 = __importDefault(require("lodash/flatten"));
|
|
43
|
-
const partition_1 = __importDefault(require("lodash/partition"));
|
|
44
|
-
const mergeWith_1 = __importDefault(require("lodash/mergeWith"));
|
|
45
|
-
const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
|
|
46
|
-
const resolve_1 = require("resolve");
|
|
47
|
-
const bind_decorator_1 = __importDefault(require("bind-decorator"));
|
|
48
15
|
const fs_extra_1 = require("fs-extra");
|
|
49
|
-
const ember_html_1 = require("@embroider/core/src/ember-html");
|
|
50
|
-
const portable_babel_config_1 = require("@embroider/core/src/portable-babel-config");
|
|
51
|
-
const app_files_1 = require("@embroider/core/src/app-files");
|
|
52
16
|
const portable_1 = require("@embroider/core/src/portable");
|
|
53
|
-
const assert_never_1 = __importDefault(require("assert-never"));
|
|
54
17
|
const typescript_memoize_1 = require("typescript-memoize");
|
|
55
|
-
const
|
|
56
|
-
const
|
|
18
|
+
const path_1 = require("path");
|
|
19
|
+
const resolve_1 = __importDefault(require("resolve"));
|
|
57
20
|
const fs_extra_2 = require("fs-extra");
|
|
58
21
|
const node_1 = require("@embroider/macros/src/node");
|
|
59
|
-
const
|
|
60
|
-
const escape_string_regexp_1 = __importDefault(require("escape-string-regexp"));
|
|
61
|
-
const sync_dir_1 = require("./sync-dir");
|
|
22
|
+
const module_resolver_options_1 = require("@embroider/core/src/module-resolver-options");
|
|
62
23
|
// This exists during the actual broccoli build step. As opposed to CompatApp,
|
|
63
24
|
// which also exists during pipeline-construction time.
|
|
64
25
|
class CompatAppBuilder {
|
|
65
|
-
constructor(
|
|
66
|
-
this.root = root;
|
|
26
|
+
constructor(origAppPackage, appPackageWithMovedDeps, options, compatApp, configTree, contentForTree, synthVendor, synthStyles) {
|
|
67
27
|
this.origAppPackage = origAppPackage;
|
|
68
28
|
this.appPackageWithMovedDeps = appPackageWithMovedDeps;
|
|
69
29
|
this.options = options;
|
|
70
30
|
this.compatApp = compatApp;
|
|
71
31
|
this.configTree = configTree;
|
|
32
|
+
this.contentForTree = contentForTree;
|
|
72
33
|
this.synthVendor = synthVendor;
|
|
73
34
|
this.synthStyles = synthStyles;
|
|
74
|
-
// for each relativePath, an Asset we have already emitted
|
|
75
|
-
this.assets = new Map();
|
|
76
|
-
this.staticComponents = false;
|
|
77
|
-
this.staticHelpers = false;
|
|
78
|
-
this.staticModifiers = false;
|
|
79
|
-
this.firstBuild = true;
|
|
80
|
-
// staticInvokables always wins when configured
|
|
81
|
-
if (typeof options.staticInvokables !== 'undefined') {
|
|
82
|
-
if (typeof options.staticComponents !== 'undefined' ||
|
|
83
|
-
typeof options.staticHelpers !== 'undefined' ||
|
|
84
|
-
typeof options.staticModifiers !== 'undefined') {
|
|
85
|
-
throw new Error('You cannot set `staticHelpers`, `staticComponents`, or `staticModifiers` if you have set `staticInvokables`. Delete these configs to continue.');
|
|
86
|
-
}
|
|
87
|
-
this.staticComponents = this.staticHelpers = this.staticModifiers = options.staticInvokables;
|
|
88
|
-
return;
|
|
89
|
-
}
|
|
90
|
-
if (typeof options.staticComponents !== 'undefined') {
|
|
91
|
-
// TODO it doesn't seem like we have any real deprecation functionality in this package yet.
|
|
92
|
-
// do we need it?
|
|
93
|
-
console.error(`Setting 'staticComponents' is deprecated. Use 'staticInvokables' instead`);
|
|
94
|
-
this.staticComponents = options.staticComponents;
|
|
95
|
-
}
|
|
96
|
-
if (typeof options.staticHelpers !== 'undefined') {
|
|
97
|
-
console.error(`Setting 'staticHelpers' is deprecated. Use 'staticInvokables' instead`);
|
|
98
|
-
this.staticHelpers = options.staticHelpers;
|
|
99
|
-
}
|
|
100
|
-
if (typeof options.staticModifiers !== 'undefined') {
|
|
101
|
-
console.error(`Setting 'staticModifiers' is deprecated. Use 'staticInvokables' instead`);
|
|
102
|
-
this.staticModifiers = options.staticModifiers;
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
fastbootJSSrcDir() {
|
|
106
|
-
let target = (0, path_2.join)(this.compatApp.root, 'fastboot');
|
|
107
|
-
if ((0, fs_extra_2.pathExistsSync)(target)) {
|
|
108
|
-
return target;
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
|
-
extractAssets(treePaths) {
|
|
112
|
-
let assets = [];
|
|
113
|
-
// Everything in our traditional public tree is an on-disk asset
|
|
114
|
-
if (treePaths.publicTree) {
|
|
115
|
-
walk_sync_1.default
|
|
116
|
-
.entries(treePaths.publicTree, {
|
|
117
|
-
directories: false,
|
|
118
|
-
})
|
|
119
|
-
.forEach(entry => {
|
|
120
|
-
assets.push({
|
|
121
|
-
kind: 'on-disk',
|
|
122
|
-
relativePath: entry.relativePath,
|
|
123
|
-
sourcePath: entry.fullPath,
|
|
124
|
-
mtime: entry.mtime, // https://github.com/joliss/node-walk-sync/pull/38
|
|
125
|
-
size: entry.size,
|
|
126
|
-
});
|
|
127
|
-
});
|
|
128
|
-
}
|
|
129
|
-
// ember-cli traditionally outputs a dummy testem.js file to prevent
|
|
130
|
-
// spurious errors when running tests under "ember s".
|
|
131
|
-
if (this.compatApp.shouldBuildTests) {
|
|
132
|
-
let testemAsset = this.findTestemAsset();
|
|
133
|
-
if (testemAsset) {
|
|
134
|
-
assets.push(testemAsset);
|
|
135
|
-
}
|
|
136
|
-
}
|
|
137
|
-
for (let asset of this.emberEntrypoints(treePaths.htmlTree)) {
|
|
138
|
-
assets.push(asset);
|
|
139
|
-
}
|
|
140
|
-
return assets;
|
|
141
|
-
}
|
|
142
|
-
findTestemAsset() {
|
|
143
|
-
let sourcePath;
|
|
144
|
-
try {
|
|
145
|
-
sourcePath = (0, resolve_1.sync)('ember-cli/lib/broccoli/testem.js', { basedir: this.root });
|
|
146
|
-
}
|
|
147
|
-
catch (err) { }
|
|
148
|
-
if (sourcePath) {
|
|
149
|
-
let stat = (0, fs_extra_1.statSync)(sourcePath);
|
|
150
|
-
return {
|
|
151
|
-
kind: 'on-disk',
|
|
152
|
-
relativePath: 'testem.js',
|
|
153
|
-
sourcePath,
|
|
154
|
-
mtime: stat.mtime.getTime(),
|
|
155
|
-
size: stat.size,
|
|
156
|
-
};
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
activeAddonChildren(pkg) {
|
|
160
|
-
let result = pkg.dependencies.filter(this.isActiveAddon).filter(
|
|
161
|
-
// When looking for child addons, we want to ignore 'peerDependencies' of
|
|
162
|
-
// a given package, to align with how ember-cli resolves addons. So here
|
|
163
|
-
// we only include dependencies that are definitely active due to one of
|
|
164
|
-
// the other sections.
|
|
165
|
-
addon => pkg.categorizeDependency(addon.name) !== 'peerDependencies');
|
|
166
|
-
if (pkg === this.appPackageWithMovedDeps) {
|
|
167
|
-
let extras = [this.synthVendor, this.synthStyles].filter(this.isActiveAddon);
|
|
168
|
-
result = [...result, ...extras];
|
|
169
|
-
}
|
|
170
|
-
return result.sort(this.orderAddons);
|
|
171
|
-
}
|
|
172
|
-
get allActiveAddons() {
|
|
173
|
-
let result = this.appPackageWithMovedDeps.findDescendants(this.isActiveAddon);
|
|
174
|
-
let extras = [this.synthVendor, this.synthStyles].filter(this.isActiveAddon);
|
|
175
|
-
let extraDescendants = (0, flatMap_1.default)(extras, dep => dep.findDescendants(this.isActiveAddon));
|
|
176
|
-
result = [...result, ...extras, ...extraDescendants];
|
|
177
|
-
return result.sort(this.orderAddons);
|
|
178
|
-
}
|
|
179
|
-
isActiveAddon(pkg) {
|
|
180
|
-
// stage1 already took care of converting everything that's actually active
|
|
181
|
-
// into v2 addons. If it's not a v2 addon, we don't want it.
|
|
182
|
-
//
|
|
183
|
-
// We can encounter v1 addons here when there is inactive stuff floating
|
|
184
|
-
// around in the node_modules that accidentally satisfy something like an
|
|
185
|
-
// optional peer dep.
|
|
186
|
-
return pkg.isV2Addon();
|
|
187
|
-
}
|
|
188
|
-
orderAddons(depA, depB) {
|
|
189
|
-
let depAIdx = 0;
|
|
190
|
-
let depBIdx = 0;
|
|
191
|
-
if (depA && depA.meta && depA.isV2Addon()) {
|
|
192
|
-
depAIdx = depA.meta['order-index'] || 0;
|
|
193
|
-
}
|
|
194
|
-
if (depB && depB.meta && depB.isV2Addon()) {
|
|
195
|
-
depBIdx = depB.meta['order-index'] || 0;
|
|
196
|
-
}
|
|
197
|
-
return depAIdx - depBIdx;
|
|
198
|
-
}
|
|
199
|
-
resolvableExtensions() {
|
|
200
|
-
// webpack's default is ['.wasm', '.mjs', '.js', '.json']. Keeping that
|
|
201
|
-
// subset in that order is sensible, since many third-party libraries will
|
|
202
|
-
// expect it to work that way.
|
|
203
|
-
//
|
|
204
|
-
// For TS, we defer to ember-cli-babel, and the setting for
|
|
205
|
-
// "enableTypescriptTransform" can be set with and without
|
|
206
|
-
// ember-cli-typescript
|
|
207
|
-
return ['.wasm', '.mjs', '.js', '.json', '.ts', '.hbs', '.hbs.js'];
|
|
208
|
-
}
|
|
209
|
-
*emberEntrypoints(htmlTreePath) {
|
|
210
|
-
let classicEntrypoints = [
|
|
211
|
-
{ entrypoint: 'index.html', includeTests: false },
|
|
212
|
-
{ entrypoint: 'tests/index.html', includeTests: true },
|
|
213
|
-
];
|
|
214
|
-
if (!this.compatApp.shouldBuildTests) {
|
|
215
|
-
classicEntrypoints.pop();
|
|
216
|
-
}
|
|
217
|
-
for (let { entrypoint, includeTests } of classicEntrypoints) {
|
|
218
|
-
let sourcePath = (0, path_2.join)(htmlTreePath, entrypoint);
|
|
219
|
-
let stats = (0, fs_extra_1.statSync)(sourcePath);
|
|
220
|
-
let asset = {
|
|
221
|
-
kind: 'ember',
|
|
222
|
-
relativePath: entrypoint,
|
|
223
|
-
includeTests,
|
|
224
|
-
sourcePath,
|
|
225
|
-
mtime: stats.mtime.getTime(),
|
|
226
|
-
size: stats.size,
|
|
227
|
-
rootURL: this.rootURL(),
|
|
228
|
-
prepare: (dom) => {
|
|
229
|
-
let scripts = [...dom.window.document.querySelectorAll('script')];
|
|
230
|
-
let styles = [...dom.window.document.querySelectorAll('link[rel*="stylesheet"]')];
|
|
231
|
-
return {
|
|
232
|
-
javascript: this.compatApp.findAppScript(scripts, entrypoint),
|
|
233
|
-
styles: this.compatApp.findAppStyles(styles, entrypoint),
|
|
234
|
-
implicitScripts: this.compatApp.findVendorScript(scripts, entrypoint),
|
|
235
|
-
implicitStyles: this.compatApp.findVendorStyles(styles, entrypoint),
|
|
236
|
-
testJavascript: this.compatApp.findTestScript(scripts),
|
|
237
|
-
implicitTestScripts: this.compatApp.findTestSupportScript(scripts),
|
|
238
|
-
implicitTestStyles: this.compatApp.findTestSupportStyles(styles),
|
|
239
|
-
};
|
|
240
|
-
},
|
|
241
|
-
};
|
|
242
|
-
yield asset;
|
|
243
|
-
}
|
|
244
35
|
}
|
|
245
36
|
modulePrefix() {
|
|
246
37
|
return this.configTree.readConfig().modulePrefix;
|
|
@@ -248,681 +39,49 @@ class CompatAppBuilder {
|
|
|
248
39
|
podModulePrefix() {
|
|
249
40
|
return this.configTree.readConfig().podModulePrefix;
|
|
250
41
|
}
|
|
251
|
-
|
|
252
|
-
return
|
|
253
|
-
|
|
254
|
-
activeRules() {
|
|
255
|
-
return (0, dependency_rules_1.activePackageRules)(this.options.packageRules.concat(defaultAddonPackageRules()), [
|
|
256
|
-
{ name: this.origAppPackage.name, version: this.origAppPackage.version, root: this.root },
|
|
257
|
-
...this.allActiveAddons.filter(p => p.meta['auto-upgraded']),
|
|
258
|
-
]);
|
|
259
|
-
}
|
|
260
|
-
resolverConfig(engines) {
|
|
261
|
-
let renamePackages = Object.assign({}, ...this.allActiveAddons.map(dep => dep.meta['renamed-packages']));
|
|
262
|
-
let renameModules = Object.assign({}, ...this.allActiveAddons.map(dep => dep.meta['renamed-modules']));
|
|
263
|
-
let activeAddons = {};
|
|
264
|
-
for (let addon of this.allActiveAddons) {
|
|
265
|
-
activeAddons[addon.name] = addon.root;
|
|
266
|
-
}
|
|
267
|
-
let options = {
|
|
268
|
-
staticHelpers: this.staticHelpers,
|
|
269
|
-
staticModifiers: this.staticModifiers,
|
|
270
|
-
staticComponents: this.staticComponents,
|
|
271
|
-
allowUnsafeDynamicComponents: this.options.allowUnsafeDynamicComponents,
|
|
272
|
-
};
|
|
273
|
-
let config = {
|
|
274
|
-
// this part is the base ModuleResolverOptions as required by @embroider/core
|
|
275
|
-
activeAddons,
|
|
276
|
-
renameModules,
|
|
277
|
-
renamePackages,
|
|
278
|
-
resolvableExtensions: this.resolvableExtensions(),
|
|
279
|
-
appRoot: this.origAppPackage.root,
|
|
280
|
-
engines: engines.map((appFiles, index) => ({
|
|
281
|
-
packageName: appFiles.engine.package.name,
|
|
282
|
-
// first engine is the app, which has been relocated to this.root
|
|
283
|
-
// we need to use the real path here because webpack requests always use the real path i.e. follow symlinks
|
|
284
|
-
root: (0, fs_extra_1.realpathSync)(index === 0 ? this.root : appFiles.engine.package.root),
|
|
285
|
-
fastbootFiles: appFiles.fastbootFiles,
|
|
286
|
-
activeAddons: [...appFiles.engine.addons]
|
|
287
|
-
.map(a => ({
|
|
288
|
-
name: a.name,
|
|
289
|
-
root: a.root,
|
|
290
|
-
}))
|
|
291
|
-
// the traditional order is the order in which addons will run, such
|
|
292
|
-
// that the last one wins. Our resolver's order is the order to
|
|
293
|
-
// search, so first one wins.
|
|
294
|
-
.reverse(),
|
|
295
|
-
})),
|
|
296
|
-
amdCompatibility: this.options.amdCompatibility,
|
|
297
|
-
// this is the additional stufff that @embroider/compat adds on top to do
|
|
298
|
-
// global template resolving
|
|
42
|
+
get resolverConfig() {
|
|
43
|
+
return (0, module_resolver_options_1.buildResolverOptions)({
|
|
44
|
+
appPackage: this.appPackageWithMovedDeps,
|
|
299
45
|
modulePrefix: this.modulePrefix(),
|
|
300
46
|
podModulePrefix: this.podModulePrefix(),
|
|
301
|
-
|
|
302
|
-
options,
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
default:
|
|
313
|
-
return 1000;
|
|
314
|
-
}
|
|
315
|
-
}
|
|
316
|
-
get resolvableExtensionsPattern() {
|
|
317
|
-
return (0, core_1.extensionsPattern)(this.resolvableExtensions());
|
|
318
|
-
}
|
|
319
|
-
impliedAssets(type, engine, emberENV) {
|
|
320
|
-
let result = this.impliedAddonAssets(type, engine).map((sourcePath) => {
|
|
321
|
-
let stats = (0, fs_extra_1.statSync)(sourcePath);
|
|
322
|
-
return {
|
|
323
|
-
kind: 'on-disk',
|
|
324
|
-
relativePath: (0, core_1.explicitRelative)(this.root, sourcePath),
|
|
325
|
-
sourcePath,
|
|
326
|
-
mtime: stats.mtimeMs,
|
|
327
|
-
size: stats.size,
|
|
328
|
-
};
|
|
329
|
-
});
|
|
330
|
-
if (type === 'implicit-scripts') {
|
|
331
|
-
result.unshift({
|
|
332
|
-
kind: 'in-memory',
|
|
333
|
-
relativePath: '_testing_prefix_.js',
|
|
334
|
-
source: `var runningTests=false;`,
|
|
335
|
-
});
|
|
336
|
-
result.unshift({
|
|
337
|
-
kind: 'in-memory',
|
|
338
|
-
relativePath: '_ember_env_.js',
|
|
339
|
-
source: `window.EmberENV={ ...(window.EmberENV || {}), ...${JSON.stringify(emberENV, null, 2)} };`,
|
|
340
|
-
});
|
|
341
|
-
result.push({
|
|
342
|
-
kind: 'in-memory',
|
|
343
|
-
relativePath: '_loader_.js',
|
|
344
|
-
source: `loader.makeDefaultExport=false;`,
|
|
345
|
-
});
|
|
346
|
-
}
|
|
347
|
-
if (type === 'implicit-test-scripts') {
|
|
348
|
-
// this is the traditional test-support-suffix.js
|
|
349
|
-
result.push({
|
|
350
|
-
kind: 'in-memory',
|
|
351
|
-
relativePath: '_testing_suffix_.js',
|
|
352
|
-
source: `
|
|
353
|
-
var runningTests=true;
|
|
354
|
-
if (typeof Testem !== 'undefined' && (typeof QUnit !== 'undefined' || typeof Mocha !== 'undefined')) {
|
|
355
|
-
Testem.hookIntoTestFramework();
|
|
356
|
-
}`,
|
|
357
|
-
});
|
|
358
|
-
// whether or not anybody was actually using @embroider/macros
|
|
359
|
-
// explicitly as an addon, we ensure its test-support file is always
|
|
360
|
-
// present.
|
|
361
|
-
if (!result.find(s => s.kind === 'on-disk' && s.sourcePath.endsWith('embroider-macros-test-support.js'))) {
|
|
362
|
-
result.unshift({
|
|
363
|
-
kind: 'on-disk',
|
|
364
|
-
sourcePath: require.resolve('@embroider/macros/src/vendor/embroider-macros-test-support'),
|
|
365
|
-
mtime: 0,
|
|
366
|
-
size: 0,
|
|
367
|
-
relativePath: 'embroider-macros-test-support.js',
|
|
368
|
-
});
|
|
369
|
-
}
|
|
370
|
-
}
|
|
371
|
-
return result;
|
|
372
|
-
}
|
|
373
|
-
impliedAddonAssets(type, { engine }) {
|
|
374
|
-
let result = [];
|
|
375
|
-
for (let addon of (0, sortBy_1.default)(Array.from(engine.addons), this.scriptPriority.bind(this))) {
|
|
376
|
-
let implicitScripts = addon.meta[type];
|
|
377
|
-
if (implicitScripts) {
|
|
378
|
-
let styles = [];
|
|
379
|
-
let options = { basedir: addon.root };
|
|
380
|
-
for (let mod of implicitScripts) {
|
|
381
|
-
if (type === 'implicit-styles') {
|
|
382
|
-
// exclude engines because they will handle their own css importation
|
|
383
|
-
if (!addon.isLazyEngine()) {
|
|
384
|
-
styles.push(resolve_2.default.sync(mod, options));
|
|
385
|
-
}
|
|
386
|
-
}
|
|
387
|
-
else {
|
|
388
|
-
result.push(resolve_2.default.sync(mod, options));
|
|
389
|
-
}
|
|
390
|
-
}
|
|
391
|
-
if (styles.length) {
|
|
392
|
-
result = [...styles, ...result];
|
|
393
|
-
}
|
|
394
|
-
}
|
|
395
|
-
}
|
|
396
|
-
return result;
|
|
397
|
-
}
|
|
398
|
-
babelConfig(resolverConfig) {
|
|
399
|
-
let babel = (0, cloneDeep_1.default)(this.compatApp.babelConfig());
|
|
400
|
-
if (!babel.plugins) {
|
|
401
|
-
babel.plugins = [];
|
|
402
|
-
}
|
|
403
|
-
// Our stage3 code is always allowed to use dynamic import. We may emit it
|
|
404
|
-
// ourself when splitting routes.
|
|
405
|
-
babel.plugins.push(require.resolve('@babel/plugin-syntax-dynamic-import'));
|
|
406
|
-
// https://github.com/webpack/webpack/issues/12154
|
|
407
|
-
babel.plugins.push(require.resolve('./rename-require-plugin'));
|
|
408
|
-
babel.plugins.push([require.resolve('babel-plugin-ember-template-compilation'), this.etcOptions(resolverConfig)]);
|
|
409
|
-
// this is @embroider/macros configured for full stage3 resolution
|
|
410
|
-
babel.plugins.push(...this.compatApp.macrosConfig.babelPluginConfig());
|
|
411
|
-
let colocationOptions = {
|
|
412
|
-
appRoot: this.origAppPackage.root,
|
|
413
|
-
// This extra weirdness is a compromise in favor of build performance.
|
|
414
|
-
//
|
|
415
|
-
// 1. When auto-upgrading an addon from v1 to v2, we definitely want to
|
|
416
|
-
// run any custom AST transforms in stage1.
|
|
417
|
-
//
|
|
418
|
-
// 2. In general case, AST transforms are allowed to manipulate Javascript
|
|
419
|
-
// scope. This means that running transforms -- even when we're doing
|
|
420
|
-
// source-to-source compilation that emits handlebars and not wire
|
|
421
|
-
// format -- implies changing .hbs files into .js files.
|
|
422
|
-
//
|
|
423
|
-
// 3. So stage1 may need to rewrite .hbs to .hbs.js (to avoid colliding
|
|
424
|
-
// with an existing co-located .js file).
|
|
425
|
-
//
|
|
426
|
-
// 4. But stage1 doesn't necessarily want to run babel over the
|
|
427
|
-
// corresponding JS file. Most of the time, that's just an
|
|
428
|
-
// unnecessarily expensive second parse. (We only run it in stage1 to
|
|
429
|
-
// eliminate an addon's custom babel plugins, and many addons don't
|
|
430
|
-
// have any.)
|
|
431
|
-
//
|
|
432
|
-
// 5. Therefore, the work of template-colocation gets defered until here,
|
|
433
|
-
// and it may see co-located templates named `.hbs.js` instead of the
|
|
434
|
-
// usual `.hbs.
|
|
435
|
-
templateExtensions: ['.hbs', '.hbs.js'],
|
|
436
|
-
// All of the above only applies to auto-upgraded packages that were
|
|
437
|
-
// authored in v1. V2 packages don't get any of this complexity, they're
|
|
438
|
-
// supposed to take care of colocating their own templates explicitly.
|
|
439
|
-
packageGuard: true,
|
|
440
|
-
};
|
|
441
|
-
babel.plugins.push([core_1.templateColocationPluginPath, colocationOptions]);
|
|
442
|
-
babel.plugins.push([
|
|
443
|
-
require.resolve('./babel-plugin-adjust-imports'),
|
|
444
|
-
(() => {
|
|
445
|
-
let pluginConfig = {
|
|
446
|
-
appRoot: resolverConfig.appRoot,
|
|
47
|
+
splitAtRoutes: this.options.splitAtRoutes,
|
|
48
|
+
staticAppPaths: this.options.staticAppPaths,
|
|
49
|
+
extraDeps: new Map([[this.appPackageWithMovedDeps.root, [this.synthVendor, this.synthStyles]]]),
|
|
50
|
+
extend: (options, allActiveAddons) => {
|
|
51
|
+
options.activePackageRules = (0, dependency_rules_1.activePackageRules)(this.options.packageRules.concat(defaultAddonPackageRules()), [
|
|
52
|
+
{ name: this.origAppPackage.name, version: this.origAppPackage.version, root: this.origAppPackage.root },
|
|
53
|
+
...allActiveAddons.filter(p => p.meta['auto-upgraded']),
|
|
54
|
+
]);
|
|
55
|
+
options.options = {
|
|
56
|
+
staticInvokables: this.options.staticInvokables,
|
|
57
|
+
allowUnsafeDynamicComponents: this.options.allowUnsafeDynamicComponents,
|
|
447
58
|
};
|
|
448
|
-
return
|
|
449
|
-
})(),
|
|
450
|
-
]);
|
|
451
|
-
// we can use globally shared babel runtime by default
|
|
452
|
-
babel.plugins.push([
|
|
453
|
-
require.resolve('@babel/plugin-transform-runtime'),
|
|
454
|
-
{ absoluteRuntime: __dirname, useESModules: true, regenerator: false },
|
|
455
|
-
]);
|
|
456
|
-
const portable = (0, portable_babel_config_1.makePortable)(babel, { basedir: this.root }, this.portableHints);
|
|
457
|
-
addCachablePlugin(portable.config);
|
|
458
|
-
return portable;
|
|
459
|
-
}
|
|
460
|
-
insertEmberApp(asset, appFiles, prepared, emberENV) {
|
|
461
|
-
let html = asset.html;
|
|
462
|
-
if (this.fastbootConfig) {
|
|
463
|
-
// ignore scripts like ember-cli-livereload.js which are not really associated with
|
|
464
|
-
// "the app".
|
|
465
|
-
let ignoreScripts = html.dom.window.document.querySelectorAll('script');
|
|
466
|
-
ignoreScripts.forEach(script => {
|
|
467
|
-
script.setAttribute('data-fastboot-ignore', '');
|
|
468
|
-
});
|
|
469
|
-
}
|
|
470
|
-
// our tests entrypoint already includes a correct module dependency on the
|
|
471
|
-
// app, so we only insert the app when we're not inserting tests
|
|
472
|
-
if (!asset.fileAsset.includeTests) {
|
|
473
|
-
let appJS = this.topAppJSAsset(appFiles, prepared);
|
|
474
|
-
html.insertScriptTag(html.javascript, appJS.relativePath, { type: 'module' });
|
|
475
|
-
}
|
|
476
|
-
if (this.fastbootConfig) {
|
|
477
|
-
// any extra fastboot app files get inserted into our html.javascript
|
|
478
|
-
// section, after the app has been inserted.
|
|
479
|
-
for (let script of this.fastbootConfig.extraAppFiles) {
|
|
480
|
-
html.insertScriptTag(html.javascript, script, { tag: 'fastboot-script' });
|
|
481
|
-
}
|
|
482
|
-
}
|
|
483
|
-
html.insertStyleLink(html.styles, `assets/${this.origAppPackage.name}.css`);
|
|
484
|
-
const parentEngine = appFiles.find(e => !e.engine.parent);
|
|
485
|
-
let vendorJS = this.implicitScriptsAsset(prepared, parentEngine, emberENV);
|
|
486
|
-
if (vendorJS) {
|
|
487
|
-
html.insertScriptTag(html.implicitScripts, vendorJS.relativePath);
|
|
488
|
-
}
|
|
489
|
-
if (this.fastbootConfig) {
|
|
490
|
-
// any extra fastboot vendor files get inserted into our
|
|
491
|
-
// html.implicitScripts section, after the regular implicit script
|
|
492
|
-
// (vendor.js) have been inserted.
|
|
493
|
-
for (let script of this.fastbootConfig.extraVendorFiles) {
|
|
494
|
-
html.insertScriptTag(html.implicitScripts, script, { tag: 'fastboot-script' });
|
|
495
|
-
}
|
|
496
|
-
}
|
|
497
|
-
let implicitStyles = this.implicitStylesAsset(prepared, parentEngine);
|
|
498
|
-
if (implicitStyles) {
|
|
499
|
-
html.insertStyleLink(html.implicitStyles, implicitStyles.relativePath);
|
|
500
|
-
}
|
|
501
|
-
if (!asset.fileAsset.includeTests) {
|
|
502
|
-
return;
|
|
503
|
-
}
|
|
504
|
-
// Test-related assets happen below this point
|
|
505
|
-
let testJS = this.testJSEntrypoint(appFiles, prepared);
|
|
506
|
-
html.insertScriptTag(html.testJavascript, testJS.relativePath, { type: 'module' });
|
|
507
|
-
let implicitTestScriptsAsset = this.implicitTestScriptsAsset(prepared, parentEngine);
|
|
508
|
-
if (implicitTestScriptsAsset) {
|
|
509
|
-
html.insertScriptTag(html.implicitTestScripts, implicitTestScriptsAsset.relativePath);
|
|
510
|
-
}
|
|
511
|
-
let implicitTestStylesAsset = this.implicitTestStylesAsset(prepared, parentEngine);
|
|
512
|
-
if (implicitTestStylesAsset) {
|
|
513
|
-
html.insertStyleLink(html.implicitTestStyles, implicitTestStylesAsset.relativePath);
|
|
514
|
-
}
|
|
515
|
-
}
|
|
516
|
-
implicitScriptsAsset(prepared, application, emberENV) {
|
|
517
|
-
let asset = prepared.get('assets/vendor.js');
|
|
518
|
-
if (!asset) {
|
|
519
|
-
let implicitScripts = this.impliedAssets('implicit-scripts', application, emberENV);
|
|
520
|
-
if (implicitScripts.length > 0) {
|
|
521
|
-
asset = new ConcatenatedAsset('assets/vendor.js', implicitScripts, this.resolvableExtensionsPattern);
|
|
522
|
-
prepared.set(asset.relativePath, asset);
|
|
523
|
-
}
|
|
524
|
-
}
|
|
525
|
-
return asset;
|
|
526
|
-
}
|
|
527
|
-
implicitStylesAsset(prepared, application) {
|
|
528
|
-
let asset = prepared.get('assets/vendor.css');
|
|
529
|
-
if (!asset) {
|
|
530
|
-
let implicitStyles = this.impliedAssets('implicit-styles', application);
|
|
531
|
-
if (implicitStyles.length > 0) {
|
|
532
|
-
// we reverse because we want the synthetic vendor style at the top
|
|
533
|
-
asset = new ConcatenatedAsset('assets/vendor.css', implicitStyles.reverse(), this.resolvableExtensionsPattern);
|
|
534
|
-
prepared.set(asset.relativePath, asset);
|
|
535
|
-
}
|
|
536
|
-
}
|
|
537
|
-
return asset;
|
|
538
|
-
}
|
|
539
|
-
implicitTestScriptsAsset(prepared, application) {
|
|
540
|
-
let testSupportJS = prepared.get('assets/test-support.js');
|
|
541
|
-
if (!testSupportJS) {
|
|
542
|
-
let implicitTestScripts = this.impliedAssets('implicit-test-scripts', application);
|
|
543
|
-
if (implicitTestScripts.length > 0) {
|
|
544
|
-
testSupportJS = new ConcatenatedAsset('assets/test-support.js', implicitTestScripts, this.resolvableExtensionsPattern);
|
|
545
|
-
prepared.set(testSupportJS.relativePath, testSupportJS);
|
|
546
|
-
}
|
|
547
|
-
}
|
|
548
|
-
return testSupportJS;
|
|
549
|
-
}
|
|
550
|
-
implicitTestStylesAsset(prepared, application) {
|
|
551
|
-
let asset = prepared.get('assets/test-support.css');
|
|
552
|
-
if (!asset) {
|
|
553
|
-
let implicitTestStyles = this.impliedAssets('implicit-test-styles', application);
|
|
554
|
-
if (implicitTestStyles.length > 0) {
|
|
555
|
-
asset = new ConcatenatedAsset('assets/test-support.css', implicitTestStyles, this.resolvableExtensionsPattern);
|
|
556
|
-
prepared.set(asset.relativePath, asset);
|
|
557
|
-
}
|
|
558
|
-
}
|
|
559
|
-
return asset;
|
|
560
|
-
}
|
|
561
|
-
// recurse to find all active addons that don't cross an engine boundary.
|
|
562
|
-
// Inner engines themselves will be returned, but not those engines' children.
|
|
563
|
-
// The output set's insertion order is the proper ember-cli compatible
|
|
564
|
-
// ordering of the addons.
|
|
565
|
-
findActiveAddons(pkg, engine, isChild = false) {
|
|
566
|
-
for (let child of this.activeAddonChildren(pkg)) {
|
|
567
|
-
if (!child.isEngine()) {
|
|
568
|
-
this.findActiveAddons(child, engine, true);
|
|
569
|
-
}
|
|
570
|
-
engine.addons.add(child);
|
|
571
|
-
}
|
|
572
|
-
// ensure addons are applied in the correct order, if set (via @embroider/compat/v1-addon)
|
|
573
|
-
if (!isChild) {
|
|
574
|
-
engine.addons = new Set([...engine.addons].sort((a, b) => {
|
|
575
|
-
return (a.meta['order-index'] || 0) - (b.meta['order-index'] || 0);
|
|
576
|
-
}));
|
|
577
|
-
}
|
|
578
|
-
}
|
|
579
|
-
partitionEngines(appJSPath) {
|
|
580
|
-
let queue = [
|
|
581
|
-
{
|
|
582
|
-
package: this.appPackageWithMovedDeps,
|
|
583
|
-
addons: new Set(),
|
|
584
|
-
parent: undefined,
|
|
585
|
-
sourcePath: appJSPath,
|
|
586
|
-
modulePrefix: this.modulePrefix(),
|
|
587
|
-
appRelativePath: '.',
|
|
59
|
+
return options;
|
|
588
60
|
},
|
|
589
|
-
];
|
|
590
|
-
let done = [];
|
|
591
|
-
let seenEngines = new Set();
|
|
592
|
-
while (true) {
|
|
593
|
-
let current = queue.shift();
|
|
594
|
-
if (!current) {
|
|
595
|
-
break;
|
|
596
|
-
}
|
|
597
|
-
this.findActiveAddons(current.package, current);
|
|
598
|
-
for (let addon of current.addons) {
|
|
599
|
-
if (addon.isEngine() && !seenEngines.has(addon)) {
|
|
600
|
-
seenEngines.add(addon);
|
|
601
|
-
queue.push({
|
|
602
|
-
package: addon,
|
|
603
|
-
addons: new Set(),
|
|
604
|
-
parent: current,
|
|
605
|
-
sourcePath: addon.root,
|
|
606
|
-
modulePrefix: addon.name,
|
|
607
|
-
appRelativePath: (0, core_1.explicitRelative)(this.root, addon.root),
|
|
608
|
-
});
|
|
609
|
-
}
|
|
610
|
-
}
|
|
611
|
-
done.push(current);
|
|
612
|
-
}
|
|
613
|
-
return done;
|
|
614
|
-
}
|
|
615
|
-
get activeFastboot() {
|
|
616
|
-
return this.activeAddonChildren(this.appPackageWithMovedDeps).find(a => a.name === 'ember-cli-fastboot');
|
|
617
|
-
}
|
|
618
|
-
emberVersion() {
|
|
619
|
-
let pkg = this.activeAddonChildren(this.appPackageWithMovedDeps).find(a => a.name === 'ember-source');
|
|
620
|
-
if (!pkg) {
|
|
621
|
-
throw new Error('no ember version!');
|
|
622
|
-
}
|
|
623
|
-
return pkg.version;
|
|
624
|
-
}
|
|
625
|
-
get fastbootConfig() {
|
|
626
|
-
if (this.activeFastboot) {
|
|
627
|
-
// this is relying on work done in stage1 by @embroider/compat/src/compat-adapters/ember-cli-fastboot.ts
|
|
628
|
-
let packageJSON = (0, fs_extra_1.readJSONSync)((0, path_2.join)(this.activeFastboot.root, '_fastboot_', 'package.json'));
|
|
629
|
-
let { extraAppFiles, extraVendorFiles } = packageJSON['embroider-fastboot'];
|
|
630
|
-
delete packageJSON['embroider-fastboot'];
|
|
631
|
-
extraVendorFiles.push('assets/embroider_macros_fastboot_init.js');
|
|
632
|
-
return { packageJSON, extraAppFiles, extraVendorFiles };
|
|
633
|
-
}
|
|
634
|
-
}
|
|
635
|
-
updateAppJS(appJSPath) {
|
|
636
|
-
var _a;
|
|
637
|
-
if (!this.engines) {
|
|
638
|
-
this.engines = this.partitionEngines(appJSPath).map(engine => {
|
|
639
|
-
if (engine.sourcePath === appJSPath) {
|
|
640
|
-
// this is the app. We have more to do for the app than for other
|
|
641
|
-
// engines.
|
|
642
|
-
let fastbootSync;
|
|
643
|
-
if (this.activeFastboot) {
|
|
644
|
-
let fastbootDir = this.fastbootJSSrcDir();
|
|
645
|
-
if (fastbootDir) {
|
|
646
|
-
fastbootSync = new sync_dir_1.SyncDir(fastbootDir, (0, path_1.resolve)(this.root, '_fastboot_'));
|
|
647
|
-
}
|
|
648
|
-
}
|
|
649
|
-
return {
|
|
650
|
-
engine,
|
|
651
|
-
appSync: new sync_dir_1.SyncDir(appJSPath, this.root),
|
|
652
|
-
fastbootSync,
|
|
653
|
-
};
|
|
654
|
-
}
|
|
655
|
-
else {
|
|
656
|
-
// this is not the app, so it's some other engine. Engines are already
|
|
657
|
-
// built by stage1 like all other addons, so we only need to observe
|
|
658
|
-
// their files, not doing any actual copying or building.
|
|
659
|
-
return {
|
|
660
|
-
engine,
|
|
661
|
-
appSync: new sync_dir_1.SyncDir(engine.sourcePath, undefined),
|
|
662
|
-
// AFAIK, we've never supported a fastboot overlay directory in an
|
|
663
|
-
// engine. But if we do need that, it would go here.
|
|
664
|
-
fastbootSync: undefined,
|
|
665
|
-
};
|
|
666
|
-
}
|
|
667
|
-
});
|
|
668
|
-
}
|
|
669
|
-
for (let engine of this.engines) {
|
|
670
|
-
engine.appSync.update();
|
|
671
|
-
(_a = engine.fastbootSync) === null || _a === void 0 ? void 0 : _a.update();
|
|
672
|
-
}
|
|
673
|
-
return this.engines.map(({ engine, appSync, fastbootSync }) => {
|
|
674
|
-
var _a;
|
|
675
|
-
return new app_files_1.AppFiles(engine, appSync.files, (_a = fastbootSync === null || fastbootSync === void 0 ? void 0 : fastbootSync.files) !== null && _a !== void 0 ? _a : new Set(), this.resolvableExtensionsPattern, this.podModulePrefix());
|
|
676
|
-
});
|
|
677
|
-
}
|
|
678
|
-
prepareAsset(asset, appFiles, prepared, emberENV) {
|
|
679
|
-
if (asset.kind === 'ember') {
|
|
680
|
-
let prior = this.assets.get(asset.relativePath);
|
|
681
|
-
let parsed;
|
|
682
|
-
if (prior && prior.kind === 'built-ember' && prior.parsedAsset.validFor(asset)) {
|
|
683
|
-
// we can reuse the parsed html
|
|
684
|
-
parsed = prior.parsedAsset;
|
|
685
|
-
parsed.html.clear();
|
|
686
|
-
}
|
|
687
|
-
else {
|
|
688
|
-
parsed = new ParsedEmberAsset(asset);
|
|
689
|
-
}
|
|
690
|
-
this.insertEmberApp(parsed, appFiles, prepared, emberENV);
|
|
691
|
-
prepared.set(asset.relativePath, new BuiltEmberAsset(parsed));
|
|
692
|
-
}
|
|
693
|
-
else {
|
|
694
|
-
prepared.set(asset.relativePath, asset);
|
|
695
|
-
}
|
|
696
|
-
}
|
|
697
|
-
prepareAssets(requestedAssets, appFiles, emberENV) {
|
|
698
|
-
let prepared = new Map();
|
|
699
|
-
for (let asset of requestedAssets) {
|
|
700
|
-
this.prepareAsset(asset, appFiles, prepared, emberENV);
|
|
701
|
-
}
|
|
702
|
-
return prepared;
|
|
703
|
-
}
|
|
704
|
-
assetIsValid(asset, prior) {
|
|
705
|
-
if (!prior) {
|
|
706
|
-
return false;
|
|
707
|
-
}
|
|
708
|
-
switch (asset.kind) {
|
|
709
|
-
case 'on-disk':
|
|
710
|
-
return prior.kind === 'on-disk' && prior.size === asset.size && prior.mtime === asset.mtime;
|
|
711
|
-
case 'in-memory':
|
|
712
|
-
return prior.kind === 'in-memory' && stringOrBufferEqual(prior.source, asset.source);
|
|
713
|
-
case 'built-ember':
|
|
714
|
-
return prior.kind === 'built-ember' && prior.source === asset.source;
|
|
715
|
-
case 'concatenated-asset':
|
|
716
|
-
return (prior.kind === 'concatenated-asset' &&
|
|
717
|
-
prior.sources.length === asset.sources.length &&
|
|
718
|
-
prior.sources.every((priorFile, index) => {
|
|
719
|
-
let newFile = asset.sources[index];
|
|
720
|
-
return this.assetIsValid(newFile, priorFile);
|
|
721
|
-
}));
|
|
722
|
-
}
|
|
723
|
-
}
|
|
724
|
-
updateOnDiskAsset(asset) {
|
|
725
|
-
let destination = (0, path_2.join)(this.root, asset.relativePath);
|
|
726
|
-
(0, fs_extra_2.ensureDirSync)((0, path_2.dirname)(destination));
|
|
727
|
-
(0, fs_extra_2.copySync)(asset.sourcePath, destination, { dereference: true });
|
|
728
|
-
}
|
|
729
|
-
updateInMemoryAsset(asset) {
|
|
730
|
-
let destination = (0, path_2.join)(this.root, asset.relativePath);
|
|
731
|
-
(0, fs_extra_2.ensureDirSync)((0, path_2.dirname)(destination));
|
|
732
|
-
(0, fs_extra_1.writeFileSync)(destination, asset.source, 'utf8');
|
|
733
|
-
}
|
|
734
|
-
updateBuiltEmberAsset(asset) {
|
|
735
|
-
let destination = (0, path_2.join)(this.root, asset.relativePath);
|
|
736
|
-
(0, fs_extra_2.ensureDirSync)((0, path_2.dirname)(destination));
|
|
737
|
-
(0, fs_extra_1.writeFileSync)(destination, asset.source, 'utf8');
|
|
738
|
-
}
|
|
739
|
-
async updateConcatenatedAsset(asset) {
|
|
740
|
-
let concat = new fast_sourcemap_concat_1.default({
|
|
741
|
-
outputFile: (0, path_2.join)(this.root, asset.relativePath),
|
|
742
|
-
mapCommentType: asset.relativePath.endsWith('.js') ? 'line' : 'block',
|
|
743
|
-
baseDir: this.root,
|
|
744
|
-
});
|
|
745
|
-
if (process.env.EMBROIDER_CONCAT_STATS) {
|
|
746
|
-
let MeasureConcat = (await Promise.resolve().then(() => __importStar(require('@embroider/core/src/measure-concat')))).default;
|
|
747
|
-
concat = new MeasureConcat(asset.relativePath, concat, this.root);
|
|
748
|
-
}
|
|
749
|
-
for (let source of asset.sources) {
|
|
750
|
-
switch (source.kind) {
|
|
751
|
-
case 'on-disk':
|
|
752
|
-
concat.addFile((0, core_1.explicitRelative)(this.root, source.sourcePath));
|
|
753
|
-
break;
|
|
754
|
-
case 'in-memory':
|
|
755
|
-
if (typeof source.source !== 'string') {
|
|
756
|
-
throw new Error(`attempted to concatenated a Buffer-backed in-memory asset`);
|
|
757
|
-
}
|
|
758
|
-
concat.addSpace(source.source);
|
|
759
|
-
break;
|
|
760
|
-
default:
|
|
761
|
-
(0, assert_never_1.default)(source);
|
|
762
|
-
}
|
|
763
|
-
}
|
|
764
|
-
await concat.end();
|
|
765
|
-
}
|
|
766
|
-
async updateAssets(requestedAssets, appFiles, emberENV) {
|
|
767
|
-
let assets = this.prepareAssets(requestedAssets, appFiles, emberENV);
|
|
768
|
-
for (let asset of assets.values()) {
|
|
769
|
-
if (this.assetIsValid(asset, this.assets.get(asset.relativePath))) {
|
|
770
|
-
continue;
|
|
771
|
-
}
|
|
772
|
-
(0, core_1.debug)('rebuilding %s', asset.relativePath);
|
|
773
|
-
switch (asset.kind) {
|
|
774
|
-
case 'on-disk':
|
|
775
|
-
this.updateOnDiskAsset(asset);
|
|
776
|
-
break;
|
|
777
|
-
case 'in-memory':
|
|
778
|
-
this.updateInMemoryAsset(asset);
|
|
779
|
-
break;
|
|
780
|
-
case 'built-ember':
|
|
781
|
-
this.updateBuiltEmberAsset(asset);
|
|
782
|
-
break;
|
|
783
|
-
case 'concatenated-asset':
|
|
784
|
-
await this.updateConcatenatedAsset(asset);
|
|
785
|
-
break;
|
|
786
|
-
default:
|
|
787
|
-
(0, assert_never_1.default)(asset);
|
|
788
|
-
}
|
|
789
|
-
}
|
|
790
|
-
for (let oldAsset of this.assets.values()) {
|
|
791
|
-
if (!assets.has(oldAsset.relativePath)) {
|
|
792
|
-
(0, fs_extra_1.unlinkSync)((0, path_2.join)(this.root, oldAsset.relativePath));
|
|
793
|
-
}
|
|
794
|
-
}
|
|
795
|
-
this.assets = assets;
|
|
796
|
-
return [...assets.values()];
|
|
797
|
-
}
|
|
798
|
-
gatherAssets(inputPaths) {
|
|
799
|
-
// first gather all the assets out of addons
|
|
800
|
-
let assets = [];
|
|
801
|
-
for (let pkg of this.allActiveAddons) {
|
|
802
|
-
if (pkg.meta['public-assets']) {
|
|
803
|
-
for (let [filename, appRelativeURL] of Object.entries(pkg.meta['public-assets'] || {})) {
|
|
804
|
-
let sourcePath = (0, path_1.resolve)(pkg.root, filename);
|
|
805
|
-
let stats = (0, fs_extra_1.statSync)(sourcePath);
|
|
806
|
-
assets.push({
|
|
807
|
-
kind: 'on-disk',
|
|
808
|
-
sourcePath,
|
|
809
|
-
relativePath: appRelativeURL,
|
|
810
|
-
mtime: stats.mtimeMs,
|
|
811
|
-
size: stats.size,
|
|
812
|
-
});
|
|
813
|
-
}
|
|
814
|
-
}
|
|
815
|
-
}
|
|
816
|
-
if (this.activeFastboot) {
|
|
817
|
-
const source = `
|
|
818
|
-
(function(){
|
|
819
|
-
var key = '_embroider_macros_runtime_config';
|
|
820
|
-
if (!window[key]){ window[key] = [];}
|
|
821
|
-
window[key].push(function(m) {
|
|
822
|
-
m.setGlobalConfig('fastboot', Object.assign({}, m.getGlobalConfig().fastboot, { isRunning: true }));
|
|
823
61
|
});
|
|
824
|
-
}())`;
|
|
825
|
-
assets.push({
|
|
826
|
-
kind: 'in-memory',
|
|
827
|
-
source,
|
|
828
|
-
relativePath: 'assets/embroider_macros_fastboot_init.js',
|
|
829
|
-
});
|
|
830
|
-
}
|
|
831
|
-
// and finally tack on the ones from our app itself
|
|
832
|
-
return assets.concat(this.extractAssets(inputPaths));
|
|
833
62
|
}
|
|
834
|
-
async build(
|
|
63
|
+
async build() {
|
|
835
64
|
// on the first build, we lock down the macros config. on subsequent builds,
|
|
836
65
|
// this doesn't do anything anyway because it's idempotent.
|
|
837
66
|
this.compatApp.macrosConfig.finalize();
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
841
|
-
this.firstBuild = false;
|
|
842
|
-
}
|
|
843
|
-
let appFiles = this.updateAppJS(inputPaths.appJS);
|
|
844
|
-
let emberENV = this.configTree.readConfig().EmberENV;
|
|
845
|
-
let assets = this.gatherAssets(inputPaths);
|
|
846
|
-
let finalAssets = await this.updateAssets(assets, appFiles, emberENV);
|
|
847
|
-
let assetPaths = assets.map(asset => asset.relativePath);
|
|
848
|
-
if (this.activeFastboot) {
|
|
849
|
-
// when using fastboot, our own package.json needs to be in the output so fastboot can read it.
|
|
850
|
-
assetPaths.push('package.json');
|
|
851
|
-
}
|
|
852
|
-
for (let asset of finalAssets) {
|
|
853
|
-
// our concatenated assets all have map files that ride along. Here we're
|
|
854
|
-
// telling the final stage packager to be sure and serve the map files
|
|
855
|
-
// too.
|
|
856
|
-
if (asset.kind === 'concatenated-asset') {
|
|
857
|
-
assetPaths.push(asset.sourcemapPath);
|
|
858
|
-
}
|
|
859
|
-
}
|
|
860
|
-
let meta = {
|
|
861
|
-
type: 'app',
|
|
862
|
-
version: 2,
|
|
863
|
-
assets: assetPaths,
|
|
864
|
-
babel: {
|
|
865
|
-
filename: '_babel_config_.js',
|
|
866
|
-
isParallelSafe: true, // TODO
|
|
867
|
-
majorVersion: this.compatApp.babelMajorVersion(),
|
|
868
|
-
fileFilter: '_babel_filter_.js',
|
|
869
|
-
},
|
|
870
|
-
'root-url': this.rootURL(),
|
|
871
|
-
};
|
|
872
|
-
// all compat apps are auto-upgraded, there's no v2 app format here
|
|
873
|
-
meta['auto-upgraded'] = true;
|
|
874
|
-
let pkg = this.combinePackageJSON(meta);
|
|
875
|
-
(0, fs_extra_1.writeFileSync)((0, path_2.join)(this.root, 'package.json'), JSON.stringify(pkg, null, 2), 'utf8');
|
|
876
|
-
let resolverConfig = this.resolverConfig(appFiles);
|
|
67
|
+
let resolverConfig = this.resolverConfig;
|
|
68
|
+
let config = this.configTree.readConfig();
|
|
69
|
+
let contentForConfig = this.contentForTree.readContents();
|
|
877
70
|
this.addResolverConfig(resolverConfig);
|
|
878
|
-
|
|
879
|
-
this.
|
|
880
|
-
|
|
881
|
-
|
|
882
|
-
let pkgLayers = [this.origAppPackage.packageJSON];
|
|
883
|
-
let fastbootConfig = this.fastbootConfig;
|
|
884
|
-
if (fastbootConfig) {
|
|
885
|
-
// fastboot-specific package.json output is allowed to add to our original package.json
|
|
886
|
-
pkgLayers.push(fastbootConfig.packageJSON);
|
|
887
|
-
}
|
|
888
|
-
// but our own new v2 app metadata takes precedence over both
|
|
889
|
-
pkgLayers.push({ keywords: ['ember-addon'], 'ember-addon': meta });
|
|
890
|
-
return combinePackageJSON(...pkgLayers);
|
|
891
|
-
}
|
|
892
|
-
etcOptions(resolverConfig) {
|
|
893
|
-
let transforms = this.compatApp.htmlbarsPlugins;
|
|
894
|
-
let { plugins: macroPlugins, setConfig } = node_1.MacrosConfig.transforms();
|
|
895
|
-
setConfig(this.compatApp.macrosConfig);
|
|
896
|
-
for (let macroPlugin of macroPlugins) {
|
|
897
|
-
transforms.push(macroPlugin);
|
|
898
|
-
}
|
|
899
|
-
if (this.staticComponents || this.staticHelpers || this.staticModifiers || globalThis.embroider_audit) {
|
|
900
|
-
let opts = {
|
|
901
|
-
appRoot: resolverConfig.appRoot,
|
|
902
|
-
emberVersion: this.emberVersion(),
|
|
903
|
-
};
|
|
904
|
-
transforms.push([require.resolve('./resolver-transform'), opts]);
|
|
905
|
-
}
|
|
906
|
-
let resolver = new core_1.Resolver(resolverConfig);
|
|
907
|
-
let resolution = resolver.nodeResolve('ember-source/dist/ember-template-compiler', (0, path_1.resolve)(this.root, 'package.json'));
|
|
908
|
-
if (resolution.type !== 'real') {
|
|
909
|
-
throw new Error(`bug: unable to resolve ember-template-compiler from ${this.root}`);
|
|
910
|
-
}
|
|
911
|
-
return {
|
|
912
|
-
transforms,
|
|
913
|
-
compilerPath: resolution.filename,
|
|
914
|
-
enableLegacyModules: ['ember-cli-htmlbars', 'ember-cli-htmlbars-inline-precompile', 'htmlbars-inline-precompile'],
|
|
915
|
-
};
|
|
71
|
+
this.addContentForConfig(contentForConfig);
|
|
72
|
+
this.addEmberEnvConfig(config.EmberENV);
|
|
73
|
+
this.outputAppBootError(config.modulePrefix, config.APP, contentForConfig);
|
|
74
|
+
this.addBabelCompat();
|
|
916
75
|
}
|
|
917
76
|
get portableHints() {
|
|
918
77
|
return this.options.pluginHints.map(hint => {
|
|
919
|
-
let cursor = (0,
|
|
78
|
+
let cursor = (0, path_1.join)(this.origAppPackage.root, 'package.json');
|
|
920
79
|
for (let i = 0; i < hint.resolve.length; i++) {
|
|
921
80
|
let target = hint.resolve[i];
|
|
922
81
|
if (i < hint.resolve.length - 1) {
|
|
923
|
-
target = (0,
|
|
82
|
+
target = (0, path_1.join)(target, 'package.json');
|
|
924
83
|
}
|
|
925
|
-
cursor =
|
|
84
|
+
cursor = resolve_1.default.sync(target, { basedir: (0, path_1.dirname)(cursor) });
|
|
926
85
|
}
|
|
927
86
|
return {
|
|
928
87
|
requireFile: cursor,
|
|
@@ -931,459 +90,109 @@ class CompatAppBuilder {
|
|
|
931
90
|
};
|
|
932
91
|
});
|
|
933
92
|
}
|
|
934
|
-
|
|
935
|
-
|
|
936
|
-
|
|
93
|
+
addBabelCompat() {
|
|
94
|
+
let plugins = this.compatApp.extraBabelPlugins();
|
|
95
|
+
let templateTransforms = this.compatApp.htmlbarsPlugins;
|
|
96
|
+
let babelMacros = this.compatApp.macrosConfig.babelPluginConfig();
|
|
97
|
+
let { plugins: templateMacros, setConfig } = node_1.MacrosConfig.transforms();
|
|
98
|
+
setConfig(this.compatApp.macrosConfig);
|
|
99
|
+
let config = {
|
|
100
|
+
plugins,
|
|
101
|
+
templateTransforms,
|
|
102
|
+
babelMacros,
|
|
103
|
+
templateMacros: templateMacros,
|
|
104
|
+
};
|
|
105
|
+
let portableConfig = new portable_1.Portable({ hints: this.portableHints }).dehydrate(config);
|
|
106
|
+
if (!portableConfig.isParallelSafe) {
|
|
107
|
+
throw new Error(`non-serializble babel plugins or AST transforms found in your app`);
|
|
937
108
|
}
|
|
938
|
-
(0, fs_extra_1.writeFileSync)((0,
|
|
939
|
-
|
|
109
|
+
(0, fs_extra_1.writeFileSync)((0, path_1.join)((0, core_1.locateEmbroiderWorkingDir)(this.compatApp.root), '_babel_compat_.js'), `
|
|
110
|
+
const { Portable } = require('@embroider/core/src/portable');
|
|
111
|
+
module.exports = new Portable().hydrate(${JSON.stringify(portableConfig.value, null, 2)});
|
|
112
|
+
`, 'utf8');
|
|
940
113
|
}
|
|
941
114
|
addResolverConfig(config) {
|
|
942
|
-
(0, fs_extra_1.outputJSONSync)((0,
|
|
115
|
+
(0, fs_extra_1.outputJSONSync)((0, path_1.join)((0, core_1.locateEmbroiderWorkingDir)(this.compatApp.root), 'resolver.json'), config, { spaces: 2 });
|
|
943
116
|
}
|
|
944
|
-
|
|
945
|
-
|
|
946
|
-
|
|
947
|
-
if (typeof pattern === 'string') {
|
|
948
|
-
return pattern === routeName;
|
|
949
|
-
}
|
|
950
|
-
else {
|
|
951
|
-
return pattern.test(routeName);
|
|
952
|
-
}
|
|
953
|
-
}));
|
|
954
|
-
}
|
|
955
|
-
splitRoute(routeName, files, addToParent, addLazyBundle) {
|
|
956
|
-
let shouldSplit = routeName && this.shouldSplitRoute(routeName);
|
|
957
|
-
let ownFiles = [];
|
|
958
|
-
let ownNames = new Set();
|
|
959
|
-
if (files.template) {
|
|
960
|
-
if (shouldSplit) {
|
|
961
|
-
ownFiles.push(files.template);
|
|
962
|
-
ownNames.add(routeName);
|
|
963
|
-
}
|
|
964
|
-
else {
|
|
965
|
-
addToParent(routeName, files.template);
|
|
966
|
-
}
|
|
967
|
-
}
|
|
968
|
-
if (files.controller) {
|
|
969
|
-
if (shouldSplit) {
|
|
970
|
-
ownFiles.push(files.controller);
|
|
971
|
-
ownNames.add(routeName);
|
|
972
|
-
}
|
|
973
|
-
else {
|
|
974
|
-
addToParent(routeName, files.controller);
|
|
975
|
-
}
|
|
976
|
-
}
|
|
977
|
-
if (files.route) {
|
|
978
|
-
if (shouldSplit) {
|
|
979
|
-
ownFiles.push(files.route);
|
|
980
|
-
ownNames.add(routeName);
|
|
981
|
-
}
|
|
982
|
-
else {
|
|
983
|
-
addToParent(routeName, files.route);
|
|
984
|
-
}
|
|
985
|
-
}
|
|
986
|
-
for (let [childName, childFiles] of files.children) {
|
|
987
|
-
this.splitRoute(`${routeName}.${childName}`, childFiles, (childRouteName, childFile) => {
|
|
988
|
-
// this is our child calling "addToParent"
|
|
989
|
-
if (shouldSplit) {
|
|
990
|
-
ownFiles.push(childFile);
|
|
991
|
-
ownNames.add(childRouteName);
|
|
992
|
-
}
|
|
993
|
-
else {
|
|
994
|
-
addToParent(childRouteName, childFile);
|
|
995
|
-
}
|
|
996
|
-
}, (routeNames, files) => {
|
|
997
|
-
addLazyBundle(routeNames, files);
|
|
998
|
-
});
|
|
999
|
-
}
|
|
1000
|
-
if (ownFiles.length > 0) {
|
|
1001
|
-
addLazyBundle([...ownNames], ownFiles);
|
|
1002
|
-
}
|
|
1003
|
-
}
|
|
1004
|
-
topAppJSAsset(engines, prepared) {
|
|
1005
|
-
let [app, ...childEngines] = engines;
|
|
1006
|
-
let relativePath = `assets/${this.origAppPackage.name}.js`;
|
|
1007
|
-
return this.appJSAsset(relativePath, app, childEngines, prepared, {
|
|
1008
|
-
autoRun: this.compatApp.autoRun,
|
|
1009
|
-
appBoot: !this.compatApp.autoRun ? this.compatApp.appBoot.readAppBoot() : '',
|
|
1010
|
-
mainModule: (0, core_1.explicitRelative)((0, path_2.dirname)(relativePath), 'app'),
|
|
1011
|
-
appConfig: this.configTree.readConfig().APP,
|
|
117
|
+
addContentForConfig(contentForConfig) {
|
|
118
|
+
(0, fs_extra_1.outputJSONSync)((0, path_1.join)((0, core_1.locateEmbroiderWorkingDir)(this.compatApp.root), 'content-for.json'), contentForConfig, {
|
|
119
|
+
spaces: 2,
|
|
1012
120
|
});
|
|
1013
|
-
|
|
1014
|
-
|
|
1015
|
-
|
|
1016
|
-
|
|
1017
|
-
|
|
1018
|
-
|
|
1019
|
-
|
|
1020
|
-
|
|
1021
|
-
|
|
1022
|
-
|
|
1023
|
-
|
|
1024
|
-
|
|
1025
|
-
|
|
1026
|
-
|
|
1027
|
-
|
|
1028
|
-
|
|
1029
|
-
|
|
1030
|
-
|
|
1031
|
-
|
|
1032
|
-
|
|
1033
|
-
|
|
1034
|
-
}
|
|
1035
|
-
let eagerModules = [];
|
|
1036
|
-
let requiredAppFiles = [this.requiredOtherFiles(appFiles)];
|
|
1037
|
-
if (!this.staticComponents) {
|
|
1038
|
-
requiredAppFiles.push(appFiles.components);
|
|
1039
|
-
}
|
|
1040
|
-
if (!this.staticHelpers) {
|
|
1041
|
-
requiredAppFiles.push(appFiles.helpers);
|
|
1042
|
-
}
|
|
1043
|
-
if (!this.staticModifiers) {
|
|
1044
|
-
requiredAppFiles.push(appFiles.modifiers);
|
|
1045
|
-
}
|
|
1046
|
-
let styles = [];
|
|
1047
|
-
// only import styles from engines with a parent (this excludeds the parent application) as their styles
|
|
1048
|
-
// will be inserted via a direct <link> tag.
|
|
1049
|
-
if (appFiles.engine.parent && appFiles.engine.package.isLazyEngine()) {
|
|
1050
|
-
let implicitStyles = this.impliedAssets('implicit-styles', appFiles);
|
|
1051
|
-
for (let style of implicitStyles) {
|
|
1052
|
-
styles.push({
|
|
1053
|
-
path: (0, core_1.explicitRelative)('assets/_engine_', style.relativePath),
|
|
1054
|
-
});
|
|
1055
|
-
}
|
|
1056
|
-
let engineMeta = appFiles.engine.package.meta;
|
|
1057
|
-
if (engineMeta && engineMeta['implicit-styles']) {
|
|
1058
|
-
for (let style of engineMeta['implicit-styles']) {
|
|
1059
|
-
styles.push({
|
|
1060
|
-
path: (0, core_1.explicitRelative)((0, path_2.dirname)(relativePath), (0, path_2.join)(appFiles.engine.appRelativePath, style)),
|
|
1061
|
-
});
|
|
1062
|
-
}
|
|
1063
|
-
}
|
|
1064
|
-
}
|
|
1065
|
-
let lazyEngines = [];
|
|
1066
|
-
for (let childEngine of childEngines) {
|
|
1067
|
-
let asset = this.appJSAsset(`assets/_engine_/${encodeURIComponent(childEngine.engine.package.name)}.js`, childEngine, [], prepared);
|
|
1068
|
-
if (childEngine.engine.package.isLazyEngine()) {
|
|
1069
|
-
lazyEngines.push({
|
|
1070
|
-
names: [childEngine.engine.package.name],
|
|
1071
|
-
path: (0, core_1.explicitRelative)((0, path_2.dirname)(relativePath), asset.relativePath),
|
|
1072
|
-
});
|
|
1073
|
-
}
|
|
1074
|
-
else {
|
|
1075
|
-
eagerModules.push((0, core_1.explicitRelative)((0, path_2.dirname)(relativePath), asset.relativePath));
|
|
121
|
+
// In addition to outputting content-for.json, we also want to check if content-for 'config-module' has a custom content.
|
|
122
|
+
// If so, it means some classic addons used to provide this custom content, which is no longer supported.
|
|
123
|
+
// Developers can deactivate this check (and the subsequent warning) with useAddonConfigModule
|
|
124
|
+
if (this.compatApp.options.useAddonConfigModule) {
|
|
125
|
+
let modulePrefix = this.configTree.readConfig().modulePrefix;
|
|
126
|
+
// This is the default script provided by https://github.com/ember-cli/ember-cli/blob/master/lib/utilities/ember-app-utils.js#L84
|
|
127
|
+
// When storeConfigInMeta is true, this content is always present in the config-module key of content-for.json
|
|
128
|
+
const defaultConfigModule = `var prefix = '${modulePrefix}';\ntry {\n var metaName = prefix + '/config/environment';\n var rawConfig = document.querySelector('meta[name=\"' + metaName + '\"]').getAttribute('content');\n var config = JSON.parse(decodeURIComponent(rawConfig));\n\n var exports = { 'default': config };\n\n Object.defineProperty(exports, '__esModule', { value: true });\n\n return exports;\n}\ncatch(err) {\n throw new Error('Could not read config from meta tag with name \"' + metaName + '\".');\n}\n`.replace(/\s/g, '');
|
|
129
|
+
const configModule = contentForConfig['/index.html']['config-module'];
|
|
130
|
+
const diff = configModule.replace(/\s/g, '').replace(defaultConfigModule, '');
|
|
131
|
+
if (diff.length) {
|
|
132
|
+
throw new Error(`
|
|
133
|
+
Your app uses at least one classic addon that provides content-for 'config-module'. This is no longer supported.
|
|
134
|
+
With Embroider, you have full control over the config module, so classic addons no longer need to modify it under the hood.
|
|
135
|
+
The following code is included via content-for 'config-module':
|
|
136
|
+
|
|
137
|
+
${configModule}
|
|
138
|
+
|
|
139
|
+
1. If you want to keep the same behavior, add it to the app/environment.js.
|
|
140
|
+
2. Once app/environment.js has the content you need, remove the present error by setting "useAddonConfigModule" to false in the build options.
|
|
141
|
+
`);
|
|
1076
142
|
}
|
|
1077
143
|
}
|
|
1078
|
-
let lazyRoutes = [];
|
|
1079
|
-
for (let [routeName, routeFiles] of appFiles.routeFiles.children) {
|
|
1080
|
-
this.splitRoute(routeName, routeFiles, (_, filename) => {
|
|
1081
|
-
requiredAppFiles.push([filename]);
|
|
1082
|
-
}, (routeNames, files) => {
|
|
1083
|
-
let routeEntrypoint = `assets/_route_/${encodeURIComponent(routeNames[0])}.js`;
|
|
1084
|
-
if (!prepared.has(routeEntrypoint)) {
|
|
1085
|
-
prepared.set(routeEntrypoint, this.routeEntrypoint(appFiles, routeEntrypoint, files));
|
|
1086
|
-
}
|
|
1087
|
-
lazyRoutes.push({
|
|
1088
|
-
names: routeNames,
|
|
1089
|
-
path: this.importPaths(appFiles, routeEntrypoint).buildtime,
|
|
1090
|
-
});
|
|
1091
|
-
});
|
|
1092
|
-
}
|
|
1093
|
-
let [fastboot, nonFastboot] = (0, partition_1.default)(excludeDotFiles((0, flatten_1.default)(requiredAppFiles)), file => appFiles.isFastbootOnly.get(file));
|
|
1094
|
-
let amdModules = nonFastboot.map(file => this.importPaths(appFiles, file));
|
|
1095
|
-
let fastbootOnlyAmdModules = fastboot.map(file => this.importPaths(appFiles, file));
|
|
1096
|
-
// this is a backward-compatibility feature: addons can force inclusion of
|
|
1097
|
-
// modules.
|
|
1098
|
-
eagerModules.push('./-embroider-implicit-modules.js');
|
|
1099
|
-
let params = { amdModules, fastbootOnlyAmdModules, lazyRoutes, lazyEngines, eagerModules, styles };
|
|
1100
|
-
if (entryParams) {
|
|
1101
|
-
Object.assign(params, entryParams);
|
|
1102
|
-
}
|
|
1103
|
-
let source = entryTemplate(params);
|
|
1104
|
-
let asset = {
|
|
1105
|
-
kind: 'in-memory',
|
|
1106
|
-
source,
|
|
1107
|
-
relativePath,
|
|
1108
|
-
};
|
|
1109
|
-
prepared.set(relativePath, asset);
|
|
1110
|
-
return asset;
|
|
1111
|
-
}
|
|
1112
|
-
importPaths({ engine }, engineRelativePath) {
|
|
1113
|
-
let noHBS = engineRelativePath.replace(this.resolvableExtensionsPattern, '').replace(/\.hbs$/, '');
|
|
1114
|
-
return {
|
|
1115
|
-
runtime: `${engine.modulePrefix}/${noHBS}`,
|
|
1116
|
-
buildtime: path_1.posix.join(engine.package.name, engineRelativePath),
|
|
1117
|
-
};
|
|
1118
144
|
}
|
|
1119
|
-
|
|
1120
|
-
|
|
1121
|
-
|
|
1122
|
-
|
|
1123
|
-
source: routeEntryTemplate({
|
|
1124
|
-
files: nonFastboot.map(f => this.importPaths(appFiles, f)),
|
|
1125
|
-
fastbootOnlyFiles: fastboot.map(f => this.importPaths(appFiles, f)),
|
|
1126
|
-
}),
|
|
1127
|
-
relativePath,
|
|
1128
|
-
};
|
|
1129
|
-
return asset;
|
|
145
|
+
addEmberEnvConfig(emberEnvConfig) {
|
|
146
|
+
(0, fs_extra_1.outputJSONSync)((0, path_1.join)((0, core_1.locateEmbroiderWorkingDir)(this.compatApp.root), 'ember-env.json'), emberEnvConfig, {
|
|
147
|
+
spaces: 2,
|
|
148
|
+
});
|
|
1130
149
|
}
|
|
1131
|
-
|
|
1132
|
-
|
|
1133
|
-
|
|
1134
|
-
|
|
150
|
+
// Classic addons providing custom content-for "app-boot" is no longer supported.
|
|
151
|
+
// The purpose of this error message is to help developers to move the classic addons code.
|
|
152
|
+
// Developers can deactivate it with useAddonAppBoot build option.
|
|
153
|
+
outputAppBootError(modulePrefix, appConfig, contentForConfig) {
|
|
154
|
+
if (!this.compatApp.options.useAddonAppBoot) {
|
|
155
|
+
return;
|
|
1135
156
|
}
|
|
1136
|
-
//
|
|
1137
|
-
//
|
|
1138
|
-
|
|
1139
|
-
|
|
1140
|
-
|
|
1141
|
-
|
|
1142
|
-
|
|
1143
|
-
|
|
1144
|
-
|
|
1145
|
-
|
|
1146
|
-
|
|
1147
|
-
|
|
1148
|
-
|
|
1149
|
-
|
|
1150
|
-
|
|
1151
|
-
|
|
1152
|
-
|
|
1153
|
-
|
|
1154
|
-
|
|
1155
|
-
|
|
157
|
+
// This is the default script provided by
|
|
158
|
+
// https://github.com/ember-cli/ember-cli/blob/master/lib/utilities/ember-app-utils.js#L103
|
|
159
|
+
const defaultAppBoot = `
|
|
160
|
+
if (!runningTests) {
|
|
161
|
+
require("${modulePrefix}/app")["default"].create(${JSON.stringify(appConfig || {})});
|
|
162
|
+
}
|
|
163
|
+
`.replace(/\s/g, '');
|
|
164
|
+
const appBoot = contentForConfig['/index.html']['app-boot'];
|
|
165
|
+
const diff = appBoot.replace(/\s/g, '').replace(defaultAppBoot, '');
|
|
166
|
+
if (diff.length) {
|
|
167
|
+
throw new Error(`
|
|
168
|
+
Your app uses at least one classic addon that provides content-for 'app-boot'. This is no longer supported.
|
|
169
|
+
With Embroider, you have full control over the app-boot script, so classic addons no longer need to modify it under the hood.
|
|
170
|
+
The following code is used for your app boot:
|
|
171
|
+
|
|
172
|
+
${appBoot}
|
|
173
|
+
|
|
174
|
+
1. If you want to keep the same behavior, copy and paste it to the app-boot script included in app/index.html.
|
|
175
|
+
2. Once app/index.html has the content you need, remove the present error by setting "useAddonAppBoot" to false in the build options.
|
|
176
|
+
`);
|
|
1156
177
|
}
|
|
1157
|
-
let source = entryTemplate({
|
|
1158
|
-
amdModules,
|
|
1159
|
-
eagerModules,
|
|
1160
|
-
testSuffix: true,
|
|
1161
|
-
});
|
|
1162
|
-
asset = {
|
|
1163
|
-
kind: 'in-memory',
|
|
1164
|
-
source,
|
|
1165
|
-
relativePath: myName,
|
|
1166
|
-
};
|
|
1167
|
-
prepared.set(asset.relativePath, asset);
|
|
1168
|
-
return asset;
|
|
1169
178
|
}
|
|
1170
179
|
}
|
|
1171
180
|
exports.CompatAppBuilder = CompatAppBuilder;
|
|
1172
181
|
__decorate([
|
|
1173
182
|
(0, typescript_memoize_1.Memoize)()
|
|
1174
|
-
], CompatAppBuilder.prototype, "
|
|
1175
|
-
__decorate([
|
|
1176
|
-
(0, typescript_memoize_1.Memoize)()
|
|
1177
|
-
], CompatAppBuilder.prototype, "findTestemAsset", null);
|
|
1178
|
-
__decorate([
|
|
1179
|
-
(0, typescript_memoize_1.Memoize)()
|
|
1180
|
-
], CompatAppBuilder.prototype, "allActiveAddons", null);
|
|
1181
|
-
__decorate([
|
|
1182
|
-
bind_decorator_1.default
|
|
1183
|
-
], CompatAppBuilder.prototype, "isActiveAddon", null);
|
|
1184
|
-
__decorate([
|
|
1185
|
-
bind_decorator_1.default
|
|
1186
|
-
], CompatAppBuilder.prototype, "orderAddons", null);
|
|
1187
|
-
__decorate([
|
|
1188
|
-
(0, typescript_memoize_1.Memoize)()
|
|
1189
|
-
], CompatAppBuilder.prototype, "activeRules", null);
|
|
1190
|
-
__decorate([
|
|
1191
|
-
(0, typescript_memoize_1.Memoize)()
|
|
1192
|
-
], CompatAppBuilder.prototype, "resolvableExtensionsPattern", null);
|
|
1193
|
-
__decorate([
|
|
1194
|
-
(0, typescript_memoize_1.Memoize)()
|
|
1195
|
-
], CompatAppBuilder.prototype, "babelConfig", null);
|
|
1196
|
-
__decorate([
|
|
1197
|
-
(0, typescript_memoize_1.Memoize)()
|
|
1198
|
-
], CompatAppBuilder.prototype, "activeFastboot", null);
|
|
1199
|
-
__decorate([
|
|
1200
|
-
(0, typescript_memoize_1.Memoize)()
|
|
1201
|
-
], CompatAppBuilder.prototype, "fastbootConfig", null);
|
|
183
|
+
], CompatAppBuilder.prototype, "resolverConfig", null);
|
|
1202
184
|
__decorate([
|
|
1203
185
|
(0, typescript_memoize_1.Memoize)()
|
|
1204
186
|
], CompatAppBuilder.prototype, "portableHints", null);
|
|
1205
|
-
__decorate([
|
|
1206
|
-
(0, typescript_memoize_1.Memoize)()
|
|
1207
|
-
], CompatAppBuilder.prototype, "staticAppPathsPattern", null);
|
|
1208
187
|
function defaultAddonPackageRules() {
|
|
1209
|
-
return (0, fs_extra_2.readdirSync)((0,
|
|
188
|
+
return (0, fs_extra_2.readdirSync)((0, path_1.join)(__dirname, 'addon-dependency-rules'))
|
|
1210
189
|
.map(filename => {
|
|
1211
190
|
if (filename.endsWith('.js')) {
|
|
1212
191
|
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
1213
|
-
return require((0,
|
|
192
|
+
return require((0, path_1.join)(__dirname, 'addon-dependency-rules', filename)).default;
|
|
1214
193
|
}
|
|
1215
194
|
})
|
|
1216
195
|
.filter(Boolean)
|
|
1217
196
|
.reduce((a, b) => a.concat(b), []);
|
|
1218
197
|
}
|
|
1219
|
-
const entryTemplate = (0, core_1.jsHandlebarsCompile)(`
|
|
1220
|
-
import { importSync as i, macroCondition, getGlobalConfig } from '@embroider/macros';
|
|
1221
|
-
let w = window;
|
|
1222
|
-
let d = w.define;
|
|
1223
|
-
|
|
1224
|
-
{{#if styles}}
|
|
1225
|
-
if (macroCondition(!getGlobalConfig().fastboot?.isRunning)) {
|
|
1226
|
-
{{#each styles as |stylePath| ~}}
|
|
1227
|
-
i("{{js-string-escape stylePath.path}}");
|
|
1228
|
-
{{/each}}
|
|
1229
|
-
}
|
|
1230
|
-
{{/if}}
|
|
1231
|
-
|
|
1232
|
-
{{#each eagerModules as |eagerModule| ~}}
|
|
1233
|
-
i("{{js-string-escape eagerModule}}");
|
|
1234
|
-
{{/each}}
|
|
1235
|
-
|
|
1236
|
-
{{#each amdModules as |amdModule| ~}}
|
|
1237
|
-
d("{{js-string-escape amdModule.runtime}}", function(){ return i("{{js-string-escape amdModule.buildtime}}");});
|
|
1238
|
-
{{/each}}
|
|
1239
|
-
|
|
1240
|
-
{{#if fastbootOnlyAmdModules}}
|
|
1241
|
-
if (macroCondition(getGlobalConfig().fastboot?.isRunning)) {
|
|
1242
|
-
{{#each fastbootOnlyAmdModules as |amdModule| ~}}
|
|
1243
|
-
d("{{js-string-escape amdModule.runtime}}", function(){ return i("{{js-string-escape amdModule.buildtime}}");});
|
|
1244
|
-
{{/each}}
|
|
1245
|
-
}
|
|
1246
|
-
{{/if}}
|
|
1247
|
-
|
|
1248
|
-
|
|
1249
|
-
{{#if lazyRoutes}}
|
|
1250
|
-
w._embroiderRouteBundles_ = [
|
|
1251
|
-
{{#each lazyRoutes as |route|}}
|
|
1252
|
-
{
|
|
1253
|
-
names: {{json-stringify route.names}},
|
|
1254
|
-
load: function() {
|
|
1255
|
-
return import("{{js-string-escape route.path}}");
|
|
1256
|
-
}
|
|
1257
|
-
},
|
|
1258
|
-
{{/each}}
|
|
1259
|
-
]
|
|
1260
|
-
{{/if}}
|
|
1261
|
-
|
|
1262
|
-
{{#if lazyEngines}}
|
|
1263
|
-
w._embroiderEngineBundles_ = [
|
|
1264
|
-
{{#each lazyEngines as |engine|}}
|
|
1265
|
-
{
|
|
1266
|
-
names: {{json-stringify engine.names}},
|
|
1267
|
-
load: function() {
|
|
1268
|
-
return import("{{js-string-escape engine.path}}");
|
|
1269
|
-
}
|
|
1270
|
-
},
|
|
1271
|
-
{{/each}}
|
|
1272
|
-
]
|
|
1273
|
-
{{/if}}
|
|
1274
|
-
|
|
1275
|
-
{{#if autoRun ~}}
|
|
1276
|
-
if (!runningTests) {
|
|
1277
|
-
i("{{js-string-escape mainModule}}").default.create({{json-stringify appConfig}});
|
|
1278
|
-
}
|
|
1279
|
-
{{else if appBoot ~}}
|
|
1280
|
-
{{ appBoot }}
|
|
1281
|
-
{{/if}}
|
|
1282
|
-
|
|
1283
|
-
{{#if testSuffix ~}}
|
|
1284
|
-
{{!- TODO: both of these suffixes should get dynamically generated so they incorporate
|
|
1285
|
-
any content-for added by addons. -}}
|
|
1286
|
-
|
|
1287
|
-
|
|
1288
|
-
{{!- this is the traditional tests-suffix.js -}}
|
|
1289
|
-
i('../tests/test-helper');
|
|
1290
|
-
EmberENV.TESTS_FILE_LOADED = true;
|
|
1291
|
-
{{/if}}
|
|
1292
|
-
`);
|
|
1293
|
-
const routeEntryTemplate = (0, core_1.jsHandlebarsCompile)(`
|
|
1294
|
-
import { importSync as i } from '@embroider/macros';
|
|
1295
|
-
let d = window.define;
|
|
1296
|
-
{{#each files as |amdModule| ~}}
|
|
1297
|
-
d("{{js-string-escape amdModule.runtime}}", function(){ return i("{{js-string-escape amdModule.buildtime}}");});
|
|
1298
|
-
{{/each}}
|
|
1299
|
-
{{#if fastbootOnlyFiles}}
|
|
1300
|
-
import { macroCondition, getGlobalConfig } from '@embroider/macros';
|
|
1301
|
-
if (macroCondition(getGlobalConfig().fastboot?.isRunning)) {
|
|
1302
|
-
{{#each fastbootOnlyFiles as |amdModule| ~}}
|
|
1303
|
-
d("{{js-string-escape amdModule.runtime}}", function(){ return i("{{js-string-escape amdModule.buildtime}}");});
|
|
1304
|
-
{{/each}}
|
|
1305
|
-
}
|
|
1306
|
-
{{/if}}
|
|
1307
|
-
`);
|
|
1308
|
-
function stringOrBufferEqual(a, b) {
|
|
1309
|
-
if (typeof a === 'string' && typeof b === 'string') {
|
|
1310
|
-
return a === b;
|
|
1311
|
-
}
|
|
1312
|
-
if (a instanceof Buffer && b instanceof Buffer) {
|
|
1313
|
-
return Buffer.compare(a, b) === 0;
|
|
1314
|
-
}
|
|
1315
|
-
return false;
|
|
1316
|
-
}
|
|
1317
|
-
const babelFilterTemplate = (0, core_1.jsHandlebarsCompile)(`
|
|
1318
|
-
const { babelFilter } = require(${JSON.stringify(require.resolve('@embroider/core'))});
|
|
1319
|
-
module.exports = babelFilter({{json-stringify skipBabel}}, "{{js-string-escape appRoot}}");
|
|
1320
|
-
`);
|
|
1321
|
-
function combinePackageJSON(...layers) {
|
|
1322
|
-
function custom(objValue, srcValue, key, _object, _source, stack) {
|
|
1323
|
-
if (key === 'keywords' && stack.size === 0) {
|
|
1324
|
-
if (Array.isArray(objValue)) {
|
|
1325
|
-
return objValue.concat(srcValue);
|
|
1326
|
-
}
|
|
1327
|
-
}
|
|
1328
|
-
}
|
|
1329
|
-
return (0, mergeWith_1.default)({}, ...layers, custom);
|
|
1330
|
-
}
|
|
1331
|
-
function addCachablePlugin(babelConfig) {
|
|
1332
|
-
if (Array.isArray(babelConfig.plugins) && babelConfig.plugins.length > 0) {
|
|
1333
|
-
const plugins = Object.create(null);
|
|
1334
|
-
plugins[core_1.cacheBustingPluginPath] = core_1.cacheBustingPluginVersion;
|
|
1335
|
-
for (const plugin of babelConfig.plugins) {
|
|
1336
|
-
let absolutePathToPlugin;
|
|
1337
|
-
if (Array.isArray(plugin) && typeof plugin[0] === 'string') {
|
|
1338
|
-
absolutePathToPlugin = plugin[0];
|
|
1339
|
-
}
|
|
1340
|
-
else if (typeof plugin === 'string') {
|
|
1341
|
-
absolutePathToPlugin = plugin;
|
|
1342
|
-
}
|
|
1343
|
-
else {
|
|
1344
|
-
throw new Error(`[Embroider] a babel plugin without an absolute path was from: ${plugin}`);
|
|
1345
|
-
}
|
|
1346
|
-
plugins[absolutePathToPlugin] = (0, portable_1.maybeNodeModuleVersion)(absolutePathToPlugin);
|
|
1347
|
-
}
|
|
1348
|
-
babelConfig.plugins.push([
|
|
1349
|
-
core_1.cacheBustingPluginPath,
|
|
1350
|
-
{
|
|
1351
|
-
plugins,
|
|
1352
|
-
},
|
|
1353
|
-
]);
|
|
1354
|
-
}
|
|
1355
|
-
}
|
|
1356
|
-
function excludeDotFiles(files) {
|
|
1357
|
-
return files.filter(file => !file.startsWith('.') && !file.includes('/.'));
|
|
1358
|
-
}
|
|
1359
|
-
class ParsedEmberAsset {
|
|
1360
|
-
constructor(asset) {
|
|
1361
|
-
this.kind = 'parsed-ember';
|
|
1362
|
-
this.fileAsset = asset;
|
|
1363
|
-
this.html = new ember_html_1.PreparedEmberHTML(asset);
|
|
1364
|
-
this.relativePath = asset.relativePath;
|
|
1365
|
-
}
|
|
1366
|
-
validFor(other) {
|
|
1367
|
-
return this.fileAsset.mtime === other.mtime && this.fileAsset.size === other.size;
|
|
1368
|
-
}
|
|
1369
|
-
}
|
|
1370
|
-
class BuiltEmberAsset {
|
|
1371
|
-
constructor(asset) {
|
|
1372
|
-
this.kind = 'built-ember';
|
|
1373
|
-
this.parsedAsset = asset;
|
|
1374
|
-
this.source = asset.html.dom.serialize();
|
|
1375
|
-
this.relativePath = asset.relativePath;
|
|
1376
|
-
}
|
|
1377
|
-
}
|
|
1378
|
-
class ConcatenatedAsset {
|
|
1379
|
-
constructor(relativePath, sources, resolvableExtensions) {
|
|
1380
|
-
this.relativePath = relativePath;
|
|
1381
|
-
this.sources = sources;
|
|
1382
|
-
this.resolvableExtensions = resolvableExtensions;
|
|
1383
|
-
this.kind = 'concatenated-asset';
|
|
1384
|
-
}
|
|
1385
|
-
get sourcemapPath() {
|
|
1386
|
-
return this.relativePath.replace(this.resolvableExtensions, '') + '.map';
|
|
1387
|
-
}
|
|
1388
|
-
}
|
|
1389
198
|
//# sourceMappingURL=compat-app-builder.js.map
|