honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: fix `yarn install` command (`--freeze-lockfile` --> `--frozen-lockfile`)

This commit is contained in:
George Kalpakas 2017-10-19 12:19:45 +03:00 committed by Alex Rickabaugh
parent fc86352adf
commit 910735d732
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -29,7 +29,7 @@ jobs:
- restore_cache: - restore_cache:
key: angular-{{ .Branch }}-{{ checksum "yarn.lock" }} 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 - run: ./node_modules/.bin/gulp lint
build: build:

2
aio/aio-builds-setup/dockerbuild/Dockerfile
View File

@ -156,7 +156,7 @@ RUN find $AIO_SCRIPTS_SH_DIR -maxdepth 1 -type f -printf "%P\n" \
# Set up the Node.js scripts # Set up the Node.js scripts
COPY scripts-js/ $AIO_SCRIPTS_JS_DIR/ COPY scripts-js/ $AIO_SCRIPTS_JS_DIR/
WORKDIR $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 # Set up health check

2
aio/aio-builds-setup/scripts/create-image.sh
View File

@ -9,7 +9,7 @@ readonly defaultImageNameAndTag="aio-builds:latest"
# (Necessary, because only `scripts-js/dist/` is copied to the docker image.) # (Necessary, because only `scripts-js/dist/` is copied to the docker image.)
( (
cd "$SCRIPTS_JS_DIR" cd "$SCRIPTS_JS_DIR"
yarn install --freeze-lockfile --non-interactive yarn install --frozen-lockfile --non-interactive
yarn build yarn build
) )

2
aio/aio-builds-setup/scripts/test.sh
View File

@ -7,6 +7,6 @@ source "`dirname $0`/_env.sh"
# Test `scripts-js/` # Test `scripts-js/`
( (
cd "$SCRIPTS_JS_DIR" cd "$SCRIPTS_JS_DIR"
yarn install --freeze-lockfile --non-interactive yarn install --frozen-lockfile --non-interactive
yarn test yarn test
) )

2
aio/package.json
View File

@ -19,7 +19,7 @@
"test": "yarn check-env && ng test", "test": "yarn check-env && ng test",
"pree2e": "yarn check-env && yarn ~~update-webdriver", "pree2e": "yarn check-env && yarn ~~update-webdriver",
"e2e": "ng e2e --no-webdriver-update", "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", "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", "postsetup": "yarn boilerplate:add && yarn build-ie-polyfills && yarn generate-plunkers && yarn generate-zips && yarn docs",
"presetup-local": "yarn presetup", "presetup-local": "yarn presetup",

2
aio/tools/ng-packages-installer/index.js
View File

@ -129,7 +129,7 @@ class NgPackagesInstaller {
* Yarn will also delete the local marker file for us. * Yarn will also delete the local marker file for us.
*/ */
restoreNpmDependencies() { restoreNpmDependencies() {
this._installDeps('--freeze-lockfile', '--check-files'); this._installDeps('--frozen-lockfile', '--check-files');
} }
// Protected helpers // Protected helpers

2
aio/tools/ng-packages-installer/index.spec.js
View File

@ -203,7 +203,7 @@ describe('NgPackagesInstaller', () => {
it('should run `yarn install` in the specified directory, with the correct options', () => { it('should run `yarn install` in the specified directory, with the correct options', () => {
spyOn(installer, '_installDeps'); spyOn(installer, '_installDeps');
installer.restoreNpmDependencies(); installer.restoreNpmDependencies();
expect(installer._installDeps).toHaveBeenCalledWith('--freeze-lockfile', '--check-files'); expect(installer._installDeps).toHaveBeenCalledWith('--frozen-lockfile', '--check-files');
}); });
}); });

2
scripts/ci/install.sh
View File

@ -37,7 +37,7 @@ travisFoldEnd "install-yarn"
# Install all npm dependencies according to yarn.lock # Install all npm dependencies according to yarn.lock
travisFoldStart "yarn-install" 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" travisFoldEnd "yarn-install"

2
yarn.lock
View File

@ -6194,7 +6194,7 @@ rx-lite@^3.1.2:
version "3.1.2" version "3.1.2"
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" 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" version "5.5.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.0.tgz#26d8f3866eb700e247e0728a147c3d628993d812" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.0.tgz#26d8f3866eb700e247e0728a147c3d628993d812"
dependencies: dependencies: