Skip to content

Commit 2991d06

Browse files
allanboweallanbowe
authored
Merge pull request #1397 from sasjs/update-tags
fix(compile-web): added the ability to update link tags with rel='mod…
2 parents f7765c6 + a9b615d commit 2991d06

File tree

9 files changed

+332
-43
lines changed

9 files changed

+332
-43
lines changed

‎.github/workflows/run-tests-windows.yml‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [lts/Iron]
15+
node-version: [lts/iron]
1616

1717
steps:
1818
- uses: actions/checkout@v2
1919

2020
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v2
21+
uses: actions/setup-node@v3
2222
with:
2323
node-version: ${{ matrix.node-version }}
2424
cache: npm
@@ -32,17 +32,16 @@ jobs:
3232

3333
- name: Create .env file for sasjs/server
3434
run: |
35-
touch .env
3635
echo RUN_TIMES=js >> .env
3736
echo NODE_PATH=node >> .env
3837
39-
- name: download sasjs/server package from github using curl
38+
- name: Download sasjs/server package from GitHub
4039
run: curl -L https://github.com/sasjs/server/releases/latest/download/windows.zip --output windows.zip
4140

42-
- name: unzip downloaded package
41+
- name: Unzip downloaded package
4342
run: npx extract-zip windows.zip
4443

45-
- name: run sasjs server in background
44+
- name: Start sasjs server in background
4645
run: START .\api-win.exe >> run-sasjs-server.txt
4746

4847
- name: Install dependencies
@@ -60,7 +59,11 @@ jobs:
6059
run: npm run build
6160

6261
- name: Test Package Install
63-
run: npm version "5.0.0" --no-git-tag-version && npm pack && npm install -g ./sasjs-cli-5.0.0.tgz && sasjs v
62+
run: |
63+
npm version "5.0.0" --no-git-tag-version
64+
npm pack
65+
npm install -g ./sasjs-cli-5.0.0.tgz
66+
sasjs v
6467
6568
- name: npm prefix for user
6669
run: echo prefix=C:\npm\prefix >> ~\.npmrc
@@ -72,12 +75,12 @@ jobs:
7275
run: npm run test:mocked
7376
env:
7477
CI: true
75-
CLIENT: ${{secrets.CLIENT}}
76-
SECRET: ${{secrets.SECRET}}
77-
SAS_USERNAME: ${{secrets.SAS_USERNAME}}
78-
SAS_PASSWORD: ${{secrets.SAS_PASSWORD}}
79-
VIYA_SERVER_URL: ${{secrets.VIYA_SERVER_URL}}
80-
SAS9_SERVER_URL: ${{secrets.SAS9_SERVER_URL}}
78+
CLIENT: ${{ secrets.CLIENT }}
79+
SECRET: ${{ secrets.SECRET }}
80+
SAS_USERNAME: ${{ secrets.SAS_USERNAME }}
81+
SAS_PASSWORD: ${{ secrets.SAS_PASSWORD }}
82+
VIYA_SERVER_URL: ${{ secrets.VIYA_SERVER_URL }}
83+
SAS9_SERVER_URL: ${{ secrets.SAS9_SERVER_URL }}
8184
SASJS_SERVER_URL: 'http://localhost:5000'
82-
ACCESS_TOKEN: ${{secrets.ACCESS_TOKEN}}
83-
REFRESH_TOKEN: ${{secrets.REFRESH_TOKEN}}
85+
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
86+
REFRESH_TOKEN: ${{ secrets.REFRESH_TOKEN }}

‎.github/workflows/run-tests.yml‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [lts/Iron]
15+
node-version: [lts/iron]
1616

1717
steps:
1818
- uses: actions/checkout@v2
1919

2020
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v2
21+
uses: actions/setup-node@v3
2222
with:
2323
node-version: ${{ matrix.node-version }}
2424
cache: npm
@@ -48,13 +48,17 @@ jobs:
4848
run: npm run build
4949

5050
- name: Test Package Install
51-
run: npm version "5.0.0" --no-git-tag-version && npm pack && npm install -g ./sasjs-cli-5.0.0.tgz && sasjs v
51+
run: |
52+
npm version "5.0.0" --no-git-tag-version
53+
npm pack
54+
npm install -g ./sasjs-cli-5.0.0.tgz
55+
sasjs v
5256
5357
- name: Run smoke tests
5458
run: sh ./test.sh
5559

