Skip to content

Commit 4bae9ac

Browse files
Douzeyustaceybeard
andauthored
chore: remove neverendingsupport dependencies in node package manager (#300)
* remove herodevs * comment * Update Dockerfile Co-authored-by: Stacey Beard <31229509+staceybeard@users.noreply.github.com> --------- Co-authored-by: Stacey Beard <31229509+staceybeard@users.noreply.github.com>
1 parent 384c3bf commit 4bae9ac

10 files changed

Lines changed: 17 additions & 40 deletions

File tree

.github/actions/build-setup/action.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,11 @@ inputs:
99
CONFIG:
1010
description: 'Contents of the file `config.json` for the given environment'
1111
required: true
12-
NPMRC_FILE:
13-
description: 'Secret with the contents of .npmrc'
14-
required: true
1512

1613
runs:
1714
using: "composite"
1815
steps:
1916
# Install dependencies
20-
- name: Load .npmrc
21-
run: echo "${NPMRC_FILE}" > .npmrc
22-
shell: bash
23-
env:
24-
NPMRC_FILE: ${{ inputs.NPMRC_FILE }}
2517
# Use setup-node's built-in functionality for caching and restoring npm dependencies
2618
# See: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/caching-dependencies-to-speed-up-workflows
2719
- uses: actions/setup-node@v4.4.0

.github/workflows/build-and-deploy.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ jobs:
5353
uses: ./.github/actions/build-setup
5454
with:
5555
CONFIG: ${{ vars[format('{0}_CONFIG', env.ENVIRONMENT)] }}
56-
NPMRC_FILE: ${{ secrets.NPMRC_FILE }}
5756

5857
# Build
5958
- name: Build the registration website

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
with:
3333
# No actual config is required, since this job just checks that all dependencies can be installed
3434
CONFIG: "{}"
35-
NPMRC_FILE: ${{ secrets.NPMRC_FILE }}
3635

3736
lint:
3837
runs-on: ubuntu-latest

.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ check build:
2323
# Since this check-build job isn't environment-specific, an empty config file is used
2424
- echo "{}" > config.json
2525
script:
26-
# add npmrc file with HeroDevs registry token
27-
- '[ -z "$NPMRC_FILE" ] && echo "Error: environment variable NPMRC_FILE must be defined for this job" && exit 1'
28-
- echo "$NPMRC_FILE" > .npmrc
26+
# add npmrc file with HeroDevs registry token, please uncomment the lines below when you have an `npm` token
27+
# - '[ -z "$NPMRC_FILE" ] && echo "Error: environment variable NPMRC_FILE must be defined for this job" && exit 1'
28+
# - echo "$NPMRC_FILE" > .npmrc
2929
# Install dependencies and cache within the project directory to cache
3030
# See: https://javascript.plainenglish.io/improving-ci-performance-aka-how-to-save-your-money-31ff691360e4
3131
- npm ci --cache .npm --prefer-offline

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ WORKDIR /app
1313

1414
COPY package.json ./
1515
COPY package-lock.json ./
16-
COPY .npmrc ./
16+
17+
# uncomment the line below if you have an npm token
18+
# COPY .npmrc ./
1719

1820
RUN npm ci
1921

README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,12 @@ This project contains a `Dockerfile` as well as a `docker-compose.yml` file to r
1515
In the root directory, copy `config.json.sample` to `config.json`.
1616
Then add the values for `apiKey` and `databaseURL` to that of your Firebase project.
1717

18-
### Step 2: Add the `.npmrc` file
18+
### Step 2: Add the `.npmrc` file (Optional)
1919

2020
This project uses [AngularJS](https://angularjs.org/) which reached end of life in January 2022.
21-
This project uses a long-term support version of AngularJS provided by [HeroDevs](https://www.herodevs.com/support/nes-angularjs).
22-
If you have an `npm` token to retrieve this version from their registry, place the `.npmrc` file containing the credentials in the root directory.
21+
A long-term support version of AngularJS can be used instead, provided by [HeroDevs](https://www.herodevs.com/support/nes-angularjs). If you have an `npm` token to retrieve this version from their registry, place the `.npmrc` file containing the credentials in the root directory.
2322

24-
You can also use the [last available version](https://www.npmjs.com/package/angular) of AngularJS (version 1.8.3).
25-
To do so, change the value for the `angular` dependency in `package.json` to `angular@1.8.3` and run `npm install` to update the lock file.
26-
27-
### Step 2: Start the container
23+
### Step 3: Start the container
2824

2925
```shell
3026
docker compose up

THIRDPARTY.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
309309

310310
* Homepage: http://angularjs.org
311311
* Repository: https://github.com/angular/angular.js
312-
* License: `MIT` (see note below)
312+
* License: `MIT`
313313

314314
```text
315315
The MIT License
@@ -335,10 +335,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
335335
THE SOFTWARE.
336336
```
337337

338-
### Notes
339-
340-
We use the extended long-term support version provided by HeroDevs (paid service).
341-
342338
## angular-translate
343339

344340
* Homepage: https://github.com/angular-translate/angular-translate#readme

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@zxcvbn-ts/language-common": "3.0.4",
1616
"@zxcvbn-ts/language-en": "3.0.2",
1717
"@zxcvbn-ts/language-fr": "3.0.2",
18-
"angular": "npm:@neverendingsupport/angularjs@1.9.10",
18+
"angular": "1.8.3",
1919
"angular-translate": "2.19.1",
2020
"angular-ui-bootstrap": "2.5.6",
2121
"angular-ui-router": "1.0.30",

renovate.json5

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
// Ensure that node docker versioning doesn't interfere with the custom managers.
2525
"ignorePresets": ["workarounds:nodeDockerVersioning"],
2626
// https://docs.renovatebot.com/getting-started/private-packages/#automatically-authenticate-for-npm-package-stored-in-private-github-npm-repository
27-
// The token for the registry it configured via hostRules in the Renovate developer dashboard for the whole organization
28-
"npmrc": "@neverendingsupport:registry=https://registry.nes.herodevs.com/npm/pkg/",
2927
"assignees": ["staceybeard"],
3028
"labels": ["dependencies"],
3129
"packageRules": [
@@ -34,10 +32,5 @@
3432
"matchDatasources": ["docker", "docker-compose"],
3533
"semanticCommitType": "build"
3634
},
37-
// Group angular-related updates
38-
{
39-
"matchPackageNames": ["/^angular/"],
40-
"groupName": "angular packages"
41-
},
4235
],
4336
}

0 commit comments

Comments
 (0)