Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(cli): [STENCIL-33] Writing and Reading the Ionic config file #2963

Merged
merged 16 commits into from
Jul 23, 2021
Merged

feat(cli): [STENCIL-33] Writing and Reading the Ionic config file #2963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
744c9a2
feat(cli): [STENCIL-33] Writing and Reading the Ionic config file
splitinfinities Jul 13, 2021
95b1c91
Adding feedback from Ryan and Lars
splitinfinities Jul 14, 2021
2870645
Update src/cli/ionic-config.ts
splitinfinities Jul 15, 2021
f9c2695
Update src/cli/telemetry/test/helpers.spec.ts
splitinfinities Jul 15, 2021
5522419
Incorporating feedback from Ryan
splitinfinities Jul 15, 2021
74b8c40
Continue to remove external Deps
splitinfinities Jul 15, 2021
614b0e9
Fixing missed type
splitinfinities Jul 15, 2021
c2271df
Update src/cli/telemetry/test/helpers.spec.ts
splitinfinities Jul 15, 2021
866151c
Update src/cli/telemetry/helpers.ts
splitinfinities Jul 15, 2021
71bbea0
Adding tests for isInteractive
splitinfinities Jul 15, 2021
2dd693f
Switching to internal sys calls instead of using packages. Adding sin…
splitinfinities Jul 16, 2021
13994a6
Update src/cli/telemetry/test/helpers.spec.ts
splitinfinities Jul 21, 2021
8a40ef6
Feedback from Ryan
splitinfinities Jul 21, 2021
2582e3a
Feedback from Ryan
splitinfinities Jul 21, 2021
e5c0313
Feedback from Ryan
splitinfinities Jul 21, 2021
f29642d
Updating the process calls to route through the abstration.
splitinfinities Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/cli/ionic-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import { getCompilerSystem } from './state/stencil-cli-config';
import { readJson, uuidv4 } from './telemetry/helpers';

export const DEFAULT_CONFIG = (file: boolean = false) => {
return getCompilerSystem().resolvePath(`${getCompilerSystem().homeDir()}/.ionic${file ? '/config.json' : ''}`);
};
export const default_config = () =>
rwaskiewicz marked this conversation as resolved.
Show resolved Hide resolved
getCompilerSystem().resolvePath(`${getCompilerSystem().homeDir()}/.ionic/config.json`);

export const default_config_directory = () =>
getCompilerSystem().resolvePath(`${getCompilerSystem().homeDir()}/.ionic`);

export interface TelemetryConfig {
'telemetry.stencil'?: boolean;
'tokens.telemetry'?: string;
}

export async function readConfig(): Promise<TelemetryConfig> {
let config: TelemetryConfig = await readJson(DEFAULT_CONFIG(true));
let config: TelemetryConfig = await readJson(default_config());

if (!config) {
config = {
Expand All @@ -27,10 +29,10 @@ export async function readConfig(): Promise<TelemetryConfig> {

export async function writeConfig(config: TelemetryConfig): Promise<void> {
try {
await getCompilerSystem().createDir(DEFAULT_CONFIG(), { recursive: true });
await getCompilerSystem().writeFile(DEFAULT_CONFIG(true), JSON.stringify(config));
await getCompilerSystem().createDir(default_config_directory(), { recursive: true });
await getCompilerSystem().writeFile(default_config(), JSON.stringify(config));
} catch (error) {
console.error(`Stencil Telemetry: couldn't write configuration file to ${DEFAULT_CONFIG(true)} - ${error}.`);
console.error(`Stencil Telemetry: couldn't write configuration file to ${default_config()} - ${error}.`);
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/cli/test/ionic-config.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mockLogger } from '@stencil/core/testing';
import { getCompilerSystem, initializeStencilCLIConfig } from '../state/stencil-cli-config';
import { readConfig, writeConfig, updateConfig, DEFAULT_CONFIG } from '../ionic-config';
import { readConfig, writeConfig, updateConfig, default_config } from '../ionic-config';
import { createSystem } from '../../compiler/sys/stencil-sys';

describe('readConfig', () => {
Expand All @@ -11,13 +11,13 @@ describe('readConfig', () => {
});

it('should create a file if it does not exist', async () => {
let result = await getCompilerSystem().stat(DEFAULT_CONFIG(true));
let result = await getCompilerSystem().stat(default_config());

if (result.isFile) {
await getCompilerSystem().removeFile(DEFAULT_CONFIG(true));
await getCompilerSystem().removeFile(default_config());
}

result = await getCompilerSystem().stat(DEFAULT_CONFIG(true));
result = await getCompilerSystem().stat(default_config());

expect(result.isFile).toBe(false);

Expand All @@ -29,7 +29,7 @@ describe('readConfig', () => {
it('should read a file if it exists', async () => {
await writeConfig({ 'telemetry.stencil': true, 'tokens.telemetry': '12345' });

let result = await getCompilerSystem().stat(DEFAULT_CONFIG(true));
let result = await getCompilerSystem().stat(default_config());

expect(result.isFile).toBe(true);

Expand All @@ -51,7 +51,7 @@ describe('updateConfig', () => {
it('should edit a file', async () => {
await writeConfig({ 'telemetry.stencil': true, 'tokens.telemetry': '12345' });

let result = await getCompilerSystem().stat(DEFAULT_CONFIG(true));
let result = await getCompilerSystem().stat(default_config());

expect(result.isFile).toBe(true);

Expand Down