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

[Release 3.0] - Update node to v18 #12663

Merged
merged 97 commits into from Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
3bb8622
Update Node version to 16.20.0 LTS and NPM to 8.19.4
matheusccastroo May 31, 2023
a112ad5
Update Node version to `18.16.0` LTS
matheusccastroo Jun 1, 2023
766a0c0
Update lockfile version on meteor-npm
matheusccastroo Jun 2, 2023
6df4c36
Merge branch 'release-3.0' into update-node-18
denihs Jun 27, 2023
69ed1b7
- fix getInstalledDependenciesTree
denihs Jun 29, 2023
a26a0ab
- change node version on travis
denihs Jun 29, 2023
2f178c8
- changing travis distro do jammy
denihs Jun 29, 2023
a0d66e7
update g++ version for travis machines
denihs Jun 29, 2023
e5eef2f
update g++ version for travis machines
denihs Jun 29, 2023
e25244c
bypass pressing enter when add-apt-repository
denihs Jun 29, 2023
7ba0364
update add-apt-repository to jammy
denihs Jun 29, 2023
27957c6
remove .npm from all packages and updating npm-shrinkwrap.json from o…
denihs Jun 29, 2023
c0a3986
add | sudo tee -a /etc/apt/sources.list to add-apt-repository command
denihs Jun 29, 2023
2e591f3
remove | sudo tee -a /etc/apt/sources.list to add-apt-repository command
denihs Jun 29, 2023
725fe1f
remove .npm from all packages to start fresh for node 18
denihs Jun 29, 2023
820df2e
update circleci yml to use node 18
denihs Jun 29, 2023
86f9714
Revert "remove | sudo tee -a /etc/apt/sources.list to add-apt-reposit…
denihs Jun 29, 2023
0ff92d9
remove | sudo tee -a /etc/apt/sources.list to add-apt-repository command
denihs Jun 29, 2023
29fec63
cat /etc/apt/sources.list
denihs Jun 29, 2023
d796200
remove .npm from all packages to start fresh for node 18
denihs Jun 29, 2023
25e2c81
Updated blaze submodule to latest commit.
denihs Jun 29, 2023
19b937f
trying to use different folder to build env for CircleCI
denihs Jun 29, 2023
097cfe8
trying to use different folder to build env for CircleCI
denihs Jun 29, 2023
035c0b4
CircleCI yml syntex error
denihs Jun 29, 2023
c899e4a
trying to change working_directory
denihs Jun 29, 2023
c35916d
generating .npm/ to all packages
denihs Jun 29, 2023
a8b9e89
adding ls command
denihs Jun 29, 2023
ff795a3
check if folder exist to avoid throwing error
denihs Jun 29, 2023
e603449
removing unnecessary string
denihs Jun 29, 2023
67813c4
update @type/node version
denihs Jun 29, 2023
5fc9abc
installing typescript directly
denihs Jun 29, 2023
5f96ff4
installing typescript directly
denihs Jun 30, 2023
5596d7a
remove the use of custom folder project-18
denihs Jun 30, 2023
383c033
creating symlink right after finish with npm
denihs Jul 3, 2023
8fef7aa
show folder infos
denihs Jul 3, 2023
e0d611d
create symlink in the right path
denihs Jul 3, 2023
554de2d
create symlink in the right path
denihs Jul 3, 2023
b64779b
show folder infos root and tools
denihs Jul 3, 2023
980a4c3
show folder infos tools
denihs Jul 3, 2023
aea46da
coping the node_modules folder from dev_bundle to tools instead of us…
denihs Jul 3, 2023
bfc830b
comment to explain why use cp instead of ln
denihs Jul 3, 2023
1eb1f58
clean up .npm folders to start fresh for node 18
denihs Jul 3, 2023
204e568
remove clean up .npm folders
denihs Jul 3, 2023
fcffab8
log packageNpmDir when fail to minimize installed dependencies
denihs Jul 3, 2023
fd9793c
adding some debugging commands
denihs Jul 3, 2023
1508b17
logging tree when there is an error minimizing tree
denihs Jul 3, 2023
6c5331d
always return some value from getInstalledDependenciesTree
denihs Jul 3, 2023
1badc0a
Look deeper in the node modules to find more dependencies
denihs Jul 4, 2023
077361f
remove debugging commands
denihs Jul 4, 2023
0dbb412
Merge remote-tracking branch 'matheusccastro/update-node-18' into upd…
denihs Jul 4, 2023
9a3e70f
Look deeper in the node modules to find more dependencies
denihs Jul 5, 2023
009a504
Merge remote-tracking branch 'matheusccastro/update-node-18' into upd…
denihs Jul 5, 2023
514478d
- copy package.json to lib folder when generating a dev_bundle
denihs Jul 6, 2023
70db916
- update blaze commit
denihs Jul 6, 2023
6cf9558
new devbundle version
denihs Jul 6, 2023
1644c55
- creating all shrinkwrap files from scratch
denihs Jul 6, 2023
2d3bc8a
- creating all shrinkwrap files from scratch
denihs Jul 6, 2023
c6d8714
- update blaze version
denihs Jul 6, 2023
c926ed5
- update all shrinkwrap files from scratch
denihs Jul 6, 2023
793393a
updating blaze commit hash
denihs Jul 6, 2023
a83f400
- fix test "meteor npm run some-script-name - error returns exit stat…
denihs Jul 7, 2023
d92c87a
- fix "package with colons is converted on Windows"
denihs Jul 7, 2023
2d9d5c0
- update cordova version on cordova-plugin-meteor-webapp
denihs Jul 10, 2023
e52a2b4
- fix "cordova builds with server options"
denihs Jul 11, 2023
bef6318
- fix "create --chakra-ui"
denihs Jul 11, 2023
8256891
- log env
denihs Jul 12, 2023
dc402d6
- log env after setup
denihs Jul 12, 2023
eb474e9
- log env to all groups
denihs Jul 12, 2023
4fd3f26
log more system information
denihs Jul 20, 2023
3d8aa28
remove hostnamectl log command
denihs Jul 20, 2023
f772894
- stop running npm command inside tools/
denihs Jul 27, 2023
8bb4176
- stop coping node_modules from dev_bundle to tools
denihs Jul 27, 2023
055026e
- trying to install dependencies directly on dev_bundle/lib
denihs Jul 27, 2023
044d206
- install lib libgbm-dev
denihs Jul 27, 2023
2e7f6e8
- install lib libgbm-dev for group 4
denihs Jul 27, 2023
b73d086
- remove forced installation for the lib libgbm-dev for group 4
denihs Jul 27, 2023
cb0fa24
- fix group 11 tests
denihs Jul 31, 2023
4d0668c
- fix group 0 tests
denihs Jul 31, 2023
41f6f31
- fix test "can't build local packages with colons"
denihs Aug 1, 2023
a3b9ab4
- fix function testShowPackageVersion
denihs Aug 1, 2023
499eaa8
testing adding python 3 to travis
Grubba27 Aug 1, 2023
a587e5d
Merge branch 'release-3.0' into update-node-18
Grubba27 Aug 1, 2023
e85f13d
testing python changes
Grubba27 Aug 1, 2023
16632ef
Merge branch 'update-node-18' of https://github.com/matheusccastroo/m…
Grubba27 Aug 1, 2023
d37a88d
testing someting
Grubba27 Aug 1, 2023
fd19bb2
- increase wait time before match
denihs Aug 2, 2023
a2579b0
Merge remote-tracking branch 'matheusccastro/update-node-18' into upd…
denihs Aug 2, 2023
699aa23
empty commit to rerun test
denihs Aug 9, 2023
7c64042
- fix tests "add cordova platforms"
denihs Aug 9, 2023
7145746
- fix tests "add cordova platforms" - set HOME env to undefined
denihs Aug 10, 2023
542b1ea
solving appveyor issue
Grubba27 Aug 11, 2023
276d0a6
Merge branch 'update-node-18' of https://github.com/matheusccastroo/m…
Grubba27 Aug 11, 2023
38711e8
- copy package-lock.json to lib folder so that npm keep everything in…
denihs Aug 15, 2023
63dadc0
Merge remote-tracking branch 'matheusccastro/update-node-18' into upd…
denihs Aug 15, 2023
0df8ae3
- bump bundle version
denihs Aug 15, 2023
169f777
force CI tests to run again
denihs Aug 16, 2023
c5a4734
Merge branch 'release-3.0' into update-node-18
denihs Aug 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 63 additions & 7 deletions .circleci/config.yml
Expand Up @@ -32,6 +32,24 @@ run_env_change: &run_env_change
# Reload sysctl so these are in effect.
# sudo sysctl -p

