From eb69ab77ea49a949e511c373f489c19cadfa985c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 May 2021 15:40:26 +0000 Subject: [PATCH 1/9] build(deps): bump hosted-git-info from 2.8.8 to 2.8.9 Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1bebd4ed..6c7d8e5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1342,9 +1342,9 @@ homedir-polyfill@^1.0.0: parse-passwd "^1.0.0" hosted-git-info@^2.1.4: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== http-proxy@^1.8.1: version "1.18.1" From b33efae7d2aa0160750b394be74d36518efcc03d Mon Sep 17 00:00:00 2001 From: Michael Prentice Date: Sat, 5 Jun 2021 11:15:39 -0400 Subject: [PATCH 2/9] chore(*): support NodeJS v12. add license & security policy. - update links - remove link to empty design docs folder - update copyright to 2021 - fix typos - fix warnings about missing package.json fields - add npm script for easily building the project w/o running e2e tests - `yarn build:dev` - update dependencies - from: 31 vulnerabilities found - Severity: 10 Low | 5 Moderate | 16 High - to: 21 vulnerabilities found - Severity: 7 Low | 4 Moderate | 10 High --- .nvmrc | 2 +- .travis.yml | 2 +- LICENSE | 22 + README.md | 9 +- SECURITY.md | 20 + package.json | 25 +- src/index.html | 14 +- yarn.lock | 1477 ++++++++++++++++++++++++------------------------ 8 files changed, 825 insertions(+), 746 deletions(-) create mode 100644 LICENSE create mode 100644 SECURITY.md diff --git a/.nvmrc b/.nvmrc index 38637d39..48082f72 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -8.17.0 \ No newline at end of file +12 diff --git a/.travis.yml b/.travis.yml index 2d73e1c2..ef6ab7bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: node_js sudo: false node_js: - - '6' + - '12' cache: yarn: true diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..9aeac3e4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +The MIT License + +Copyright (c) 2021 Google LLC. http://angularjs.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/README.md b/README.md index 76fb86d8..e072577e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +# AngularJS.org Home Page + The angularjs.org site is not designed to be used by third parties. It is only kept here as part of our own deployment processes. @@ -7,13 +9,14 @@ If you want to have a go at hosting it yourself you can try running This will build the website in the `build` folder, which you can then serve with something like: - yarn run http-server build/ + yarn start and browse to http://localhost:8080 -**Note: we do not be provide support for doing this.** +**Note: we do not provide support for doing this.** The site relies upon accessing numerous additional resources from all over the web. Hint: to access the AngularJS docs application rather than this site, which is only the homepage, - clone the main project and build the docs yourself. See https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md +clone the main project and build the docs yourself. +See https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..47aebc70 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,20 @@ +# Security Policy + +## Supported Versions + +| Version | Supported | Status | Comments | +| ----------- | ------------------ | --------------------- | ------------------------------------ | +| 1.8.x | :white_check_mark: | Long Term Support | See [Long Term Support policy][0] | +| 1.3.x-1.7.x | :x: | | | +| 1.2.x | :warning: | Security patches only | Last version to provide IE 8 support | +| <1.2.0 | :x: | | | + +## Reporting a Vulnerability + +Email us at [security@angularjs.org](mailto:security@angularjs.org) to report any potential security issues in AngularJS. + +Please [use the latest AngularJS possible](https://docs.angularjs.org/guide/security#use-the-latest-angularjs-possible) +and keep in mind the guidance around AngularJS' +[expression language](https://docs.angularjs.org/guide/security#angularjs-templates-and-expressions). + +[0]: https://docs.angularjs.org/misc/version-support-status#long-term-support diff --git a/package.json b/package.json index c2d88ee0..dba8c78a 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,29 @@ { "name": "angularjs.org", "version": "0.0.0", + "private": true, + "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/angular/angularjs.org" + }, "scripts": { - "build": "yarn && gulp && node scripts/build" + "build": "yarn && gulp && node scripts/build", + "build:dev": "gulp && node scripts/build copy", + "start": "http-server build/" }, "devDependencies": { - "eslint": "^4.18.2", + "eslint": "^7.27.0", "gulp": "^3.9.1", - "gulp-sass": "^3.0.0", - "http-server": "*", - "protractor": "^5.4.2" + "gulp-sass": "^4.1.0", + "http-server": "^0.12.3", + "protractor": "^7.0.0" + }, + "resolutions": { + "//1": "`natives@1.1.0` does not work with Node.js 10.x on Windows 10", + "//2": "(E.g. see https://github.com/gulpjs/gulp/issues/2162 and https://github.com/nodejs/node/issues/25132.)", + "natives": "1.1.6", + "//3": "`graceful-fs` needs to be pinned to support gulp 3, on Node v12+", + "graceful-fs": "^4.2.6" } } diff --git a/src/index.html b/src/index.html index a8a73df2..2e27b141 100644 --- a/src/index.html +++ b/src/index.html @@ -54,7 +54,7 @@

Tutorial
  • FAQ
  • Videos
    • -
  • Case Studies
    • +
  • Case Studies
  • @@ -72,10 +72,10 @@

    Discuss @@ -139,12 +139,6 @@

    AngularJS

    • - -
  • - - Design Docs & Notes - -
    • @@ -349,7 +343,7 @@

    Testable