From ce0d770dceda2a6d586c971afa64f0be7c597eb9 Mon Sep 17 00:00:00 2001 From: Jonathon Reese Perry Date: Sun, 1 Dec 2024 13:03:58 -0600 Subject: [PATCH 1/7] Create atproto-did --- .well-known/atproto-did | 1 + 1 file changed, 1 insertion(+) create mode 100644 .well-known/atproto-did diff --git a/.well-known/atproto-did b/.well-known/atproto-did new file mode 100644 index 0000000..54b193d --- /dev/null +++ b/.well-known/atproto-did @@ -0,0 +1 @@ +did:plc:g3gvegk5idcnf6p56b534uzg From 0a1402fd68e42585fc477e4e68ce172ad0ff114b Mon Sep 17 00:00:00 2001 From: Jonathon Reese Perry Date: Sun, 1 Dec 2024 20:02:05 +0000 Subject: [PATCH 2/7] update fix --- .github/workflows/npm-gulp-minify_assets.yml | 2 +- .well-known/atproto-did | 1 - .well-known/atproto-did/index.txt | 2 ++ package.json | 36 ++++++++++---------- 4 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 .well-known/atproto-did create mode 100644 .well-known/atproto-did/index.txt diff --git a/.github/workflows/npm-gulp-minify_assets.yml b/.github/workflows/npm-gulp-minify_assets.yml index 1f4f141..de3f56a 100644 --- a/.github/workflows/npm-gulp-minify_assets.yml +++ b/.github/workflows/npm-gulp-minify_assets.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: diff --git a/.well-known/atproto-did b/.well-known/atproto-did deleted file mode 100644 index 54b193d..0000000 --- a/.well-known/atproto-did +++ /dev/null @@ -1 +0,0 @@ -did:plc:g3gvegk5idcnf6p56b534uzg diff --git a/.well-known/atproto-did/index.txt b/.well-known/atproto-did/index.txt new file mode 100644 index 0000000..14249dc --- /dev/null +++ b/.well-known/atproto-did/index.txt @@ -0,0 +1,2 @@ + +did:plc:g3gvegk5idcnf6p56b534uzg \ No newline at end of file diff --git a/package.json b/package.json index 8909c7c..792cc94 100644 --- a/package.json +++ b/package.json @@ -23,23 +23,23 @@ ], "dependencies": {}, "devDependencies": { - "del": "^6.0.0", - "extend": "^3.0.2", - "gulp": "^4.0.2", - "gulp-clean-css": "^4.3.0", - "gulp-imagemin": "^8.0.0", - "gulp-postcss": "^9.0.1", - "gulp-rename": "^2.0.0", - "gulp-responsive": "^3.0.1", - "gulp-sass": "^5.1.0", - "gulp-seo": "^1.0.2", - "gulp-typescript": "^6.0.0-alpha.1", - "gulp-uglify": "^3.0.2", - "gulp-webserver": "^0.9.1", - "node-notifier": "^10.0.1", - "postcss": "^8.4.6", - "postcss-preset-env": "^7.3.3", - "sass": "^1.49.9", - "typescript": "^4.5.5" + "del": "6.0.0", + "extend": "3.0.2", + "gulp": "4.0.2", + "gulp-clean-css": "4.3.0", + "gulp-imagemin": "8.0.0", + "gulp-postcss": "9.0.1", + "gulp-rename": "2.0.0", + "gulp-responsive": "3.0.1", + "gulp-sass": "5.1.0", + "gulp-seo": "1.0.2", + "gulp-typescript": "6.0.0-alpha.1", + "gulp-uglify": "3.0.2", + "gulp-webserver": "0.9.1", + "node-notifier": "10.0.1", + "postcss": "8.4.6", + "postcss-preset-env": "7.3.3", + "sass": "1.49.9", + "typescript": "4.5.5" } } From 9321d9b2dd036794deeb8be6ddc4d338e0f5b226 Mon Sep 17 00:00:00 2001 From: Jonathon Reese Perry Date: Sun, 1 Dec 2024 20:07:52 +0000 Subject: [PATCH 3/7] set engines --- .npmrc | 1 + package.json | 39 +++++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..4fd0219 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +engine-strict=true \ No newline at end of file diff --git a/package.json b/package.json index 792cc94..0d662ef 100644 --- a/package.json +++ b/package.json @@ -23,23 +23,26 @@ ], "dependencies": {}, "devDependencies": { - "del": "6.0.0", - "extend": "3.0.2", - "gulp": "4.0.2", - "gulp-clean-css": "4.3.0", - "gulp-imagemin": "8.0.0", - "gulp-postcss": "9.0.1", - "gulp-rename": "2.0.0", - "gulp-responsive": "3.0.1", - "gulp-sass": "5.1.0", - "gulp-seo": "1.0.2", - "gulp-typescript": "6.0.0-alpha.1", - "gulp-uglify": "3.0.2", - "gulp-webserver": "0.9.1", - "node-notifier": "10.0.1", - "postcss": "8.4.6", - "postcss-preset-env": "7.3.3", - "sass": "1.49.9", - "typescript": "4.5.5" + "del": "^6.0.0", + "extend": "^3.0.2", + "gulp": "^4.0.2", + "gulp-clean-css": "^4.3.0", + "gulp-imagemin": "^8.0.0", + "gulp-postcss": "^9.0.1", + "gulp-rename": "^2.0.0", + "gulp-responsive": "^3.0.1", + "gulp-sass": "^5.1.0", + "gulp-seo": "^1.0.2", + "gulp-typescript": "^6.0.0-alpha.1", + "gulp-uglify": "^3.0.2", + "gulp-webserver": "^0.9.1", + "node-notifier": "^10.0.1", + "postcss": "^8.4.6", + "postcss-preset-env": "^7.3.3", + "sass": "^1.49.9", + "typescript": "^4.5.5" + }, + "engines": { + "node": "14.x.x" } } From 2dd9d8347a97859f109e250f945c49ef2aace5fa Mon Sep 17 00:00:00 2001 From: Jonathon Reese Perry Date: Sun, 1 Dec 2024 20:12:44 +0000 Subject: [PATCH 4/7] try upgrading node --- .github/workflows/npm-gulp-minify_assets.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/npm-gulp-minify_assets.yml b/.github/workflows/npm-gulp-minify_assets.yml index de3f56a..d3e43df 100644 --- a/.github/workflows/npm-gulp-minify_assets.yml +++ b/.github/workflows/npm-gulp-minify_assets.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - node-version: [14.x] + node-version: [16.x] steps: - uses: actions/checkout@v2 diff --git a/package.json b/package.json index 0d662ef..9536ce8 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,6 @@ "typescript": "^4.5.5" }, "engines": { - "node": "14.x.x" + "node": "16.x.x" } } From 2943ed0cd11f8f967836cf4986c4bf76f1495cb0 Mon Sep 17 00:00:00 2001 From: Jonathon Reese Perry Date: Sun, 1 Dec 2024 20:16:06 +0000 Subject: [PATCH 5/7] upgrade node to minimum needed by cherrio? --- .github/workflows/npm-gulp-minify_assets.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/npm-gulp-minify_assets.yml b/.github/workflows/npm-gulp-minify_assets.yml index d3e43df..2c17091 100644 --- a/.github/workflows/npm-gulp-minify_assets.yml +++ b/.github/workflows/npm-gulp-minify_assets.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v2 diff --git a/package.json b/package.json index 9536ce8..549b641 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,6 @@ "typescript": "^4.5.5" }, "engines": { - "node": "16.x.x" + "node": "18.x.x" } } From 96fd9d2c5c361fd680a6b2227ab297872da1dde5 Mon Sep 17 00:00:00 2001 From: Jonathon Reese Perry Date: Sun, 1 Dec 2024 20:23:00 +0000 Subject: [PATCH 6/7] downgrade ubuntu version --- .github/workflows/npm-gulp-minify_assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-gulp-minify_assets.yml b/.github/workflows/npm-gulp-minify_assets.yml index 2c17091..2b0b1a4 100644 --- a/.github/workflows/npm-gulp-minify_assets.yml +++ b/.github/workflows/npm-gulp-minify_assets.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 strategy: matrix: From 387e691d76a22ac5be14fdeb7b394c943365350b Mon Sep 17 00:00:00 2001 From: Jonathon Reese Perry Date: Sun, 1 Dec 2024 20:54:14 +0000 Subject: [PATCH 7/7] move to public and remove unused packages causing errors --- package.json | 2 -- {.well-known => public/.well-known}/atproto-did/index.txt | 0 2 files changed, 2 deletions(-) rename {.well-known => public/.well-known}/atproto-did/index.txt (100%) diff --git a/package.json b/package.json index 549b641..fdfe5cf 100644 --- a/package.json +++ b/package.json @@ -27,10 +27,8 @@ "extend": "^3.0.2", "gulp": "^4.0.2", "gulp-clean-css": "^4.3.0", - "gulp-imagemin": "^8.0.0", "gulp-postcss": "^9.0.1", "gulp-rename": "^2.0.0", - "gulp-responsive": "^3.0.1", "gulp-sass": "^5.1.0", "gulp-seo": "^1.0.2", "gulp-typescript": "^6.0.0-alpha.1", diff --git a/.well-known/atproto-did/index.txt b/public/.well-known/atproto-did/index.txt similarity index 100% rename from .well-known/atproto-did/index.txt rename to public/.well-known/atproto-did/index.txt