Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert missing example #3294

Merged
merged 60 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
07dc7fe
add umd federation back
ScriptedAlchemy Nov 2, 2023
d4277f8
add umd federation back
ScriptedAlchemy Nov 2, 2023
feb1ccd
umd federation
ScriptedAlchemy Nov 2, 2023
c35f99f
add umd federation back
ScriptedAlchemy Nov 2, 2023
e068f5e
add typescript back
ScriptedAlchemy Nov 3, 2023
12d5fc7
Merge branch 'master' into revert-missing-example
ScriptedAlchemy Nov 3, 2023
239c3a5
umd federation
ScriptedAlchemy Nov 3, 2023
5d9c2fd
Merge remote-tracking branch 'origin/revert-missing-example' into rev…
ScriptedAlchemy Nov 3, 2023
2308d44
add typescript back
ScriptedAlchemy Nov 3, 2023
2dfb246
add typescript back
ScriptedAlchemy Nov 3, 2023
d198aca
add typescript back
ScriptedAlchemy Nov 3, 2023
121b345
convert to JS from TS
ScriptedAlchemy Nov 3, 2023
fcd1f67
convert to JS from TS
ScriptedAlchemy Nov 3, 2023
3903f36
convert to JS from TS
ScriptedAlchemy Nov 3, 2023
46f8078
convert to JS from TS
ScriptedAlchemy Nov 3, 2023
cc483fc
convert to JS from TS
ScriptedAlchemy Nov 3, 2023
261365c
convert to JS from TS
ScriptedAlchemy Nov 3, 2023
8dd8b1e
convert to JS from TS
ScriptedAlchemy Nov 3, 2023
c077f44
convert to JS from TS
ScriptedAlchemy Nov 3, 2023
1ec57be
convert to JS from TS
ScriptedAlchemy Nov 4, 2023
0ea95f9
convert to JS from TS
ScriptedAlchemy Nov 4, 2023
16bfc5d
convert to JS from TS
ScriptedAlchemy Nov 4, 2023
1c98ef1
convert to JS from TS
ScriptedAlchemy Nov 4, 2023
fbb460a
convert to JS from TS
ScriptedAlchemy Nov 4, 2023
aa39a06
convert to JS from TS
ScriptedAlchemy Nov 4, 2023
9ed4dc6
convert to JS from TS
ScriptedAlchemy Nov 4, 2023
c9e9575
convert to JS from TS
ScriptedAlchemy Nov 4, 2023
e242211
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
db14d1e
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
ac75c71
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
82cca9c
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
d755dd4
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
3d5f5a0
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
37a1496
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
d899210
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
79ad6c7
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
230ef89
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
c2b1f42
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
b464005
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
237641d
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
22f0ee3
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
4d41e74
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
3ca783f
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
b7c1ef9
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
ea2a973
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
23f519b
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
bb2731a
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
286d45b
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
b23e235
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
9b68f9b
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
29bdccf
convert to JS from TS
ScriptedAlchemy Nov 5, 2023
cb3a68b
convert to JS from TS
ScriptedAlchemy Nov 6, 2023
07ddea4
convert to JS from TS
ScriptedAlchemy Nov 6, 2023
93d66de
convert to JS from TS
ScriptedAlchemy Nov 6, 2023
ab7555a
convert to JS from TS
ScriptedAlchemy Nov 6, 2023
ea41f7a
convert to JS from TS
ScriptedAlchemy Nov 6, 2023
eed0458
convert to JS from TS
ScriptedAlchemy Nov 6, 2023
b9e08cf
convert to JS from TS
ScriptedAlchemy Nov 6, 2023
bf22471
convert to JS from TS
ScriptedAlchemy Nov 6, 2023
18a37a2
convert to JS from TS
ScriptedAlchemy Nov 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 26 additions & 40 deletions .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,20 +147,12 @@ jobs:
id: restore-yarn-global-cache
uses: actions/cache/restore@v3
with:
path: ${{ env.YARN_CACHE_PATH }}
key: yarn-global-cache-${{ github.run_id }} # Can use time based key as well
path: |
${{ env.YARN_CACHE_PATH }}
${{ env.CACHE_PATH }}
key: yarn-global-cache-${{ steps.check-yarn-hash.outputs.yarnHash }} # Can use time based key as well
restore-keys: |
yarn-global-cache
yarn-global-cache-
- name: Restore Yarn and Cypress cache
id: restore-yarn-cypress-cache
uses: actions/cache/restore@v3
with:
path: ${{ env.CACHE_PATH }}
key: e2e-cache-${{ steps.check-yarn-hash.outputs.yarnHash }}
restore-keys: |
e2e-cache-
e2e-