5660
- name: Install Doxygen
57-
run: sudo apt-get install doxygen
61+
run: sudo apt-get install -y doxygen
5862

5963
# Mocked (*.spec.ts) tests will be conducted during this step
6064
- name: Generate coverage report
@@ -63,23 +67,22 @@ jobs:
6367
github-token: ${{ secrets.GITHUB_TOKEN }}
6468
test-script: npx jest --config=jest.config.js --silent --runInBand --ci --coverage --testLocationInResults --json --outputFile="report.json"
6569

66-
- name: install pm2 for process management
70+
- name: Install PM2
6771
run: npm i -g pm2
6872

6973
- name: Create .env file for sasjs/server
7074
run: |
71-
touch .env
72-
echo RUN_TIMES=js >> .env
73-
echo NODE_PATH=node >> .env
74-
echo MOCK_SERVERTYPE=sas9 >> .env
75+
echo "RUN_TIMES=js" >> .env
76+
echo "NODE_PATH=node" >> .env
77+
echo "MOCK_SERVERTYPE=sas9" >> .env
7578
76-
- name: download sasjs/server package from github using curl
77-
run: curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
79+
- name: Download sasjs/server package
80+
run: curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip -o linux.zip
7881

79-
- name: unzip downloaded package
82+
- name: Unzip downloaded package
8083
run: unzip linux.zip
8184

82-
- name: run sasjs server
85+
- name: Run sasjs server
8386
run: pm2 start api-linux
8487

8588
- name: Deploy SAS9 tests
@@ -90,16 +93,15 @@ jobs:
9093
ls sasjs_root -R
9194
9295
- name: Run server tests
93-
run: |
94-
npm run test:server
96+
run: npm run test:server
9597
env:
9698
CI: true
97-
CLIENT: ${{secrets.CLIENT}}
98-
SECRET: ${{secrets.SECRET}}
99-
SAS_USERNAME: ${{secrets.SAS_USERNAME}}
100-
SAS_PASSWORD: ${{secrets.SAS_PASSWORD}}
101-
VIYA_SERVER_URL: ${{secrets.VIYA_SERVER_URL}}
99+
CLIENT: ${{ secrets.CLIENT }}
100+
SECRET: ${{ secrets.SECRET }}
101+
SAS_USERNAME: ${{ secrets.SAS_USERNAME }}
102+
SAS_PASSWORD: ${{ secrets.SAS_PASSWORD }}
103+
VIYA_SERVER_URL: ${{ secrets.VIYA_SERVER_URL }}
102104
SAS9_SERVER_URL: http://localhost:5000
103105
SASJS_SERVER_URL: http://localhost:5000
104-
ACCESS_TOKEN: ${{secrets.ACCESS_TOKEN}}
105-
REFRESH_TOKEN: ${{secrets.REFRESH_TOKEN}}
106+
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
107+
REFRESH_TOKEN: ${{ secrets.REFRESH_TOKEN }}

‎src/commands/create/spec/reactAppFiles.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export const reactAppFiles: Folder = {
4949
{ fileName: 'data-page.component.tsx' },
5050
{ fileName: 'home-page.component.tsx' },
5151
{ fileName: 'login.component.tsx' },
52-
{ fileName: 'request-modal.component.jsx' },
52+
{ fileName: 'request-modal.component.tsx' },
5353
{ fileName: 'syntax-highlighting.css' },
5454
{ fileName: 'user-name.component.tsx' }
5555
],
@@ -72,7 +72,7 @@ export const reactAppFiles: Folder = {
7272
},
7373
{
7474
folderName: 'theme',
75-
files: [{ fileName: 'index.js' }],
75+
files: [{ fileName: 'index.ts' }],
7676
subFolders: []
7777
}
7878
]

‎src/commands/web/internal/getTags.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ export const getSasjsTags = (parsedHtml: JSDOM) =>
66
export const getScriptTags = (parsedHtml: JSDOM) =>
77
Array.from(parsedHtml.window.document.getElementsByTagName('script'))
88

9+
export const getModulePreload = (parsedHtml: JSDOM) =>
10+
Array.from(parsedHtml.window.document.getElementsByTagName('link')).filter(
11+
(s) => s.getAttribute('rel') === 'modulepreload'
12+
)
13+
914
export const getStyleInPageTags = (parsedHtml: JSDOM) =>
1015
Array.from(parsedHtml.window.document.getElementsByTagName('style'))
1116

0 commit comments

Comments
 (0)