Skip to content
This repository has been archived by the owner on May 3, 2024. It is now read-only.

v5 on Node 16 #677

Merged
merged 3 commits into from
Feb 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/dangerJS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '16.x'
- uses: actions/cache@v2
with:
path: ~/.npm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integrations_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
${{ runner.os }}-node-
- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x
- name: npm install
run: NODE_ENV=development npm ci
- name: Build docker image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_statics_npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '16.x'
registry-url: 'https://registry.npmjs.org'
- name: Docker login
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login --username ${{ secrets.DOCKER_USER }} --password-stdin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_integration_test .yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
${{ runner.os }}-node-
- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x
- name: npm install
run: NODE_ENV=development npm ci
- name: Build docker image
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# which includes build utils preinstalled (e.g. gcc, make, etc).
# This will result in faster and reliable One App docker image
# builds as we do not have to run apk installs for alpine.
FROM node:12 as builder
FROM node:16 as builder
WORKDIR /opt/build
RUN npm install -g npm@6.12.1 --registry=https://registry.npmjs.org
RUN npm install -g npm@8 --registry=https://registry.npmjs.org
COPY --chown=node:node ./ /opt/build
# npm ci does not run postinstall with root account
RUN NODE_ENV=development npm ci --build-from-source
Expand All @@ -29,7 +29,7 @@ RUN NODE_ENV=production npm run build && \

# development image
# docker build . --target=development
FROM node:12-alpine as development
FROM node:16-alpine as development
ARG USER
ENV USER ${USER:-node}
ENV NODE_ENV=development
Expand All @@ -47,7 +47,7 @@ COPY --from=builder --chown=node:node /opt/one-app/development ./

# production image
# last so that it's the default image artifact
FROM node:12-alpine as production
FROM node:16-alpine as production
ARG USER
ENV USER ${USER:-node}
ENV NODE_ENV=production
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/Publishing-Modules.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 12.x
- name: Use Node.js 16.x
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '16.x'
- name: Cache NPM Dependencies
uses: actions/cache@v1
with:
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"chalk": "^4.1.2",
"compression": "^1.7.4",
"cookie-parser": "^1.4.5",
"core-js": "^3.16.0",
"core-js": "^3.21.0",
"cors": "^2.8.5",
"create-shared-react-context": "^1.0.3",
"cross-fetch": "^3.0.6",
Expand Down
2 changes: 1 addition & 1 deletion prod-sample/api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12-alpine
FROM node:16-alpine
MAINTAINER One App Team