- name: Check disk space before install
id: check-disk-space-before-install
Expand All @@ -169,26 +161,23 @@ jobs:

- name: Install dependencies
id: install-dependencies
if: steps.restore-yarn-cypress-cache.outputs.cache-hit != 'true'
if: steps.restore-yarn-global-cache.outputs.cache-hit != 'true'
env:
NODE_OPTIONS: "--max_old_space_size=4096"
run: |
echo "Yarn has changed - installing dependencies ... "
npm install lerna@6 -g
lerna bootstrap
- name: Cache Yarn and Cypress
if: steps.restore-yarn-global-cache.outputs.cache-hit != 'true'
id: cache-yarn-cypress
uses: actions/cache/save@v3
with:
path: ${{ env.YARN_CACHE_PATH }}
key: yarn-global-cache-${{ github.run_id }} # Can use time based key as well
path: |
${{ env.YARN_CACHE_PATH }}
${{ env.CACHE_PATH }}
key: yarn-global-cache-${{ steps.check-yarn-hash.outputs.yarnHash }} # Can use time based key as well

- name: Create additional cache
id: create-additional-cache
uses: actions/cache/save@v3
with:
path: ${{ env.CACHE_PATH }}
key: e2e-cache-${{ steps.check-yarn-hash.outputs.yarnHash }}
- name: Check disk space after installation
id: check-disk-space-after-installation
run: |
Expand Down Expand Up @@ -223,34 +212,26 @@ jobs:

# Hash yarn.lock files to use it as a cache key, if yarn.lock files are changed, the cache will be invalidated
- name: Check Yarn hash
id: check-yarn-hash-e2e
id: check-yarn-hash
run: |
yarnHash="$(npx hash-files -f '["**/yarn.lock"]' -a sha256)"
echo "yarnHash=$yarnHash" >> $GITHUB_OUTPUT

- name: Restore Yarn and Cypress cache
id: restore-yarn-cypress-cache-e2e
uses: actions/cache/restore@v3
with:
path: ${{ env.CACHE_PATH }}
key: e2e-cache-${{ steps.check-yarn-hash-e2e.outputs.yarnHash }}
restore-keys: |
e2e-cache-
e2e-

- name: Restore Yarn Global Cache
id: restore-yarn-global-cache-e2e
uses: actions/cache/restore@v3
with:
path: ${{ env.YARN_CACHE_PATH }}
key: yarn-global-cache-${{ github.run_id }} # Can use time based key as well
path: |
${{ env.YARN_CACHE_PATH }}
${{ env.CACHE_PATH }}
key: yarn-global-cache-${{ steps.check-yarn-hash.outputs.yarnHash }} # Can use time based key as well
restore-keys: |
yarn-global-cache
yarn-global-cache-

- name: Install deps
id: install-deps-e2e
if: steps.restore-yarn-cypress-cache-e2e.outputs.cache-hit != 'true'
if: steps.restore-yarn-global-cache-e2e.outputs.cache-hit != 'true'
env:
NODE_OPTIONS: "--max_old_space_size=4096"
run: |
Expand All @@ -266,16 +247,21 @@ jobs:
# npx lerna exec --stream --scope="${{ matrix.container }}*" --concurrency=1 "yarn install"
echo 'test'

