Skip to content

Commit 89902bf

Browse files
committed
feat(showcase): vite
1 parent 39fcb55 commit 89902bf

File tree

19 files changed

+1192
-451
lines changed

19 files changed

+1192
-451
lines changed

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@
2525
},
2626
"pnpm": {
2727
"overrides": {
28-
"ember-composable-helpers": "npm:@nullvoxpopuli/ember-composable-helpers@^5.2.9"
28+
"ember-composable-helpers": "npm:@nullvoxpopuli/ember-composable-helpers@^5.2.9",
29+
"ember-get-config": "git://github.com/mansona/ember-get-config.git#config-meta-loader"
2930
},
3031
"patchedDependencies": {
3132
"@embroider/core": "patches/@embroider__core.patch",
3233
"@glint/environment-ember-loose": "patches/@glint__environment-ember-loose.patch",
33-
"broccoli-asset-rewrite": "patches/broccoli-asset-rewrite.patch"
34+
"broccoli-asset-rewrite": "patches/broccoli-asset-rewrite.patch",
35+
"@embroider/[email protected]": "patches/@[email protected]"
3436
}
3537
}
3638
}

packages/flight-icons/svg-sprite/svg-sprite-module.js

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

patches/@[email protected]

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
diff --git a/dist/src/app-files.js b/dist/src/app-files.js
2+
index 924a11241f9e6584fee5aba793e9cd86ea6d708f..6822e87bba314adeacee240964fd6f3317349088 100644
3+
--- a/dist/src/app-files.js
4+
+++ b/dist/src/app-files.js
5+
@@ -74,10 +74,10 @@ class AppFiles {
6+
}
7+
continue;
8+
}
9+
- if (relativePath.startsWith('templates/components/')) {
10+
- components.push(relativePath);
11+
- continue;
12+
- }
13+
+ // if (relativePath.startsWith('templates/components/')) {
14+
+ // components.push(relativePath);
15+
+ // continue;
16+
+ // }
17+
if (relativePath.startsWith('helpers/')) {
18+
helpers.push(relativePath);
19+
continue;
20+
diff --git a/dist/src/module-resolver.js b/dist/src/module-resolver.js
21+
index b9a779995bd8a08fa86d47a0ea77c7b394a1a2bd..2206395627189588033a849505d5e074b9cbb458 100644
22+
--- a/dist/src/module-resolver.js
23+
+++ b/dist/src/module-resolver.js
24+
@@ -479,7 +479,7 @@ class Resolver {
25+
.rehome((0, path_1.resolve)(inEngine.root, 'package.json')));
26+
}
27+
*componentTemplateCandidates(inPackageName) {
28+
- yield { prefix: '/templates/components/', suffix: '' };
29+
+ // yield { prefix: '/templates/components/', suffix: '' };
30+
yield { prefix: '/components/', suffix: '/template' };
31+
let pods = this.podPrefix(inPackageName);
32+
if (pods) {

pnpm-lock.yaml

Lines changed: 798 additions & 173 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: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
import Application from '@ember/application';
77
import Resolver from 'ember-resolver';
88
import loadInitializers from 'ember-load-initializers';
9-
import config from 'showcase/config/environment';
9+
import config from './config/environment';
10+
11+
import compatModules from '@embroider/virtual/compat-modules';
1012

1113
export default class App extends Application {
1214
modulePrefix = config.modulePrefix;
1315
podModulePrefix = config.podModulePrefix;
14-
Resolver = Resolver;
16+
Resolver = Resolver.withModules(compatModules);
1517
}
1618

17-
loadInitializers(App, config.modulePrefix);
19+
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/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 & 10 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,12 +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-
});
43+
return compatBuild(app, buildOnce);
4844
};

showcase/eslint.config.mjs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@ const parserOptions = {
3030
js: {
3131
ecmaFeatures: { modules: true },
3232
ecmaVersion: 'latest',
33-
requireConfigFile: false,
34-
babelOptions: {
35-
plugins: [
36-
[
37-
'@babel/plugin-proposal-decorators',
38-
{ decoratorsBeforeExport: true },
39-
],
40-
],
41-
},
4233
},
4334
ts: {
4435
projectService: true,
@@ -104,10 +95,8 @@ export default ts.config(
10495
files: [
10596
'**/*.cjs',
10697
'config/**/*.js',
107-
'tests/dummy/config/**/*.js',
10898
'testem.js',
10999
'testem*.js',
110-
'index.js',
111100
'.prettierrc.js',
112101
'.stylelintrc.js',
113102
'.template-lintrc.js',

0 commit comments

Comments
 (0)