Skip to content

Commit 07e7c5b

Browse files
committed
feat(showcase): vite
temp test fixes fix(showcase): add ember-inspector support cleanup after rebase
1 parent c5066a0 commit 07e7c5b

File tree

21 files changed

+827
-359
lines changed

21 files changed

+827
-359
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
"pnpm": {
2828
"overrides": {
2929
"@glimmer/component": "^2.0.0",
30-
"ember-composable-helpers": "npm:@nullvoxpopuli/ember-composable-helpers@^5.2.11"
30+
"ember-composable-helpers": "npm:@nullvoxpopuli/ember-composable-helpers@^5.2.11",
31+
"ember-get-config": "git://github.com/mansona/ember-get-config.git#config-meta-loader"
3132
},
3233
"patchedDependencies": {
3334
"broccoli-asset-rewrite": "patches/broccoli-asset-rewrite.patch"

pnpm-lock.yaml

Lines changed: 606 additions & 220 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

showcase/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/tmp/
2+
13
# compiled output
24
/dist/
35
/declarations/

showcase/app/app.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,21 @@
66
import Application from '@ember/application';
77
import Resolver from 'ember-resolver';
88
import loadInitializers from 'ember-load-initializers';
9+
import compatModules from '@embroider/virtual/compat-modules';
910
import config from 'showcase/config/environment';
10-
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
11+
import { isDevelopingApp, macroCondition } from '@embroider/macros';
12+
import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
1113

1214
if (macroCondition(isDevelopingApp())) {
13-
importSync('./deprecation-workflow');
15+
await import('./deprecation-workflow');
1416
}
1517

1618
export default class App extends Application {
1719
modulePrefix = config.modulePrefix;
1820
podModulePrefix = config.podModulePrefix;
19-
Resolver = Resolver;
21+
Resolver = Resolver.withModules(compatModules);
22+
23+
inspector = setupInspector(this);
2024
}
2125

22-
loadInitializers(App, config.modulePrefix);
26+
loadInitializers(App, config.modulePrefix, compatModules);

showcase/app/config/environment.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import loadConfigFromMeta from '@embroider/config-meta-loader';
2+
3+
export default loadConfigFromMeta('showcase');

showcase/app/router.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: MPL-2.0
44
*/
55

6-
import EmberRouter from '@ember/routing/router';
6+
import EmberRouter from '@embroider/router';
77
import config from 'showcase/config/environment';
88

99
export default class Router extends EmberRouter {

showcase/babel.config.cjs

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
const {
2+
babelCompatSupport,
3+
templateCompatSupport,
4+
} = require('@embroider/compat/babel');
5+
6+
module.exports = {
7+
plugins: [
8+
[
9+
'@babel/plugin-transform-typescript',
10+
{
11+
allExtensions: true,
12+
onlyRemoveTypeImports: true,
13+
allowDeclareFields: true,
14+
},
15+
],
16+
[
17+
'babel-plugin-ember-template-compilation',
18+
{
19+
compilerPath: 'ember-source/dist/ember-template-compiler.js',
20+
enableLegacyModules: [
21+
'ember-cli-htmlbars',
22+
'ember-cli-htmlbars-inline-precompile',
23+
'htmlbars-inline-precompile',
24+
],
25+
transforms: [...templateCompatSupport()],
26+
},
27+
],
28+
[
29+
'module:decorator-transforms',
30+
{
31+
runtime: {
32+
import: require.resolve('decorator-transforms/runtime-esm'),
33+
},
34+
},
35+
],
36+
[
37+
'@babel/plugin-transform-runtime',
38+
{
39+
absoluteRuntime: __dirname,
40+
useESModules: true,
41+
regenerator: false,
42+
},
43+
],
44+
...babelCompatSupport(),
45+
],
46+
47+
generatorOpts: {
48+
compact: false,
49+
},
50+
};

showcase/ember-cli-build.js

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
*/
55

66
'use strict';
7-
87
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
98

10-
module.exports = function (defaults) {
9+
const { compatBuild } = require('@embroider/compat');
10+
11+
module.exports = async function (defaults) {
12+
const { buildOnce } = await import('@embroider/vite');
13+
1114
const app = new EmberApp(defaults, {
1215
'ember-cli-babel': {
1316
enableTypeScriptTransform: true,
@@ -37,15 +40,5 @@ module.exports = function (defaults) {
3740
behave. You most likely want to be modifying `./index.js` or app's build file
3841
*/
3942

40-
const { maybeEmbroider } = require('@embroider/test-setup');
41-
return maybeEmbroider(app, {
42-
skipBabel: [
43-
{
44-
package: 'qunit',
45-
},
46-
{
47-
package: '@hashicorp/flight-icons',
48-
},
49-
],
50-
});
43+
return compatBuild(app, buildOnce);
5144
};

showcase/eslint.config.mjs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,6 @@ const parserOptions = {
3535
js: {
3636
ecmaFeatures: { modules: true },
3737
ecmaVersion: 'latest',
38-
requireConfigFile: false,
39-
babelOptions: {
40-
plugins: [
41-
[
42-
'@babel/plugin-proposal-decorators',
43-
{ decoratorsBeforeExport: true },
44-
],
45-
],
46-
},
4738
},
4839
ts: {
4940
projectService: true,
@@ -109,10 +100,8 @@ export default ts.config(
109100
files: [
110101
'**/*.cjs',
111102
'config/**/*.js',
112-
'tests/dummy/config/**/*.js',
113103
'testem.js',
114104
'testem*.js',
115-
'index.js',
116105
'.prettierrc.js',
117106
'.stylelintrc.js',
118107
'.template-lintrc.js',

showcase/app/index.html renamed to showcase/index.html

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
{{content-for "head"}}
1616

17-
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
18-
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/showcase.css">
17+
<link integrity="" rel="stylesheet" href="/@embroider/virtual/vendor.css">
18+
<link integrity="" rel="stylesheet" href="/@embroider/virtual/app.css">
1919

2020
<link rel="shortcut icon" href="/assets/logos/favicon.png" />
2121

@@ -24,8 +24,13 @@
2424
<body class="showcase-app">
2525
{{content-for "body"}}
2626

27-
<script src="{{rootURL}}assets/vendor.js"></script>
28-
<script src="{{rootURL}}assets/showcase.js"></script>
27+
<script src="/@embroider/virtual/vendor.js"></script>
28+
<script type="module">
29+
import Application from './app/app';
30+
import environment from './app/config/environment';
31+
32+
Application.create(environment.APP);
33+
</script>
2934

3035
{{content-for "body-footer"}}
3136
</body>

0 commit comments

Comments
 (0)