Skip to content

Commit 317d1b3

Browse files
authored
chore: replace herodevs' angularjs dependencies with original angularjs (#1419)
Removed all references to the `HeroDevs` Never-Ending Support for AngularJS, since our token has expired, and replaced them with the last published official AngularJS version, 1.8.3.
1 parent 45daf1a commit 317d1b3

File tree

10 files changed

+39
-84
lines changed

10 files changed

+39
-84
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ name: Build App Setup
66
description: Setup before building the app
77

88
inputs:
9-
NPMRC_FILE:
10-
description: 'Secret with the contents of .npmrc'
11-
required: true
129
ENV_CONFIG_JS:
1310
description: 'Contents of the file `opal.config.js` for the given environment'
1411
required: true
@@ -22,8 +19,6 @@ runs:
2219
# Install dependencies
2320
- name: Install dependencies
2421
uses: ./.github/actions/install-dependencies
25-
with:
26-
NPMRC_FILE: ${{ inputs.NPMRC_FILE }}
2722

2823
# Initialize the environment files needed to build the app from repository-level Actions variables
2924
- name: Load environment files

.github/actions/install-dependencies/action.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,10 @@
55
name: Install Dependencies
66
description: Install the dependencies needed by the app, using npm
77

8-
inputs:
9-
NPMRC_FILE:
10-
description: 'Secret with the contents of .npmrc'
11-
required: true
12-
138
runs:
149
using: "composite"
1510
steps:
1611
# Install dependencies
17-
- name: Load .npmrc
18-
run: echo "${NPMRC_FILE}" > .npmrc
19-
shell: bash
20-
env:
21-
NPMRC_FILE: ${{ inputs.NPMRC_FILE }}
2212
# Use setup-node's built-in functionality for caching and restoring npm dependencies
2313
# See: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/caching-dependencies-to-speed-up-workflows
2414
- uses: actions/setup-node@v4.4.0

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ jobs:
5555
- name: Set up build
5656
uses: ./.github/actions/build-setup
5757
with:
58-
NPMRC_FILE: ${{ secrets.NPMRC_FILE }}
5958
ENV_CONFIG_JS: ${{ vars[format('{0}_CONFIG_JS', env.ENVIRONMENT)] }}
6059
ENV_GOOGLE_SERVICES: ${{ vars[format('{0}_GOOGLE_SERVICES', env.ENVIRONMENT)] }}
6160

@@ -92,7 +91,6 @@ jobs:
9291
- name: Set up build
9392
uses: ./.github/actions/build-setup
9493
with:
95-
NPMRC_FILE: ${{ secrets.NPMRC_FILE }}
9694
ENV_CONFIG_JS: ${{ vars[format('{0}_CONFIG_JS', env.ENVIRONMENT)] }}
9795
ENV_GOOGLE_SERVICES: ${{ vars[format('{0}_GOOGLE_SERVICES', env.ENVIRONMENT)] }}
9896

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ jobs:
5555
- name: Set up build
5656
uses: ./.github/actions/build-setup
5757
with:
58-
NPMRC_FILE: ${{ secrets.NPMRC_FILE }}
5958
ENV_CONFIG_JS: ${{ vars[format('{0}_CONFIG_JS', env.ENVIRONMENT)] }}
6059
ENV_GOOGLE_SERVICES: ${{ vars[format('{0}_GOOGLE_SERVICES', env.ENVIRONMENT)] }}
6160

.github/workflows/increment-version.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ jobs:
2626
fetch-depth: ${{ vars.FETCH_DEPTH }}
2727
- name: Install dependencies
2828
uses: ./.github/actions/install-dependencies
29-
with:
30-
NPMRC_FILE: ${{ secrets.NPMRC_FILE }}
3129

3230
# Increment the version
3331
- name: Run semantic-release

README.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,19 @@ This section covers installation steps to build the app's web code on your local
5757

