Skip to content
This repository was archived by the owner on May 18, 2023. It is now read-only.

Commit 76ace67

Browse files
matthewlilleymatthewlilley
committed
Merge remote-tracking branch 'upstream/styled_component_purge' into canary
2 parents 828e4fc + 435abb6 commit 76ace67

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+703
-1523
lines changed

‎.babelrc

-4
This file was deleted.

‎.babelrc.js

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
presets: ['next/babel'],
3+
plugins: ['macros', ['styled-components', { ssr: true }]],
4+
}

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/erbium
1+
lts/fermium

‎lingui.config.js

+60-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module.exports = {
66
exclude: ['**/node_modules/**'],
77
},
88
],
9-
compileNamespace: 'cjs',
10-
extractBabelOptions: {},
9+
// compileNamespace: 'cjs',
10+
// extractBabelOptions: {},
1111
fallbackLocales: {},
1212
format: 'minimal',
1313
formatOptions: { origins: false, lineNumbers: false },
@@ -16,5 +16,62 @@ module.exports = {
1616
orderBy: 'messageId',
1717
pseudoLocale: '',
1818
rootDir: '.',
19-
runtimeConfigModule: ['@lingui/core', 'i18n'],
19+
runtimeConfigModule: {
20+
i18n: ['@lingui/core', 'i18n'],
21+
Trans: ['@lingui/react', 'Trans'],
22+
},
2023
}
24+
25+
// For reference
26+
27+
// var defaultConfig = {
28+
// catalogs: [{
29+
// path: pathJoinPosix("<rootDir>", "locale", "{locale}", "messages"),
30+
// include: ["<rootDir>"],
31+
// exclude: ["*/node_modules/*"]
32+
// }],
33+
// catalogsMergePath: "",
34+
// compileNamespace: "cjs",
35+
// compilerBabelOptions: {
36+
// minified: true,
37+
// jsescOption: {
38+
// minimal: true
39+
// }
40+
// },
41+
// extractBabelOptions: {
42+
// plugins: [],
43+
// presets: []
44+
// },
45+
// fallbackLocales: {},
46+
// format: "po",
47+
// formatOptions: {
48+
// origins: true,
49+
// lineNumbers: true
50+
// },
51+
// locales: [],
52+
// orderBy: "messageId",
53+
// pseudoLocale: "",
54+
// rootDir: ".",
55+
// runtimeConfigModule: ["@lingui/core", "i18n"],
56+
// sourceLocale: ""
57+
// };
58+
59+
// var exampleConfig = _objectSpread(_objectSpread({}, defaultConfig), {}, {
60+
// runtimeConfigModule: (0, _jestValidate.multipleValidOptions)({
61+
// i18n: ["@lingui/core", "i18n"],
62+
// Trans: ["@lingui/react", "Trans"]
63+
// }, ["@lingui/core", "i18n"]),
64+
// fallbackLocales: (0, _jestValidate.multipleValidOptions)({}, {
65+
// "en-US": "en"
66+
// }, {
67+
// "en-US": ["en"]
68+
// }, {
69+
// default: "en"
70+
// }, false),
71+
// extractBabelOptions: {
72+
// extends: "babelconfig.js",
73+
// rootMode: "rootmode",
74+
// plugins: ["plugin"],
75+
// presets: ["preset"]
76+
// }
77+
// });

‎locale/de.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"Aave": "",
1111
"Accept": "",
1212
"Add": "",
13-
"Add Liquidity": "",
1413
"Add SUSHI to your MetaMask wallet": "",
1514
"Add collateral in order to borrow assets": "",
1615
"Add liquidity": "",
@@ -90,7 +89,6 @@
9089
"Cream → Bento": "",
9190
"Create Pool & Supply": "",
9291
"Create a new Kashi Market": "",
93-
"Create a pair": "",
9492
"Create pool": "",
9593
"Current": "",
9694
"Deposit": "",
@@ -141,6 +139,7 @@
141139
"Historical Total Locked: {0} SUSHI": "",
142140
"If you want to supply to a market that is not listed yet, you can use this tool to create a new pair.": "",
143141
"Import": "",
142+
"Import List": "",
144143
"Import Pool": "",
145144
"In Bento:": "",
146145
"In Wallet:": "",
@@ -192,7 +191,6 @@
192191
"Miner Tip": "",
193192
"Minimum Received": "",
194193
"Minimum received": "",
195-
"Miso": "",
196194
"My Liquidity Positions": "",
197195
"My Orders": "",
198196
"My SUSHI": "",
@@ -249,7 +247,6 @@
249247
"Recipient": "",
250248
"Redenominate xSUSHI into MEOWSHI": "",
251249
"Remove": "",
252-
"Remove Liquidity": "",
253250
"Remove recipient": "",
254251
"Remove {0} {1} and {2} {3}": "",
255252
"Removing {0} {1} and {2} {3}": "",