WORKDIR /
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"immutable": "^3.8.2",
"prop-types": "^15.5.9",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-intl": "^3.12.1",
"react-redux": "^7.2.4",
"redux": "^4.1.1"
Expand All @@ -25,4 +26,4 @@
"eslint": "^6.8.0",
"rimraf": "^2.5.2"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"immutable": "^3.8.2",
"prop-types": "^15.5.9",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-intl": "^3.12.1",
"react-redux": "^7.2.4",
"redux": "^4.1.1"
Expand All @@ -30,4 +31,4 @@
]
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"ip": "^1.1.5",
"prop-types": "^15.5.9",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-helmet": "^6.1.0",
"react-immutable-proptypes": "^2.2.0",
"react-redux": "^7.2.4",
Expand All @@ -27,4 +28,4 @@
"babel-preset-amex": "^3.5.0",
"rimraf": "^2.5.2"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"ip": "^1.1.5",
"prop-types": "^15.5.9",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-helmet": "^6.1.0",
"react-redux": "^7.2.4",
"redux": "^3.0.6"
Expand All @@ -26,4 +27,4 @@
"babel-preset-amex": "^3.5.0",
"rimraf": "^2.5.2"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
"content-security-policy-builder": "^2.1.0",
"holocron": "^1.1.4",
"holocron-module-route": "^1.1.4",
"immutable": "^4.0.0-0",
"immutable": "^4.0.0",
"ip": "^1.1.5",
"prop-types": "^15.5.9",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-helmet": "^6.1.0",
"react-immutable-proptypes": "^2.2.0",
"react-redux": "^7.2.4",
Expand All @@ -35,4 +36,4 @@
]
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"ip": "^1.1.5",
"prop-types": "^15.5.9",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-helmet": "^6.1.0",
"react-immutable-proptypes": "^2.2.0",
"react-redux": "^7.2.4",
Expand All @@ -34,4 +35,4 @@
"webpackConfigPath": "webpack.config.js"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
"dependencies": {
"holocron": "^1.1.4",
"prop-types": "^15.5.9",
"react": "^16.14.0"
"react": "^16.14.0",
"react-dom": "^16.14.0"
},
"devDependencies": {
"@americanexpress/one-app-bundler": "^6.14.1",
"babel-preset-amex": "^3.5.0",
"rimraf": "^2.5.2"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
"prepare": "npm run build"
},
"dependencies": {
"react": "^16.14.0"
"react": "^16.14.0",
"react-dom": "^16.14.0"
},
"devDependencies": {
"@americanexpress/one-app-bundler": "^6.14.1",
"babel-preset-amex": "^3.5.1",
"rimraf": "^3.0.1"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
"holocron-module-route": "^1.1.4",
"prop-types": "^15.5.9",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-redux": "^7.2.4"
},
"devDependencies": {
"@americanexpress/one-app-bundler": "^6.14.1",
"babel-preset-amex": "^3.5.0",
"rimraf": "^2.5.2"
}
}
}
5 changes: 3 additions & 2 deletions prod-sample/sample-modules/late-frank/0.0.0/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
"dependencies": {
"holocron": "^1.1.4",
"prop-types": "^15.5.9",
"react": "^16.14.0"
"react": "^16.14.0",
"react-dom": "^16.14.0"
},
"devDependencies": {
"@americanexpress/one-app-bundler": "^6.14.1",
"babel-preset-amex": "^3.5.1",
"rimraf": "^2.5.2"
}
}
}
3 changes: 2 additions & 1 deletion prod-sample/sample-modules/late-frank/0.0.1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"dependencies": {
"@emotion/core": "^10.1.1",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-intl": "^3.12.1"
},
"devDependencies": {
Expand All @@ -25,4 +26,4 @@
]
}
}
}
}
5 changes: 3 additions & 2 deletions prod-sample/sample-modules/late-frank/0.0.2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
},
"dependencies": {
"@emotion/core": "^10.1.1",
"react": "^16.14.0"
"react": "^16.14.0",
"react-dom": "^16.14.0"
},
"devDependencies": {
"@americanexpress/one-app-bundler": "^6.14.1",
Expand All @@ -24,4 +25,4 @@
]
}
}
}
}
5 changes: 3 additions & 2 deletions prod-sample/sample-modules/needy-frank/0.0.0/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
},
"dependencies": {
"holocron": "^1.1.4",
"iguazu": "3.0.0-3",
"iguazu": "^3.2.0",
"iguazu-holocron": "^1.1.4",
"iguazu-rest": "^1.10.1",
"iguazu-rpc": "^1.6.1",
"object-hash": "^2.2.0",
"prop-types": "^15.5.9",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-redux": "^7.2.4",
"redux": "^4.1.1",
"redux-immutable": "^4.0.0",
Expand All @@ -32,4 +33,4 @@
"performanceBudget": 600000
}
}
}
}
5 changes: 3 additions & 2 deletions prod-sample/sample-modules/needy-frank/0.0.1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
},
"dependencies": {
"holocron": "^1.1.4",
"iguazu": "3.0.0-3",
"iguazu": "^3.2.0",
"iguazu-holocron": "^1.1.4",
"iguazu-rest": "^1.10.1",
"iguazu-rpc": "^1.6.1",
"object-hash": "^2.1.1",
"prop-types": "^15.5.9",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-redux": "^7.2.4",
"redux": "^4.1.0",
"redux-immutable": "^4.0.0",
Expand All @@ -32,4 +33,4 @@
"performanceBudget": 600000
}
}
}
}
5 changes: 3 additions & 2 deletions prod-sample/sample-modules/picky-frank/0.0.0/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
"dependencies": {
"holocron": "^1.1.4",
"prop-types": "^15.5.9",
"react": "^16.14.0"
"react": "^16.14.0",
"react-dom": "^16.14.0"
},
"devDependencies": {
"@americanexpress/one-app-bundler": "^6.14.1",
"babel-preset-amex": "^3.5.0",
"rimraf": "^2.5.2"
}
}
}
5 changes: 3 additions & 2 deletions prod-sample/sample-modules/picky-frank/0.0.1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
"dependencies": {
"holocron": "^1.1.4",
"prop-types": "^15.5.9",
"react": "^16.14.0"
"react": "^16.14.0",
"react-dom": "^16.14.0"
},
"devDependencies": {
"@americanexpress/one-app-bundler": "^6.14.1",
"babel-preset-amex": "^3.5.0",
"rimraf": "^2.5.2"
}
}
}
Loading