Commit 115d861f authored by David Burke's avatar David Burke

Using npm over yarn on ci

parent ddb74e64
......@@ -16,9 +16,9 @@ test:
paths:
- node_modules/
script:
- yarn install
- yarn run lint
- yarn test --progress false --watch=false --browsers=Chromium_CI
- npm install
- npm run lint
- npm test --progress false --watch=false --browsers=Chromium_CI
build-web-assets:
stage: test
......@@ -26,7 +26,7 @@ build-web-assets:
paths:
- node_modules/
script:
- yarn install
- npm install
- node --max_old_space_size=6000 node_modules/@angular/cli/bin/ng build --prod --build-optimizer --progress false --source-map
artifacts:
paths:
......@@ -38,12 +38,12 @@ build-ext-assets:
paths:
- node_modules/
script:
- yarn install
- npm install
- ./set_version.sh
- yarn run build:ext --prod --build-optimizer --progress false
- npm run build:ext --prod --build-optimizer --progress false
- bin/remove_eval.sh
- yarn ext:lint
- yarn ext:build
- npm run ext:lint
- npm run ext:build
- mv web-ext-artifacts/*.zip web-ext-artifacts/passit.zip
- mv dist dist-ext
artifacts:
......@@ -124,8 +124,8 @@ deploy-firefox-ext:
- master
when: manual
script:
- yarn add @wext/shipit
- yarn run ext:publish_firefox
- npm install @wext/shipit
- npm run ext:publish_firefox
pages:
stage: pages
......@@ -133,8 +133,8 @@ pages:
paths:
- node_modules/
script:
- yarn install
- yarn build-storybook -o public
- npm install
- npm run build-storybook -o public
artifacts:
paths:
- public
......
......@@ -12359,9 +12359,9 @@
}
},
"nativescript-angular": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/nativescript-angular/-/nativescript-angular-7.0.0.tgz",
"integrity": "sha512-JyI5dSKGz1QFrBxTFOct+79t8iReUzLLtESEk59jDSkaFzgc2b0Gxtfw3uUrJLSSJmyRyRuI4odwB5kn2KGpoQ==",
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/nativescript-angular/-/nativescript-angular-7.0.1.tgz",
"integrity": "sha512-fiZSzH38IUD6QmlKeenA/qBuXtkyd9GMrLBpU0vddzKGkVpxBxwQ4FMqlFmdEfCKQ0M8FE8KbMQyzEj9UhjrLg==",
"requires": {
"nativescript-intl": "^3.0.0",
"reflect-metadata": "^0.1.8"
......@@ -18182,23 +18182,23 @@
}
},
"tns-core-modules": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/tns-core-modules/-/tns-core-modules-5.0.2.tgz",
"integrity": "sha512-36MJPa5FpIfF5lQgeioQejmUWJM9f4z/a8lD11eYnAqspemjxk76gKa+KdfHwcI+MZ0McYyO3oao3u/KH4JPPg==",
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/tns-core-modules/-/tns-core-modules-5.0.3.tgz",
"integrity": "sha512-b2gGpCYeXQ4JbQG8GcneGMDCDRcXmSiGppUFb0SaGRDQ+JkFDtLMAsM3bn/OhMPRS9R6s4SyY0U2ikrQpLkNvw==",
"requires": {
"tns-core-modules-widgets": "5.0.1",
"tns-core-modules-widgets": "^5.1.0-2018-10-23-150131-01",
"tslib": "^1.9.3"
}
},
"tns-core-modules-widgets": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/tns-core-modules-widgets/-/tns-core-modules-widgets-5.0.1.tgz",
"integrity": "sha512-zDml+PISblTkAQ+Xd4JcMHl/o5dpAn0B+R2fLtxWjNIhkNzNfz+FmfMtH7Js2wnwtLp+kC2ZNOQRVAzOBquxAQ=="
"version": "5.1.0-2018-10-23-150131-01",
"resolved": "https://registry.npmjs.org/tns-core-modules-widgets/-/tns-core-modules-widgets-5.1.0-2018-10-23-150131-01.tgz",
"integrity": "sha512-2fFyRpGA6YW9t+h/eSN0LOOFDOFn/21AKUioKhHMN0XBcUde7xxR8JdOEb+rHuaPm/kCHJgNszICDxBYTsU07w=="
},
"tns-platform-declarations": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/tns-platform-declarations/-/tns-platform-declarations-5.0.2.tgz",
"integrity": "sha512-CGRHyibgjd1MWPfUVD0f2uIGgj3r9g8Cp9q4fi1h82adgrZWo3vVcWGv7pkdmiyzlJ6Y2ukwSyi6VxSMcAZPkQ==",
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/tns-platform-declarations/-/tns-platform-declarations-5.0.3.tgz",
"integrity": "sha512-l8PyusXbUj91rko5AMTGFc+f4XA7Stxl8cqnz2NyFfcP8a7rWLGlCbbj2SJcv5TrYTLk2DTW+VC/MYWPY98qUw==",
"dev": true
},
"to-array": {
......@@ -19378,6 +19378,12 @@
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
"dev": true
},
"camelcase": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
"integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
"dev": true
},
"cliui": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
......@@ -19402,15 +19408,6 @@
"which": "^1.2.9"
}
},
"decamelize": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
"dev": true,
"requires": {
"xregexp": "4.0.0"
}
},
"find-up": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
......@@ -19462,13 +19459,13 @@
}
},
"yargs": {
"version": "12.0.2",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
"version": "12.0.5",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
"integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
"dev": true,
"requires": {
"cliui": "^4.0.0",
"decamelize": "^2.0.0",
"decamelize": "^1.2.0",
"find-up": "^3.0.0",
"get-caller-file": "^1.0.1",
"os-locale": "^3.0.0",
......@@ -19478,16 +19475,17 @@
"string-width": "^2.0.0",
"which-module": "^2.0.0",
"y18n": "^3.2.1 || ^4.0.0",
"yargs-parser": "^10.1.0"
"yargs-parser": "^11.1.1"
}
},
"yargs-parser": {
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
"version": "11.1.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
"integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
"dev": true,
"requires": {
"camelcase": "^4.1.0"
"camelcase": "^5.0.0",
"decamelize": "^1.2.0"
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment