Skip to content

Commit ad8c528

Browse files
aklkvaklkv
committed
feat(showcase): vite
1 parent c62e2b4 commit ad8c528

File tree

16 files changed

+829
-359
lines changed

16 files changed

+829
-359
lines changed

‎pnpm-lock.yaml‎

Lines changed: 617 additions & 222 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>

‎showcase/package.json‎

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010
},
1111
"license": "MPL-2.0",
1212
"author": "HashiCorp Design Systems <[email protected]>",
13+
"exports": {
14+
"./tests/*": "./tests/*",
15+
"./*": "./app/*"
16+
},
1317
"directories": {
1418
"test": "tests"
1519
},
1620
"scripts": {
17-
"build": "pnpm build:packages && ember build --environment=production",
21+
"build": "pnpm build:packages && vite build",
1822
"build:packages": "pnpm -F @hashicorp/design-system-components build",
1923
"format": "prettier . --cache --write",
2024
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\" --prefixColors auto",
@@ -27,18 +31,20 @@
2731
"lint:js": "eslint . --cache",
2832
"lint:js:fix": "eslint . --fix",
2933
"lint:types": "glint",
30-
"start": "pnpm build:packages && ember serve",
34+
"start": "pnpm build:packages && vite",
3135
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
32-
"test:ember": "pnpm build:packages && ember test",
33-
"test:ember-compatibility": "ember try:each",
34-
"test:ember:percy": "percy exec ember test",
3536
"test:a11y": "pnpm build:packages && ENABLE_A11Y_AUDIT=true ember test --server -f=\"Acceptance\"",
36-
"test:a11y-report": "pnpm build:packages && ENABLE_A11Y_AUDIT=true ENABLE_A11Y_MIDDLEWARE_REPORTER=true ember test -f=\"Acceptance\""
37+
"test:a11y-report": "pnpm build:packages && ENABLE_A11Y_AUDIT=true ENABLE_A11Y_MIDDLEWARE_REPORTER=true ember test -f=\"Acceptance\"",
38+
"test:ember": "vite build --mode test && ember test --path dist",
39+
"test:ember-compatibility": "ember try:each",
40+
"test:ember:percy": "percy exec ember test"
3741
},
3842
"devDependencies": {
3943
"@babel/core": "^7.27.1",
4044
"@babel/eslint-parser": "^7.27.1",
41-
"@babel/plugin-proposal-decorators": "^7.27.1",
45+
"@babel/plugin-transform-runtime": "^7.28.3",
46+
"@babel/plugin-transform-typescript": "^7.27.1",
47+
"@babel/runtime": "^7.27.1",
4248
"@codemirror/lint": "^6.8.4",
4349
"@codemirror/state": "^6.5.0",
4450
"@codemirror/view": "^6.36.2",
@@ -47,8 +53,14 @@
4753
"@ember/string": "^4.0.1",
4854
"@ember/test-helpers": "^5.2.1",
4955
"@ember/test-waiters": "^3.1.0",
50-
"@embroider/macros": "^1.18.1",
56+
"@embroider/compat": "^4.1.10",
57+
"@embroider/config-meta-loader": "^1.0.0",
58+
"@embroider/core": "^4.2.8",
59+
"@embroider/legacy-inspector-support": "^0.1.3",
60+
"@embroider/macros": "^1.19.4",
61+
"@embroider/router": "^3.0.5",
5162
"@embroider/test-setup": "^4.0.0",
63+
"@embroider/vite": "^1.4.2",
5264
"@eslint/js": "^9.27.0",
5365
"@floating-ui/dom": "^1.6.12",
5466
"@glimmer/component": "^2.0.0",
@@ -61,46 +73,42 @@
6173
"@hashicorp/design-system-tokens": "workspace:*",
6274
"@nullvoxpopuli/ember-composable-helpers": "^5.2.11",
6375
"@percy/cli": "^1.30.5",
64-
"@percy/ember": "^4.2.0",
76+
"@percy/ember": "^5.0.0",
77+
"@rollup/plugin-babel": "^6.0.4",
6578
"@tsconfig/ember": "^3.0.10",
6679
"@types/qunit": "^2.19.12",
6780
"@types/rsvp": "^4.0.9",
6881
"@types/sinon": "^17.0.4",
69-
"broccoli-asset-rev": "^3.0.0",
82+
"babel-plugin-ember-template-compilation": "^2.4.1",
7083
"concurrently": "^9.1.2",
84+
"decorator-transforms": "^2.3.0",
7185
"ember-a11y-testing": "^7.1.2",
7286
"ember-auto-import": "^2.10.0",
7387
"ember-basic-dropdown": "^8.6.1",
7488
"ember-body-class": "^3.0.0",
7589
"ember-cli": "~6.5.0",
7690
"ember-cli-app-version": "^7.0.0",
7791
"ember-cli-babel": "^8.2.0",
78-
"ember-cli-clean-css": "^3.0.0",
79-
"ember-cli-dependency-checker": "^3.3.3",
8092
"ember-cli-deprecation-workflow": "^3.3.0",
8193
"ember-cli-htmlbars": "^6.3.0",
82-
"ember-cli-inject-live-reload": "^2.1.0",
8394
"ember-cli-sass": "^11.0.1",
84-
"ember-cli-sri": "^2.1.1",
8595
"ember-cli-string-helpers": "^8.0.1",
8696
"ember-cli-string-utils": "^1.1.0",
87-
"ember-cli-terser": "^4.0.2",
88-
"ember-concurrency": "^4.0.4",
97+
"ember-concurrency": "^4.0.2",
8998
"ember-deep-tracked": "^2.0.1",
9099
"ember-intl": "^7.3.0",
91100
"ember-load-initializers": "^3.0.1",
92-
"ember-math-helpers": "^5.0.0",
93-
"ember-modifier": "^4.2.2",
94-
"ember-page-title": "^9.0.2",
95-
"ember-power-select": "^8.7.1",
101+
"ember-math-helpers": "^3.0.0",
102+
"ember-modifier": "^4.2.0",
103+
"ember-page-title": "^8.2.3",
104+
"ember-power-select": "^8.6.2",
96105
"ember-qunit": "^9.0.3",
97-
"ember-resolver": "^13.1.1",
106+
"ember-resolver": "^13.1.0",
98107
"ember-router-generator": "^2.0.0",
99108
"ember-set-helper": "^3.0.1",
100109
"ember-source": "~6.5.0",
101110
"ember-source-channel-url": "^3.0.0",
102111
"ember-style-modifier": "^4.4.0",
103-
"ember-template-imports": "^4.3.0",
104112
"ember-template-lint": "^7.7.0",
105113
"ember-truth-helpers": "^4.0.3",
106114
"ember-try": "^4.0.0",
@@ -111,7 +119,6 @@
111119
"eslint-plugin-qunit": "^8.1.2",
112120
"fs-extra": "^11.3.0",
113121
"globals": "^16.1.0",
114-
"loader.js": "^4.7.0",
115122
"postcss": "^8.5.3",
116123
"prettier": "^3.5.3",
117124
"prettier-plugin-ember-template-tag": "^2.0.5",
@@ -126,16 +133,16 @@
126133
"tracked-built-ins": "^4.0.0",
127134
"typescript": "^5.8.3",
128135
"typescript-eslint": "^8.32.1",
129-
"webpack": "^5.99.9"
136+
"vite": "^6.3.5"
130137
},
131138
"engines": {
132139
"node": ">= 22"
133140
},
134141
"ember": {
135142
"edition": "octane"
136143
},
137-
"exports": {
138-
"./tests/*": "./tests/*",
139-
"./*": "./app/*"
144+
"ember-addon": {
145+
"type": "app",
146+
"version": 2
140147
}
141148
}

0 commit comments

Comments
 (0)