‎locale/en.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"Aave": "",
1111
"Accept": "",
1212
"Add": "",
13-
"Add Liquidity": "",
1413
"Add SUSHI to your MetaMask wallet": "",
1514
"Add collateral in order to borrow assets": "",
1615
"Add liquidity": "",
@@ -90,7 +89,6 @@
9089
"Cream → Bento": "",
9190
"Create Pool & Supply": "",
9291
"Create a new Kashi Market": "",
93-
"Create a pair": "",
9492
"Create pool": "",
9593
"Current": "",
9694
"Deposit": "",
@@ -141,6 +139,7 @@
141139
"Historical Total Locked: {0} SUSHI": "",
142140
"If you want to supply to a market that is not listed yet, you can use this tool to create a new pair.": "",
143141
"Import": "",
142+
"Import List": "",
144143
"Import Pool": "",
145144
"In Bento:": "",
146145
"In Wallet:": "",
@@ -192,7 +191,6 @@
192191
"Miner Tip": "",
193192
"Minimum Received": "",
194193
"Minimum received": "",
195-
"Miso": "",
196194
"My Liquidity Positions": "",
197195
"My Orders": "",
198196
"My SUSHI": "",
@@ -249,7 +247,6 @@
249247
"Recipient": "",
250248
"Redenominate xSUSHI into MEOWSHI": "",
251249
"Remove": "",
252-
"Remove Liquidity": "",
253250
"Remove recipient": "",
254251
"Remove {0} {1} and {2} {3}": "",
255252
"Removing {0} {1} and {2} {3}": "",

‎locale/es.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"Aave": "",
1111
"Accept": "",
1212
"Add": "",
13-
"Add Liquidity": "",
1413
"Add SUSHI to your MetaMask wallet": "",
1514
"Add collateral in order to borrow assets": "",
1615
"Add liquidity": "",
@@ -90,7 +89,6 @@
9089
"Cream → Bento": "",
9190
"Create Pool & Supply": "",
9291
"Create a new Kashi Market": "",
93-
"Create a pair": "",
9492
"Create pool": "",
9593
"Current": "",
9694
"Deposit": "",
@@ -141,6 +139,7 @@
141139
"Historical Total Locked: {0} SUSHI": "",
142140
"If you want to supply to a market that is not listed yet, you can use this tool to create a new pair.": "",
143141
"Import": "",
142+
"Import List": "",
144143
"Import Pool": "",
145144
"In Bento:": "",
146145
"In Wallet:": "",
@@ -192,7 +191,6 @@
192191
"Miner Tip": "",
193192
"Minimum Received": "",
194193
"Minimum received": "",
195-
"Miso": "",
196194
"My Liquidity Positions": "",
197195
"My Orders": "",
198196
"My SUSHI": "",
@@ -249,7 +247,6 @@
249247
"Recipient": "",
250248
"Redenominate xSUSHI into MEOWSHI": "",
251249
"Remove": "",
252-
"Remove Liquidity": "",
253250
"Remove recipient": "",
254251
"Remove {0} {1} and {2} {3}": "",
255252
"Removing {0} {1} and {2} {3}": "",

‎locale/fa.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"Aave": "",
1111
"Accept": "",
1212
"Add": "",
13-
"Add Liquidity": "",
1413
"Add SUSHI to your MetaMask wallet": "",
1514
"Add collateral in order to borrow assets": "",
1615
"Add liquidity": "",
@@ -90,7 +89,6 @@
9089
"Cream → Bento": "",
9190
"Create Pool & Supply": "",
9291
"Create a new Kashi Market": "",
93-
"Create a pair": "",
9492
"Create pool": "",
9593
"Current": "",
9694
"Deposit": "",
@@ -141,6 +139,7 @@
141139
"Historical Total Locked: {0} SUSHI": "",
142140
"If you want to supply to a market that is not listed yet, you can use this tool to create a new pair.": "",
143141
"Import": "",
142+
"Import List": "",
144143
"Import Pool": "",
145144
"In Bento:": "",
146145
"In Wallet:": "",
@@ -192,7 +191,6 @@
192191
"Miner Tip": "",
193192
"Minimum Received": "",
194193
"Minimum received": "",
195-
"Miso": "",
196194
"My Liquidity Positions": "",
197195
"My Orders": "",
198196
"My SUSHI": "",
@@ -249,7 +247,6 @@
249247
"Recipient": "",
250248
"Redenominate xSUSHI into MEOWSHI": "",
251249
"Remove": "",
252-
"Remove Liquidity": "",
253250
"Remove recipient": "",
254251
"Remove {0} {1} and {2} {3}": "",
255252
"Removing {0} {1} and {2} {3}": "",

