From 5e4758db90724e6e97b34828f168eefdda422658 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 31 May 2024 14:47:40 -0400 Subject: [PATCH 1/2] add new config structure --- files/app/config/environment.js | 3 +++ index.js | 1 + 2 files changed, 4 insertions(+) create mode 100644 files/app/config/environment.js diff --git a/files/app/config/environment.js b/files/app/config/environment.js new file mode 100644 index 0000000..fad999a --- /dev/null +++ b/files/app/config/environment.js @@ -0,0 +1,3 @@ +import loadConfigFromMeta from '@embroider/config-meta-loader'; + +export default loadConfigFromMeta('<%= name %>'); diff --git a/index.js b/index.js index 27f230e..542fafe 100644 --- a/index.js +++ b/index.js @@ -32,6 +32,7 @@ module.exports = { '@embroider/vite@unstable', '@embroider/compat@unstable', '@embroider/test-setup@unstable', + '@embroider/config-meta-loader@unstable', 'vite', '@rollup/plugin-babel', ], From 88d7393fbffcf1822583ec774f64ec057876f937 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 31 May 2024 14:50:57 -0400 Subject: [PATCH 2/2] fix eslint config --- eslint.config.mjs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eslint.config.mjs b/eslint.config.mjs index 3d790b8..b207f35 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -7,6 +7,10 @@ export default [ files: ['**/*.js'], languageOptions: { sourceType: 'commonjs' }, }, + { + files: ['files/app/**/*.js'], + languageOptions: { sourceType: 'module' }, + }, { languageOptions: { globals: globals.node } }, pluginJs.configs.recommended, eslintPluginPrettierRecommended,