Skip to content

Commit 276ca16

Browse files
mansonamansona
committed
try vite again
1 parent f50f4fe commit 276ca16

File tree

13 files changed

+1144
-717
lines changed

13 files changed

+1144
-717
lines changed

‎app/app.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
import Application from '@ember/application';
2+
import compatModules from '@embroider/core/entrypoint';
23
import Resolver from 'ember-resolver';
34
import loadInitializers from 'ember-load-initializers';
4-
import config from 'ember-api-docs/config/environment';
5+
import config from './config/environment';
56

67
import './deprecation-workflow';
8+
let d = window.define;
9+
10+
for (const [name, module] of Object.entries(compatModules)) {
11+
d(name, function () {
12+
return module;
13+
});
14+
}
715

816
export default class App extends Application {
917
modulePrefix = config.modulePrefix;

‎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('ember-api-docs');

‎app/index.html‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎babel.config.cjs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
let config;
2+
3+
// TODO - remove this once we have the better solution for injecting stage1 babel config into a real config file
4+
// this is needed because there are things (like ember-composible-helpers) that are now finding our babel config during
5+
// their stage1 build and historically they will never (99% of the time) have found any babel config.
6+
// we might need to keep something like this so that prebuild will never apply babel configs during stage1 i.e. a util
7+
// function that wraps your whole babel config
8+
if (
9+
process.env.EMBROIDER_PREBUILD ||
10+
process.env.EMBROIDER_TEST_SETUP_FORCE === 'classic'
11+
) {
12+
config = {};
13+
} else {
14+
config = require('./node_modules/.embroider/_babel_config_');
15+
}
16+
17+
module.exports = config;

‎ember-cli-build.js‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app');
44
const envIsProduction = process.env.EMBER_ENV === 'production';
55
const premberUrls = require('./prember-urls');
66
const nodeSass = require('node-sass');
7+
const { maybeEmbroider } = require('@embroider/test-setup');
78

89
module.exports = function (defaults) {
910
let app = new EmberApp(defaults, {
@@ -55,14 +56,5 @@ module.exports = function (defaults) {
5556
},
5657
});
5758

58-
const { Webpack } = require('@embroider/webpack');
59-
const appTree = require('@embroider/compat').compatBuild(app, Webpack, {
60-
staticAddonTrees: true,
61-
staticAddonTestSupportTrees: true,
62-
staticHelpers: true,
63-
staticModifiers: true,
64-
staticComponents: true,
65-
});
66-
67-
return require('prember').prerender(app, appTree);
59+
return maybeEmbroider(app);
6860
};

‎index.html‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>AppTemplate</title>
6+
<meta name="description" content="">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
9+
{{content-for "head"}}
10+
11+
<link integrity="" rel="stylesheet" href="/@embroider/core/vendor.css">
12+
<link integrity="" rel="stylesheet" href="/assets/ember-api-docs.css">
13+
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600" rel="stylesheet">
14+
15+
{{content-for "head-footer"}}
16+
</head>
17+
<body>
18+
{{content-for "body"}}
19+
20+
<script src="/@embroider/core/vendor.js"></script>
21+
<script type="module">
22+
import Application from './app/app';
23+
import environment from './app/config/environment';
24+
25+
Application.create(environment.APP);
26+
</script>
27+
28+
{{content-for "body-footer"}}
29+
</body>
30+
</html>

‎package.json‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
11
{
22
"name": "ember-api-docs",
3-
"version": "0.1.0",
3+
"version": "0.0.0",
44
"private": true,
55
"description": "Small description for ember-api-docs goes here",
6-
"repository": {
7-
"type": "git",
8-
"url": "https://github.com/ember-learn/ember-api-docs.git"
9-
},
6+
"repository": "",
107
"license": "MIT",
11-
"author": "Ember Learning Team and contributors",
8+
"author": "",
129
"directories": {
10+
"doc": "doc",
1311
"test": "tests"
1412
},
1513
"scripts": {
16-
"clone": "rm -rf ember-api-docs-data && git clone --depth=1 https://github.com/ember-learn/ember-api-docs-data.git",
17-
"build": "ember build --environment=production",
18-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
19-
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
14+
"build": "vite build",
15+
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
16+
"lint:css": "stylelint \"**/*.css\"",
17+
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
18+
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
2019
"lint:hbs": "ember-template-lint .",
2120
"lint:hbs:fix": "ember-template-lint . --fix",
2221
"lint:js": "eslint . --cache",
23-
"start:local": "API_HOST=http://localhost:5050 ember serve",
2422
"lint:js:fix": "eslint . --fix",
25-
"start": "ember serve",
26-
"test:browserstack": "node run-tests.js",
27-
"test:ember": "ember test"
23+
"start": "vite",
24+
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
25+
"test:ember": "vite build --mode test && ember test --path dist"
2826
},
2927
"devDependencies": {
3028
"@ember/optional-features": "^2.0.0",
3129
"@ember/test-helpers": "^2.6.0",
32-
"@embroider/compat": "^3.4.3",
33-
"@embroider/core": "^3.4.3",
30+
"@embroider/compat": "3.6.2-unstable.a691d39",
31+
"@embroider/config-meta-loader": "0.0.1-unstable.a691d39",
32+
"@embroider/core": "3.4.16-unstable.a691d39",
33+
"@embroider/test-setup": "4.0.1-unstable.a691d39",
34+
"@embroider/vite": "0.2.1-unstable.a691d39",
3435
"@embroider/webpack": "^3.2.1",
3536
"@glimmer/component": "^1.1.2",
3637
"@glimmer/tracking": "^1.1.2",
3738
"@glint/core": "^0.9.7",
3839
"@glint/environment-ember-loose": "^0.9.7",
3940
"@percy/cli": "^1.28.7",
4041
"@percy/ember": "^4.2.0",
42+
"@rollup/plugin-babel": "^6.0.4",
4143
"@tsconfig/ember": "^1.0.1",
4244
"@types/ember": "^4.0.2",
4345
"@types/ember-qunit": "^5.0.2",
@@ -59,37 +61,30 @@
5961
"bootstrap": "^4.6.2",
6062
"bourbon": "5.1.0",
6163
"bourbon-neat": "^1.9.1",
62-
"broccoli-asset-rev": "^3.0.0",
6364
"broccoli-funnel": "^2.0.1",
6465
"ember-a11y-testing": "^5.2.1",
6566
"ember-anchor": "^1.0.3",
6667
"ember-auto-import": "^2.7.2",
6768
"ember-cli": "~3.28.6",
68-
"ember-cli-app-version": "^5.0.0",
6969
"ember-cli-autoprefixer": "^1.0.0",
7070
"ember-cli-babel": "^7.26.10",
7171
"ember-cli-bourbon": "^2.0.1",
7272
"ember-cli-browserstack": "^1.0.1",
7373
"ember-cli-clipboard": "^1.1.0",
74-
"ember-cli-dependency-checker": "^3.2.0",
7574
"ember-cli-deploy": "^1.0.1",
7675
"ember-cli-deploy-build": "^1.1.0",
7776
"ember-cli-deploy-gzip": "^1.0.0",
7877
"ember-cli-deprecation-workflow": "^3.0.1",
7978
"ember-cli-document-title-northm": "^1.0.3",
80-
"ember-cli-fastboot": "^4.1.5",
8179
"ember-cli-htmlbars": "^6.1.1",
8280
"ember-cli-inject-live-reload": "^2.1.0",
8381
"ember-cli-meta-tags": "^7.0.0",
8482
"ember-cli-sass": "^10.0.1",
8583
"ember-cli-showdown": "^9.0.1",
86-
"ember-cli-terser": "^4.0.2",
8784
"ember-composable-helpers": "^3.1.1",
8885
"ember-concurrency": "^2.3.7",
8986
"ember-data": "~3.28.6",
90-
"ember-data-fastboot": "https://github.com/cardstack/ember-data-fastboot#6e6fb8bbf0b405ae174160cc1e4833c5582f68cd",
9187
"ember-export-application-global": "^2.0.1",
92-
"ember-fetch": "^8.1.1",
9388
"ember-inflector": "^4.0.3",
9489
"ember-load-initializers": "^2.1.2",
9590
"ember-maybe-import-regenerator": "^0.1.6",
@@ -132,7 +127,6 @@
132127
"node-sass": "^9.0.0",
133128
"normalize.css": "^8.0.1",
134129
"npm-run-all": "^4.1.5",
135-
"prember": "^2.1.0",
136130
"prettier": "^2.5.1",
137131
"qunit": "^2.17.2",
138132
"qunit-dom": "^1.6.0",
@@ -142,15 +136,13 @@
142136
"spawndamnit": "2.0.0",
143137
"testem": "^3.10.0",
144138
"typescript": "^4.9.3",
139+
"vite": "^5.4.3",
145140
"webpack": "^5.90.0"
146141
},
147142
"engines": {
148143
"node": "16.* || 18.* || 20.*",
149144
"npm": "7 || 8 || >= 9"
150145
},
151-
"cacheDirectories": [
152-
"node_modules"
153-
],
154146
"ember": {
155147
"edition": "octane"
156148
},
@@ -163,7 +155,13 @@
163155
"ember-addon": {
164156
"paths": [
165157
"lib/api-docs-data"
166-
]
158+
],
159+
"type": "app",
160+
"version": 2
161+
},
162+
"exports": {
163+
"./tests/*": "./tests/*",
164+
"./*": "./app/*"
167165
},
168166
"pnpm": {
169167
"overrides": {

0 commit comments

Comments
 (0)