- name: Check disk space after install
id: check-disk-space-after-install-e2e
run: |
df -h
- name: Cache Yarn and Cypress
if: steps.restore-yarn-global-cache-e2e.outputs.cache-hit != 'true'
id: cache-yarn-cypress
uses: actions/cache/save@v3
with:
path: |
${{ env.YARN_CACHE_PATH }}
${{ env.CACHE_PATH }}
key: yarn-global-cache-${{ steps.check-yarn-hash.outputs.yarnHash }} # Can use time based key as well

- name: Set up node
id: setup-node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Run sample e2e tests
id: run-sample-e2e-tests
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ pids
*.pid
*.seed
*.pid.lock
.nx

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v18.18.1
8 changes: 4 additions & 4 deletions advanced-api/automatic-vendor-sharing/app1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"@babel/core": "7.21.4",
"@babel/preset-react": "7.18.6",
"babel-loader": "8.2.5",
"html-webpack-plugin": "5.5.1",
"serve": "13.0.4",
"webpack": "5.80.0",
"html-webpack-plugin": "5.5.3",
"serve": "14.2.1",
"webpack": "5.89.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.13.3"
"webpack-dev-server": "4.15.1"
},
"scripts": {
"start": "webpack-cli serve",
Expand Down
8 changes: 4 additions & 4 deletions advanced-api/automatic-vendor-sharing/app2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"@babel/core": "7.21.4",
"@babel/preset-react": "7.18.6",
"babel-loader": "8.2.5",
"html-webpack-plugin": "5.5.1",
"serve": "13.0.4",
"webpack": "5.80.0",
"html-webpack-plugin": "5.5.3",
"serve": "14.2.1",
"webpack": "5.89.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.13.3"
"webpack-dev-server": "4.15.1"
},
"scripts": {
"start": "webpack-cli serve",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"@babel/core": "7.21.4",
"@babel/preset-react": "7.18.6",
"babel-loader": "8.2.5",
"html-webpack-plugin": "5.5.1",
"html-webpack-plugin": "5.5.3",
"copy-webpack-plugin": "9.1.0",
"serve": "13.0.4",
"webpack": "5.80.0",
"serve": "14.2.1",
"webpack": "5.89.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.13.3"
"webpack-dev-server": "4.15.1"
},
"scripts": {
"start": "chmod +x ./env.sh && cp env-config.json ./public/ && webpack-cli serve",
Expand All @@ -22,7 +22,7 @@
"docker:rm": "docker rm -f csr-env-host"
},
"dependencies": {
"moment": "^2.24.0",
"moment": "^2.29.4",
"react": "^16.13.0",
"react-dom": "^16.13.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
"./remote"
],
"private": true,


"version": "0.0.0",
"scripts": {
"start": "lerna run --scope=dynamic-remotes-runtime-environment-variables_* --parallel start",
Expand All @@ -19,8 +17,6 @@
"e2e:ci": "yarn start & wait-on http-get://localhost:3000/ && npx cypress run --config-file ../../cypress/config/cypress.config.ts --config '{\"supportFile\": \"../../cypress/support/e2e.ts\"}' --spec \"./e2e/*.cy.ts\" --browser=chrome"
},
"devDependencies": {
"copy-webpack-plugin": "11.0.0",
"wait-on": "7.0.1",
"webpack-cli": "4.10.0"
"wait-on": "7.0.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"@babel/core": "7.21.4",
"@babel/preset-react": "7.18.6",
"babel-loader": "8.2.5",
"html-webpack-plugin": "5.5.1",
"serve": "13.0.4",
"webpack": "5.80.0",
"html-webpack-plugin": "5.5.3",
"serve": "14.2.1",
"webpack": "5.89.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.13.3"
"webpack-dev-server": "4.15.1"
},
"scripts": {
"start": "chmod +x ./env.sh && cp env-config.json ./public/ && webpack-cli serve",
Expand All @@ -21,8 +21,8 @@
"docker:rm": "docker rm -f csr-env-remote"
},
"dependencies": {
"copy-webpack-plugin": "^9.0.0",
"moment": "^2.24.0",
"copy-webpack-plugin": "9.1.0",
"moment": "^2.29.4",
"react": "^16.13.0",
"react-dom": "^16.13.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"@babel/core": "7.21.4",
"@babel/preset-react": "7.18.6",
"babel-loader": "8.2.5",
"html-webpack-plugin": "5.5.1",
"serve": "13.0.4",
"webpack": "5.80.0",
"html-webpack-plugin": "5.5.3",
"serve": "14.2.1",
"webpack": "5.89.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.13.3"
"webpack-dev-server": "4.15.1"
},
"scripts": {
"start": "webpack-cli serve",
Expand All @@ -18,7 +18,7 @@
"clean": "rm -rf dist"
},
"dependencies": {
"moment": "^2.24.0",
"moment": "^2.29.4",
"react": "^16.13.0",
"react-dom": "^16.13.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"@babel/core": "7.21.4",
"@babel/preset-react": "7.18.6",
"babel-loader": "8.2.5",
"html-webpack-plugin": "5.5.1",
"serve": "13.0.4",
"webpack": "5.80.0",
"html-webpack-plugin": "5.5.3",
"serve": "14.2.1",
"webpack": "5.89.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.13.3"
"webpack-dev-server": "4.15.1"
},
"scripts": {
"start": "webpack-cli serve",
Expand All @@ -18,7 +18,7 @@
"clean": "rm -rf dist"
},
"dependencies": {
"moment": "^2.24.0",
"moment": "^2.29.4",
"react": "^16.13.0",
"react-dom": "^16.13.0",
"react-redux": "^7.2.0",
Expand Down
2 changes: 0 additions & 2 deletions advanced-api/dynamic-remotes-synchronous-imports/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
"./app2"
],
"private": true,


