Skip to content

Commit

Permalink
feat: support for esm of quasar.config.js
Browse files Browse the repository at this point in the history
  • Loading branch information
dongwa committed Aug 10, 2023
1 parent b1d747a commit 4954d05
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 19 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"consola": "^2.15.3",
"execa": "5.1.1",
"fs-extra": "^10.1.0",
"jiti": "^1.13.0"
"jiti": "^1.19.1"
},
"standard-version": {
"skip": {
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 12 additions & 7 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -214,24 +214,29 @@ export function getQuasarConfig(
quasarConfigName = './quasar.config.js'
): QuasarConfiguration {
const load = jiti(rootDir);
let quasarConfigFile = load(quasarConfigName)({

let quasarConfigModule = load(quasarConfigName);
if (quasarConfigModule.default)
quasarConfigModule = quasarConfigModule.default;

let quasarConfig = quasarConfigModule({
dev: false,
prod: true,
});
quasarConfigFile = quasarConfigFile.default || quasarConfigFile;

for (let key in defaultQuasarConfig.build) {
if (!quasarConfigFile.build[key])
quasarConfigFile.build[key] =
if (!quasarConfig.build[key])
quasarConfig.build[key] =
defaultQuasarConfig.build[
key as keyof typeof defaultQuasarConfig['build']
];
}
for (let key in defaultQuasarConfig.ssr) {
if (!quasarConfigFile.ssr[key])
quasarConfigFile.ssr[key] =
if (!quasarConfig.ssr[key])
quasarConfig.ssr[key] =
defaultQuasarConfig.ssr[key as keyof typeof defaultQuasarConfig['ssr']];
}
return quasarConfigFile;
return quasarConfig;
}

export function getNuxtConfigName(rootDir: string): string {
Expand Down
14 changes: 7 additions & 7 deletions tests/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { add, multi } from '../src';
import { getQuasarConfig } from '../src/utils';

let [a, b] = [Math.random(), Math.random()];
it('add', () => {
expect(add(a, b)).toEqual(a + b);
});
it('getQuasarConfig', () => {
// const testPro = '/Users/lin/Code/repo/quasar-docs-cn';
const testPro = '/Users/lin/Code/test/qua/quasar-vite';
const res = getQuasarConfig(testPro);

it('mulit', () => {
expect(multi(a, b)).toBe(a * b);
console.log('res', res);
expect(res).not.toBeNull();
});

0 comments on commit 4954d05

Please sign in to comment.