‎locale/fr.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"Aave": "",
1111
"Accept": "",
1212
"Add": "",
13-
"Add Liquidity": "",
1413
"Add SUSHI to your MetaMask wallet": "",
1514
"Add collateral in order to borrow assets": "",
1615
"Add liquidity": "",
@@ -90,7 +89,6 @@
9089
"Cream → Bento": "",
9190
"Create Pool & Supply": "",
9291
"Create a new Kashi Market": "",
93-
"Create a pair": "",
9492
"Create pool": "",
9593
"Current": "",
9694
"Deposit": "",
@@ -141,6 +139,7 @@
141139
"Historical Total Locked: {0} SUSHI": "",
142140
"If you want to supply to a market that is not listed yet, you can use this tool to create a new pair.": "",
143141
"Import": "",
142+
"Import List": "",
144143
"Import Pool": "",
145144
"In Bento:": "",
146145
"In Wallet:": "",
@@ -192,7 +191,6 @@
192191
"Miner Tip": "",
193192
"Minimum Received": "",
194193
"Minimum received": "",
195-
"Miso": "",
196194
"My Liquidity Positions": "",
197195
"My Orders": "",
198196
"My SUSHI": "",
@@ -249,7 +247,6 @@
249247
"Recipient": "",
250248
"Redenominate xSUSHI into MEOWSHI": "",
251249
"Remove": "",
252-
"Remove Liquidity": "",
253250
"Remove recipient": "",
254251
"Remove {0} {1} and {2} {3}": "",
255252
"Removing {0} {1} and {2} {3}": "",

‎locale/hi.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"Aave": "",
1111
"Accept": "",
1212
"Add": "",
13-
"Add Liquidity": "",
1413
"Add SUSHI to your MetaMask wallet": "",
1514
"Add collateral in order to borrow assets": "",
1615
"Add liquidity": "",
@@ -90,7 +89,6 @@
9089
"Cream → Bento": "",
9190
"Create Pool & Supply": "",
9291
"Create a new Kashi Market": "",
93-
"Create a pair": "",
9492
"Create pool": "",
9593
"Current": "",
9694
"Deposit": "",
@@ -141,6 +139,7 @@
141139
"Historical Total Locked: {0} SUSHI": "",
142140
"If you want to supply to a market that is not listed yet, you can use this tool to create a new pair.": "",
143141
"Import": "",
142+
"Import List": "",
144143
"Import Pool": "",
145144
"In Bento:": "",
146145
"In Wallet:": "",
@@ -192,7 +191,6 @@
192191
"Miner Tip": "",
193192
"Minimum Received": "",
194193
"Minimum received": "",
195-
"Miso": "",
196194
"My Liquidity Positions": "",
197195
"My Orders": "",
198196
"My SUSHI": "",
@@ -249,7 +247,6 @@
249247
"Recipient": "",
250248
"Redenominate xSUSHI into MEOWSHI": "",
251249
"Remove": "",
252-
"Remove Liquidity": "",
253250
"Remove recipient": "",
254251
"Remove {0} {1} and {2} {3}": "",
255252
"Removing {0} {1} and {2} {3}": "",

‎locale/it.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"Aave": "",
1111
"Accept": "",
1212
"Add": "",
13-
"Add Liquidity": "",
1413
"Add SUSHI to your MetaMask wallet": "",
1514
"Add collateral in order to borrow assets": "",
1615
"Add liquidity": "",
@@ -90,7 +89,6 @@
9089
"Cream → Bento": "",
9190
"Create Pool & Supply": "",
9291
"Create a new Kashi Market": "",
93-
"Create a pair": "",
9492
"Create pool": "",
9593
"Current": "",
9694
"Deposit": "",
@@ -141,6 +139,7 @@
141139
"Historical Total Locked: {0} SUSHI": "",
142140
"If you want to supply to a market that is not listed yet, you can use this tool to create a new pair.": "",
143141
"Import": "",
142+
"Import List": "",
144143
"Import Pool": "",
145144
"In Bento:": "",
146145
"In Wallet:": "",
@@ -192,7 +191,6 @@
192191
"Miner Tip": "",
193192
"Minimum Received": "",
194193
"Minimum received": "",
195-
"Miso": "",
196194
"My Liquidity Positions": "",
197195
"My Orders": "",
198196
"My SUSHI": "",
@@ -249,7 +247,6 @@
249247
"Recipient": "",
250248
"Redenominate xSUSHI into MEOWSHI": "",
251249
"Remove": "",
252-
"Remove Liquidity": "",
253250
"Remove recipient": "",
254251
"Remove {0} {1} and {2} {3}": "",
255252
"Removing {0} {1} and {2} {3}": "",

0 commit comments

Comments
 (0)