Skip to content

Commit

Permalink
Fix site mode types to be consistently "amp" | "default"
Browse files Browse the repository at this point in the history
  • Loading branch information
michalczaplinski committed May 27, 2021
1 parent 566ded9 commit 2d2ca82
Show file tree
Hide file tree
Showing 38 changed files with 411 additions and 359 deletions.
6 changes: 3 additions & 3 deletions packages/file-settings/src/__tests__/getAllSites.tests.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import getAllSites from "../getAllSites";
import * as importSettings from "../importSettings";
import mockedMonoSettings from "./mocks/getAllSites/monoSettings.json";
import mockedMultiSettings from "./mocks/getAllSites/multiSettings.json";
import mockedDeactivatedPackage from "./mocks/getAllSites/deactivatedPackage.json";
import mockedMonoSettings from "./mocks/getAllSites/monoSettings";
import mockedMultiSettings from "./mocks/getAllSites/multiSettings";
import mockedDeactivatedPackage from "./mocks/getAllSites/deactivatedPackage";

jest.mock("../importSettings");

Expand Down
10 changes: 5 additions & 5 deletions packages/file-settings/src/__tests__/getSettings.tests.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import getSettings from "../getSettings";
import * as importSettings from "../importSettings";
import mockedMonoSettings from "./mocks/getSettings/monoSettings.json";
import mockedSettingsWithLengthOne from "./mocks/getSettings/settingsWithLengthOne.json";
import mockedSettingsWithNames from "./mocks/getSettings/settingsWithNames.json";
import mockedSettingsWithOneMatch from "./mocks/getSettings/settingsWithOneMatch.json";
import mockedSettingsWithMatches from "./mocks/getSettings/settingsWithMatches.json";
import mockedMonoSettings from "./mocks/getSettings/monoSettings";
import mockedSettingsWithLengthOne from "./mocks/getSettings/settingsWithLengthOne";
import mockedSettingsWithNames from "./mocks/getSettings/settingsWithNames";
import mockedSettingsWithOneMatch from "./mocks/getSettings/settingsWithOneMatch";
import mockedSettingsWithMatches from "./mocks/getSettings/settingsWithMatches";

jest.mock("../importSettings");

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export default [
{
name: "mono-settings",
mode: "default" as const,
state: {},
packages: [
{
name: "@frontity/theme",
active: true,
state: {},
},
{
name: "@frontity/wp-source",
active: false,
state: {},
},
],
},
];

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export default [
{
name: "mono-settings",
mode: "default" as const,
state: {},
packages: [
{
name: "@frontity/theme",
active: true,
state: {},
},
{
name: "@frontity/wp-source",
active: true,
state: {},
},
],
},
];

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
export default [
{
name: "settings-default",
mode: "default" as const,
state: {},
packages: [
{
name: "@frontity/theme-default",
active: true,
state: {},
},
{
name: "@frontity/wp-source-default",
active: true,
state: {},
},
],
},
{
name: "settings-amp",
mode: "amp" as const,
state: {},
packages: [
{
name: "@frontity/theme-amp",
active: true,
state: {},
},
{
name: "@frontity/wp-source-amp",
active: true,
state: {},
},
],
},
];

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export default [
{
name: "mono-settings",
mode: "default" as const,
state: {},
packages: [
{
name: "@frontity/theme",
active: true,
state: {},
},
],
},
];

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export default [
{
name: "settings-with-length-one",
mode: "default" as const,
state: {},
packages: [],
},
];

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
export default [
{
name: "settings-with-short-match",
mode: "default" as const,
state: {},
match: ["https://frontity.org.*"],
packages: [],
},
{
name: "settings-with-large-match",
mode: "default" as const,
state: {},
match: ["https://frontity.org/page/.*"],
packages: [],
},
];

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export default [
{
name: "settings-one",
mode: "default" as const,
state: {},
packages: [],
},
{
name: "settings-two",
mode: "default" as const,
state: {},
packages: [],
},
];

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export default [
{
name: "settings-without-match",
mode: "default" as const,
state: {},
packages: [],
},
{
name: "settings-with-match",
mode: "default" as const,
match: ["https://frontity.org.*/amp/?$"],
state: {},
packages: [],
},
];

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export default [
{
name: "mono-settings",
mode: "amp" as const,
state: {},
packages: [
{
name: "@frontity/theme",
active: true,
state: {},
},
{
name: "@frontity/wp-source",
active: true,
state: {},
},
],
},
];

0 comments on commit 2d2ca82

Please sign in to comment.