Skip to content

Commit 8260b39

Browse files
authored
Merge pull request #20787 from emberjs/publish-v2-addon
Publish ember-source as v2 addon
2 parents 988dd79 + bdef85e commit 8260b39

File tree

3 files changed

+4126
-3518
lines changed

3 files changed

+4126
-3518
lines changed

lib/index.js

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,27 @@ add(
2929
path.join(__dirname, '..', 'dist', 'ember-template-compiler.js')
3030
);
3131

32+
const { addonV1Shim } = require('@embroider/addon-shim');
33+
34+
const shim = addonV1Shim(path.join(__dirname, '..'), {
35+
autoImportCompat: {
36+
customizeMeta(meta) {
37+
return { ...meta, 'renamed-modules': {} };
38+
},
39+
},
40+
});
41+
3242
module.exports = {
43+
...shim,
44+
paths,
45+
absolutePaths,
46+
3347
init() {
34-
this._super.init && this._super.init.apply(this, arguments);
48+
if (shim.init) {
49+
shim.init.apply(this, arguments);
50+
} else {
51+
this._super.init && this._super.init.apply(this, arguments);
52+
}
3553

3654
// resets `this.root` to the correct location by default ember-cli
3755
// considers `__dirname` here to be the root, but since our main entry
@@ -43,16 +61,17 @@ module.exports = {
4361
this.treePaths.vendor = 'dist';
4462
},
4563

46-
name: 'ember-source',
47-
paths,
48-
absolutePaths,
4964
_overrideTree: undefined,
5065

5166
// Expose supported list of browsers for reference by other packages
5267
supportedBrowsers: SupportedBrowsers,
5368

5469
included() {
55-
this._super.included.apply(this, arguments);
70+
if (shim.included) {
71+
shim.included.apply(this, arguments);
72+
} else {
73+
this._super.included.apply(this, arguments);
74+
}
5675

5776
let overrides = Overrides.for(this.project);
5877

@@ -104,6 +123,9 @@ module.exports = {
104123
},
105124

106125
treeForVendor(tree) {
126+
if (shim.treeForVendor) {
127+
tree = shim.treeForVendor.call(this, tree);
128+
}
107129
const isProduction = process.env.EMBER_ENV === 'production';
108130

109131
let templateCompiler = new Funnel(tree, {

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"dependencies": {
6666
"@babel/core": "^7.24.4",
6767
"@ember/edition-utils": "^1.2.0",
68+
"@embroider/addon-shim": "^1.9.0",
6869
"@glimmer/compiler": "0.92.4",
6970
"@glimmer/destroyable": "0.92.3",
7071
"@glimmer/env": "^0.1.7",
@@ -88,7 +89,7 @@
8889
"broccoli-funnel": "^3.0.8",
8990
"broccoli-merge-trees": "^4.2.0",
9091
"chalk": "^4.0.0",
91-
"ember-auto-import": "^2.6.3",
92+
"ember-auto-import": "^2.10.0",
9293
"ember-cli-babel": "^8.2.0",
9394
"ember-cli-get-component-path-option": "^1.0.0",
9495
"ember-cli-is-package-missing": "^1.0.0",
@@ -181,6 +182,7 @@
181182
"ember-addon": {
182183
"after": "ember-cli-legacy-blueprints",
183184
"type": "addon",
185+
"version": 2,
184186
"renamed-modules": {
185187
"@ember/-internals/browser-environment/index.js": "ember-source/@ember/-internals/browser-environment/index.js",
186188
"@ember/-internals/container/index.js": "ember-source/@ember/-internals/container/index.js",

0 commit comments

Comments
 (0)