Skip to content

Commit

Permalink
Merge branch 'main' into baseline-glean
Browse files Browse the repository at this point in the history
  • Loading branch information
@LeoMcA
LeoMcA committed Aug 7, 2023
2 parents fc02399 + 915c05d commit 2d4327f
Show file tree
Hide file tree
Showing 11 changed files with 992 additions and 675 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/prod-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,10 @@ jobs:
REACT_APP_MDN_PLUS_10Y_PLAN: price_1KeG02JNcmPzuWtRlrSiLTI6

# Surveys.
REACT_APP_SURVEY_START_BLOG_FEEDBACK_2023: 1687867200000 # (new Date("2023-06-27 12:00:00Z").getTime())
REACT_APP_SURVEY_END_BLOG_FEEDBACK_2023: 1688299200000 # (new Date("2023-07-02 12:00:00Z").getTime())
REACT_APP_SURVEY_RATE_FROM_BLOG_FEEDBACK_2023: 0.0
REACT_APP_SURVEY_RATE_TILL_BLOG_FEEDBACK_2023: 0.05 # 5%
REACT_APP_SURVEY_START_DISCOVERABILITY_AUG_2023: 1691409600000 # new Date("2023-08-07 12:00:00Z").getTime()
REACT_APP_SURVEY_END_DISCOVERABILITY_AUG_2023: 1691841600000 # new Date("2023-08-12 12:00:00Z").getTime()
REACT_APP_SURVEY_RATE_FROM_DISCOVERABILITY_AUG_2023: 0.0
REACT_APP_SURVEY_RATE_TILL_DISCOVERABILITY_AUG_2023: 0.10 # 10%

# Telemetry.
REACT_APP_GLEAN_CHANNEL: prod
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/stage-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@ jobs:
REACT_APP_MDN_PLUS_10Y_PLAN: price_1K6X8VKb9q6OnNsLFlUcEiu4

# Surveys.
REACT_APP_SURVEY_START_BLOG_FEEDBACK_2023: 0 # stage
REACT_APP_SURVEY_END_BLOG_FEEDBACK_2023: 1688299200000 # (new Date("2023-07-02 12:00:00Z").getTime())
REACT_APP_SURVEY_RATE_FROM_BLOG_FEEDBACK_2023: 0.0
REACT_APP_SURVEY_RATE_TILL_BLOG_FEEDBACK_2023: 0.05 # 5%
REACT_APP_SURVEY_START_DISCOVERABILITY_AUG_2023: 0 # stage
REACT_APP_SURVEY_END_DISCOVERABILITY_AUG_2023: 1691841600000 # new Date("2023-08-12 12:00:00Z").getTime()
REACT_APP_SURVEY_RATE_FROM_DISCOVERABILITY_AUG_2023: 0.0
REACT_APP_SURVEY_RATE_TILL_DISCOVERABILITY_AUG_2023: 0.10 # 10%