5858
2. Install the app's dependencies
5959
60-
Add the `.npmrc` file
60+
```shell
61+
npm install
62+
```
6163
6264
This project uses [AngularJS](https://angularjs.org/) which reached end of life in January 2022.
63-
This project uses a long-term support version of AngularJS provided by [HeroDevs](https://www.herodevs.com/support/nes-angularjs).
64-
If you have an `npm` token to retrieve this version from their registry, place the `.npmrc` file containing the credentials in the root directory.
6565
66-
You can also use the [last available version](https://www.npmjs.com/package/angular) of AngularJS (version 1.8.3).
67-
To do so, change the value for the `angular` dependency to `angular@1.8.3` in `package.json`.
68-
Also change all other auxiliary angular dependencies accessed through `neverendingsupport` to their latest default versions, as provided by npm.
69-
Then, run:
66+
A long-term support version of AngularJS can be used instead, provided by [HeroDevs](https://www.herodevs.com/support/nes-angularjs) (paid service).
67+
If you have an `npm` token to retrieve this version from their registry, place the `.npmrc` file containing the credentials in the root directory.
7068
71-
```shell
72-
npm install
73-
```
69+
Then, substitute the AngularJS dependencies in `package.json` with the packages provided by HeroDevs
70+
(see [their setup instructions here](https://docs.herodevs.com/angularjs/angularjs-1-8#detailed-instructions)).
7471
75-
For a list of all dependencies, refer to [package.json](./package.json).
72+
For a list of all dependencies used in this project, refer to [package.json](./package.json).
7673
7774
3. Connect your installation to a running backend.
7875

THIRDPARTY.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -399,10 +399,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
399399
THE SOFTWARE.
400400
```
401401

402-
### Notes
403-
404-
We use the extended long-term support version provided by HeroDevs (paid service).
405-
406402
## angular-animate
407403

408404
* Homepage: http://angularjs.org
@@ -433,10 +429,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
433429
THE SOFTWARE.
434430
```
435431

436-
### Notes
437-
438-
We use the extended long-term support version provided by HeroDevs (paid service).
439-
440432
## angular-dynamic-locale
441433

442434
* Homepage: https://github.com/lgalfaso/angular-dynamic-locale#readme
@@ -497,10 +489,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
497489
THE SOFTWARE.
498490
```
499491

500-
### Notes
501-
502-
We use the extended long-term support version provided by HeroDevs (paid service).
503-
504492
## angular-touch
505493

506494
* Homepage: http://angularjs.org
@@ -531,10 +519,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
531519
THE SOFTWARE.
532520
```
533521

534-
### Notes
535-
536-
We use the extended long-term support version provided by HeroDevs (paid service).
537-
538522
## angular-translate
539523

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

package-lock.json

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

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@
5454
"@zxcvbn-ts/language-common": "3.0.4",
5555
"@zxcvbn-ts/language-en": "3.0.2",
5656
"@zxcvbn-ts/language-fr": "3.0.2",
57-
"angular": "npm:@neverendingsupport/angularjs@1.9.9",
58-
"angular-animate": "npm:@neverendingsupport/angularjs@1.9.9-animate",
57+
"angular": "1.8.3",
58+
"angular-animate": "1.8.3",
5959
"angular-dynamic-locale": "0.1.38",
60-
"angular-sanitize": "npm:@neverendingsupport/angularjs@1.9.9-sanitize",
61-
"angular-touch": "npm:@neverendingsupport/angularjs@1.9.9-touch",
60+
"angular-sanitize": "1.8.3",
61+
"angular-touch": "1.8.3",
6262
"angular-translate": "2.19.1",
6363
"angular-translate-interpolation-messageformat": "2.19.1",
6464
"angular-translate-loader-partial": "2.19.1",

renovate.json5

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@
3131
// Group auxiliary angular-related updates
3232
{
3333
"matchDepPatterns": ["^angular"],
34-
"excludePackagePatterns": ["^@neverendingsupport/"],
3534
"groupName": "auxiliary angular packages"
3635
},
37-
// Group AngularJS Never-Ending Support updates (from HeroDevs)
36+
// Group angular-translate updates
3837
{
39-
"matchSourceUrlPrefixes": ["https://github.com/xlts-dev/"],
40-
"groupName": "angularjs NES packages"
38+
"matchPackagePatterns": ["^angular-translate"],
39+
"groupName": "angular-translate packages"
4140
},
4241
// Rate-limit firebase-tools updates: first day of each month
4342
{
@@ -64,10 +63,5 @@
6463
"matchPackagePatterns": ["-loader$"],
6564
"groupName": "webpack loader packages",
6665
},
67-
// Group angular-translate updates
68-
{
69-
"matchPackagePatterns": ["^angular-translate"],
70-
"groupName": "angular-translate packages"
71-
},
7266
],
7367
}

0 commit comments

Comments
 (0)