log_env: &log_env
name: Log Environment
command: |
echo "==> LBS Version"
lsb_release -a
echo "==> cat /etc/os-release"
cat /etc/os-release
echo "==> uname -srm"
uname -srm
echo "==> Node version: $(node --version)"
echo "==> NPM version: $(npm --version)"
echo "==> Meteor Node version: $(./meteor node --version)"
echo "==> Meteor NPM version: $(./meteor npm --version)"
echo "==> Dev bundle package.json:"
cat ./dev_bundle/lib/package.json
echo "==> Dev bundle node_modules:"
ls -l ./dev_bundle/lib/node_modules

# A reusable "run" snippet which enables the continued logging of memoryusage
# to a file on disk which can be saved to build artifacts for later analysis.
run_log_mem_use: &run_log_mem_use
Expand Down Expand Up @@ -61,7 +79,7 @@ run_save_node_bin: &run_save_node_bin
build_machine_environment: &build_machine_environment
# Specify that we want an actual machine (ala Circle 1.0), not a Docker image.
docker:
- image: meteor/circleci:android-30-node-14
- image: meteor/circleci:android-30-node-18
resource_class: large
environment:
# This multiplier scales the waitSecs for selftests.
Expand Down Expand Up @@ -117,8 +135,16 @@ jobs:
- run:
name: Combine NPM Shrinkwrap Files
command: |
for d in packages/*/.npm/package; do cat $d/npm-shrinkwrap.json >> shrinkwraps.txt; done
for d in packages/*/.npm/plugin/*; do cat $d/npm-shrinkwrap.json >> shrinkwraps.txt; done
for d in packages/*/.npm/package; do
if [ -f $d/npm-shrinkwrap.json ]; then
cat $d/npm-shrinkwrap.json >> shrinkwraps.txt;
fi
done
for d in packages/*/.npm/plugin/*; do
if [ -f $d/npm-shrinkwrap.json ]; then
cat $d/npm-shrinkwrap.json >> shrinkwraps.txt;
fi
done
- restore_cache:
keys:
- package-npm-deps-cache-group1-v3-{{ checksum "shrinkwraps.txt" }}
Expand All @@ -145,15 +171,19 @@ jobs:
- run:
name: Clear npm cache
command: ./meteor npm cache clear --force
- run:
<<: *log_env
- run:
name: Get Ready
command: |
eval $PRE_TEST_COMMANDS;
pushd tools
npm install @types/node@14.17.6 --save-dev
cd dev_bundle/lib
../../meteor npm install @types/node@18.11.9 --save-dev
# Ensure that meteor/tools has no TypeScript errors.
../meteor npx tsc --noEmit --skipLibCheck
popd
../../meteor npm install -g typescript
cd ../../
# tools/node_modules is a symlink, but starting on NPM 7, this symlinks are deleted https://github.com/npm/cli/issues/3669
# so we are copying the node_modules to tools
./meteor --get-ready
# shouldn't take longer than 60 minutes
no_output_timeout: 60m
Expand Down Expand Up @@ -188,6 +218,8 @@ jobs:
--retries ${METEOR_SELF_TEST_RETRIES} \
--headless \
no_output_timeout: 20m
- run:
<<: *log_env
- run:
name: "Running self-test (Custom Warehouse Tests)"
command: |
Expand Down Expand Up @@ -221,6 +253,8 @@ jobs:
- run:
name: "Print environment"
command: printenv
- run:
<<: *log_env
- run:
name: "Running self-test (Test Group 0)"
command: |
Expand Down Expand Up @@ -261,6 +295,8 @@ jobs:
- run:
name: "Print environment"
command: printenv
- run:
<<: *log_env
- run:
name: "Running self-test (Test Group 1)"
command: |
Expand Down Expand Up @@ -298,6 +334,8 @@ jobs:
<<: *run_env_change
- attach_workspace:
at: .
- run:
<<: *log_env
- run:
name: "Print environment"
command: printenv
Expand Down Expand Up @@ -338,6 +376,8 @@ jobs:
<<: *run_env_change
- attach_workspace:
at: .
- run:
<<: *log_env
- run:
name: "Print environment"
command: printenv
Expand Down Expand Up @@ -381,6 +421,8 @@ jobs:
- run:
name: "Print environment"
command: printenv
- run:
<<: *log_env
- run:
name: "Running self-test (Test Group 4)"
command: |
Expand Down Expand Up @@ -421,6 +463,8 @@ jobs:
- run:
name: "Print environment"
command: printenv
- run:
<<: *log_env
- run:
name: "Running self-test (Test Group 5)"
command: |
Expand Down Expand Up @@ -461,6 +505,8 @@ jobs:
- run:
name: "Print environment"
command: printenv
- run:
<<: *log_env
- run:
name: "Running self-test (Test Group 6)"
command: |
Expand Down Expand Up @@ -501,6 +547,8 @@ jobs:
- run:
name: "Print environment"
command: printenv
- run:
<<: *log_env
- run:
name: "Running self-test (Test Group 7)"
command: |
Expand Down Expand Up @@ -541,6 +589,8 @@ jobs:
- run:
name: "Print environment"
command: printenv
- run:
<<: *log_env
- run:
name: "Running self-test (Test Group 8)"
command: |
Expand Down Expand Up @@ -581,6 +631,8 @@ jobs:
- run:
name: "Print environment"
command: printenv
- run:
<<: *log_env
- run:
name: "Running self-test (Test Group 9)"
command: |
Expand Down Expand Up @@ -621,6 +673,8 @@ jobs:
- run:
name: "Print environment"
command: printenv
- run:
<<: *log_env
- run:
name: "Running self-test (Test Group 10)"
command: |
Expand Down Expand Up @@ -661,6 +715,8 @@ jobs:
- run:
name: "Print environment"
command: printenv
- run:
<<: *log_env
- run:
name: "Running self-test (Test Group 11)"
command: |
Expand Down
12 changes: 7 additions & 5 deletions .travis.yml
@@ -1,8 +1,8 @@
language: node_js
os: linux
dist: xenial
dist: jammy
node_js:
- "14.21.2"
- "18.16.0"
cache:
directories:
- ".meteor"
Expand All @@ -11,18 +11,20 @@ script:
- travis_retry ./packages/test-in-console/run.sh
env:
global:
- CXX=g++-4.8
- CXX=g++-12
- phantom=false
- PUPPETEER_DOWNLOAD_PATH=~/.npm/chromium
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- g++-12
- libnss3

before_install:
- sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu bionic main universe"
- cat /etc/apt/sources.list
- python3 --version
- echo "deb http://archive.ubuntu.com/ubuntu jammy main universe" | sudo tee -a /etc/apt/sources.list
- sudo apt-get update
- sudo apt-get install -y libnss3
5 changes: 3 additions & 2 deletions meteor
@@ -1,13 +1,14 @@
#!/usr/bin/env bash

BUNDLE_VERSION=14.21.3.6
BUNDLE_VERSION=18.16.0.2


# OS Check. Put here because here is where we download the precompiled
# bundles that are arch specific.
# Use of : "${ARCH:=$(uname)}" assignment permits users to set their
# architecture manually; this is useful for multi-arch systems whose
# uname executables may sometimes return different architectures in
# uname executables may sometimes return different architectures
# in
# different contexts.
# Ex: ARCH=arm64 meteor ARGS...;
UNAME="$(uname)"
Expand Down
4 changes: 2 additions & 2 deletions npm-packages/cordova-plugin-meteor-webapp/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-meteor-webapp",
"version": "2.0.0",
"version": "2.0.1",
"description": "Cordova plugin that serves a Meteor web app through a local server and implements hot code push",
"cordova": {
"id": "cordova-plugin-meteor-webapp",
Expand Down Expand Up @@ -30,7 +30,7 @@
"xcode": "^2.0.0"
},
"devDependencies": {
"cordova": "^9.0.0",
"cordova": "^12.0.0",
"cordova-paramedic": "github:meteor/cordova-paramedic#40df66c3efc2f0db4d66b8c172174a68c031c114",
"ios-deploy": "^1.10.0-beta.3",
"ios-sim": "^8.0.2"
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

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

10 changes: 8 additions & 2 deletions package.json
Expand Up @@ -17,7 +17,7 @@
"@babel/eslint-parser": "^7.21.3",
"@babel/eslint-plugin": "^7.19.1",
"@babel/preset-react": "^7.18.6",
"@types/node": "^14.17.6",
"@types/node": "^18.16.18",
"@typescript-eslint/eslint-plugin": "^5.56.0",
"@typescript-eslint/parser": "^5.56.0",
"eslint": "^8.36.0",
Expand Down Expand Up @@ -46,7 +46,13 @@
"no-console": "off",
"camelcase": "warn",
"consistent-return": "off",
"quotes": ["warn", "single", { "allowTemplateLiterals": true }],
"quotes": [
"warn",
"single",
{
"allowTemplateLiterals": true
}
],
"no-shadow": [
"error",
{
Expand Down
14 changes: 7 additions & 7 deletions packages/accounts-2fa/.npm/package/npm-shrinkwrap.json

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