Skip to content

Commit

Permalink
There is an actual issue
Browse files Browse the repository at this point in the history
  • Loading branch information
NullVoxPopuli committed Aug 6, 2024
1 parent 0182d25 commit 026a7d1
Show file tree
Hide file tree
Showing 7 changed files with 316 additions and 289 deletions.
5 changes: 1 addition & 4 deletions apps/repl/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ module.exports = function (environment) {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false,
},
EXTEND_PROTOTYPES: false,
},

APP: {
Expand Down
5 changes: 5 additions & 0 deletions apps/repl/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ module.exports = async function (defaults) {

let app = new EmberApp(defaults, config);

// Adds:
// - ember-template-compiler
// - @glimmer/syntax
// app.import('vendor/ember/ember-template-compiler.js');

const { Webpack } = require('@embroider/webpack');
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');

Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
"rollup",
"rsvp"
]
},
"patchedDependencies": {
"ember-source@5.10.0": "patches/ember-source@5.10.0.patch"
}
}
}
7 changes: 0 additions & 7 deletions packages/app-support/limber-ui/addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,8 @@
"prettier-plugin-ember-template-tag": "2.0.2",
"rollup": "^4.17.2",
"rollup-plugin-copy": "^3.5.0",
<<<<<<< HEAD
"typescript": "^5.4.5",
"webpack": "5.92.0"
||||||| parent of cbeaa507 (ember-source *really* needs to drop the peer on webpack)
"typescript": "^5.4.5"
=======
"typescript": "^5.4.5",
"webpack": "^5.92.1"
>>>>>>> cbeaa507 (ember-source *really* needs to drop the peer on webpack)
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down
2 changes: 2 additions & 0 deletions packages/ember-repl/addon/src/compile/formats/gjs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ async function preprocess(input: string, name: string): Promise<string> {
return processor.process(input, `${name}.js`);
}

console.log(compiler);

async function transform(
intermediate: string,
name: string,
Expand Down
34 changes: 34 additions & 0 deletions patches/ember-source@5.10.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/dist/ember-template-compiler.js b/dist/ember-template-compiler.js
index 6b97705af339ca7eef12ed2a5b6ebf587c3bdc50..36a2e115d193fe82ef0802394664058abfb2ef99 100644
--- a/dist/ember-template-compiler.js
+++ b/dist/ember-template-compiler.js
@@ -18734,29 +18734,6 @@ var define, require;
default: bootstrap
}, Symbol.toStringTag, { value: 'Module' });

- // Globals mode template compiler
- if (emberApp__namespace.default) {
- let Application = emberApp__namespace.default;
- let {
- hasTemplate,
- setTemplate
- } = emberGlimmer__namespace;
- let {
- hasDOM
- } = emberinternalsBrowserEnvironmentIndex;
- Application.initializer({
- name: 'domTemplates',
- initialize() {
- if (hasDOM) {
- bootstrap({
- context: document,
- hasTemplate,
- setTemplate
- });
- }
- }
- });
- }

const emberTemplateCompilerLibSystemInitializer = /*#__PURE__*/Object.defineProperty({
__proto__: null
549 changes: 271 additions & 278 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

0 comments on commit 026a7d1

Please sign in to comment.