diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d6373b2e..1ebaa70ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -73,7 +73,7 @@ Follow these steps to copy this repository to your computer and build the site: git clone https://github.com/electron/electronjs.org cd electronjs.org yarn install -npm run dev +yarn dev ``` You should now have an Express server running at @@ -83,7 +83,7 @@ You should now have an Express server running at If there is an error building the `node-sass` dependency, try running `npm rebuild node-sass`. -**Note**: If errors are still shown after you have installed all the dependencies, try to delete the `node_modules` directory in your project and run `yarn install` again. +**Note**: If errors are still shown after you have installed all the dependencies, try to delete the `node_modules` directory in your project and run `yarn` again. Read on for more info about the structure of the site. diff --git a/package.json b/package.json index 7f6d7a556..d8fe2863d 100644 --- a/package.json +++ b/package.json @@ -47,11 +47,11 @@ "crowdin-editor-language-codes": "^1.0.0", "description": "0.0.4", "dotenv": "^10.0.0", - "electron-api-historian": "1.47.0", - "electron-apps": "1.8878.0", - "electron-i18n": "1.3082.0", + "electron-api-historian": "1.51.0", + "electron-apps": "1.8899.0", + "electron-i18n": "1.3090.0", "electron-markdown": "^0.8.2", - "electron-releases": "3.741.0", + "electron-releases": "3.747.0", "electron-userland-reports": "1.6.0", "express": "^4.17.1", "express-hbs": "^2.3.4", diff --git a/script/update-data.js b/script/update-data.js index c07a7387e..63f503c90 100644 --- a/script/update-data.js +++ b/script/update-data.js @@ -8,7 +8,7 @@ const packages = [ ] const packagesString = packages.map((str) => `${str}@latest`).join(' ') -const command = `yarn install ${packagesString} --exact` +const command = `yarn add ${packagesString} --exact` console.time(`Running ${command}`) child_process.execSync(command, { diff --git a/scripts/expanding-versions.js b/scripts/expanding-versions.js index 2600db77a..4c0e00ad3 100644 --- a/scripts/expanding-versions.js +++ b/scripts/expanding-versions.js @@ -19,22 +19,23 @@ module.exports = () => { target.classList.add(...EXPANDED_CLASS) } const select = (e) => { - const elem = e.target; - if (document.selection) { // IE - var range = document.body.createTextRange(); - range.moveToElementText(elem); - range.select(); + const elem = e.target + if (document.selection) { + // IE + var range = document.body.createTextRange() + range.moveToElementText(elem) + range.select() } else if (window.getSelection) { - var range = document.createRange(); - range.selectNode(elem); - window.getSelection().removeAllRanges(); - window.getSelection().addRange(range); + var range = document.createRange() + range.selectNode(elem) + window.getSelection().removeAllRanges() + window.getSelection().addRange(range) } } for (const version of versions) { version.addEventListener('mouseover', expand.bind(null, version)) version.addEventListener('mouseout', reset) - version.addEventListener('click', select); + version.addEventListener('click', select) } } diff --git a/test/index.js b/test/index.js index 78a113a76..7160ab93a 100644 --- a/test/index.js +++ b/test/index.js @@ -287,13 +287,13 @@ describe('electronjs.org', () => { ) }) - test('includes a link to translate the doc on Crowdin', async () => { + test('includes a link to translate the doc on Crowdin for Chinese Simplified', async () => { const res = await supertest(app) .get('/docs/api/accelerator') .set('Cookie', ['language=zh-CN']) const $ = cheerio.load(res.text) should.exist( - $('[href="https://crowdin.com/translate/electron/250480/en-zhcn"]') + $('[href="https://crowdin.com/translate/electron/255648/en-zhcn"]') ) }) @@ -303,7 +303,7 @@ describe('electronjs.org', () => { .set('Cookie', ['language=fr-FR']) const $ = cheerio.load(res.text) should.exist( - $('[href="https://crowdin.com/translate/electron/250506/en-fr"]') + $('[href="https://crowdin.com/translate/electron/255674/en-fr"]') ) }) @@ -315,7 +315,7 @@ describe('electronjs.org', () => { .set('Cookie', ['language=en-US']) const $ = cheerio.load(res.text) should.exist( - $('[href="https://crowdin.com/translate/electron/250486/en-en"]') + $('[href="https://crowdin.com/translate/electron/255654/en-en"]') ) }) diff --git a/yarn.lock b/yarn.lock index 30733085a..fd4dd5626 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3313,24 +3313,24 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-api-historian@1.47.0: - version "1.47.0" - resolved "https://registry.yarnpkg.com/electron-api-historian/-/electron-api-historian-1.47.0.tgz#33e8d02b63348fdd8da140dc771e565b05c908e1" - integrity sha512-jyVSpGGKB3VIxfmzGRRQHDQtzAjYW7N0vvLf0kpYZIzmYzHYvZ9ZbDv0csghS33GB9Vv25H1CABWo8oFyKVWGg== +electron-api-historian@1.51.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/electron-api-historian/-/electron-api-historian-1.51.0.tgz#4bbf4e30ee0221f781304be318c86b52397d14f5" + integrity sha512-tJQHRMc3b7KM2oFrM8vv8nAIGJ2eZ1Or4xMe5o8jkYrh45Q9QqbSNfPZwlOLP0sIzPyJpU6XD0oZDmAMrpp6XA== -electron-apps@1.8878.0: - version "1.8878.0" - resolved "https://registry.yarnpkg.com/electron-apps/-/electron-apps-1.8878.0.tgz#8e5fb2a0328bcdbdc9e6d7215fb87f33ed26fd8b" - integrity sha512-4cfkq4F/dMvRq0NMiSQtol26j9vd3wYn7TWYVcFrWhqV7aKxZeIgu4IiavsDhfAL9Oh7IXKGsZCjNAPrSuy2Ng== +electron-apps@1.8899.0: + version "1.8899.0" + resolved "https://registry.yarnpkg.com/electron-apps/-/electron-apps-1.8899.0.tgz#390f807c077fd86debe3ce8b73c7d4831f2127ce" + integrity sha512-L1hY7IRUQRd0KvcpMcZB68ry2WSTAeY00yrfgdxVEV85J5QmSYZ/VmiuzLXX2uA5P3abA/cALQ1LeT+mrSDtQw== dependencies: json-stable-stringify "^1.0.1" mime-types "^2.1.30" rev-hash "^3.0.0" -electron-i18n@1.3082.0: - version "1.3082.0" - resolved "https://registry.yarnpkg.com/electron-i18n/-/electron-i18n-1.3082.0.tgz#68e9420fafa15ff799ebfbdf208a550f78dc0113" - integrity sha512-36725TGKuyjBrsIOLIzVrwGp5orKMzmNBFNE7E8CUT6LtP2aH32BOCcJGp2ay8o7Yx7ZAAARDouxBM84s0Bpkg== +electron-i18n@1.3090.0: + version "1.3090.0" + resolved "https://registry.yarnpkg.com/electron-i18n/-/electron-i18n-1.3090.0.tgz#9b6af534bdb0b42a6be7a3a4aaa68b681b5a7a45" + integrity sha512-C0LbfexJGKuL3iUKh6g6UdonzcCL0N3sJ2nqEdL0AUjLg5k+3bRpwrjNgvMisliEljk3mpZfkhp7g8+a4tJhVA== electron-markdown@^0.8.2: version "0.8.2" @@ -3345,10 +3345,10 @@ electron-markdown@^0.8.2: rehype-slug "^4.0.0" remark-gemoji-to-emoji "^1.1.0" -electron-releases@3.741.0: - version "3.741.0" - resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-3.741.0.tgz#80c9699cb7ebe21d7b8f2b3dd09e3ee0ba34e6bb" - integrity sha512-6oun/KxJOJEuO84u90NT2Om7uZ3zkfiIBZ4NK91KRbIDSb16O5/hz7cotq9NyLGUNs8Smne7iG+iPiOZ6LU0jA== +electron-releases@3.747.0: + version "3.747.0" + resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-3.747.0.tgz#b33226dd1c0d93e4ac43de3df61af2ec2104d135" + integrity sha512-4L2KDdp/BGVV/JDgB7NWekc9qMrqPaDh9ORe2B82j0iu2hee2FRgfHrKS8JRSKQBqo+rq2WCwqmpTRsULI/0rQ== electron-to-chromium@^1.3.723: version "1.3.739"