"version": "0.0.0",
"scripts": {
"start": "lerna run --scope=dynamic-remotes-synchronous-imports_app* --parallel start",
Expand Down
8 changes: 4 additions & 4 deletions advanced-api/dynamic-remotes/app1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"@babel/core": "7.21.4",
"@babel/preset-react": "7.18.6",
"babel-loader": "8.2.5",
"html-webpack-plugin": "5.5.1",
"serve": "13.0.4",
"webpack": "5.80.0",
"html-webpack-plugin": "5.5.3",
"serve": "14.2.1",
"webpack": "5.89.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.13.3"
"webpack-dev-server": "4.15.1"
},
"scripts": {
"start": "webpack-cli serve",
Expand Down
10 changes: 5 additions & 5 deletions advanced-api/dynamic-remotes/app2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"@babel/core": "7.21.4",
"@babel/preset-react": "7.18.6",
"babel-loader": "8.2.5",
"html-webpack-plugin": "5.5.1",
"serve": "13.0.4",
"webpack": "5.80.0",
"html-webpack-plugin": "5.5.3",
"serve": "14.2.1",
"webpack": "5.89.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.13.3"
"webpack-dev-server": "4.15.1"
},
"scripts": {
"start": "webpack-cli serve",
Expand All @@ -20,6 +20,6 @@
"dependencies": {
"react": "^16.13.0",
"react-dom": "^16.13.0",
"moment": "^2.24.0"
"moment": "^2.29.4"
}
}
10 changes: 5 additions & 5 deletions advanced-api/dynamic-remotes/app3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"@babel/core": "7.21.4",
"@babel/preset-react": "7.18.6",
"babel-loader": "8.2.5",
"html-webpack-plugin": "5.5.1",
"serve": "13.0.4",
"webpack": "5.80.0",
"html-webpack-plugin": "5.5.3",
"serve": "14.2.1",
"webpack": "5.89.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.13.3"
"webpack-dev-server": "4.15.1"
},
"scripts": {
"start": "webpack-cli serve",
Expand All @@ -18,7 +18,7 @@
"clean": "rm -rf dist"
},
"dependencies": {
"moment": "^2.24.0",
"moment": "^2.29.4",
"react": "^16.13.0",
"react-dom": "^16.13.0",
"react-redux": "^7.2.0",
Expand Down
2 changes: 0 additions & 2 deletions advanced-api/dynamic-remotes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
"./app3"
],
"private": true,


"version": "0.0.0",
"scripts": {
"start": "lerna run --scope=dynamic-remotes_app* --parallel start",
Expand Down
Loading
Loading