Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- [#2539: Remove dependency on `sync-request`](https://github.com/alphagov/govuk-prototype-kit/pull/2539)
- [#2540: Remove dependency on `require-dir`](https://github.com/alphagov/govuk-prototype-kit/pull/2540)
- [#2543: Update `qs`, `ws`, `body-parser`, `express`, `engine.io`, `engine.io-client` and `socket.io-adapter`](https://github.com/alphagov/govuk-prototype-kit/pull/2543)
- [#2545: Remove usage data tracking](https://github.com/alphagov/govuk-prototype-kit/pull/2545)

## 13.20.1

Expand Down
2 changes: 1 addition & 1 deletion __tests__/spec/sanity-checks.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const createKitTimeout = parseInt(process.env.CREATE_KIT_TIMEOUT || '90000', 10)
*/
describe('The Prototype Kit', () => {
beforeAll(async () => {
await mkPrototype(tmpDir, { allowTracking: false, overwrite: true })
await mkPrototype(tmpDir, { overwrite: true })

const { setPackagesCache } = require('../../lib/plugins/packages')
setPackagesCache([{
Expand Down
8 changes: 0 additions & 8 deletions __tests__/utils/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,13 @@ function mkdtempSync () {
* @param {Object} [options]
* @param {string} [options.kitPath] - Path to the kit to use when creating prototype, if not provided uses mkReleaseArchive
* @param {boolean} [options.overwrite] - Allow existing prototype to be overwritten (optional)
* @param {boolean} [options.allowTracking] - If undefined no usage-data-config.json is created (optional),
* if true a usage-data-config.json is created allowing tracking,
* if false a usage-data-config.json is crated disallowing tracking
* @param {boolean} [options.npmInstallLinks] - Set value for npm config install-links (optional)
* @param {string} [options.commandLineParameters] - Command line parameters (optional)
* @returns {Promise<void>}
*/
async function mkPrototype (prototypePath, {
kitPath,
overwrite = false,
allowTracking = undefined,
npmInstallLinks = undefined,
commandLineParameters = ''
} = {}) { // TODO: Use kitPath if provided
Expand Down Expand Up @@ -85,10 +81,6 @@ async function mkPrototype (prototypePath, {
{ cwd: repoDir, env: execEnv, stdio: 'inherit' }
)

if (allowTracking !== undefined) {
await fse.writeJson(path.join(prototypePath, 'usage-data-config.json'), { collectUsageData: !!allowTracking })
}

process.stderr.write(`Kit creation took [${Math.round((Date.now() - startTime) / 100) / 10}] seconds\n`)
} catch (error) {
console.error(error.message)
Expand Down
1 change: 0 additions & 1 deletion bin/cli
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ node_modules/
.tmp/
.env
migrate.log
usage-data-config.json

# General ignores
.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion cypress/scripts/run-starter-prototype.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const defaultKitPath = path.join(os.tmpdir(), 'cypress', 'test-prototype')
const testDir = path.resolve(process.env.KIT_TEST_DIR || defaultKitPath)

;(async () => {
await mkPrototype(testDir, { overwrite: true, allowTracking: false, npmInstallLinks: true })
await mkPrototype(testDir, { overwrite: true, npmInstallLinks: true })

const fooLocation = path.join(__dirname, '..', 'fixtures', 'plugins', 'plugin-foo')
const barLocation = path.join(__dirname, '..', 'fixtures', 'plugins', 'plugin-bar')
Expand Down
2 changes: 0 additions & 2 deletions lib/dev-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const {
setNodemonInstance
} = require('./build')
const plugins = require('./plugins/plugins')
const { collectDataUsage } = require('./usage-data')
const utils = require('./utils')
const {
packageDir,
Expand All @@ -32,7 +31,6 @@ const { logPerformanceSummaryOnce, startPerformanceTimer, endPerformanceTimer }

// Build watch and serve
async function runDevServer () {
await collectDataUsage()
let startupError

try {
Expand Down
120 changes: 0 additions & 120 deletions lib/usage-data.js

This file was deleted.

77 changes: 0 additions & 77 deletions lib/usage-data.test.js

This file was deleted.

65 changes: 4 additions & 61 deletions npm-shrinkwrap.json

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

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@
"portscanner": "^2.2.0",
"sass": "^1.89.2",
"semver": "^7.7.2",
"tar-stream": "^3.1.7",
"universal-analytics": "^0.5.3"
"tar-stream": "^3.1.7"
},
"devDependencies": {
"cheerio": "^1.0.0-rc.12",
Expand Down
2 changes: 1 addition & 1 deletion scripts/create-prototype-and-run.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ console.log(`running prototype using command "${command}"`)
console.log()

// noinspection JSVoidFunctionReturnValueUsed
mkPrototype(testDir, { overwrite: true, allowTracking: false })
mkPrototype(testDir, { overwrite: true })
.then(() => {
console.log()
return exec(command, { cwd: testDir, env: { ...process.env, env: 'test' }, stdio: 'inherit' })
Expand Down
Loading
Loading