# Telemetry.
REACT_APP_GLEAN_CHANNEL: stage
Expand Down
1 change: 1 addition & 0 deletions build/syntax-highlight.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const loadAllLanguages = lazy(() => {
"latex",
"less",
"md",
"nginx",
"php",
"powershell",
"pug",
Expand Down
4 changes: 1 addition & 3 deletions client/config/webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ const shouldInlineRuntimeChunk = process.env.INLINE_RUNTIME_CHUNK !== "false";
const emitErrorsAsWarnings = process.env.ESLINT_NO_DEV_ERRORS === "true";
const disableESLintPlugin = process.env.DISABLE_ESLINT_PLUGIN === "true";

const imageInlineSizeLimit = parseInt(
process.env.IMAGE_INLINE_SIZE_LIMIT || "10000"
);
const imageInlineSizeLimit = 0; // our CSP doesn't support inline images

// Check if TypeScript is setup
const useTypeScript = fs.existsSync(paths.appTsConfig);
Expand Down
16 changes: 9 additions & 7 deletions client/src/ui/molecules/document-survey/surveys.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ enum SurveyBucket {
WEB_COMPONENTS_2023 = "WEB_COMPONENTS_2023",
DISCOVERABILITY_2023 = "DISCOVERABILITY_2023",
WEB_SECURITY_2023 = "WEB_SECURITY_2023",
DISCOVERABILITY_AUG_2023 = "DISCOVERABILITY_AUG_2023",
}

enum SurveyKey {
Expand All @@ -41,18 +42,19 @@ enum SurveyKey {
WEB_COMPONENTS_2023 = "WEB_COMPONENTS_2023",
DISCOVERABILITY_2023 = "DISCOVERABILITY_2023",
WEB_SECURITY_2023 = "WEB_SECURITY_2023",
DISCOVERABILITY_AUG_2023 = "DISCOVERABILITY_AUG_2023",
}

export const SURVEYS: Survey[] = [
{
key: SurveyKey.BLOG_FEEDBACK_2023,
bucket: SurveyBucket.BLOG_FEEDBACK_2023,
key: SurveyKey.DISCOVERABILITY_AUG_2023,
bucket: SurveyBucket.DISCOVERABILITY_AUG_2023,
show: (doc: Doc) => /en-US\/docs\/(Web|Learn)(\/|$)/i.test(doc.mdn_url),
src: "https://survey.alchemer.com/s3/7397017/MDN-Blog-user-feedback",
src: "https://survey.alchemer.com/s3/7457498/MDN-Discoverability-User-Satisfaction",
teaser:
"We recently launched the MDN blog to enrich our platform with valuable content and enhance your experience. To ensure that we are meeting your needs, we would like to hear your thoughts and feedback through a short user satisfaction survey.",
question: "How satisfied are you with your experience of the MDN blog?",
...survey_duration(SurveyBucket.BLOG_FEEDBACK_2023),
...survey_rates(SurveyKey.BLOG_FEEDBACK_2023),
"At MDN, we are committed to improving the user experience on our website. To ensure that we are meeting this goal, we would like to hear your thoughts and feedback regarding your experience on MDN.",
question: "What’s your experience on MDN Web Docs?",
...survey_duration(SurveyBucket.DISCOVERABILITY_AUG_2023),
...survey_rates(SurveyKey.DISCOVERABILITY_AUG_2023),
},
];
172 changes: 86 additions & 86 deletions deployer/poetry.lock
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions deployer/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ readme = "README.md"

[tool.poetry.dependencies]
python = "^3.10"
click = "^8.1.5"
boto3 = "^1.28.9"
click = "^8.1.6"
boto3 = "^1.28.20"
python-decouple = "^3.8"
requests = {extras = ["security"], version = "^2.31.0"}
elasticsearch-dsl = "^7.4.1"
selectolax = "^0.3.15"
selectolax = "^0.3.16"
PyGithub = "^1.59"
unidiff = "^0.7.5"

[tool.poetry.dev-dependencies]
black = "^23.7"
flake8 = "^6.0.0"
flake8 = "^6.1.0"
pytest = "^7.4.0"

[tool.poetry.scripts]
Expand Down
48 changes: 24 additions & 24 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@
},
"dependencies": {
"@caporal/core": "^2.0.2",
"@codemirror/lang-css": "^6.2.0",
"@codemirror/lang-css": "^6.2.1",
"@codemirror/lang-html": "^6.4.5",
"@codemirror/lang-javascript": "^6.1.9",
"@codemirror/state": "^6.2.1",
"@codemirror/theme-one-dark": "^6.1.2",
"@fast-csv/parse": "^4.3.6",
"@mdn/bcd-utils-api": "^0.0.4",
"@mdn/browser-compat-data": "^5.3.6",
"@mdn/browser-compat-data": "^5.3.8",
"@mozilla/glean": "1.4.0",
"@sentry/integrations": "^7.60.0",
"@sentry/node": "^7.60.0",
"@sentry/integrations": "^7.61.1",
"@sentry/node": "^7.61.1",
"@use-it/interval": "^1.0.0",
"@vscode/ripgrep": "^1.15.5",
"@webref/css": "^5.4.4",
Expand All @@ -89,7 +89,7 @@
"dotenv": "^16.3.1",
"ejs": "^3.1.9",
"express": "^4.18.2",
"fdir": "^6.0.1",
"fdir": "^6.0.2",
"feed": "^4.2.2",
"file-type": "^18.5.0",
"front-matter": "^4.0.2",
Expand All @@ -103,7 +103,7 @@
"imagemin-mozjpeg": "^10.0.0",
"imagemin-pngquant": "^9.0.2",
"imagemin-svgo": "^10.0.1",
"inquirer": "^9.2.8",
"inquirer": "^9.2.10",
"is-svg": "^5.0.0",
"js-yaml": "^4.1.0",
"loglevel": "^1.8.1",
Expand All @@ -113,7 +113,7 @@
"mdast-util-phrasing": "^4.0.0",
"mdn-data": "^2.0.32",
"open": "^9.1.0",
"open-editor": "^4.0.0",
"open-editor": "^4.1.0",
"openai": "^3.3.0",
"prism-svelte": "^0.5.0",
"prismjs": "^1.29.0",
Expand All @@ -136,7 +136,7 @@
"unist-builder": "^4.0.0",
"unist-util-visit": "^5.0.0",
"web-features": "^0.4.1",
"web-specs": "^2.64.0"
"web-specs": "^2.65.0"
},
"devDependencies": {
"@babel/core": "^7.22.9",
Expand All @@ -147,44 +147,44 @@
"@mdn/minimalist": "^2.0.4",
"@playwright/test": "^1.36.2",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
"@supabase/supabase-js": "^2.30.0",
"@supabase/supabase-js": "^2.32.0",
"@svgr/webpack": "^8.0.1",
"@swc/core": "^1.3.71",
"@swc/core": "^1.3.74",
"@testing-library/react": "^14.0.0",
"@types/async": "^3.2.20",
"@types/cli-progress": "^3.11.0",
"@types/imagemin": "^8.0.1",
"@types/jest": "^29.5.3",
"@types/mdast": "^4.0.0",
"@types/node": "^18.16.6",
"@types/react": "^18.2.16",
"@types/react": "^18.2.18",
"@types/react-dom": "^18.2.7",
"@types/react-modal": "^3.16.0",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"babel-jest": "^29.6.1",
"babel-jest": "^29.6.2",
"babel-loader": "^9.1.3",
"babel-plugin-named-asset-import": "^0.3.8",
"babel-preset-react-app": "^10.0.1",
"bfj": "^7.0.2",
"braces": "^3.0.2",
"browserslist": "^4.21.9",
"browserslist": "^4.21.10",
"camelcase": "^7.0.1",
"case-sensitive-paths-webpack-plugin": "^2.4.0",
"cross-env": "^7.0.3",
"css-loader": "^6.8.1",
"css-minimizer-webpack-plugin": "^5.0.1",
"diff": "^5.1.0",
"downshift": "^7.6.1",
"eslint": "^8.45.0",
"eslint": "^8.46.0",
"eslint-config-react-app": "^7.0.1",
"eslint-gitignore": "^0.1.0",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-jest": "^27.2.3",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-react": "^7.33.0",
"eslint-plugin-react": "^7.33.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-unicorn": "^48.0.1",
"eslint-webpack-plugin": "^4.0.1",
Expand All @@ -197,10 +197,10 @@
"husky": "^8.0.3",
"identity-obj-proxy": "^3.0.0",
"ignore-loader": "^0.1.2",
"jest": "^29.6.1",
"jest-environment-jsdom": "^29.6.1",
"jest": "^29.6.2",
"jest-environment-jsdom": "^29.6.2",
"jest-junit-reporter": "^1.1.0",
"jest-resolve": "^29.6.1",
"jest-resolve": "^29.6.2",
"jest-watch-typeahead": "^2.2.2",
"jsdom": "^22.1.0",
"lint-staged": "^13.2.3",
Expand All @@ -211,8 +211,8 @@
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-loader": "^7.3.3",
"postcss-normalize": "^10.0.1",
"postcss-preset-env": "^9.1.0",
"prettier": "^3.0.0",
"postcss-preset-env": "^9.1.1",
"prettier": "^3.0.1",
"prettier-plugin-packagejson": "^2.4.5",
"prompts": "^2.4.2",
"react": "^18.2.0",
Expand All @@ -224,10 +224,10 @@
"react-router": "^6.11.1",
"react-router-dom": "^6.14.2",
"remark-prettier": "^2.0.0",
"resolve": "^1.22.3",
"resolve": "^1.22.4",
"resolve-url-loader": "^5.0.0",
"rough-notation": "^0.5.1",
"sass": "^1.64.1",
"sass": "^1.64.2",
"sass-loader": "^13.3.2",
"semver": "^7.5.4",
"source-map-explorer": "^2.5.3",
Expand All @@ -240,7 +240,7 @@
"stylelint-config-recommended-scss": "^12.0.0",
"stylelint-config-sass-guidelines": "^10.0.0",
"stylelint-order": "^6.0.3",
"stylelint-prettier": "^4.0.0",
"stylelint-prettier": "^4.0.2",
"stylelint-scss": "^5.0.1",
"swr": "^2.2.0",
"tailwindcss": "^3.3.3",
Expand Down
28 changes: 14 additions & 14 deletions testing/integration/poetry.lock
View file

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

2 changes: 1 addition & 1 deletion testing/integration/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ braceexpand = "^0.1.7"

[tool.poetry.dev-dependencies]
black = "^23.7"
flake8 = "^6.0.0"
flake8 = "^6.1.0"

[build-system]
requires = ["poetry>=0.12"]
Expand Down
Loading

0 comments on commit 2d4327f

Please sign in to comment.