diff --git a/babel.test.config.mjs b/babel.test.config.mjs index 7c6af37c5ae..fbb3ba083be 100644 --- a/babel.test.config.mjs +++ b/babel.test.config.mjs @@ -12,7 +12,7 @@ import vmBabelPlugins from '@glimmer/vm-babel-plugins'; import baseConfig from './babel.config.mjs'; const require = createRequire(import.meta.url); -const buildDebugMacroPlugin = require('./lib/build-debug-macro-plugin.js'); +const buildDebugMacroPlugin = require('./broccoli/build-debug-macro-plugin.js'); const isProduction = process.env.EMBER_ENV === 'production'; export default { diff --git a/lib/amd-compat-entrypoints/ember-template-compiler.js b/broccoli/amd-compat-entrypoints/ember-template-compiler.js similarity index 100% rename from lib/amd-compat-entrypoints/ember-template-compiler.js rename to broccoli/amd-compat-entrypoints/ember-template-compiler.js diff --git a/lib/amd-compat-entrypoints/ember-testing.js b/broccoli/amd-compat-entrypoints/ember-testing.js similarity index 100% rename from lib/amd-compat-entrypoints/ember-testing.js rename to broccoli/amd-compat-entrypoints/ember-testing.js diff --git a/lib/amd-compat-entrypoints/ember.debug.js b/broccoli/amd-compat-entrypoints/ember.debug.js similarity index 100% rename from lib/amd-compat-entrypoints/ember.debug.js rename to broccoli/amd-compat-entrypoints/ember.debug.js diff --git a/broccoli/babel-helpers.js b/broccoli/babel-helpers.js deleted file mode 100644 index cbc20d8855d..00000000000 --- a/broccoli/babel-helpers.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict'; - -const Funnel = require('broccoli-funnel'); - -module.exports = function () { - return new Funnel('packages/external-helpers/lib', { - files: ['external-helpers.js'], - getDestinationPath() { - return 'ember-babel.js'; - }, - }); -}; diff --git a/lib/build-debug-macro-plugin.js b/broccoli/build-debug-macro-plugin.js similarity index 100% rename from lib/build-debug-macro-plugin.js rename to broccoli/build-debug-macro-plugin.js diff --git a/broccoli/deprecated-features.js b/broccoli/deprecated-features.js deleted file mode 100644 index b74799ec2fc..00000000000 --- a/broccoli/deprecated-features.js +++ /dev/null @@ -1,54 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const path = require('path'); -const ts = require('typescript'); - -/** - * @param name {string} - * @param source {string} - */ -const DEPRECATED_FEATURES = (function getFeatures() { - let fileName = path.join( - __dirname, - '..', - 'packages', - '@ember', - 'deprecated-features', - 'index.ts' - ); - let contents = fs.readFileSync(fileName, 'utf8'); - let sourceFile = ts.createSourceFile(fileName, contents, ts.ScriptTarget.ES2017); - let flags = {}; - - sourceFile.statements.forEach((statement) => { - if ( - statement.kind === ts.SyntaxKind.VariableStatement && - statement.modifiers.some((m) => m.kind === ts.SyntaxKind.ExportKeyword) - ) { - handleExportedDeclaration(statement, flags); - } - }); - - return flags; -})(); - -/** - * @param d {ts.VariableStatement} - * @param map {{[flag: string]: string}} - */ -function handleExportedDeclaration(d, map) { - let declaration = d.declarationList.declarations[0]; - /** @type {ts.StringLiteral} */ - let initializer = declaration.initializer; - if ( - initializer && - initializer.kind === ts.SyntaxKind.PrefixUnaryExpression && - initializer.operand.kind === ts.SyntaxKind.PrefixUnaryExpression && - initializer.operand.operand.kind === ts.SyntaxKind.StringLiteral - ) { - map[declaration.name.text] = initializer.operand.operand.text; - } -} - -module.exports = DEPRECATED_FEATURES; diff --git a/broccoli/find-lib.js b/broccoli/find-lib.js deleted file mode 100644 index 34169242204..00000000000 --- a/broccoli/find-lib.js +++ /dev/null @@ -1,25 +0,0 @@ -'use strict'; - -const { findFromProject, entrypoint } = require('./find-package'); -const path = require('path'); - -module.exports = function findLib(names, libPath) { - let pkg = findFromProject(...names); - - if (libPath) { - let resolved = path.resolve(pkg.root, libPath); - if (resolved) { - return resolved; - } - } - - let pkgModule = entrypoint(pkg, 'module'); - if (pkgModule) { - return pkgModule.dir; - } - - let pkgMain = entrypoint(pkg, 'main'); - if (pkgMain) { - return pkgMain.dir; - } -}; diff --git a/broccoli/find-package.js b/broccoli/find-package.js deleted file mode 100644 index bfb223b6b71..00000000000 --- a/broccoli/find-package.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; -const { PackageCache } = require('@embroider/shared-internals'); -const path = require('path'); - -const packageCache = PackageCache.shared('ember-source', __dirname); - -exports.findFromProject = function findFromProject(...names) { - let current = packageCache.get(packageCache.appRoot); - for (let name of names) { - current = packageCache.resolve(name, current); - } - return current; -}; - -exports.entrypoint = function moduleEntrypoint(pkg, which) { - let module = pkg.packageJSON[which]; - if (!module) { - return; - } - let resolved = path.resolve(pkg.root, module); - let { dir, base } = path.parse(resolved); - return { - dir, - base, - path: resolved, - }; -}; diff --git a/broccoli/funnel-lib.js b/broccoli/funnel-lib.js deleted file mode 100644 index f77c975dfdb..00000000000 --- a/broccoli/funnel-lib.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; - -const Funnel = require('broccoli-funnel'); -const findLib = require('./find-lib'); - -module.exports = function funnelLib(name) { - let libPath, options; - if (arguments.length > 2) { - libPath = arguments[1]; - options = arguments[2]; - } else { - options = arguments[1]; - } - - return new Funnel(findLib([name], libPath), options); -}; diff --git a/broccoli/minify.js b/broccoli/minify.js deleted file mode 100644 index ab32d4d8f5f..00000000000 --- a/broccoli/minify.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -const Uglify = require('broccoli-uglify-sourcemap'); - -module.exports = function _minify(tree) { - let options = { - enabled: true, - - uglify: { - compress: { - // this is adversely affects heuristics for IIFE eval - negate_iife: false, - // limit sequences because of memory issues during parsing - sequences: 0, - }, - mangle: { - safari10: true, - }, - output: { - // no difference in size and much easier to debug - semicolons: false, - }, - }, - }; - - return new Uglify(tree, options); -}; diff --git a/broccoli/package-json-writer.js b/broccoli/package-json-writer.js deleted file mode 100644 index 4e6e6a746ae..00000000000 --- a/broccoli/package-json-writer.js +++ /dev/null @@ -1,109 +0,0 @@ -const fs = require('fs'); -const path = require('path'); -const glob = require('glob'); -const mkdirp = require('mkdirp'); -const Plugin = require('broccoli-plugin'); - -const DEFAULT_PACKAGE_JSON = { - main: './index.js', - module: './index.js', - license: 'MIT', -}; - -/** - * Broccoli plugin that generates a package.json file for each subpackage, as - * well as any necessary package.json files for nested entry points. - */ -module.exports = class PackageJSONWriter extends Plugin { - constructor(inputNode) { - super([inputNode]); - } - - /** - * Each time the plugin builds, discover the npm packages in the input tree - * and generate their package.json files. - */ - build() { - let packages = this.discoverPackages(); - - packages.forEach((packageName) => { - this.writeMainPackageJson(packageName); - this.discoverEntryPoints(packageName).forEach((entryPoint) => { - this.writeEntryPointPackageJson(packageName, entryPoint); - }); - }); - } - - /** - * Find all packages and scoped packages at the root of the input tree. - */ - discoverPackages() { - return this.glob('{!(@*),@*/*}/'); - } - - /** - * Find any nested entry points (i.e. modules that are accessed other than the - * root package name). For example, `@ember/object/computed` is a nested entry - * point of `@ember/object`. - * - * To discover nested entry points, we search for any non-standard directories - * and files in the package root. Files that should not be considered an entry - * point should be placed inside the `lib/` directory. - * - */ - discoverEntryPoints(packageName) { - let files = this.glob(`${packageName}/!(index).js`) - .map((file) => path.basename(file, '.js')) - .map((file) => [file, true]); - let directories = this.glob(`${packageName}/!(lib|tests)/`) - .map((file) => path.basename(file)) - .map((file) => [file, false]); - - return [...files, ...directories]; - } - - glob(globStr) { - return glob.sync(globStr, { cwd: this.inputPaths[0] }); - } - - writeMainPackageJson(packagePath) { - let packageJson = this.tryReadPackageJson(packagePath); - Object.assign(packageJson, DEFAULT_PACKAGE_JSON); - - let packageJsonPath = path.join(this.outputPath, packagePath, 'package.json'); - mkdirp.sync(path.dirname(packageJsonPath)); - fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2)); - } - - writeEntryPointPackageJson(packageName, [entryPoint, isFile]) { - let entryPointPath = path.join(packageName, entryPoint); - - let packageJson = { - name: entryPointPath, - module: isFile ? `../${entryPoint}.js` : `../${entryPoint}/index.js`, - }; - - this.writePackageJson(entryPointPath, packageJson); - } - - writePackageJson(packagePath, packageJson) { - let packageJsonPath = path.join(this.outputPath, packagePath, 'package.json'); - mkdirp.sync(path.dirname(packageJsonPath)); - fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2)); - } - - /** - * Returns the package.json of the specified directory. If it doesn't exist, - * returns an empty object. - * @param {string} packagePath - */ - tryReadPackageJson(packagePath) { - let packageJsonPath = path.join(this.inputPaths[0], packagePath, 'package.json'); - try { - let data = fs.readFileSync(packageJsonPath); - return JSON.parse(data.toString()); - } catch (e) { - return {}; - } - } -}; diff --git a/broccoli/packages.js b/broccoli/packages.js deleted file mode 100644 index f9e685b3ad0..00000000000 --- a/broccoli/packages.js +++ /dev/null @@ -1,305 +0,0 @@ -'use strict'; - -const { existsSync } = require('fs'); -const path = require('path'); -const Rollup = require('broccoli-rollup'); -const Funnel = require('broccoli-funnel'); -const MergeTrees = require('broccoli-merge-trees'); -const typescript = require('broccoli-typescript-compiler').default; -const BroccoliDebug = require('broccoli-debug'); -const findLib = require('./find-lib'); -const { findFromProject, entrypoint } = require('./find-package'); -const funnelLib = require('./funnel-lib'); -const { VERSION } = require('./version'); -const PackageJSONWriter = require('./package-json-writer'); -const WriteFile = require('broccoli-file-creator'); -const StringReplace = require('broccoli-string-replace'); -const VERSION_PLACEHOLDER = /VERSION_STRING_PLACEHOLDER/g; -const canaryFeatures = require('./canary-features'); - -const debugTree = BroccoliDebug.buildDebugCallback('ember-source'); - -module.exports.routerES = function _routerES() { - return new Rollup(findLib(['router_js']), { - rollup: { - external: ['route-recognizer', 'rsvp'], - input: 'index.js', - output: { - file: 'router_js.js', - format: 'es', - }, - }, - annotation: 'router.js', - }); -}; - -module.exports.loader = function _loader() { - return new Funnel('packages/loader/lib', { - files: ['index.js'], - getDestinationPath() { - return 'loader.js'; - }, - annotation: 'internal loader', - }); -}; - -module.exports.qunit = function _qunit() { - return new Funnel(findLib(['qunit']), { - files: ['qunit.js', 'qunit.css'], - destDir: 'qunit', - annotation: 'qunit', - }); -}; - -module.exports.getPackagesES = function getPackagesES() { - let input = new Funnel(`packages`, { - exclude: ['loader/**', 'external-helpers/**', '**/node_modules'], - destDir: `packages`, - }); - - let debuggedInput = debugTree(input, `get-packages-es:input`); - - let nonTypeScriptContents = debugTree( - new Funnel(debuggedInput, { - srcDir: 'packages', - exclude: ['**/*.ts'], - }), - 'get-packages-es:js:output' - ); - - let typescriptContents = new Funnel(debuggedInput, { - include: ['**/*.ts'], - }); - - let typescriptCompiled = typescript(debugTree(typescriptContents, `get-packages-es:ts:input`), { - compilerOptions: { - sourceMap: false, - }, - }); - - let debuggedCompiledTypescript = debugTree(typescriptCompiled, `get-packages-es:ts:output`); - - let mergedFinalOutput = new MergeTrees([nonTypeScriptContents, debuggedCompiledTypescript], { - overwrite: true, - }); - - let packageJSON = debugTree( - new PackageJSONWriter(mergedFinalOutput), - `get-packages-es:package-json` - ); - - mergedFinalOutput = canaryFeatures( - new MergeTrees([mergedFinalOutput, packageJSON], { overwrite: true }) - ); - - return debugTree(mergedFinalOutput, `get-packages-es:output`); -}; - -module.exports.handlebarsES = function _handlebars() { - return new Rollup(findLib(['@glimmer/syntax', '@handlebars/parser'], 'dist/esm'), { - annotation: '@handlebars/parser', - rollup: { - input: 'index.js', - output: { - file: '@handlebars/parser/index.js', - format: 'es', - exports: 'named', - }, - }, - }); -}; - -module.exports.rsvpES = function _rsvpES() { - let lib = path.resolve(path.dirname(require.resolve('rsvp')), '../lib'); - return new Rollup(lib, { - annotation: 'rsvp.js', - rollup: { - input: 'rsvp.js', - output: { - file: 'rsvp.js', - format: 'es', - exports: 'named', - }, - }, - }); -}; - -module.exports.backburnerES = function _backburnerES() { - return funnelLib('backburner.js', 'dist/es6', { - files: ['backburner.js'], - annotation: 'backburner es', - // This writes the "output" to `backburner.js.js` in the funnel, which means - // that when it gets fed into the Babel AMD transform, which (implicitly) - // pulls off the trailing `.js`, the result is just `backburner.js`, which - // is the actual Node-resolve-able (and therefore TS-resolve-able) ES module - // on disk. - getDestinationPath: (relativePath) => relativePath + '.js', - }); -}; - -module.exports.dagES = function _dagES() { - let lib = funnelLib('dag-map', { - files: ['dag-map.js'], - annotation: 'dag-map es', - }); - - return new StringReplace(lib, { - files: ['dag-map.js'], - patterns: [ - { - match: /\/\/# sourceMappingURL=dag-map.js.map/g, - replacement: '', - }, - ], - annotation: 'remove sourcemap annotation (dag-map)', - }); -}; - -module.exports.routeRecognizerES = function _routeRecognizerES() { - return funnelLib('route-recognizer', { - files: ['route-recognizer.es.js'], - getDestinationPath() { - return 'route-recognizer.js'; - }, - annotation: 'route-recognizer es', - }); -}; - -module.exports.simpleHTMLTokenizerES = function _simpleHTMLTokenizerES() { - let { dir, base } = entrypoint( - findFromProject('@glimmer/syntax', 'simple-html-tokenizer'), - 'module' - ); - - return new Rollup(dir, { - annotation: 'simple-html-tokenizer es', - rollup: { - input: base, - output: { - file: 'simple-html-tokenizer.js', - format: 'es', - exports: 'named', - }, - }, - }); -}; - -const _glimmerTrees = new Map(); - -function rollupGlimmerPackage(pkg) { - let name = pkg.name; - let tree = _glimmerTrees.get(name); - - // @glimmer/debug and @glimmer/local-debug-flags are external dependencies, - // but exist in dev-dependencies because they are fully removed before - // publishing. Including them here allows Rollup to work for local builds. - let externalDeps = Object.keys(pkg.packageJSON.dependencies || {}).concat([ - '@glimmer/debug', - '@glimmer/local-debug-flags', - ]); - - let pkgModule = entrypoint(pkg, 'module'); - - if (tree === undefined) { - tree = new Rollup(pkgModule.dir, { - rollup: { - input: pkgModule.base, - external: externalDeps, - output: { - file: name + '.js', - format: 'es', - }, - }, - annotation: name, - }); - _glimmerTrees.set(name, tree); - } - return tree; -} - -function glimmerTrees(packageNames) { - let seen = new Set(); - - let trees = []; - let queue = packageNames.map((name) => findFromProject(name)); - let pkg; - - while ((pkg = queue.pop()) !== undefined) { - if (seen.has(pkg.name)) { - continue; - } - seen.add(pkg.name); - - if (!pkg.name.startsWith('@glimmer/') && !pkg.name.startsWith('@simple-dom/')) { - continue; - } - - let pkgModule = entrypoint(pkg, 'module'); - - if (pkgModule && existsSync(pkgModule.path)) { - trees.push(rollupGlimmerPackage(pkg)); - } - - let dependencies = pkg.dependencies; - if (dependencies) { - queue.push(...dependencies); - } - } - - return new MergeTrees(trees); -} - -module.exports.glimmerCompilerES = () => { - return glimmerTrees(['@glimmer/compiler']); -}; - -module.exports.glimmerES = function glimmerES(environment) { - let glimmerEntries = [ - '@glimmer/node', - '@simple-dom/document', - '@glimmer/manager', - '@glimmer/destroyable', - '@glimmer/owner', - '@glimmer/opcode-compiler', - '@glimmer/runtime', - ]; - - if (environment === 'development') { - let hasGlimmerDebug = true; - try { - require.resolve('@glimmer/debug'); // eslint-disable-line n/no-missing-require - } catch (e) { - hasGlimmerDebug = false; - } - if (hasGlimmerDebug) { - glimmerEntries.push('@glimmer/debug', '@glimmer/local-debug-flags'); - } - } - - return glimmerTrees(glimmerEntries); -}; - -module.exports.emberVersionES = function _emberVersionES() { - let content = 'export default ' + JSON.stringify(VERSION) + ';\n'; - return new WriteFile('ember/version.js', content, { - annotation: 'ember/version', - }); -}; - -module.exports.emberLicense = function _emberLicense() { - let license = new Funnel('generators', { - files: ['license.js'], - annotation: 'license', - }); - - return new StringReplace(license, { - files: ['license.js'], - patterns: [ - { - match: VERSION_PLACEHOLDER, - replacement: VERSION, - }, - ], - annotation: 'license', - }); -}; diff --git a/broccoli/rollup-package.js b/broccoli/rollup-package.js deleted file mode 100644 index 5daf409b926..00000000000 --- a/broccoli/rollup-package.js +++ /dev/null @@ -1,46 +0,0 @@ -const Rollup = require('broccoli-rollup'); -const BroccoliDebug = require('broccoli-debug'); -const Funnel = require('broccoli-funnel'); -const path = require('path'); - -const debugTree = BroccoliDebug.buildDebugCallback('ember-source'); - -module.exports = function rollupPackage(packagesES, name) { - // this prevents broccoli-rollup from "seeing" changes in - // its input that are unrelated to what we are building - // and therefore noop on rebuilds... - let rollupRestrictedInput = new Funnel(packagesES, { - srcDir: name, - destDir: name, - }); - - rollupRestrictedInput = debugTree(rollupRestrictedInput, `rollup-package:${name}:input`); - - let output = new Rollup(rollupRestrictedInput, { - annotation: `rollup ${name}`, - rollup: { - input: `${name}/index.js`, - external(importee, importer) { - // importer of null/undefined means entry module - if (!importer) { - return false; - } - - // import is relative initially, then expanded to absolute - // when resolveId is called. this checks for either... - if (importee[0] === '.' || path.isAbsolute(importee)) { - return false; - } - - return true; - }, - output: { - file: `${name}/index.js`, - format: 'es', - exports: 'named', - }, - }, - }); - - return debugTree(output, `rollup-package:${name}:output`); -}; diff --git a/broccoli/test-index-html.js b/broccoli/test-index-html.js deleted file mode 100644 index f42c1916023..00000000000 --- a/broccoli/test-index-html.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -const Funnel = require('broccoli-funnel'); -const StringReplace = require('broccoli-string-replace'); -const FEATURES = require('./features'); - -module.exports = function testIndexHTML() { - let index = new Funnel('tests', { - files: ['index.html'], - annotation: 'tests/index.html', - }); - index = new StringReplace(index, { - files: ['tests/index.html'], - patterns: [ - { - match: /\{\{DEV_FEATURES\}\}/g, - replacement: JSON.stringify(FEATURES.DEBUG), - }, - { - match: /\{\{PROD_FEATURES\}\}/g, - replacement: JSON.stringify(FEATURES.RELEASE), - }, - ], - }); - index._annotation = 'tests/index.html FEATURES'; - return index; -}; diff --git a/broccoli/version.js b/broccoli/version.js deleted file mode 100644 index adbcbfd451b..00000000000 --- a/broccoli/version.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -const buildInfo = require('../broccoli/build-info').buildInfo(); - -module.exports.VERSION = buildInfo.version; diff --git a/ember-cli-build.js b/ember-cli-build.js deleted file mode 100644 index 07ceb34439c..00000000000 --- a/ember-cli-build.js +++ /dev/null @@ -1,304 +0,0 @@ -'use strict'; - -const MergeTrees = require('broccoli-merge-trees'); -const Funnel = require('broccoli-funnel'); -const babelHelpers = require('./broccoli/babel-helpers'); -const concatBundle = require('./lib/concat-bundle'); -const testIndexHTML = require('./broccoli/test-index-html'); -const rollupPackage = require('./broccoli/rollup-package'); -const minify = require('./broccoli/minify'); -const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:ember-cli-build'); - -Error.stackTraceLimit = Infinity; - -const { - routerES, - loader, - qunit, - handlebarsES, - rsvpES, - simpleHTMLTokenizerES, - backburnerES, - dagES, - routeRecognizerES, - glimmerES, - glimmerCompilerES, - emberVersionES, - emberLicense, - getPackagesES, -} = require('./broccoli/packages'); - -const { allSupportedBrowsers, modernBrowsers } = require('./config/browserlists'); - -const ENV = process.env.EMBER_ENV || 'development'; -const SHOULD_ROLLUP = process.env.SHOULD_ROLLUP !== 'false'; -const SHOULD_MINIFY = Boolean(process.env.SHOULD_MINIFY); - -/** - * There isn't a way for us to override targets through ember-cli-babel, and we - * don't want to introduce that functionality for reasons. This is a quick and - * dirty way for us to accomplish custom targets. This is specifically for: - * - * 1. The ember-template-compiler.js file, which should always be built for all - * of our supported browsers. - * 2. The ember.debug.js file, which should always be built for modern browsers. - * - * This is not a recommended way of building standard Ember apps. - */ -function withTargets(project, fn) { - return (tree, isProduction = ENV === 'production', { targets } = {}) => { - let originalTargets = project.targets; - if (targets !== undefined) project._targets = targets; - - let transpiled = fn(tree, isProduction); - - project._targets = originalTargets; - - return transpiled; - }; -} - -module.exports = function ({ project }) { - let emberSource = project.addons.find((a) => a.name === 'ember-source'); - - let transpileTree = withTargets(project, emberSource.transpileTree.bind(emberSource)); - let emberBundles = withTargets(project, emberSource.buildEmberBundles.bind(emberSource)); - - let packages = debugTree( - new MergeTrees( - [ - // packages/** (after typescript compilation) - getPackagesES(), - - emberVersionES(), - - // externalized helpers - babelHelpers(), - ], - { - // we're replacing the ember/verion file with the actual version number - overwrite: true, - } - ), - 'packages:initial' - ); - - // Rollup - if (SHOULD_ROLLUP) { - packages = debugTree( - new MergeTrees([ - new Funnel(packages, { - exclude: [ - '@ember/-internals/browser-environment/index.js', - '@ember/-internals/browser-environment/lib/**', - '@ember/-internals/container/index.js', - '@ember/-internals/container/lib/**', - '@ember/-internals/environment/index.js', - '@ember/-internals/environment/lib/**', - '@ember/-internals/glimmer/index.js', - '@ember/-internals/glimmer/lib/**', - '@ember/-internals/metal/index.js', - '@ember/-internals/metal/lib/**', - '@ember/-internals/utils/index.js', - '@ember/-internals/utils/lib/**', - ], - }), - rollupPackage(packages, '@ember/-internals/browser-environment'), - rollupPackage(packages, '@ember/-internals/environment'), - rollupPackage(packages, '@ember/-internals/glimmer'), - rollupPackage(packages, '@ember/-internals/metal'), - rollupPackage(packages, '@ember/-internals/utils'), - rollupPackage(packages, '@ember/-internals/container'), - ]), - 'packages:rollup' - ); - } - - let dist = debugTree( - new MergeTrees([ - new Funnel(packages, { - destDir: 'packages', - exclude: [ - '**/package.json', - '@ember/-internals/*/tests/**' /* internal packages */, - '*/*/tests/**' /* scoped packages */, - '*/tests/**' /* packages */, - '@ember/-internals/*/type-tests/**' /* internal packages */, - '*/*/type-tests/**' /* scoped packages */, - '*/type-tests/**' /* packages */, - 'ember-template-compiler/**', - 'internal-test-helpers/**', - ], - }), - new Funnel(emberHeaderFiles(), { destDir: 'header' }), - new Funnel(emberDependencies(ENV), { destDir: 'dependencies' }), - ]), - 'dist' - ); - - // Test builds, tests, and test harness - let testFiles = debugTree( - new Funnel( - new MergeTrees([ - emberBundles(dist), - testsBundle(packages, ENV, transpileTree), - testHarness(), - ]), - { - destDir: 'tests', - } - ), - 'testFiles' - ); - - let preBuilt = debugTree( - new Funnel(emberBundles(dist, false, { targets: modernBrowsers, loose: false }), { - getDestinationPath(path) { - return path.replace('ember.', 'ember.debug.'); - }, - }), - 'preBuilt' - ); - - if (SHOULD_MINIFY) { - preBuilt = minify(preBuilt); - } - - return new MergeTrees([ - // Distributed files - dist, - - // Pre-built bundles - preBuilt, - debugTree(templateCompilerBundle(packages, transpileTree), 'template-compiler'), - - testFiles, - ]); -}; - -function emberDependencies(environment) { - // generate "loose" ES modules... - return debugTree( - new MergeTrees([ - backburnerES(), - rsvpES(), - dagES(), - routerES(), - routeRecognizerES(), - glimmerES(environment), - ]), - 'dependencies' - ); -} - -function testsBundle(emberPackages, env, transpileTree) { - let exclude = env === 'production' ? ['@ember/debug/tests/**', 'ember-testing/tests/**'] : []; - - let emberTestsFiles = transpileTree( - new MergeTrees([ - new Funnel(emberPackages, { - include: [ - 'internal-test-helpers/**', - '@ember/-internals/*/tests/**' /* internal packages */, - '*/*/tests/**' /* scoped packages */, - '*/tests/**' /* packages */, - 'ember-template-compiler/**', - ], - exclude, - }), - ]) - ); - - return concatBundle(new MergeTrees([emberTestsFiles, emberHeaderFiles()]), { - outputFile: 'ember-tests.js', - }); -} - -function templateCompilerBundle(emberPackages, transpileTree) { - let templateCompilerFiles = transpileTree( - new MergeTrees([ - new Funnel(emberPackages, { - include: [ - '@ember/-internals/utils/**', - '@ember/-internals/environment/**', - '@ember/-internals/browser-environment/**', - '@ember/canary-features/**', - '@ember/debug/**', - '@ember/deprecated-features/**', - 'ember/version.js', - 'ember-babel.js', - 'ember-template-compiler/**', - 'node-module/**', - ], - exclude: [ - '@ember/-internals/*/tests/**' /* internal packages */, - '*/*/tests/**' /* scoped packages */, - '*/tests/**' /* packages */, - '*/*/type-tests/**' /* scoped packages */, - '*/type-tests/**' /* packages */, - ], - }), - templateCompilerDependencies(), - ]), - false, - { targets: allSupportedBrowsers, loose: false } - ); - - return concatBundle(new MergeTrees([templateCompilerFiles, emberHeaderFiles()]), { - outputFile: 'ember-template-compiler.js', - footer: ` - try { - // in the browser, the ember-template-compiler.js and ember.js bundles find each other via globalThis.require. - require('@ember/template-compilation'); - } catch (err) { - // in node, that coordination is a no-op - define('@ember/template-compilation', ['exports'], function (e) { - e.__registerTemplateCompiler = function () {}; - }); - define('ember', [ - 'exports', - '@ember/-internals/environment', - '@ember/canary-features', - 'ember/version', - ], function (e, env, fea, ver) { - e.default = { - ENV: env.ENV, - FEATURES: fea.FEATURES, - VERSION: ver.default, - }; - }); - define('@ember/-internals/glimmer', ['exports'], function(e) { - e.template = undefined; - }); - define('@ember/application', ['exports'], function(e) {}); - } - - (function (m) { - if (typeof module === 'object' && module.exports) { - module.exports = m; - } - })(require('ember-template-compiler')); - - `, - }); -} - -function testHarness() { - return new MergeTrees([emptyTestem(), testIndexHTML(), loader(), qunit()]); -} - -function emptyTestem() { - return new Funnel('tests', { - files: ['testem.js'], - destDir: '', - annotation: 'tests/testem.js', - }); -} - -function templateCompilerDependencies() { - return new MergeTrees([simpleHTMLTokenizerES(), handlebarsES(), glimmerCompilerES()]); -} - -function emberHeaderFiles() { - return new MergeTrees([emberLicense(), loader()]); -} diff --git a/lib/build-strip-class-callcheck-plugin.js b/lib/build-strip-class-callcheck-plugin.js deleted file mode 100644 index 90b1e1f8bc2..00000000000 --- a/lib/build-strip-class-callcheck-plugin.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = () => { - return [ - require.resolve('babel-plugin-filter-imports'), - { imports: { 'ember-babel': ['_classCallCheck'] } }, - ]; -}; diff --git a/lib/concat-bundle.js b/lib/concat-bundle.js deleted file mode 100644 index d8df03644b9..00000000000 --- a/lib/concat-bundle.js +++ /dev/null @@ -1,19 +0,0 @@ -'use strict'; - -const concat = require('broccoli-concat'); - -module.exports = function concatBundle( - tree, - { outputFile, header = '', footer = '', headerFiles = [], footerFiles = [] } -) { - return concat(tree, { - header: '(function() {' + header, - outputFile, - headerFiles: ['license.js', 'loader.js'].concat(headerFiles), - sourceMapConfig: { enabled: true }, - footerFiles, - inputFiles: ['**/*.js'], - annotation: outputFile, - footer: footer + '\n}());', - }); -}; diff --git a/lib/index.js b/lib/index.js index 2273d8ffc37..4866b810011 100644 --- a/lib/index.js +++ b/lib/index.js @@ -3,10 +3,6 @@ const MergeTrees = require('broccoli-merge-trees'); const Funnel = require('broccoli-funnel'); const path = require('path'); -const concatBundle = require('./concat-bundle'); -const buildDebugMacroPlugin = require('./build-debug-macro-plugin'); -const buildStripClassCallcheckPlugin = require('./build-strip-class-callcheck-plugin'); -const { default: vmBabelPlugins } = require('@glimmer/vm-babel-plugins'); const Overrides = require('./overrides'); const SilentError = require('silent-error'); const SupportedBrowsers = require('./browsers'); @@ -125,97 +121,6 @@ module.exports = { } }, - transpileTree(tree, isProduction, shouldCompileModules) { - let emberCliBabel = this.addons.find((a) => a.name === 'ember-cli-babel'); - - let parentOptions = this.parent && this.parent.options; - let appOptions = this.app && this.app.options; - let babelOptions = (parentOptions || appOptions || {}).babel; - let compilerPath = path.resolve(__dirname, '../dist/ember-template-compiler.js'); - - let options = { - 'ember-cli-babel': { - disableDebugTooling: true, - disableEmberModulesAPIPolyfill: true, - }, - babel: Object.assign({}, babelOptions, { - loose: true, - plugins: [ - buildDebugMacroPlugin(!isProduction), - [require.resolve('babel-plugin-ember-template-compilation'), { compilerPath }], - ...vmBabelPlugins({ isDebug: !isProduction }), - ], - }), - }; - - if (shouldCompileModules !== undefined) { - // ember-cli-babel internally uses **any** value that was provided IIF - // the option is set so this option must only be set when we have a - // useful value for it - options['ember-cli-babel'].compileModules = shouldCompileModules; - } - - if (isProduction) { - options.babel.plugins.push(buildStripClassCallcheckPlugin()); - } - - return emberCliBabel.transpileTree(tree, options); - }, - - buildEmberBundles(tree, isProduction) { - if (this._overrideTree) { - tree = new MergeTrees([tree, this._overrideTree], { overwrite: true }); - } - - let packages = this.transpileTree(new Funnel(tree, { srcDir: 'packages' }), isProduction); - - let dependencies = this.transpileTree( - new Funnel(tree, { srcDir: 'dependencies' }), - isProduction - ); - - let headerFiles = this.transpileTree( - new Funnel(tree, { srcDir: 'header' }), - isProduction, - false - ); - - let exclude = isProduction ? ['ember-testing/**'] : []; - - let emberFiles = new MergeTrees([new Funnel(packages, { exclude }), dependencies, headerFiles]); - - let emberTestingFiles = new MergeTrees([ - new Funnel(packages, { - include: [ - '@ember/debug/lib/**', - '@ember/debug/index.js', - 'ember-testing/index.js', - 'ember-testing/lib/**', - ], - }), - headerFiles, - ]); - - return new MergeTrees([ - concatBundle(emberFiles, { - outputFile: 'ember.js', - footer: ` - (function bootstrap() { - // Bootstrap Node module - if (typeof module === 'object' && typeof module.require === 'function') { - module.exports = require('ember').default; - } - })(); - `, - }), - - concatBundle(emberTestingFiles, { - outputFile: 'ember-testing.js', - footer: "require('ember-testing');", - }), - ]); - }, - treeForVendor(tree) { const isProduction = process.env.EMBER_ENV === 'production'; diff --git a/package.json b/package.json index bd4cabeafbe..1629b2e91b7 100644 --- a/package.json +++ b/package.json @@ -17,11 +17,12 @@ "blueprints-js", "dist/packages", "dist/dependencies", - "dist/header", "dist/ember-template-compiler.js", "dist/ember-template-compiler.map", "dist/ember.debug.js", "dist/ember.debug.map", + "dist/ember.prod.js", + "dist/ember.prod.map", "dist/ember-testing.js", "dist/ember-testing.map", "docs/data.json", @@ -78,12 +79,7 @@ "@glimmer/vm": "0.92.0", "@glimmer/vm-babel-plugins": "0.92.0", "@simple-dom/interface": "^1.4.0", - "babel-plugin-debug-macros": "1.0.0-alpha.2", - "babel-plugin-ember-template-compilation": "^2.1.1", - "babel-plugin-filter-imports": "^4.0.0", "backburner.js": "^2.8.0", - "broccoli-concat": "^4.2.5", - "broccoli-debug": "^0.6.4", "broccoli-file-creator": "^2.1.1", "broccoli-funnel": "^3.0.8", "broccoli-merge-trees": "^4.2.0", @@ -107,6 +103,8 @@ }, "devDependencies": { "@aws-sdk/client-s3": "^3.321.1", + "babel-plugin-debug-macros": "1.0.0-alpha.2", + "babel-plugin-ember-template-compilation": "^2.1.1", "@babel/plugin-transform-typescript": "^7.22.9", "@babel/preset-env": "^7.16.11", "@babel/types": "^7.22.5", @@ -122,16 +120,6 @@ "@typescript-eslint/parser": "^5.62.0", "ast-types": "^0.14.2", "auto-dist-tag": "^2.1.1", - "babel-template": "^6.26.0", - "broccoli-babel-transpiler": "^7.8.1", - "broccoli-persistent-filter": "^2.3.1", - "broccoli-plugin": "^4.0.3", - "broccoli-rollup": "^3", - "broccoli-source": "^3.0.1", - "broccoli-string-replace": "^0.1.2", - "broccoli-typescript-compiler": "^8.0.0", - "broccoli-uglify-sourcemap": "^4.0.0", - "common-tags": "^1.8.2", "dag-map": "^2.0.2", "decorator-transforms": "2.0.0-alpha.2", "ember-cli": "^4.10.0", @@ -150,16 +138,12 @@ "eslint-plugin-qunit": "^8.0.1", "execa": "^5.1.1", "expect-type": "^0.15.0", - "express": "^4.18.2", "finalhandler": "^1.1.2", "fs-extra": "^11.1.1", "git-repo-info": "^2.1.1", "github": "^0.2.3", "glob": "^8.0.3", "html-differ": "^1.4.0", - "lodash.uniq": "^4.5.0", - "mkdirp": "^3.0.1", - "mocha": "^10.2.0", "npm-run-all2": "^6.0.6", "prettier": "^2.8.0", "puppeteer": "^20.9.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 712c5e663d3..fc49f892b5d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -75,24 +75,9 @@ importers: '@simple-dom/interface': specifier: ^1.4.0 version: 1.4.0 - babel-plugin-debug-macros: - specifier: 1.0.0-alpha.2 - version: 1.0.0-alpha.2(@babel/core@7.24.4) - babel-plugin-ember-template-compilation: - specifier: ^2.1.1 - version: 2.2.2 - babel-plugin-filter-imports: - specifier: ^4.0.0 - version: 4.0.0 backburner.js: specifier: ^2.8.0 version: 2.8.0 - broccoli-concat: - specifier: ^4.2.5 - version: 4.2.5 - broccoli-debug: - specifier: ^0.6.4 - version: 0.6.5 broccoli-file-creator: specifier: ^2.1.1 version: 2.1.1 @@ -202,36 +187,12 @@ importers: auto-dist-tag: specifier: ^2.1.1 version: 2.1.1 - babel-template: - specifier: ^6.26.0 - version: 6.26.0 - broccoli-babel-transpiler: - specifier: ^7.8.1 - version: 7.8.1 - broccoli-persistent-filter: - specifier: ^2.3.1 - version: 2.3.1 - broccoli-plugin: - specifier: ^4.0.3 - version: 4.0.7 - broccoli-rollup: - specifier: ^3 - version: 3.0.0 - broccoli-source: - specifier: ^3.0.1 - version: 3.0.1 - broccoli-string-replace: - specifier: ^0.1.2 - version: 0.1.2 - broccoli-typescript-compiler: - specifier: ^8.0.0 - version: 8.0.0(typescript@5.1.6) - broccoli-uglify-sourcemap: - specifier: ^4.0.0 - version: 4.0.0 - common-tags: - specifier: ^1.8.2 - version: 1.8.2 + babel-plugin-debug-macros: + specifier: 1.0.0-alpha.2 + version: 1.0.0-alpha.2(@babel/core@7.24.4) + babel-plugin-ember-template-compilation: + specifier: ^2.1.1 + version: 2.2.2 dag-map: specifier: ^2.0.2 version: 2.0.2 @@ -286,9 +247,6 @@ importers: expect-type: specifier: ^0.15.0 version: 0.15.0 - express: - specifier: ^4.18.2 - version: 4.19.2 finalhandler: specifier: ^1.1.2 version: 1.2.0 @@ -307,15 +265,6 @@ importers: html-differ: specifier: ^1.4.0 version: 1.4.0 - lodash.uniq: - specifier: ^4.5.0 - version: 4.5.0 - mkdirp: - specifier: ^3.0.1 - version: 3.0.1 - mocha: - specifier: ^10.2.0 - version: 10.4.0 npm-run-all2: specifier: ^6.0.6 version: 6.1.2 @@ -2362,7 +2311,7 @@ packages: '@babel/traverse': 7.24.1 '@babel/types': 7.24.0 convert-source-map: 2.0.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -2436,7 +2385,7 @@ packages: '@babel/core': 7.24.4 '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-plugin-utils': 7.24.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 lodash.debounce: 4.0.8 resolve: 1.22.8 transitivePeerDependencies: @@ -3513,7 +3462,7 @@ packages: '@babel/helper-split-export-declaration': 7.22.6 '@babel/parser': 7.24.4 '@babel/types': 7.24.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -3570,7 +3519,7 @@ packages: engines: {node: 12.* || 14.* || >= 16} dependencies: babel-import-util: 2.1.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ember-rfc176-data: 0.3.18 fs-extra: 9.1.0 js-string-escape: 1.0.1 @@ -3809,7 +3758,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 espree: 9.6.1 globals: 13.24.0 ignore: 5.3.1 @@ -3890,7 +3839,6 @@ packages: /@glimmer/env@0.1.7: resolution: {integrity: sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==} - dev: false /@glimmer/global-context@0.92.0: resolution: {integrity: sha512-XUPXIsz/F0YQz3vY9x+u3YQMibM3378gEPJObs3CHzAWJUl9Kz1CAb+jRigRrxIcmdzoonA49VMwGmmKRNoGag==} @@ -3900,7 +3848,6 @@ packages: resolution: {integrity: sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==} dependencies: '@simple-dom/interface': 1.4.0 - dev: false /@glimmer/interfaces@0.92.0: resolution: {integrity: sha512-SKZvIs+ZPN8F3EH8kEzs7rGIUa+wuV+/3oWYyEiBrqd+VrZlmAxIELM6qZ6oxXT2tx6q1rh2EmA5rWezi6bmYQ==} @@ -3999,7 +3946,6 @@ packages: '@glimmer/util': 0.84.3 '@handlebars/parser': 2.0.0 simple-html-tokenizer: 0.5.11 - dev: false /@glimmer/syntax@0.92.0: resolution: {integrity: sha512-h8pYBC2cCnEyjbZBip2Yw4qi8S8sjNCYAb57iHek3AIhyFKMM13aTN+/aajFOM4FUTMCVE2B/iAAmO41WRCX4A==} @@ -4021,7 +3967,6 @@ packages: '@glimmer/env': 0.1.7 '@glimmer/interfaces': 0.84.3 '@simple-dom/interface': 1.4.0 - dev: false /@glimmer/util@0.92.0: resolution: {integrity: sha512-Fap52smLp8RkCgvozrZG7RysNJ2T6mk1SPoknMzmukbabFVBAzxl5iyY4OXUbmR09j6t2pupjF6sPabnLtL4vw==} @@ -4064,14 +4009,13 @@ packages: /@handlebars/parser@2.0.0: resolution: {integrity: sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==} - dev: false /@humanwhocodes/config-array@0.11.14: resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 2.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -4102,13 +4046,6 @@ packages: resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} engines: {node: '>=6.0.0'} - /@jridgewell/source-map@0.3.6: - resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==} - dependencies: - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - dev: true - /@jridgewell/sourcemap-codec@1.4.15: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} @@ -4149,7 +4086,7 @@ packages: typescript: optional: true dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 extract-zip: 2.0.1 progress: 2.0.3 proxy-agent: 6.3.0 @@ -4831,7 +4768,7 @@ packages: '@swc-node/sourcemap-support': 0.5.0 '@swc/core': 1.5.0 colorette: 2.0.20 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 pirates: 4.0.6 tslib: 2.6.2 typescript: 5.1.6 @@ -5181,7 +5118,7 @@ packages: '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/type-utils': 5.62.0(eslint@8.57.0)(typescript@5.1.6) '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.1.6) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.1 @@ -5206,7 +5143,7 @@ packages: '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.57.0 typescript: 5.1.6 transitivePeerDependencies: @@ -5233,7 +5170,7 @@ packages: dependencies: '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6) '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.1.6) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.57.0 tsutils: 3.21.0(typescript@5.1.6) typescript: 5.1.6 @@ -5257,7 +5194,7 @@ packages: dependencies: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/visitor-keys': 5.62.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.0 @@ -5341,7 +5278,7 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -5350,7 +5287,7 @@ packages: resolution: {integrity: sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==} engines: {node: '>= 14'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -5408,10 +5345,6 @@ packages: /amdefine@1.0.1: resolution: {integrity: sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==} engines: {node: '>=0.4.2'} - - /ansi-colors@4.1.1: - resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==} - engines: {node: '>=6'} dev: true /ansi-escapes@3.2.0: @@ -5721,7 +5654,7 @@ packages: resolution: {integrity: sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==} engines: {node: 8.* || >= 10.*} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 heimdalljs: 0.2.6 istextorbinary: 2.6.0 mkdirp: 0.5.6 @@ -5770,7 +5703,7 @@ packages: engines: {node: '>=10'} hasBin: true dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 fs-extra: 9.1.0 meow: 9.0.0 package-json: 6.5.0 @@ -5796,14 +5729,6 @@ packages: resolution: {integrity: sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==} dev: true - /babel-code-frame@6.26.0: - resolution: {integrity: sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==} - dependencies: - chalk: 1.1.3 - esutils: 2.0.3 - js-tokens: 3.0.2 - dev: true - /babel-import-util@2.1.1: resolution: {integrity: sha512-3qBQWRjzP9NreSH/YrOEU1Lj5F60+pWSLP0kIdCWxjFHH7pX2YPHIxQ67el4gnMNfYoDxSDGcT0zpVlZ+gVtQA==} engines: {node: '>= 12.*'} @@ -5827,12 +5752,6 @@ packages: schema-utils: 2.7.1 dev: false - /babel-messages@6.23.0: - resolution: {integrity: sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==} - dependencies: - babel-runtime: 6.26.0 - dev: true - /babel-plugin-debug-macros@0.2.0(@babel/core@7.24.4): resolution: {integrity: sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==} engines: {node: '>=4'} @@ -5862,7 +5781,7 @@ packages: '@babel/core': 7.24.4 babel-import-util: 2.1.1 semver: 7.6.0 - dev: false + dev: true /babel-plugin-ember-data-packages-polyfill@0.1.2: resolution: {integrity: sha512-kTHnOwoOXfPXi00Z8yAgyD64+jdSXk3pknnS7NlqnCKAU6YDkXZ4Y7irl66kaZjZn0FBBt0P4YOZFZk85jYOww==} @@ -5884,15 +5803,6 @@ packages: dependencies: '@glimmer/syntax': 0.84.3 babel-import-util: 2.1.1 - dev: false - - /babel-plugin-filter-imports@4.0.0: - resolution: {integrity: sha512-jDLlxI8QnfKd7PtieH6pl4tZJzymzfCDCPGdTq/grgbiYAikwDPp/oL0IlFJn0HQjLpcLkyYhPKkUVneRESw5w==} - engines: {node: '>=8'} - dependencies: - '@babel/types': 7.24.0 - lodash: 4.17.21 - dev: false /babel-plugin-htmlbars-inline-precompile@5.3.1: resolution: {integrity: sha512-QWjjFgSKtSRIcsBhJmEwS2laIdrA6na8HAlc/pEAhjHgQsah/gMiBFRZvbQTy//hWxR4BMwV7/Mya7q5H8uHeA==} @@ -5974,55 +5884,6 @@ packages: resolution: {integrity: sha512-MioUE+LfjCEz65Wf7Z/Rm4XCP5k2c+TbMd2Z2JKc7U9uwjBhAfNPE48KC4GTGKhppMeYVepwDBNO/nGY6NYHBA==} dev: false - /babel-runtime@6.26.0: - resolution: {integrity: sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==} - dependencies: - core-js: 2.6.12 - regenerator-runtime: 0.11.1 - dev: true - - /babel-template@6.26.0: - resolution: {integrity: sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==} - dependencies: - babel-runtime: 6.26.0 - babel-traverse: 6.26.0 - babel-types: 6.26.0 - babylon: 6.18.0 - lodash: 4.17.21 - transitivePeerDependencies: - - supports-color - dev: true - - /babel-traverse@6.26.0: - resolution: {integrity: sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==} - dependencies: - babel-code-frame: 6.26.0 - babel-messages: 6.23.0 - babel-runtime: 6.26.0 - babel-types: 6.26.0 - babylon: 6.18.0 - debug: 2.6.9 - globals: 9.18.0 - invariant: 2.2.4 - lodash: 4.17.21 - transitivePeerDependencies: - - supports-color - dev: true - - /babel-types@6.26.0: - resolution: {integrity: sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==} - dependencies: - babel-runtime: 6.26.0 - esutils: 2.0.3 - lodash: 4.17.21 - to-fast-properties: 1.0.3 - dev: true - - /babylon@6.18.0: - resolution: {integrity: sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==} - hasBin: true - dev: true - /backbone@1.6.0: resolution: {integrity: sha512-13PUjmsgw/49EowNcQvfG4gmczz1ximTMhUktj0Jfrjth0MVaTxehpU+qYYX4MxnuIuhmvBLC6/ayxuAGnOhbA==} dependencies: @@ -6080,11 +5941,6 @@ packages: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} dev: false - /binary-extensions@2.3.0: - resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} - engines: {node: '>=8'} - dev: true - /binaryextensions@2.3.0: resolution: {integrity: sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==} engines: {node: '>=0.8'} @@ -6104,10 +5960,6 @@ packages: resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==} dev: true - /blueimp-md5@2.19.0: - resolution: {integrity: sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==} - dev: true - /body-parser@1.20.2: resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} @@ -6321,6 +6173,7 @@ packages: lodash.uniq: 4.5.0 transitivePeerDependencies: - supports-color + dev: true /broccoli-config-loader@1.0.1: resolution: {integrity: sha512-MDKYQ50rxhn+g17DYdfzfEM9DjTuSGu42Db37A8TQHQe8geYEcUZ4SQqZRgzdAI3aRQNlA1yBHJfOeGmOjhLIg==} @@ -6391,7 +6244,7 @@ packages: dependencies: array-equal: 1.0.2 broccoli-plugin: 4.0.7 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 fs-tree-diff: 2.0.1 heimdalljs: 0.2.6 minimatch: 3.1.2 @@ -6578,24 +6431,6 @@ packages: transitivePeerDependencies: - supports-color - /broccoli-rollup@3.0.0: - resolution: {integrity: sha512-VpFFbDImDYXSIYNtuXOSJl2UZVA4uVuI0Ls28eU9cy7wovvgbymECmwTn4hcOFIVNT3+LbECXCZMIzdrhwzvoA==} - engines: {node: '>=6.0'} - dependencies: - '@types/node': 20.12.7 - broccoli-plugin: 1.3.1 - fs-tree-diff: 0.5.9 - heimdalljs: 0.2.6 - heimdalljs-logger: 0.1.10 - magic-string: 0.25.9 - node-modules-path: 1.0.2 - rollup: 4.16.4 - symlink-or-copy: 1.3.1 - walk-sync: 0.3.4 - transitivePeerDependencies: - - supports-color - dev: true - /broccoli-slow-trees@3.1.0: resolution: {integrity: sha512-FRI7mRTk2wjIDrdNJd6znS7Kmmne4VkAkl8Ix1R/VoePFMD0g0tEl671xswzFqaRjpT9Qu+CC4hdXDLDJBuzMw==} dependencies: @@ -6623,7 +6458,7 @@ packages: broccoli-persistent-filter: 2.3.1 broccoli-plugin: 2.1.0 chalk: 2.4.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ensure-posix-path: 1.1.1 fs-extra: 8.1.0 minimatch: 3.1.2 @@ -6635,50 +6470,6 @@ packages: - supports-color dev: true - /broccoli-string-replace@0.1.2: - resolution: {integrity: sha512-QHESTrrrPlKuXQNWsvXawSQbV2g34wCZ5oKgd6bntdOuN8VHxbg1BCBHqVY5HxXJhWelimgGxj3vI7ECkyij8g==} - dependencies: - broccoli-persistent-filter: 1.4.6 - minimatch: 3.1.2 - transitivePeerDependencies: - - supports-color - dev: true - - /broccoli-typescript-compiler@8.0.0(typescript@5.1.6): - resolution: {integrity: sha512-I6hs7tGYte/mU3OubPtcgqUgHSjqU5KzcsrKnXFqfSrpoaFkjHhhVZE5V2CdvfKOY1k6zJlldKL01fa+sjCG7A==} - peerDependencies: - typescript: ^4.0.3 - dependencies: - broccoli-funnel: 3.0.8 - broccoli-merge-trees: 4.2.0 - broccoli-plugin: 4.0.7 - fs-tree-diff: 2.0.1 - heimdalljs: 0.3.3 - md5-hex: 3.0.1 - typescript: 5.1.6 - walk-sync: 2.2.0 - transitivePeerDependencies: - - supports-color - dev: true - - /broccoli-uglify-sourcemap@4.0.0: - resolution: {integrity: sha512-46yB4gw1Q3ALtBROY5QfKXNXxYK5uPSvER1OGjjh2t3piaipqBfuRXTzQZvmZ+Odr6/McY+J8XmxON4+lE1ukg==} - engines: {node: ^10.12.0 || 12.* || >= 14} - dependencies: - async-promise-queue: 1.0.5 - broccoli-plugin: 4.0.7 - debug: 4.3.4(supports-color@8.1.1) - lodash.defaultsdeep: 4.6.1 - matcher-collection: 2.0.1 - source-map-url: 0.4.1 - symlink-or-copy: 1.3.1 - terser: 5.30.4 - walk-sync: 2.2.0 - workerpool: 6.5.1 - transitivePeerDependencies: - - supports-color - dev: true - /broccoli@3.5.2: resolution: {integrity: sha512-sWi3b3fTUSVPDsz5KsQ5eCQNVAtLgkIE/HYFkEZXR/07clqmd4E/gFiuwSaqa9b+QTXc1Uemfb7TVWbEIURWDg==} engines: {node: 8.* || >= 10.*} @@ -6711,10 +6502,6 @@ packages: - supports-color dev: true - /browser-stdout@1.3.1: - resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==} - dev: true - /browserslist@4.23.0: resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -6854,11 +6641,6 @@ packages: engines: {node: '>=6'} dev: true - /camelcase@6.3.0: - resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} - engines: {node: '>=10'} - dev: true - /can-symlink@1.0.0: resolution: {integrity: sha512-RbsNrFyhwkx+6psk/0fK/Q9orOUr9VMxohGd8vTa4djf4TGLfblBgUfqZChrZuW0Q+mz2eBPFLusw9Jfukzmhg==} hasBin: true @@ -6982,21 +6764,6 @@ packages: get-func-name: 2.0.2 dev: true - /chokidar@3.5.3: - resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} - engines: {node: '>= 8.10.0'} - dependencies: - anymatch: 3.1.3 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 - dev: true - /chromium-bidi@0.4.16(devtools-protocol@0.0.1147663): resolution: {integrity: sha512-7ZbXdWERxRxSwo3txsBjjmc/NLxqb1Bk30mRb0BMS4YIaiV6zvKZqL/UAH+DdqcDYayDWk2n/y8klkBDODrPvA==} peerDependencies: @@ -7085,14 +6852,6 @@ packages: engines: {node: '>= 10'} dev: true - /cliui@7.0.4: - resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} - dependencies: - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi: 7.0.0 - dev: true - /cliui@8.0.1: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} @@ -7193,11 +6952,6 @@ packages: engines: {node: '>= 10'} dev: true - /common-tags@1.8.2: - resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==} - engines: {node: '>=4.0.0'} - dev: true - /commondir@1.0.1: resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==} dev: false @@ -7497,6 +7251,7 @@ packages: /core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} + dev: true /cors@2.8.5: resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==} @@ -7642,7 +7397,7 @@ packages: ms: 2.1.3 dev: true - /debug@4.3.4(supports-color@8.1.1): + /debug@4.3.4: resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} peerDependencies: @@ -7652,7 +7407,6 @@ packages: optional: true dependencies: ms: 2.1.2 - supports-color: 8.1.1 /decamelize-keys@1.1.1: resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==} @@ -7667,11 +7421,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /decamelize@4.0.0: - resolution: {integrity: sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==} - engines: {node: '>=10'} - dev: true - /decode-uri-component@0.2.2: resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==} engines: {node: '>=0.10'} @@ -7822,11 +7571,6 @@ packages: engines: {node: '>=0.3.1'} dev: true - /diff@5.0.0: - resolution: {integrity: sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==} - engines: {node: '>=0.3.1'} - dev: true - /diff@5.2.0: resolution: {integrity: sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==} engines: {node: '>=0.3.1'} @@ -7910,7 +7654,7 @@ packages: broccoli-plugin: 4.0.7 broccoli-source: 3.0.1 css-loader: 5.2.7 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 fs-extra: 10.1.0 fs-tree-diff: 2.0.1 handlebars: 4.7.8 @@ -8019,7 +7763,7 @@ packages: chai: 4.4.1 chai-as-promised: 7.1.1(chai@4.4.1) chai-files: 1.4.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ember-cli-internal-test-helpers: 0.9.1 fs-extra: 7.0.1 testdouble: 3.20.2 @@ -8035,7 +7779,7 @@ packages: dependencies: browserstack: 1.6.1 browserstack-local: 1.5.5 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 rsvp: 4.8.5 yargs: 17.7.2 transitivePeerDependencies: @@ -8129,7 +7873,7 @@ packages: dependencies: '@babel/plugin-transform-typescript': 7.5.5(@babel/core@7.24.4) ansi-to-html: 0.6.15 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ember-cli-babel-plugin-helpers: 1.1.1 execa: 2.1.0 fs-extra: 8.1.0 @@ -8406,7 +8150,7 @@ packages: base64id: 2.0.0 cookie: 0.4.2 cors: 2.8.5 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 engine.io-parser: 5.2.2 ws: 8.11.0 transitivePeerDependencies: @@ -8829,7 +8573,7 @@ packages: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -9128,7 +8872,7 @@ packages: engines: {node: '>= 10.17.0'} hasBin: true dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 get-stream: 5.2.0 yauzl: 2.10.0 optionalDependencies: @@ -9184,6 +8928,7 @@ packages: source-map-url: 0.3.0 transitivePeerDependencies: - supports-color + dev: true /fast-xml-parser@4.2.5: resolution: {integrity: sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==} @@ -9315,6 +9060,7 @@ packages: /find-index@1.1.1: resolution: {integrity: sha512-XYKutXMrIK99YMUPf91KX5QVJoG31/OsgftD6YoTPAObfQIxM4ziA9f0J1AsqKhJmo+IeaIPP0CFopTD4bdUBw==} + dev: true /find-up@2.1.0: resolution: {integrity: sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==} @@ -9426,11 +9172,6 @@ packages: rimraf: 3.0.2 dev: true - /flat@5.0.2: - resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} - hasBin: true - dev: true - /flatted@3.3.1: resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true @@ -9542,6 +9283,7 @@ packages: graceful-fs: 4.2.11 jsonfile: 4.0.0 universalify: 0.1.2 + dev: true /fs-extra@7.0.1: resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==} @@ -9729,7 +9471,7 @@ packages: dependencies: basic-ftp: 5.0.5 data-uri-to-buffer: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 fs-extra: 11.2.0 transitivePeerDependencies: - supports-color @@ -9852,11 +9594,6 @@ packages: type-fest: 0.20.2 dev: true - /globals@9.18.0: - resolution: {integrity: sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==} - engines: {node: '>=0.10.0'} - dev: true - /globalthis@1.0.3: resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==} engines: {node: '>= 0.4'} @@ -10072,11 +9809,6 @@ packages: dev: true optional: true - /he@1.2.0: - resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} - hasBin: true - dev: true - /heimdalljs-fs-monitor@1.1.1: resolution: {integrity: sha512-BHB8oOXLRlrIaON0MqJSEjGVPDyqt2Y6gu+w2PaEZjrCxeVtZG7etEZp7M4ZQ80HNvnr66KIQ2lot2qdeG8HgQ==} dependencies: @@ -10107,12 +9839,6 @@ packages: dependencies: rsvp: 3.2.1 - /heimdalljs@0.3.3: - resolution: {integrity: sha512-xRlqDhgaXW4WccsiQlv6avDMKVN9Jk+FyMopDRPkmdf92TqfGSd2Osd/PKrK9sbM1AKcj8OpPlCzNlCWaLagCw==} - dependencies: - rsvp: 3.2.1 - dev: true - /hoek@0.9.1: resolution: {integrity: sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA==} engines: {node: '>=0.8.0'} @@ -10194,7 +9920,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -10236,7 +9962,7 @@ packages: engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -10246,7 +9972,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -10388,12 +10114,6 @@ packages: hasown: 2.0.2 side-channel: 1.0.6 - /invariant@2.2.4: - resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==} - dependencies: - loose-envify: 1.4.0 - dev: true - /invert-kv@3.0.1: resolution: {integrity: sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==} engines: {node: '>=8'} @@ -10443,13 +10163,6 @@ packages: dependencies: has-bigints: 1.0.2 - /is-binary-path@2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - dependencies: - binary-extensions: 2.3.0 - dev: true - /is-boolean-object@1.1.2: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} engines: {node: '>= 0.4'} @@ -10715,6 +10428,7 @@ packages: /isarray@0.0.1: resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==} + dev: true /isarray@1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} @@ -10762,10 +10476,6 @@ packages: resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==} engines: {node: '>= 0.8'} - /js-tokens@3.0.2: - resolution: {integrity: sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==} - dev: true - /js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -11070,10 +10780,6 @@ packages: /lodash.debounce@4.0.8: resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} - /lodash.defaultsdeep@4.6.1: - resolution: {integrity: sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==} - dev: true - /lodash.find@4.6.0: resolution: {integrity: sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==} dev: true @@ -11103,9 +10809,11 @@ packages: /lodash.merge@4.6.2: resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} + dev: true /lodash.omit@4.5.0: resolution: {integrity: sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==} + dev: true /lodash.restparam@3.6.1: resolution: {integrity: sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==} @@ -11126,6 +10834,7 @@ packages: /lodash.uniq@4.5.0: resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==} + dev: true /lodash.uniqby@4.7.0: resolution: {integrity: sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==} @@ -11149,13 +10858,6 @@ packages: is-unicode-supported: 0.1.0 dev: true - /loose-envify@1.4.0: - resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} - hasBin: true - dependencies: - js-tokens: 4.0.0 - dev: true - /loupe@2.3.7: resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==} dependencies: @@ -11197,6 +10899,7 @@ packages: resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==} dependencies: sourcemap-codec: 1.4.8 + dev: false /make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} @@ -11289,13 +10992,6 @@ packages: '@types/minimatch': 3.0.5 minimatch: 3.1.2 - /md5-hex@3.0.1: - resolution: {integrity: sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==} - engines: {node: '>=8'} - dependencies: - blueimp-md5: 2.19.0 - dev: true - /mdn-links@0.1.0: resolution: {integrity: sha512-m+gI2Hrgro1O0SwqHd9cFkqN8VGzP56eprB63gxu6z9EFQDMeaR083wcNqMVADIbgiMP/TOCCe0ZIXHLBv2tUg==} dev: true @@ -11322,6 +11018,7 @@ packages: resolution: {integrity: sha512-qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA==} dependencies: readable-stream: 1.0.34 + dev: true /memorystream@0.3.1: resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==} @@ -11463,13 +11160,6 @@ packages: dependencies: brace-expansion: 1.1.11 - /minimatch@5.0.1: - resolution: {integrity: sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==} - engines: {node: '>=10'} - dependencies: - brace-expansion: 2.0.1 - dev: true - /minimatch@5.1.6: resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} engines: {node: '>=10'} @@ -11563,33 +11253,6 @@ packages: resolution: {integrity: sha512-IXnMcJ6ZyTuhRmJSjzvHSRhlVPiN9Jwc6e59V0bEJ0ba6OBeX2L0E+mRN1QseeOF4mM+F1Rit6Nh7o+rl2Yn/A==} engines: {node: '>0.9'} - /mocha@10.4.0: - resolution: {integrity: sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==} - engines: {node: '>= 14.0.0'} - hasBin: true - dependencies: - ansi-colors: 4.1.1 - browser-stdout: 1.3.1 - chokidar: 3.5.3 - debug: 4.3.4(supports-color@8.1.1) - diff: 5.0.0 - escape-string-regexp: 4.0.0 - find-up: 5.0.0 - glob: 8.1.0 - he: 1.2.0 - js-yaml: 4.1.0 - log-symbols: 4.1.0 - minimatch: 5.0.1 - ms: 2.1.3 - serialize-javascript: 6.0.0 - strip-json-comments: 3.1.1 - supports-color: 8.1.1 - workerpool: 6.2.1 - yargs: 16.2.0 - yargs-parser: 20.2.4 - yargs-unparser: 2.0.0 - dev: true - /morgan@1.10.0: resolution: {integrity: sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==} engines: {node: '>= 0.8.0'} @@ -12106,7 +11769,7 @@ packages: dependencies: '@tootallnate/quickjs-emscripten': 0.23.0 agent-base: 7.1.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 get-uri: 6.0.3 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.4 @@ -12453,7 +12116,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.4 lru-cache: 7.18.3 @@ -12504,7 +12167,7 @@ packages: '@puppeteer/browsers': 1.4.6(typescript@5.1.6) chromium-bidi: 0.4.16(devtools-protocol@0.0.1147663) cross-fetch: 4.0.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 devtools-protocol: 0.0.1147663 typescript: 5.1.6 ws: 8.13.0 @@ -12599,12 +12262,6 @@ packages: tiny-glob: 0.2.9 dev: true - /randombytes@2.1.0: - resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==} - dependencies: - safe-buffer: 5.2.1 - dev: true - /range-parser@1.2.1: resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} engines: {node: '>= 0.6'} @@ -12672,6 +12329,7 @@ packages: inherits: 2.0.4 isarray: 0.0.1 string_decoder: 0.10.31 + dev: true /readable-stream@3.6.2: resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} @@ -12682,13 +12340,6 @@ packages: util-deprecate: 1.0.2 dev: true - /readdirp@3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} - dependencies: - picomatch: 2.3.1 - dev: true - /recast@0.18.10: resolution: {integrity: sha512-XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ==} engines: {node: '>= 4'} @@ -12733,10 +12384,6 @@ packages: /regenerate@1.4.2: resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==} - /regenerator-runtime@0.11.1: - resolution: {integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==} - dev: true - /regenerator-runtime@0.13.11: resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} @@ -13220,12 +12867,6 @@ packages: - supports-color dev: true - /serialize-javascript@6.0.0: - resolution: {integrity: sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==} - dependencies: - randombytes: 2.1.0 - dev: true - /serve-static@1.15.0: resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==} engines: {node: '>= 0.8.0'} @@ -13341,7 +12982,6 @@ packages: /simple-html-tokenizer@0.5.11: resolution: {integrity: sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==} - dev: false /slash@3.0.0: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} @@ -13398,7 +13038,7 @@ packages: /socket.io-adapter@2.5.4: resolution: {integrity: sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ws: 8.11.0 transitivePeerDependencies: - bufferutil @@ -13411,7 +13051,7 @@ packages: engines: {node: '>=10.0.0'} dependencies: '@socket.io/component-emitter': 3.1.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -13423,7 +13063,7 @@ packages: accepts: 1.3.8 base64id: 2.0.0 cors: 2.8.5 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 engine.io: 6.5.4 socket.io-adapter: 2.5.4 socket.io-parser: 4.2.4 @@ -13438,7 +13078,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 socks: 2.8.3 transitivePeerDependencies: - supports-color @@ -13493,6 +13133,7 @@ packages: /source-map-url@0.3.0: resolution: {integrity: sha512-QU4fa0D6aSOmrT+7OHpUXw+jS84T0MLaQNtFs8xzLNe6Arj44Magd7WEbyVW5LNYoAPVV35aKs4azxIfVJrToQ==} deprecated: See https://github.com/lydell/source-map-url#deprecated + dev: true /source-map-url@0.4.1: resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==} @@ -13504,6 +13145,7 @@ packages: engines: {node: '>=0.8.0'} dependencies: amdefine: 1.0.1 + dev: true /source-map@0.5.7: resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==} @@ -13517,6 +13159,7 @@ packages: /sourcemap-codec@1.4.8: resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==} deprecated: Please use @jridgewell/sourcemap-codec instead + dev: false /spawn-args@0.2.0: resolution: {integrity: sha512-73BoniQDcRWgnLAf/suKH6V5H54gd1KLzwYN9FB6J/evqTV33htH9xwV/4BHek+++jzxpVlZQKKZkqstPQPmQg==} @@ -13568,7 +13211,7 @@ packages: resolution: {integrity: sha512-GqXBq2SPWv9hTXDFKS8WrKK1aISB0aKGHZzH+uD4ShAgs+Fz20ZfoerLOm8U+f62iRWLrw6nimOY/uYuTcVhvg==} engines: {node: 6.* || 8.* || >= 10.*} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: false @@ -13671,6 +13314,7 @@ packages: /string_decoder@0.10.31: resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==} + dev: true /string_decoder@1.3.0: resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==} @@ -13806,12 +13450,6 @@ packages: dependencies: has-flag: 4.0.0 - /supports-color@8.1.1: - resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} - engines: {node: '>=10'} - dependencies: - has-flag: 4.0.0 - /supports-preserve-symlinks-flag@1.0.0: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} @@ -13834,7 +13472,7 @@ packages: resolution: {integrity: sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==} engines: {node: 8.* || >= 10.*} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 heimdalljs: 0.2.6 mkdirp: 0.5.6 rimraf: 3.0.2 @@ -13888,17 +13526,6 @@ packages: rimraf: 2.6.3 dev: true - /terser@5.30.4: - resolution: {integrity: sha512-xRdd0v64a8mFK9bnsKVdoNP9GQIKUAaJPTaqEQDL4w/J8WaW4sWXXoMZ+6SimPkfT5bElreXf8m9HnmPc3E1BQ==} - engines: {node: '>=10'} - hasBin: true - dependencies: - '@jridgewell/source-map': 0.3.6 - acorn: 8.11.3 - commander: 2.20.3 - source-map-support: 0.5.21 - dev: true - /testdouble@3.20.2: resolution: {integrity: sha512-790e9vJKdfddWNOaxW1/V9FcMk48cPEl3eJSj2i8Hh1fX89qArEJ6cp3DBnaECpGXc3xKJVWbc1jeNlWYWgiMg==} engines: {node: '>= 16'} @@ -14139,11 +13766,6 @@ packages: resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==} dev: true - /to-fast-properties@1.0.3: - resolution: {integrity: sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==} - engines: {node: '>=0.10.0'} - dev: true - /to-fast-properties@2.0.0: resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} engines: {node: '>=4'} @@ -14221,7 +13843,7 @@ packages: resolution: {integrity: sha512-OLWW+Nd99NOM53aZ8ilT/YpEiOo6mXD3F4/wLbARqybSZ3Jb8IxHK5UGVbZaae0wtXAyQshVV+SeqVBik+Fbmw==} engines: {node: '>=8'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 fs-tree-diff: 2.0.1 mkdirp: 0.5.6 quick-temp: 0.1.8 @@ -14791,10 +14413,6 @@ packages: transitivePeerDependencies: - supports-color - /workerpool@6.2.1: - resolution: {integrity: sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==} - dev: true - /workerpool@6.5.1: resolution: {integrity: sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==} @@ -14883,11 +14501,6 @@ packages: lodash.merge: 4.6.2 dev: true - /yargs-parser@20.2.4: - resolution: {integrity: sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==} - engines: {node: '>=10'} - dev: true - /yargs-parser@20.2.9: resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} engines: {node: '>=10'} @@ -14898,29 +14511,6 @@ packages: engines: {node: '>=12'} dev: true - /yargs-unparser@2.0.0: - resolution: {integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==} - engines: {node: '>=10'} - dependencies: - camelcase: 6.3.0 - decamelize: 4.0.0 - flat: 5.0.2 - is-plain-obj: 2.1.0 - dev: true - - /yargs@16.2.0: - resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==} - engines: {node: '>=10'} - dependencies: - cliui: 7.0.4 - escalade: 3.1.2 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - string-width: 4.2.3 - y18n: 5.0.8 - yargs-parser: 20.2.4 - dev: true - /yargs@17.7.1: resolution: {integrity: sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==} engines: {node: '>=12'} diff --git a/rollup.config.mjs b/rollup.config.mjs index 304828c2624..89f93bc1bf4 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -11,16 +11,20 @@ const { PackageCache, packageName } = require('@embroider/shared-internals'); const projectRoot = dirname(fileURLToPath(import.meta.url)); const packageCache = PackageCache.shared('ember-source', projectRoot); const { buildInfo } = require('./broccoli/build-info'); -const buildDebugMacroPlugin = require('./lib/build-debug-macro-plugin'); +const buildDebugMacroPlugin = require('./broccoli/build-debug-macro-plugin'); const canaryFeatures = require('./broccoli/canary-features'); const testDependencies = ['qunit', 'vite']; export default [ esmConfig(), - legacyBundleConfig('./lib/amd-compat-entrypoints/ember.debug.js', 'ember.debug.js', true), - legacyBundleConfig('./lib/amd-compat-entrypoints/ember.debug.js', 'ember.prod.js', false), - legacyBundleConfig('./lib/amd-compat-entrypoints/ember-testing.js', 'ember-testing.js', true), + legacyBundleConfig('./broccoli/amd-compat-entrypoints/ember.debug.js', 'ember.debug.js', true), + legacyBundleConfig('./broccoli/amd-compat-entrypoints/ember.debug.js', 'ember.prod.js', false), + legacyBundleConfig( + './broccoli/amd-compat-entrypoints/ember-testing.js', + 'ember-testing.js', + true + ), templateCompilerConfig(), ]; @@ -421,7 +425,7 @@ function templateCompilerConfig() { '@ember/application': `undefined`, }; let config = legacyBundleConfig( - './lib/amd-compat-entrypoints/ember-template-compiler.js', + './broccoli/amd-compat-entrypoints/ember-template-compiler.js', 'ember-template-compiler.js', true ); diff --git a/server/index.js b/server/index.js deleted file mode 100644 index bb180fff6a5..00000000000 --- a/server/index.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = function (app) { - app.get('/', function (req, res) { - res.redirect('/tests/index.html?hidepassed'); - }); -};