diff --git a/.circleci/config.yml b/.circleci/config.yml index 78885785aa..28a661dafe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: - restore_cache: key: angular-{{ .Branch }}-{{ checksum "yarn.lock" }} - - run: yarn install --freeze-lockfile --non-interactive + - run: yarn install --frozen-lockfile --non-interactive - run: ./node_modules/.bin/gulp lint build: diff --git a/aio/aio-builds-setup/dockerbuild/Dockerfile b/aio/aio-builds-setup/dockerbuild/Dockerfile index 5bbe6c670d..7d082d1df1 100644 --- a/aio/aio-builds-setup/dockerbuild/Dockerfile +++ b/aio/aio-builds-setup/dockerbuild/Dockerfile @@ -156,7 +156,7 @@ RUN find $AIO_SCRIPTS_SH_DIR -maxdepth 1 -type f -printf "%P\n" \ # Set up the Node.js scripts COPY scripts-js/ $AIO_SCRIPTS_JS_DIR/ WORKDIR $AIO_SCRIPTS_JS_DIR/ -RUN yarn install --production --freeze-lockfile +RUN yarn install --production --frozen-lockfile # Set up health check diff --git a/aio/aio-builds-setup/scripts/create-image.sh b/aio/aio-builds-setup/scripts/create-image.sh index 4d35376ef0..553b426210 100755 --- a/aio/aio-builds-setup/scripts/create-image.sh +++ b/aio/aio-builds-setup/scripts/create-image.sh @@ -9,7 +9,7 @@ readonly defaultImageNameAndTag="aio-builds:latest" # (Necessary, because only `scripts-js/dist/` is copied to the docker image.) ( cd "$SCRIPTS_JS_DIR" - yarn install --freeze-lockfile --non-interactive + yarn install --frozen-lockfile --non-interactive yarn build ) diff --git a/aio/aio-builds-setup/scripts/test.sh b/aio/aio-builds-setup/scripts/test.sh index b449bd8270..7bc25f9479 100755 --- a/aio/aio-builds-setup/scripts/test.sh +++ b/aio/aio-builds-setup/scripts/test.sh @@ -7,6 +7,6 @@ source "`dirname $0`/_env.sh" # Test `scripts-js/` ( cd "$SCRIPTS_JS_DIR" - yarn install --freeze-lockfile --non-interactive + yarn install --frozen-lockfile --non-interactive yarn test ) diff --git a/aio/package.json b/aio/package.json index 55ac1fb2cd..eb9cfdf5c6 100644 --- a/aio/package.json +++ b/aio/package.json @@ -19,7 +19,7 @@ "test": "yarn check-env && ng test", "pree2e": "yarn check-env && yarn ~~update-webdriver", "e2e": "ng e2e --no-webdriver-update", - "presetup": "yarn install --freeze-lockfile && yarn ~~check-env && yarn boilerplate:remove", + "presetup": "yarn install --frozen-lockfile && yarn ~~check-env && yarn boilerplate:remove", "setup": "yarn aio-use-npm && yarn example-use-npm", "postsetup": "yarn boilerplate:add && yarn build-ie-polyfills && yarn generate-plunkers && yarn generate-zips && yarn docs", "presetup-local": "yarn presetup", diff --git a/aio/tools/ng-packages-installer/index.js b/aio/tools/ng-packages-installer/index.js index 90785af76f..f1dc7feffd 100644 --- a/aio/tools/ng-packages-installer/index.js +++ b/aio/tools/ng-packages-installer/index.js @@ -129,7 +129,7 @@ class NgPackagesInstaller { * Yarn will also delete the local marker file for us. */ restoreNpmDependencies() { - this._installDeps('--freeze-lockfile', '--check-files'); + this._installDeps('--frozen-lockfile', '--check-files'); } // Protected helpers diff --git a/aio/tools/ng-packages-installer/index.spec.js b/aio/tools/ng-packages-installer/index.spec.js index 641bff294f..561c09e7c1 100644 --- a/aio/tools/ng-packages-installer/index.spec.js +++ b/aio/tools/ng-packages-installer/index.spec.js @@ -203,7 +203,7 @@ describe('NgPackagesInstaller', () => { it('should run `yarn install` in the specified directory, with the correct options', () => { spyOn(installer, '_installDeps'); installer.restoreNpmDependencies(); - expect(installer._installDeps).toHaveBeenCalledWith('--freeze-lockfile', '--check-files'); + expect(installer._installDeps).toHaveBeenCalledWith('--frozen-lockfile', '--check-files'); }); }); diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh index de53413d75..159ef2b79a 100755 --- a/scripts/ci/install.sh +++ b/scripts/ci/install.sh @@ -37,7 +37,7 @@ travisFoldEnd "install-yarn" # Install all npm dependencies according to yarn.lock travisFoldStart "yarn-install" - node tools/npm/check-node-modules --purge || yarn install --freeze-lockfile --non-interactive + node tools/npm/check-node-modules --purge || yarn install --frozen-lockfile --non-interactive travisFoldEnd "yarn-install" diff --git a/yarn.lock b/yarn.lock index 00669f455b..c275198d0a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6194,7 +6194,7 @@ rx-lite@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" -rxjs@5.5.x: +rxjs@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.0.tgz#26d8f3866eb700e247e0728a147c3d628993d812" dependencies: