From 307bb56ab912208414c795fe36c306c55b5da62b Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Wed, 28 Mar 2018 18:22:30 -0700 Subject: [PATCH] switch from @std/esm to esm --- package-lock.json | 10 +++++----- package.json | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 717e9437..b9425e83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,6 @@ "resolved": "https://registry.npmjs.org/@gamestdio/websocket/-/websocket-0.2.2.tgz", "integrity": "sha512-ptWTKBq6IliC7lNhfAI/YI5WBjhPClflZV61V7In/qxGbgrWrlny6/Df4NtrUs7QUeNccv8yqQwjjw+f0veGjQ==" }, - "@std/esm": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@std/esm/-/esm-0.25.0.tgz", - "integrity": "sha512-htyUY4TrUSMYLdtmk2RPrNJJGZPAhliYcjf5vIh+RMVEI6Yy88Jl98cWcJY8McPcrizkXdbzOGFtp6pf8qd45w==" - }, "@types/chalk": { "version": "0.4.31", "resolved": "https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz", @@ -2962,6 +2957,11 @@ "estraverse": "4.2.0" } }, + "esm": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/esm/-/esm-3.0.12.tgz", + "integrity": "sha512-DkfPQ/dJHBtYOvStTsr/heiMDFOijSbFDco/qfe5YORpHuhn0mCXTOD+QRlp3ihOgkDc1CP12kXKhWbNSqhTfg==" + }, "espree": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.3.tgz", diff --git a/package.json b/package.json index 210ba23e..d9f6e60a 100644 --- a/package.json +++ b/package.json @@ -14,20 +14,19 @@ "build-svg": "node ./bin/build-svg.js", "build-sass": "node ./bin/build-sass.js", "build-sass-watch": "node ./bin/build-sass.js --watch", - "run-mastodon": "node -r @std/esm ./bin/run-mastodon", + "run-mastodon": "node -r esm ./bin/run-mastodon", "run-testcafe": "cross-env-shell testcafe --hostname localhost --skip-js-errors $BROWSER tests/spec", "test": "cross-env BROWSER=chrome:headless npm run test-browser", "test-browser": "run-p --race run-mastodon dev test-mastodon", "test-mastodon": "run-s wait-for-mastodon-to-start wait-for-mastodon-data run-testcafe", - "wait-for-mastodon-to-start": "node -r @std/esm bin/wait-for-mastodon-to-start.js", - "wait-for-mastodon-data": "node -r @std/esm bin/wait-for-mastodon-data.js", + "wait-for-mastodon-to-start": "node -r esm bin/wait-for-mastodon-to-start.js", + "wait-for-mastodon-data": "node -r esm bin/wait-for-mastodon-data.js", "globalize-css": "node ./bin/globalize-css.js", "deglobalize-css": "node ./bin/globalize-css.js --reverse", "backup-mastodon-data": "pg_dump -Fc mastodon_development > fixtures/dump.sql && cd mastodon/public/system && tar -czf ../../../fixtures/system.tgz ." }, "dependencies": { "@gamestdio/websocket": "^0.2.2", - "@std/esm": "^0.25.0", "a11y-dialog": "^4.0.1", "cheerio": "^1.0.0-rc.2", "child-process-promise": "^2.2.1", @@ -35,6 +34,7 @@ "compression": "^1.7.1", "cross-env": "^5.1.3", "css-loader": "^0.28.7", + "esm": "^3.0.12", "express": "^4.16.2", "fg-loadcss": "^2.0.1", "file-api": "^0.10.4", @@ -111,8 +111,8 @@ "routes/_utils/asyncModules.js" ] }, - "@std/esm": { - "mode": "js", + "esm": { + "mode": "auto", "cjs": "vars" }, "now": {