Skip to content

Commit

Permalink
Setup vite: is broke
Browse files Browse the repository at this point in the history
  • Loading branch information
NullVoxPopuli committed Mar 29, 2024
1 parent ed743db commit c7e0a28
Show file tree
Hide file tree
Showing 7 changed files with 483 additions and 289 deletions.
4 changes: 4 additions & 0 deletions docs-app/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// eslint-disable-next-line n/no-missing-require
let config = require('./node_modules/.embroider/rewritten-app/_babel_config_');

module.exports = config;
5 changes: 5 additions & 0 deletions docs-app/ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

const EmberApp = require('ember-cli/lib/broccoli/ember-app');
const { prebuild } = require('@embroider/compat');

module.exports = async function (defaults) {
const app = new EmberApp(defaults, {
Expand All @@ -13,6 +14,10 @@ module.exports = async function (defaults) {
},
});

if (!process.env.WEBPACK) {
return prebuild(app);
}

const { Webpack } = require('@embroider/webpack');

const { kolay } = await import('kolay/webpack');
Expand Down
16 changes: 10 additions & 6 deletions docs-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@
"lint:js:fix": "eslint . --fix",
"lint:prettier": "prettier . --check",
"lint:prettier:fix": "prettier . --write",
"start": "concurrently 'ember serve' 'pnpm _syncPnpm --watch' --names 'serve,sync'",
"start:vite": "vite",
"start:webpack": "WEBPACK=true concurrently 'ember serve' 'pnpm _syncPnpm --watch' --names 'serve,sync'",
"_syncPnpm": "DEBUG=* pnpm sync-dependencies-meta-injected",
"test:ember": "ember test"
"test:ember:webpack": "WEBPACK=true ember test"
},
"devDependencies": {
"@babel/core": "^7.23.6",
Expand All @@ -34,9 +35,9 @@
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
"@ember/test-waiters": "^3.1.0",
"@embroider/compat": "^3.4.3",
"@embroider/core": "^3.4.3",
"@embroider/webpack": "^3.2.1",
"@embroider/compat": "3.4.6-unstable.bdb7f3d",
"@embroider/core": "3.4.6-unstable.bdb7f3d",
"@embroider/webpack": "3.2.3-unstable.bdb7f3d",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@glint/core": "^1.3.0",
Expand Down Expand Up @@ -96,6 +97,8 @@
"extends": "../package.json"
},
"dependencies": {
"@embroider/vite": "0.2.1-unstable.bdb7f3d",
"@rollup/plugin-babel": "^6.0.4",
"@shikijs/rehype": "^1.1.7",
"@universal-ember/kolay-ui": "workspace:^",
"@universal-ember/test-support": "^0.2.0",
Expand All @@ -107,7 +110,8 @@
"ember-route-template": "^1.0.3",
"kolay": "workspace:^",
"reactiveweb": "^1.2.1",
"shiki": "^1.1.7"
"shiki": "^1.1.7",
"vite": "^5.1.3"
},
"dependenciesMeta": {
"kolay": {
Expand Down
59 changes: 59 additions & 0 deletions docs-app/vite.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import { defineConfig } from "vite";
import { resolver, hbs, scripts, templateTag, optimizeDeps, compatPrebuild } from "@embroider/vite";
import { resolve } from "path";
import { babel } from "@rollup/plugin-babel";

const root = "node_modules/.embroider/rewritten-app";

import { kolay } from "kolay/vite";

export default defineConfig({
root,
// esbuild in vite does not support decorators
esbuild: false,
cacheDir: resolve("node_modules", ".vite"),
plugins: [
// Ember standard plugins
hbs(),
templateTag(),
scripts(),
resolver(),
compatPrebuild(),
kolay({
src: "public/docs",
groups: [
{
name: "Runtime",
src: "../ui/docs",
},
],
packages: ["kolay"],
}),

babel({
babelHelpers: "runtime",

// this needs .hbs because our hbs() plugin above converts them to
// javascript but the javascript still also needs babel, but we don't want
// to rename them because vite isn't great about knowing how to hot-reload
// them if we resolve them to made-up names.
extensions: [".gjs", ".js", ".hbs", ".ts", ".gts"],
}),
],
optimizeDeps: optimizeDeps(),
server: {
port: 4200,
watch: {
ignored: ["!**/node_modules/.embroider/rewritten-app/**"],
},
},
build: {
outDir: resolve(process.cwd(), "dist"),
rollupOptions: {
input: {
main: resolve(root, "index.html"),
tests: resolve(root, "tests/index.html"),
},
},
},
});
17 changes: 16 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,22 @@
"overrides": {
"@ember/test-waiters": "^3.1.0",
"webpack": "^5.90.3",
"ember-repl": "^4.1.1"
"ember-repl": "^4.1.1",
"@embroider/addon-dev": "4.2.2-unstable.bdb7f3d",
"@embroider/addon-shim": "1.8.8-unstable.bdb7f3d",
"@embroider/babel-loader-9": "3.1.2-unstable.bdb7f3d",
"@embroider/broccoli-side-watch": "0.0.2-unstable.bdb7f3d",
"@embroider/core": "3.4.6-unstable.bdb7f3d",
"@embroider/compat": "3.4.6-unstable.bdb7f3d",
"@embroider/macros": "1.14.1-unstable.bdb7f3d",
"@embroider/hbs-loader": "3.0.4-unstable.bdb7f3d",
"@embroider/reverse-exports": "0.1.1-unstable.bdb7f3d",
"@embroider/router": "2.1.7-unstable.bdb7f3d",
"@embroider/shared-internals": "2.5.3-unstable.bdb7f3d",
"@embroider/test-setup": "3.0.4-unstable.bdb7f3d",
"@embroider/util": "1.12.2-unstable.bdb7f3d",
"@embroider/vite": "0.2.1-unstable.bdb7f3d",
"@embroider/webpack": "3.2.3-unstable.bdb7f3d"
}
},
"volta": {
Expand Down
Loading

0 comments on commit c7e0a28

Please sign in to comment.